Added basic TDD features