Adding more tests for grouping