Trying to stabilize the tests on all environments