Merge pull request #26 from eparis/moar-tests

Moar tests