Fix more broken tests after merge from master