Test Refactor