Trying again to fix the tests.