Fixed more tests.