Unit tests for thr CLI
More CLI tests
Merge branch 'cli-unit-tests'