Refactoring test suite