Fix unit tests
Merge pull request #240 from TheoChevalier/fix-travis

Fix unit tests