WithValueIsOrderedSet tests and some fixes