added more test for {x|P(X) & P2(X)} sets + impl of t special cases