More fix for test failures.