Test cleanup

[justsmth]

Description of changes:

A few minor test issues to clean up.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.89%. Comparing base (ab8953b) to head (7d8e7d0).

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2000   +/-   ##
=======================================
  Coverage   78.89%   78.89%           
=======================================
  Files         595      595           
  Lines      102451   102450    -1     
  Branches    14527    14526    -1     
=======================================
+ Hits        80827    80831    +4     
+ Misses      20976    20969    -7     
- Partials      648      650    +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

---

🚨 Try these New Features:

• Flaky Tests Detection - Detect and resolve failed and flaky tests