Lays out some future tests, adds some tests to the CLI