Update bug reference numbers, and bring over part of a test from unfixed that is now working (rest remains broken)