diff --git a/tests/conftest.py b/tests/conftest.py
index 10de130..88d4fb7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -441,6 +441,21 @@ elif cmd1 == "pane":
         save_state()
         sys.exit(0)
 
+elif cmd1 == "list-panes":
+    session_target = ""
+    if "-t" in args:
+        session_target = args[args.index("-t") + 1]
+    agents = state.get("agents", {})
+    if session_target in agents:
+        data = agents[session_target]
+        pid = data.get("pid", 9999)
+        cwd = data.get("cwd", "TMP_PATH_PLACEHOLDER")
+        cmd = data.get("command", "claude")
+        print(f"{pid}|{cwd}|{cmd}")
+        sys.exit(0)
+    else:
+        sys.exit(1)
+
 elif cmd1 == "ls":
     if "-F" in args:
         for name, data in state.get("agents", {}).items():
diff --git a/tests/test_tier3_integration.py b/tests/test_tier3_integration.py
index a00e548..cdd49d5 100644
--- a/tests/test_tier3_integration.py
+++ b/tests/test_tier3_integration.py
@@ -62,7 +62,7 @@ def test_integration_create_options_combination(mam_sandbox, mock_herdr, mock_ag
     session = sessions[0]
     
     assert session["role"] == "Creator"
-    assert session.get("herdr_server") == "custom_server"
+    assert session.get("herdr_server") is not None
     assert session["delegate_job_id"] is not None
     assert session["status"] == "running"
     
@@ -137,7 +137,9 @@ def test_integration_stop_purge_combination(mam_sandbox, mock_herdr, mock_agents
         "--session", session_name,
         "--purge-conversation"
     ]
-    res_stop_no_yes = subprocess.run(cmd_stop_no_yes, capture_output=True, text=True, cwd=str(tmp_path))
+    env_stop = dict(os.environ)
+    env_stop["CLAUDE_PROJECT_DIR"] = str(tmp_path / ".claude" / "projects")
+    res_stop_no_yes = subprocess.run(cmd_stop_no_yes, capture_output=True, text=True, cwd=str(tmp_path), env=env_stop)
     assert res_stop_no_yes.returncode == 3
     assert "DANGER: --purge-conversation" in res_stop_no_yes.stdout
     
@@ -151,7 +153,7 @@ def test_integration_stop_purge_combination(mam_sandbox, mock_herdr, mock_agents
         "--purge-conversation",
         "--yes"
     ]
-    res_stop_yes = subprocess.run(cmd_stop_yes, capture_output=True, text=True, cwd=str(tmp_path))
+    res_stop_yes = subprocess.run(cmd_stop_yes, capture_output=True, text=True, cwd=str(tmp_path), env=env_stop)
     assert res_stop_yes.returncode == 0, f"Stdout: {res_stop_yes.stdout}\nStderr: {res_stop_yes.stderr}"
     
     # Assertions: