Testcase for Grill Cli and Grill Client.

Fixing misc bug fixes in the code which were not caught in testing.


help should say query to explain? 

Can you check help for all the commands once?