Team decorator
Team decorator
fixing tests
fixing some team tests