Added tests for CLI