More tests!
Merge pull request #104 from g-ortuno/moar-tests

More tests!