Fixed some TDD tests