Added some TDD-tests