[6.14.z] fix cli errata tests and update cli factory method

[6.14.z] fix cli errata tests and update cli factory method #3944