refactored test suite.