Fix tests

There was two breaking tests (one exception and one failure) with dependencies versions.

This PR fix the tests, though I'm not sure about my second commit (see commit msg).