Fixed the test suite.