Cli tests

Opening this up for further discussion. Closes #450.
These should assert the new output.