Fix some more tests.