[8.x] Fixing muted tests and small refactor to remove duplicate functions (#125138)#125152

elasticsearchmachine merged 4 commits intoelastic:8.xelastic/elasticsearch:8.xfrom

ymao1:backport/8.x/pr-125138ymao1/elasticsearch:backport/8.x/pr-125138Copy head branch name to clipboard