Fix failing tests
Merge pull request #179 from magopian/fix-failing-tests

fix failing tests on jenkins