Update admin for orgs
Remove use of TeamMember
Correct test