test suite refactored