Refactor TDD