Rewritten several set matching tests to no longer depend on construction
order.
Untangling