Fix some flaky tests

[basepi]

What does this pull request do?

Fixes a couple of flaky tests since the introduction of #1628

Fixes #1633

[apmmachine]

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

• Start Time: 2022-09-14T18:12:46.638+0000

• Duration: 31 min 19 sec

Test stats 🧪

Test	Results
Failed	0
Passed	4979
Skipped	3338
Total	8317

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

• /test : Re-trigger the build.

• /test linters : Run the Python linters only.

• /test full : Run the full matrix of tests.

• /test benchmark : Run the APM Agent Python benchmarks tests.

• run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

[apmmachine]

🌐 Coverage report

Name	Metrics % (covered/total)	Diff
Packages	100.0% (66/66)	💚
Files	100.0% (225/225)	💚
Classes	100.0% (225/225)	💚
Lines	89.808% (17464/19446)	👎 -0.008
Conditionals	77.133% (3191/4137)	👍

[basepi]

/test full

[beniwohli]

Great find!