Set/Bag test tweaks