Improve script and resolve context-dependent test failure

[bwohlberg]

Improve script and resolve context-dependent test failure.

[codecov]

Codecov Report

Merging #305 (01c73dd) into main (89d6870) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #305   +/-   ##
=======================================
  Coverage   93.98%   93.98%           
=======================================
  Files          54       54           
  Lines        3356     3356           
=======================================
  Hits         3154     3154           
  Misses        202      202           

Flag	Coverage Δ
unittests	93.98% <ø> (ø)

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

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 89d6870...01c73dd. Read the comment docs.