Comment out the assertion for join and where. Add more test cases, including complex group by