Fix more broken tests.