Another try to fix the tests.