Completed team service code and tests