Another small update to the teams stuff + testing.