Setup tests
Merge pull request #66 from charliedowler/master

Setup tests