diff --git a/src/NodeDev.Blazor/NodeDev.Blazor.csproj b/src/NodeDev.Blazor/NodeDev.Blazor.csproj
index cb3ed18..7dadfbb 100644
--- a/src/NodeDev.Blazor/NodeDev.Blazor.csproj
+++ b/src/NodeDev.Blazor/NodeDev.Blazor.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="BlazorMonaco" Version="3.2.0" />
     <PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="7.0.0-rc.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0-rc.1.24452.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
     <PackageReference Include="MudBlazor" Version="7.2.0" />
   </ItemGroup>
 
diff --git a/src/NodeDev.Core/NodeDev.Core.csproj b/src/NodeDev.Core/NodeDev.Core.csproj
index 787fe34..1aa964c 100644
--- a/src/NodeDev.Core/NodeDev.Core.csproj
+++ b/src/NodeDev.Core/NodeDev.Core.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FastExpressionCompiler" Version="4.2.1" />
-    <PackageReference Include="NuGet.Versioning" Version="6.11.0" />
+    <PackageReference Include="FastExpressionCompiler" Version="4.2.2" />
+    <PackageReference Include="NuGet.Versioning" Version="6.12.1" />
     <PackageReference Include="System.Reactive" Version="6.0.1" />
   </ItemGroup>
 
diff --git a/src/NodeDev.EndToEndTests/Features/SaveProject.feature.cs b/src/NodeDev.EndToEndTests/Features/SaveProject.feature.cs
index 837ef7f..916f927 100644
--- a/src/NodeDev.EndToEndTests/Features/SaveProject.feature.cs
+++ b/src/NodeDev.EndToEndTests/Features/SaveProject.feature.cs
@@ -28,34 +28,41 @@ public partial class SaveAProjectToFileSystemFeature
         
         private static string[] featureTags = ((string[])(null));
         
+        private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "Save a project to file system", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags);
+        
 #line 1 "SaveProject.feature"
 #line hidden
         
         [NUnit.Framework.OneTimeSetUpAttribute()]
-        public virtual async System.Threading.Tasks.Task FeatureSetupAsync()
+        public static async System.Threading.Tasks.Task FeatureSetupAsync()
         {
-            testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly();
-            global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "Save a project to file system", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags);
-            await testRunner.OnFeatureStartAsync(featureInfo);
         }
         
         [NUnit.Framework.OneTimeTearDownAttribute()]
-        public virtual async System.Threading.Tasks.Task FeatureTearDownAsync()
+        public static async System.Threading.Tasks.Task FeatureTearDownAsync()
         {
-            await testRunner.OnFeatureEndAsync();
-            global::Reqnroll.TestRunnerManager.ReleaseTestRunner(testRunner);
-            testRunner = null;
         }
         
         [NUnit.Framework.SetUpAttribute()]
         public async System.Threading.Tasks.Task TestInitializeAsync()
         {
+            testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo);
+            if (((testRunner.FeatureContext != null) 
+                        && (testRunner.FeatureContext.FeatureInfo.Equals(featureInfo) == false)))
+            {
+                await testRunner.OnFeatureEndAsync();
+            }
+            if ((testRunner.FeatureContext == null))
+            {
+                await testRunner.OnFeatureStartAsync(featureInfo);
+            }
         }
         
         [NUnit.Framework.TearDownAttribute()]
         public async System.Threading.Tasks.Task TestTearDownAsync()
         {
             await testRunner.OnScenarioEndAsync();
+            global::Reqnroll.TestRunnerManager.ReleaseTestRunner(testRunner);
         }
         
         public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo)
diff --git a/src/NodeDev.EndToEndTests/NodeDev.EndToEndTests.csproj b/src/NodeDev.EndToEndTests/NodeDev.EndToEndTests.csproj
index 885db40..4fed022 100644
--- a/src/NodeDev.EndToEndTests/NodeDev.EndToEndTests.csproj
+++ b/src/NodeDev.EndToEndTests/NodeDev.EndToEndTests.csproj
@@ -21,11 +21,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.47.0" />
-    <PackageReference Include="Reqnroll.NUnit" Version="2.1.0" />
-    <PackageReference Include="nunit" Version="3.14.0" />
+    <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.48.0" />
+    <PackageReference Include="Reqnroll.NUnit" Version="2.2.1" />
+    <PackageReference Include="nunit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="FluentAssertions" Version="6.12.1" />
+    <PackageReference Include="FluentAssertions" Version="6.12.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/NodeDev.Tests/NodeDev.Tests.csproj b/src/NodeDev.Tests/NodeDev.Tests.csproj
index fca5f18..fb3e7ca 100644
--- a/src/NodeDev.Tests/NodeDev.Tests.csproj
+++ b/src/NodeDev.Tests/NodeDev.Tests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>