Make unions into sets.
Progess fixing the tests.