[6.12.z] Fix test failures from cli.factory refactor

[6.12.z] Fix test failures from cli.factory refactor #3771