Update test framework to include groupby .. having tests