fix: address test failures

Closes #3604038

Merge request reports

Loading