Improving the CLI and adding a couple of host specific tests.

Signed-off-by: Rob Dobson <rob.dobson@citrix.com>