Part 1 of bringing Set/Bag tests up to spec
Part 2 of bringing Bag/Set tests up to spec again