Cli tests

Opening this up for further discussion. Closes #450.
This Is not safe to run concurrently.