Cli tests

Opening this up for further discussion. Closes #450.
Oops, missed the next line.