Filled in a few more tests for CLI.