SOLID and TDD, Sitting in a

Refactoring