Fixed older failing tests.