TDD2 Refactoring