tidy up the CLI, add a test for usage