Create Test Refactor