Added Tests

Tried some TDD, seems to be going ok.