Improve test coverage

[#56447064]
Merge 56447064-coverage to master

[Completes #56447064]