Fix test failures.