Cli tests

Opening this up for further discussion.