refactoring test suite