Refactoring the basic test suite.