Add new functional CLI tests

Change-Id: Ia0d8f727e6875f6c39551dd84eab1ad9422ad820
Closes-Bug: #1398383