Attempt to fix the tests.