Cleaned up test suite.