Add GroupByTestCase and OrderByTestCase