Add more code coverage improvements

[acelaya]

Closes #2527

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 95.03%. Comparing base (0604237) to head (9432a5b).
⚠️ Report is 9 commits behind head on develop.

Additional details and impacted files

@@              Coverage Diff              @@
##             develop    #2533      +/-   ##
=============================================
+ Coverage      94.31%   95.03%   +0.71%     
+ Complexity      1700     1698       -2     
=============================================
  Files            277      277              
  Lines           5545     5539       -6     
=============================================
+ Hits            5230     5264      +34     
+ Misses           315      275      -40     

☔ 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.