Fix existing test failures

Claudiu Cristearequested to merge
issue/node_revision_delete-3619956:3619956-fix-tests-failures into 2.1.x

Closes #3619956

Merge request reports