Finally fixing the tests.