One more attempt to fix test failures.