[420821] Fix test failures in full test suite
2 files changed