Fix tests
Merge pull request #26 from MrCreosote/master

Fix tests