CliMessage tests
More tests in place