Test fixes#22724

ellert wants to merge 3 commits into

root-project:masterroot-project/root:masterfrom

ellert:test-fixesellert/root:test-fixesCopy head branch name to clipboard