Fix more test failures