Additional tests. Fixes #11 #12
Merge pull request #13 from mrjoelkemp/tests

Additional tests. Fixes #11 #12