Updates to join and aggregates testcases
Incremental updates for JoinsSuite tests
Change .toRdd.collect to sql()