some TDD fixes