Fixing tests
Merge pull request #1 from FabienDeshayes/master

Fixing tests