Faster tests
Merge pull request #28 from borovsky/testing-magic

Faster tests