Fix more broken tests