+ Unit test failures are resolved
Refs: #17685, #18169