Refactoring test complete