JARVIS-495 updated tests to cover 100% of cli