Converted INTERSECT tests and moved to separate files