diff --git a/tests/qa-dash-08-cross-account-views/run.sh b/tests/qa-dash-08-cross-account-views/run.sh
index ad8406c2..9d00ce65 100644
--- a/tests/qa-dash-08-cross-account-views/run.sh
+++ b/tests/qa-dash-08-cross-account-views/run.sh
@@ -86,9 +86,9 @@ mcp_call "$ALICE_NTOK" "report_status" "$ARG" | jq -e '.ok == true' >/dev/null \
   || { echo "FAIL: alice report_status"; exit 1; }
 # dispatch + reply (so /api/completions gets a row)
 ARG=$(jq -nc --arg net "$ALICE_NET" \
-  '{alias:"alice-secret-agent",task:"alice-confidential-task",priority:"normal",network_id:$net,from_session:"alice"}')
+  '{alias:"alice-secret-agent",task:"alice-confidential-task",priority:"normal",network_id:$net,from_session:"alice-secret-agent"}')
 TASK_ID=$(mcp_call "$ALICE_NTOK" "send_task" "$ARG" | jq -r '.message_id')
-[[ -n "$TASK_ID" ]] || { echo "FAIL: no task id"; exit 1; }
+[[ -n "$TASK_ID" && "$TASK_ID" != "null" ]] || { echo "FAIL: no task id"; exit 1; }
 ARG=$(jq -nc --arg t "$TASK_ID" \
   '{alias:"alice",text:"alice-private-reply-text",in_reply_to:$t,status:"replied",from_session:"alice-secret-agent"}')
 mcp_call "$ALICE_NTOK" "send_reply" "$ARG" | jq -e '.ok == true' >/dev/null \
diff --git a/tests/qa-dash-10-incremental-poll/run.sh b/tests/qa-dash-10-incremental-poll/run.sh
index 958aab89..4a0d5bcd 100644
--- a/tests/qa-dash-10-incremental-poll/run.sh
+++ b/tests/qa-dash-10-incremental-poll/run.sh
@@ -79,7 +79,7 @@ mcp_call "$NTOK" "report_status" "$ARG" | jq -e '.ok == true' >/dev/null \
 do_send() {
   local text="$1"
   ARG=$(jq -nc --arg net "$NET_ID" --arg t "$text" \
-    '{alias:"dash10-agent",task:$t,priority:"normal",network_id:$net,from_session:"admin"}')
+    '{alias:"dash10-agent",task:$t,priority:"normal",network_id:$net,from_session:"dash10-agent"}')
   mcp_call "$NTOK" "send_task" "$ARG" | jq -r '.message_id'
 }
 
diff --git a/tests/qa-hub-06b-cross-user-isolation/run.sh b/tests/qa-hub-06b-cross-user-isolation/run.sh
index 880a6514..f4181edb 100644
--- a/tests/qa-hub-06b-cross-user-isolation/run.sh
+++ b/tests/qa-hub-06b-cross-user-isolation/run.sh
@@ -94,7 +94,7 @@ mcp_call "$ALICE_NTOK" "report_status" "$ARG" | jq -e '.ok == true' >/dev/null \
 
 echo "[3] alice sends a 'top-secret-alice' task to alice-agent"
 ARG=$(jq -nc --arg a "alice-agent" --arg t "top-secret-alice-payload" --arg net "$ALICE_NET" \
-  '{alias:$a,task:$t,priority:"normal",network_id:$net,from_session:"alice"}')
+  '{alias:$a,task:$t,priority:"normal",network_id:$net,from_session:"alice-agent"}')
 mcp_call "$ALICE_NTOK" "send_task" "$ARG" | jq -e '.message_id' >/dev/null \
   || { echo "FAIL: alice send_task"; exit 1; }
 
diff --git a/tests/qa-hub-09-task-state-machine/run.sh b/tests/qa-hub-09-task-state-machine/run.sh
index 040bcdf6..751839aa 100644
--- a/tests/qa-hub-09-task-state-machine/run.sh
+++ b/tests/qa-hub-09-task-state-machine/run.sh
@@ -128,7 +128,7 @@ echo "[5] BRANCH cancelled: send → cancel_task"
 T_CXL=$(send_task "$UTOK" "$NET_ID" "agent-09" "task-cancelled")
 [[ "$(task_field "$UTOK" "$NET_ID" "$T_CXL" status)" == "delivered" ]] || \
   { echo "FAIL: cancel PRE != delivered"; exit 1; }
-ARG=$(jq -nc --arg t "$T_CXL" '{task_id:$t,reason:"user changed mind",from_session:"admin"}')
+ARG=$(jq -nc --arg t "$T_CXL" '{task_id:$t,reason:"user changed mind",from_session:"agent-09"}')
 # cancel_task needs a network-scoped writer (canWrite). Use NTOK (which is
 # bound to NET_ID) — agent-09 cancelling a task targeted at itself.
 CXL_RESP=$(mcp_call "$NTOK" "cancel_task" "$ARG")
@@ -163,7 +163,7 @@ sleep 0.2
   { echo "FAIL: terminal task.status changed on second send_reply"; exit 1; }
 
 echo "[8] PIN: cancel_task on already-cancelled task returns ok:false"
-ARG=$(jq -nc --arg t "$T_CXL" '{task_id:$t,reason:"again",from_session:"admin"}')
+ARG=$(jq -nc --arg t "$T_CXL" '{task_id:$t,reason:"again",from_session:"agent-09"}')
 CXL2=$(mcp_call "$NTOK" "cancel_task" "$ARG")
 # cancel_task's WHERE excludes terminal states → changes=0 → ok:false
 echo "$CXL2" | jq -e '.ok == false' >/dev/null \