Fix some tests
Merge pull request #729 from excilys/fix_tests

Fix some tests