fixes and tests for SetTheory stuff