added consumer groups and relevant tests