Fix 2 unit tests that were assuming specific ordering for sets; and order changed between hppc 0.4 and 0.5