Fix again test failures.