Fixed the rest of the test suite.