Fix the test suite