Cleaned up the test suite.