Fix more test failures.