Fresh start - tests
From-srcatch refresh for TDD