Expand cli test, cleaned up message output
Merge pull request #5 from bayendor/cli_improvements

Expand cli test, cleaned up message output