Add tests for 4731- support team behavior