This should fix the tests.