Fix UT failure in ClusterCommandsTest