Fixed 5 more tests.