Make the tests work again
Merge pull request #1 from aurhe/fix-tests

Make the tests work again