Fix tests
Merge pull request #330 from frankier/fix_tests

Fix tests