Small changes in test cases + removed duplicate grouping entry