Fixed some more tests.