Using set equality in some tests where workarounds were before.
Merge pull request #358 from herby/using-set-equality

Using set equality in some tests where workarounds were before.