Trying fixing the tests.