more tests
Merge pull request #11 from craigspaeth/master

More tests