Fix cli internal interface
Fix cli test