Fixing muted tests and consolidating duplicate functions#125138

ymao1 merged 3 commits intoelastic:mainelastic/elasticsearch:mainfrom

ymao1:input-type-followupsymao1/elasticsearch:input-type-followupsCopy head branch name to clipboard