Fix the tests!