Fixing even more tests.