add the CLI as well as the tests for it