Issue #2331477 followup: fixing tests