refactored team stuff
debugging tests
fixed test suite