Add CLI tests
Add tests for remainder of CLI