simple test suite refactoring