Attempt to fix new tests that are failing.