Changes to group activity to support test cases