And more testing
Merge pull request #2 from erinnichols/moar-testing

And more testing