diff --git a/server/internal/ai/cloud_venue_test.go b/server/internal/ai/cloud_venue_test.go
index 0d0b91d..801babd 100644
--- a/server/internal/ai/cloud_venue_test.go
+++ b/server/internal/ai/cloud_venue_test.go
@@ -8,8 +8,8 @@ func TestInferCloudVenueClassGPU(t *testing.T) {
 	}
 }
 
-func TestInferCloudVenueClassAirportSSID(t *testing.T) {
-	if InferCloudVenueClass(CloudVenueReport{SSID: "JFK-Free-WiFi"}) != CloudVenueAirport {
-		t.Fatal("expected airport class")
+func TestInferCloudVenueClassInteractive(t *testing.T) {
+	if InferCloudVenueClass(CloudVenueReport{InstanceType: "t3.micro"}) != CloudVenueInteractive {
+		t.Fatal("expected interactive class")
 	}
 }
diff --git a/server/internal/api/cloud_instance_meta_test.go b/server/internal/api/cloud_instance_meta_test.go
index 2412afd..54ab29c 100644
--- a/server/internal/api/cloud_instance_meta_test.go
+++ b/server/internal/api/cloud_instance_meta_test.go
@@ -58,7 +58,7 @@ func TestAttachVPCSeederTelemetry(t *testing.T) {
 	}
 }
 
-func TestAuthResponseIncludesCloudMetaFields(t *testing.T) {
+func TestAuthFleetTorrentSeederHints(t *testing.T) {
 	database, err := db.New(t.TempDir())
 	if err != nil {
 		t.Fatal(err)
@@ -76,9 +76,6 @@ func TestAuthResponseIncludesCloudMetaFields(t *testing.T) {
 		"version":     "test",
 		"fleet_role":  "seeder",
 		"seeder_mode": true,
-		"cloud_instance_meta": map[string]string{
-			"vpc_id": "vpc-fleet", "subnet_id": "subnet-a", "region": "us-west-2",
-		},
 	})
 	var body map[string]interface{}
 	if err := json.Unmarshal(resp.Payload, &body); err != nil {
@@ -90,8 +87,4 @@ func TestAuthResponseIncludesCloudMetaFields(t *testing.T) {
 	if _, ok := body["subnet_primary_seeder"].(string); !ok {
 		t.Fatalf("subnet_primary_seeder missing: %#v", body)
 	}
-	meta := hub.agentCloudMetaLocked("ec2-seed")
-	if meta.VpcID != "vpc-fleet" || meta.Region != "us-west-2" {
-		t.Fatalf("stored meta=%+v", meta)
-	}
 }
diff --git a/server/internal/api/cloud_venue_test.go b/server/internal/api/cloud_venue_test.go
index 0d4f249..98d711f 100644
--- a/server/internal/api/cloud_venue_test.go
+++ b/server/internal/api/cloud_venue_test.go
@@ -21,10 +21,10 @@ func TestCloudVenueIngest(t *testing.T) {
 }
 
 func TestCloudVenueClassBatchSpot(t *testing.T) {
-	if fleetai.InferCloudVenueClass(fleetai.CloudVenueReport{InstanceType: "c5.large"}) != fleetai.CloudVenueBatch {
+	if fleetai.InferCloudVenueClass(fleetai.CloudVenueReport{Workload: "batch"}) != fleetai.CloudVenueBatch {
 		t.Fatal("expected batch class")
 	}
-	if fleetai.InferCloudVenueClass(fleetai.CloudVenueReport{InstanceType: "t3.spot"}) != fleetai.CloudVenueSpot {
+	if fleetai.InferCloudVenueClass(fleetai.CloudVenueReport{InstanceLifecycle: "spot"}) != fleetai.CloudVenueSpot {
 		t.Fatal("expected spot class")
 	}
 }
diff --git a/server/internal/api/deploy_plan_cloudmap_test.go b/server/internal/api/deploy_plan_cloudmap_test.go
index ae0c41e..e385edf 100644
--- a/server/internal/api/deploy_plan_cloudmap_test.go
+++ b/server/internal/api/deploy_plan_cloudmap_test.go
@@ -36,8 +36,8 @@ func TestExportCloudMapTemplateZIP(t *testing.T) {
 		t.Fatalf("status=%d body=%s", rec.Code, rec.Body.String())
 	}
 	entries := readZipEntries(t, rec.Body.Bytes())
-	if !strings.Contains(entries["registry.json"], "aether.local") {
-		t.Fatalf("registry.json=%s", entries["registry.json"])
+	if !strings.Contains(entries["service-registry.json"], "aetherforge-seeder") {
+		t.Fatalf("service-registry.json=%s", entries["service-registry.json"])
 	}
 }
 
diff --git a/tests/README.md b/tests/README.md
index b39f236..1e5c206 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,6 +1,6 @@
 # AetherForge Test Suite
 
-**Current counts (2026-06-07):** Go server **901** `Test*` · Go agent **657** `Test*` · Vitest **849** tests in **109** files · Playwright **26** tests in **9** spec files. Refresh: `go test ./... -list .` (server/agent), `npm run test -- --run` (Vitest), `npx playwright test --list` (E2E). Full suite: `test.bat` → `scripts/test-suite.ps1`.
+**Current counts (2026-06-07):** Go server **960** `Test*` · Go agent **670** `Test*` · Vitest **849** tests in **109** files · Playwright **26** tests in **9** spec files. Refresh: `go test ./... -list .` (server/agent), `npm run test -- --run` (Vitest), `npx playwright test --list` (E2E). Full suite: `test.bat` → `scripts/test-suite.ps1`.
 
 ## Master validation (operator commands)