Allow seft-unions plus beefed up the self-join test cases