diff --git a/tests/Aetheria.Shared.Tests/MiningCut3Tests.cs b/tests/Aetheria.Shared.Tests/MiningCut3Tests.cs
index d6de2de59..a92f69a0c 100644
--- a/tests/Aetheria.Shared.Tests/MiningCut3Tests.cs
+++ b/tests/Aetheria.Shared.Tests/MiningCut3Tests.cs
@@ -850,9 +850,10 @@ public sealed partial class MiningCut3Tests : IDisposable
                 existing.GenerationWeight = 0f;
                 cache.Upsert(existing);
             }
-            cache.Upsert(Kind("Gen A", 1f, 1f));
-            cache.Upsert(Kind("Gen B", 1f, 2f));
-            cache.Upsert(Kind("Gen C", 1f, 4f));
+            // Authored kinds have fixed keys; the pick orders kinds by key, so the fixture's keys are fixed too.
+            cache.Upsert(typeof(FieldKindData), Kind("Gen A", 1f, 1f), new CultRecordKey("field-kind:gen-a"));
+            cache.Upsert(typeof(FieldKindData), Kind("Gen B", 1f, 2f), new CultRecordKey("field-kind:gen-b"));
+            cache.Upsert(typeof(FieldKindData), Kind("Gen C", 1f, 4f), new CultRecordKey("field-kind:gen-c"));
             Galaxy galaxy;
             try
             {
diff --git a/tests/Aetheria.Shared.Tests/StationKindTests.cs b/tests/Aetheria.Shared.Tests/StationKindTests.cs
index 12d1c0e50..47154c1c7 100644
--- a/tests/Aetheria.Shared.Tests/StationKindTests.cs
+++ b/tests/Aetheria.Shared.Tests/StationKindTests.cs
@@ -343,9 +343,9 @@ public sealed class StationKindTests : IDisposable
             var galaxy = new Galaxy(authored.Read<TutorialGenerationSettings>("TutorialGenerationSettings"),
                 authored.Read<SectorBackgroundSettings>("TutorialBackgroundSettings"), w.Cache, new PlayerSettings(),
                 Directory.CreateDirectory(Path.Combine(_root, "galaxy" + _worlds++, "Narrative")), _ => { }, null, 3);
-            var pack = ZoneGenerator.GenerateZone(w.Items, authored.Read<ZoneGenerationSettings>("ZoneSettings"),
-                authored.Read<PlanetSettings>("PlanetSettings"), galaxy, galaxy.Entrance, galaxy.IsPrelude, true);
-            return pack.Entities.OfType<OrbitalEntityPack>().Where(e => e.Kind.IsSet()).Select(e => e.Kind.Key.Value).ToArray();
+            return galaxy.Zones.Take(8).SelectMany(zone => ZoneGenerator.GenerateZone(w.Items, authored.Read<ZoneGenerationSettings>("ZoneSettings"),
+                    authored.Read<PlanetSettings>("PlanetSettings"), galaxy, zone, zone == galaxy.Entrance && galaxy.IsPrelude, true)
+                .Entities.OfType<OrbitalEntityPack>().Where(e => e.Kind.IsSet()).Select(e => e.Kind.Key.Value)).ToArray();
         }
         var first = Kinds();
         Assert.True(first.Length >= 3, "the sample placed stations");