adding team and refactoring tests