test & util: Add a missing test and a conditonal teller#21455

Closed

ghost wants to merge 1 commit intomasterfrom unknown repository

+26-9