diff --git a/test/Garnet.test/RespSetTest.cs b/test/Garnet.test/RespSetTest.cs
index 59344b462d..d362fd086c 100644
--- a/test/Garnet.test/RespSetTest.cs
+++ b/test/Garnet.test/RespSetTest.cs
@@ -17,20 +17,20 @@ namespace Garnet.test
     [TestFixture]
     public class RespSetTest
     {
-        GarnetServer server;
+        GarnetApplication server;
 
         [SetUp]
-        public void Setup()
+        public async Task Setup()
         {
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, lowMemory: true);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, lowMemory: true);
+            await server.RunAsync();
         }
 
         [TearDown]
-        public void TearDown()
+        public async Task TearDown()
         {
-            server.Dispose();
+            await server.StopAsync();
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir);
         }
 
diff --git a/test/Garnet.test/RespTests.cs b/test/Garnet.test/RespTests.cs
index 670b0f4f69..338f12bf5f 100644
--- a/test/Garnet.test/RespTests.cs
+++ b/test/Garnet.test/RespTests.cs
@@ -20,22 +20,22 @@ namespace Garnet.test
     [TestFixture]
     public class RespTests
     {
-        GarnetServer server;
+        GarnetApplication server;
         Random r;
 
         [SetUp]
-        public void Setup()
+        public async Task Setup()
         {
             r = new Random(674386);
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, disablePubSub: false);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, disablePubSub: false);
+            await server.RunAsync();
         }
 
         [TearDown]
-        public void TearDown()
+        public async Task TearDown()
         {
-            server.Dispose();
+            await server.StopAsync();
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir);
         }
 
@@ -1359,13 +1359,13 @@ public void SingleDelete()
         }
 
         [Test]
-        public void SingleDeleteWithObjectStoreDisabled()
+        public async Task SingleDeleteWithObjectStoreDisabled()
         {
             TearDown();
 
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);
+            await server.RunAsync();
 
             var key = "delKey";
             var value = "1234";
@@ -1391,13 +1391,13 @@ private string GetRandomString(int len)
         }
 
         [Test]
-        public void SingleDeleteWithObjectStoreDisable_LTM()
+        public async Task SingleDeleteWithObjectStoreDisable_LTM()
         {
             TearDown();
 
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);
+            await server.RunAsync();
             using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
             var db = redis.GetDatabase(0);
 
@@ -1431,14 +1431,14 @@ public void SingleDeleteWithObjectStoreDisable_LTM()
         }
 
         [Test]
-        public void MultiKeyDelete([Values] bool withoutObjectStore)
+        public async Task MultiKeyDelete([Values] bool withoutObjectStore)
         {
             if (withoutObjectStore)
             {
                 TearDown();
                 TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-                server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);
-                server.Start();
+                server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);
+                await server.RunAsync();
             }
 
             using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
@@ -1499,14 +1499,14 @@ public void MultiKeyDeleteObjectStore()
         }
 
         [Test]
-        public void MultiKeyUnlink([Values] bool withoutObjectStore)
+        public async Task MultiKeyUnlink([Values] bool withoutObjectStore)
         {
             if (withoutObjectStore)
             {
                 TearDown();
                 TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-                server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);
-                server.Start();
+                server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);
+                await server.RunAsync();
             }
 
             using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
@@ -1565,14 +1565,14 @@ public void MultiKeyUnlinkObjectStore()
         }
 
         [Test]
-        public void SingleExists([Values] bool withoutObjectStore)
+        public async Task SingleExists([Values] bool withoutObjectStore)
         {
             if (withoutObjectStore)
             {
                 TearDown();
                 TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-                server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);
-                server.Start();
+                server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);
+                await server.RunAsync();
             }
             using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
             var db = redis.GetDatabase(0);
@@ -1830,14 +1830,14 @@ public void SingleRenameWithExpiry()
         }
 
         [Test]
-        public void SingleRenameKeyEdgeCase([Values] bool withoutObjectStore)
+        public async Task SingleRenameKeyEdgeCase([Values] bool withoutObjectStore)
         {
             if (withoutObjectStore)
             {
                 TearDown();
                 TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-                server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);
-                server.Start();
+                server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);
+                await server.RunAsync();
             }
             using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
             var db = redis.GetDatabase(0);
@@ -3730,13 +3730,13 @@ public void HelloTest1()
         }
 
         [Test]
-        public void AsyncTest1()
+        public async Task AsyncTest1()
         {
             // Set up low-memory database
             TearDown();
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);
+            await server.RunAsync();
 
             string firstKey = null, firstValue = null, lastKey = null, lastValue = null;
 
diff --git a/test/Garnet.test/RespTlsTests.cs b/test/Garnet.test/RespTlsTests.cs
index 7e61240516..4ec8fb0f5f 100644
--- a/test/Garnet.test/RespTlsTests.cs
+++ b/test/Garnet.test/RespTlsTests.cs
@@ -17,20 +17,20 @@ namespace Garnet.test
     [TestFixture]
     public class RespTlsTests
     {
-        GarnetServer server;
+        GarnetApplication server;
 
         [SetUp]
-        public void Setup()
+        public async Task Setup()
         {
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, EnableTLS: true);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, EnableTLS: true);
+            await server.RunAsync();
         }
 
         [TearDown]
-        public void TearDown()
+        public async Task TearDown()
         {
-            server.Dispose();
+            await server.StopAsync();
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir);
         }