Modified team tests