Trying once again to fix these tests.