Made changes as asked by Jay in PR. Added tests to UserGroupListWidget.
ACTUALLY cleaned code for non-team groups.