Merge pull request #63 from retornam/fix

fixing broken tests
fixing test_teams