Merge pull request #129 from tooxie/tests

MOAR TESTS!