TDD almost done 26April