TDD improvements