Refactor team test