Cherry pick 'Fixing the schema resolver related Unit tests' into the release branch

Original MR: !162 (merged)

Merge request reports

Loading