Added some tests
Merge pull request #237 from brendandburns/tests

Added some tests