diff --git a/test/yavscTests/Mandatory/ServerSideFixture.cs b/test/yavscTests/Mandatory/ServerSideFixture.cs
index 3a66affc..92d53989 100644
--- a/test/yavscTests/Mandatory/ServerSideFixture.cs
+++ b/test/yavscTests/Mandatory/ServerSideFixture.cs
@@ -230,7 +230,7 @@ namespace yavscTests
                 WebHostBuilder = new WebHostBuilder();
                 webhostengnine = WebHostBuilder
                 .UseEnvironment("Development")
-                .UseServer("Yavsc")
+                .UseServer("yavscTests")
                 .UseStartup<Yavsc.Startup>()
                 .Build();
                 WebApp = webhostengnine.Start();
@@ -240,9 +240,9 @@ namespace yavscTests
 
         public void Dispose()
         {
-            WebApp.Dispose();
-            
-            Logger.LogInformation("Disposing");
+            if (DbCreated) DropTestDb();
+            if (WebApp!=null) WebApp.Dispose();
+            if (Logger!=null) Logger.LogInformation("Disposing");
         }
 
         public bool DbCreated { get { 
diff --git a/test/yavscTests/NonRegression/Database.cs b/test/yavscTests/NonRegression/Database.cs
index e8345bf3..cba53c5a 100644
--- a/test/yavscTests/NonRegression/Database.cs
+++ b/test/yavscTests/NonRegression/Database.cs
@@ -41,7 +41,10 @@ namespace yavscTests.Mandatory
 
         public void Dispose()
         {
-            _serverFixture.DropTestDb();
+            if (_serverFixture!=null) 
+            {
+                _serverFixture.Dispose();
+            }
 
         }
     }