Refactored includes tests
Added one more include test, fixes for complex select queries involving multiple joins.
Minor re-organization of tests