Refactor and TDD