added tests for Cli
Cli changes