Completing TDD implementation