Fix broken tests after a137e59