7261 Followup to make tests consistent