Fix some unit tests in 21.0-mc16d branch
This merge request backports a number of fixes for unit tests from 21.0 to 21.0-mc16d. Mostly just reference file updates, although some non-functional tests are disabled in addition.
This merge request backports a number of fixes for unit tests from 21.0 to 21.0-mc16d. Mostly just reference file updates, although some non-functional tests are disabled in addition.