Removed join queries for non-sql tests