refactored group related test cases