APOLLO-3179 Removed group
APOLLO-3179 Changed grouping to only accept teams and updated tests
APOLLO-3179 Added in displayName tests