Using set equality in some tests where workarounds were before.