Fixing the tests.