TDD almost done