Added tests and team level to roster