Moar tests.
Merge pull request #115 from kilogram/master

Test coverage 1-up'd