Support #1725: Improving pup_stl testing