Stuff; moar tests
Merge pull request #14 from boaf/master

Adding more tests