Fixing more tests.