Edit with the expected messages from the CLI
Edit with the expected messages from the CLI