Add team context to suggestion when adding draft picks to team and rubocop and test fixes