Fix broken tests after merging in #6