Redo PR 976 because the interim package refactoring caused the files to hang around post merge.

[gregschohn]

Description

See PR 976

Check List

• New functionality includes testing
  • All tests pass, including unit test, integration test and doctest
• New functionality has been documented
• Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.16%. Comparing base (84f499e) to head (8ccfbe7).
Report is 2 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main     #999      +/-   ##
============================================
+ Coverage     79.83%   80.16%   +0.33%     
+ Complexity     2721     2720       -1     
============================================
  Files           375      370       -5     
  Lines         13680    13622      -58     
  Branches        939      938       -1     
============================================
- Hits          10921    10920       -1     
+ Misses         2188     2131      -57     
  Partials        571      571              

Flag	Coverage Δ
gradle-test	78.17% <ø> (+0.39%)	⬆️
python-test	89.90% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

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