Testcase for Grill Cli and Grill Client.

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