diff --git a/Tests/Editor/PerfBaseline.cs b/Tests/Editor/PerfBaseline.cs
index 441de1e..f5b4b4b 100644
--- a/Tests/Editor/PerfBaseline.cs
+++ b/Tests/Editor/PerfBaseline.cs
@@ -950,14 +950,18 @@ internal RunState(string outputDirectory)
 
         private enum Phase
         {
-            Idle,
-            WaitingColdReady,
-            InteractionSamples,
-            WaitingSearchResults,
-            WarmOpen,
-            WaitingWarmReady,
-            BetweenWarmRepetitions,
-            Finished,
+            [Obsolete("Please use a valid value")]
+            None = 0,
+
+            // RunState explicitly initializes Idle; phases are never persisted.
+            Idle = 8,
+            WaitingColdReady = 1,
+            InteractionSamples = 2,
+            WaitingSearchResults = 3,
+            WarmOpen = 4,
+            WaitingWarmReady = 5,
+            BetweenWarmRepetitions = 6,
+            Finished = 7,
         }
     }
 }
diff --git a/Tests/Editor/PerfBaselineTests.cs b/Tests/Editor/PerfBaselineTests.cs
index 0803556..fc0dc12 100644
--- a/Tests/Editor/PerfBaselineTests.cs
+++ b/Tests/Editor/PerfBaselineTests.cs
@@ -71,13 +71,16 @@ public void ShouldEscapeJsonStrings(string input, string expected)
             Assert.AreEqual(expected, PerfBaseline.JsonEscape(input));
         }
 
-        [Test]
-        public void ShouldNameFixturesDeterministically()
+        [TestCase(0, "Player Save")]
+        [TestCase(7, "Damage Table")]
+        [TestCase(8, "Player Save 000001")]
+        [TestCase(9, "World Settings 000001")]
+        [TestCase(15, "Damage Table 000001")]
+        [TestCase(16, "Player Save 000002")]
+        [TestCase(9999, "Damage Table 001249")]
+        public void ShouldNameFixturesDeterministically(int index, string expected)
         {
-            Assert.AreEqual("Player Save", PerfBaseline.FixtureName(0));
-            Assert.AreEqual("Damage Table", PerfBaseline.FixtureName(7));
-            Assert.AreEqual("Player Save 000001", PerfBaseline.FixtureName(8));
-            Assert.AreEqual("World Settings 000002", PerfBaseline.FixtureName(9));
+            Assert.AreEqual(expected, PerfBaseline.FixtureName(index));
         }
 
         [Test]