Cli tests

Opening this up for further discussion. Closes #450.
It was removed because it is redundant since #520.