[1.23] misc test fixes#6323

openshift-merge-robot merged 3 commits intocri-o:release-1.23cri-o/cri-o:release-1.23from

haircommander:fix-unit-test-1.23haircommander/cri-o:fix-unit-test-1.23Copy head branch name to clipboard