Factory for Team, and more tests