finish refactoring test suite