Make tests run
Merge pull request #6 from Munter/master

Make tests run