Updating equijoin test to include join syntax
Adding support for subqueries