Second attempt to fix the tests.