moar tests!
Merge pull request #6 from eriksvedang/master

moar tests!