Refactored the test suite.