Group C added
Added group D
More teams, tests pass, safer deployment