Finally fixed the tests.