Add more tests for command line client

Change-Id: Ib43f9e4e615285a01166fc9c4a5255aba024d142
Merge "Add more tests for command line client"