Fix the test suite.