test suite refactoring