Fixing more tests, all done now, all pass