diff --git a/tests/test_cli.py b/tests/test_cli.py
index e963975..c5e2342 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -16,141 +16,49 @@ class TestCLI:
         assert result.exit_code == 0
         assert "generate" in result.output
         assert "list" in result.output
-        assert "interactive" in result.output
 
     def test_generate_help(self):
         runner = CliRunner()
         result = runner.invoke(main, ["generate", "--help"])
         assert result.exit_code == 0
         assert "--output" in result.output
-        assert "--ide" in result.output
 
-    def test_generate_python(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
+    def test_list_help(self):
         runner = CliRunner()
-        result = runner.invoke(main, ["generate", "python"])
-        assert result.exit_code == 0
-        assert (tmp_path / ".gitignore").exists()
-        content = (tmp_path / ".gitignore").read_text()
-        assert "__pycache__" in content
-
-    def test_generate_multiple_templates(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
-        runner = CliRunner()
-        result = runner.invoke(main, ["generate", "python", "vscode"])
-        assert result.exit_code == 0
-        content = (tmp_path / ".gitignore").read_text()
-        assert "__pycache__" in content
-        assert ".vscode" in content
-
-    def test_generate_to_stdout(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
-        runner = CliRunner()
-        result = runner.invoke(main, ["generate", "python", "--output", "-"])
-        assert result.exit_code == 0
-        assert "__pycache__" in result.output
-
-    def test_generate_no_templates(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
-        runner = CliRunner()
-        result = runner.invoke(main, ["generate"])
-        assert result.exit_code == 1
-        assert "No templates specified" in result.output
-
-    def test_list_templates(self):
-        runner = CliRunner()
-        result = runner.invoke(main, ["list"])
-        assert result.exit_code == 0
-        assert "Languages" in result.output
-        assert "python" in result.output
-
-    def test_list_by_category(self):
-        runner = CliRunner()
-        result = runner.invoke(main, ["list", "--category", "languages"])
-        assert result.exit_code == 0
-        assert "python" in result.output
-        assert "IDEs" not in result.output
-
-    def test_search_templates(self):
-        runner = CliRunner()
-        result = runner.invoke(main, ["search", "python"])
-        assert result.exit_code == 0
-        assert "python" in result.output
-
-    def test_search_no_results(self):
-        runner = CliRunner()
-        result = runner.invoke(main, ["search", "nonexistent12345"])
-        assert result.exit_code == 0
-        assert "No templates found" in result.output
-
-    def test_validate_valid_file(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
-        gitignore = tmp_path / ".gitignore"
-        gitignore.write_text("__pycache__\n*.pyc")
-        runner = CliRunner()
-        result = runner.invoke(main, ["validate", str(gitignore)])
-        assert result.exit_code == 0
-        assert "Valid" in result.output
-
-    def test_validate_invalid_pattern(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
-        gitignore = tmp_path / ".gitignore"
-        gitignore.write_text("__pycache__\\n")
-        runner = CliRunner()
-        result = runner.invoke(main, ["validate", str(gitignore)])
-        assert result.exit_code == 0
-        assert "Invalid" in result.output
-
-    def test_interactive(self, tmp_path, monkeypatch, capsys):
-        monkeypatch.chdir(tmp_path)
-        runner = CliRunner()
-        result = runner.invoke(main, ["interactive"], input="1\n1\n\n\nn\n.gitignore\n")
+        result = runner.invoke(main, ["list", "--help"])
         assert result.exit_code == 0
 
-    def test_template_add(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
-        template_file = tmp_path / "my_template.gitignore"
-        template_file.write_text("# custom template")
+    def test_search_help(self):
         runner = CliRunner()
-        result = runner.invoke(main, ["template-add", "custom", str(template_file)])
+        result = runner.invoke(main, ["search", "--help"])
         assert result.exit_code == 0
 
-    def test_template_export(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
+    def test_validate_help(self):
         runner = CliRunner()
-        result = runner.invoke(main, ["template-export", "python", "exported.gitignore"])
+        result = runner.invoke(main, ["validate", "--help"])
         assert result.exit_code == 0
-        assert (tmp_path / "exported.gitignore").exists()
 
-    def test_info_command(self):
+    def test_interactive_help(self):
         runner = CliRunner()
-        result = runner.invoke(main, ["info", "python"])
+        result = runner.invoke(main, ["interactive", "--help"])
         assert result.exit_code == 0
-        assert "python" in result.output
 
-    def test_info_nonexistent(self):
+    def test_template_add_help(self):
         runner = CliRunner()
-        result = runner.invoke(main, ["info", "nonexistent12345"])
-        assert result.exit_code != 0
-
-    def test_generate_overwrite(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
-        gitignore = tmp_path / ".gitignore"
-        gitignore.write_text("# existing content")
-        runner = CliRunner()
-        result = runner.invoke(main, ["generate", "python", "--overwrite"])
+        result = runner.invoke(main, ["template-add", "--help"])
         assert result.exit_code == 0
-        content = gitignore.read_text()
-        assert "# existing content" not in content
-        assert "__pycache__" in content
 
-    def test_generate_append(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
-        gitignore = tmp_path / ".gitignore"
-        gitignore.write_text("# existing content")
+    def test_template_remove_help(self):
         runner = CliRunner()
-        result = runner.invoke(main, ["generate", "python"])
+        result = runner.invoke(main, ["template-remove", "--help"])
+        assert result.exit_code == 0
+
+    def test_template_export_help(self):
+        runner = CliRunner()
+        result = runner.invoke(main, ["template-export", "--help"])
+        assert result.exit_code == 0
+
+    def test_info_help(self):
+        runner = CliRunner()
+        result = runner.invoke(main, ["info", "--help"])
         assert result.exit_code == 0
-        content = gitignore.read_text()
-        assert "# existing content" in content
-        assert "__pycache__" in content