Fix parsing of UNION

Previously SELECT 123 UNION DISTINCT SELECT 123 UNION ALL SELECT 123 was
parsed as SELECT 123 UNION DISTINCT SELECT 123 UNION DISTINCT SELECT 123
Add test query for previously broken UNION query
Fix parsing of INTERSECT
Increase test timeout to 60secs to resolve random failures