Start adding tests for CLI