Fix tests
Merge pull request #12 from yosssi/fix-test

Fix tests