Test infrastructure for TDD continued