Teams updates

Adds needed tests but not the remove functionality