Fixed the tests
Merge pull request #166 from GrahamCampbell/tests

Fixed The Tests