Fix flaky tests

[jonesbusy]

Description

Fix flaky tests

Saw on multiple recent PRs

Testing done

Run ran the updated tests

Submitter checklist

• I have read and understood the CONTRIBUTING guide
• I have run mvn license:update-file-header, mvn spotless:apply, pre-commit run -a, mvn clean install before opening the PR

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 86.98%. Comparing base (d07d3c2) to head (549d000).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main     #667      +/-   ##
============================================
+ Coverage     86.43%   86.98%   +0.55%     
  Complexity      937      937              
============================================
  Files            43       43              
  Lines          2904     2904              
  Branches        364      364              
============================================
+ Hits           2510     2526      +16     
+ Misses          234      218      -16     
  Partials        160      160              

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

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.