Cli tests fixes

Test fixes according last automation job result.

Some of the tests was updated and some was skipped due to a bug.