Started moving towards TDD