diff --git a/.github/workflows/run_g_tests.yml b/.github/workflows/run_g_tests.yml
index 79a9001a7..6a8d6e710 100644
--- a/.github/workflows/run_g_tests.yml
+++ b/.github/workflows/run_g_tests.yml
@@ -40,6 +40,11 @@ jobs:
         Start-Process "C:\\Program Files\\National Instruments\\LabVIEW ${{ matrix.version }}\\LabVIEW.exe"
         Start-Sleep 60
 
+    - name: Run Discovery Service
+      run: |
+        Start-Process -FilePath "C:\\Program Files\\National Instruments\\Shared\\MeasurementLink\\Discovery\\NationalInstruments.MeasurementLink.DiscoveryService.exe" -WorkingDirectory "C:\\Program Files\\National Instruments\\Shared\\MeasurementLink\\Discovery"
+        Start-Sleep 10
+    
     - name: Run G Tests
       run:
         python ${{runner.workspace}}/measurementlink-labview/Source/Tests/run_tests.py --labview-path "C:\Program Files\National Instruments\LabVIEW ${{ matrix.version }}\LabVIEW.exe" --port-number ${{ matrix.port }}
diff --git a/Source/Runtime/Measurement Server.lvproj b/Source/Runtime/Measurement Server.lvproj
index 0ee03419a..2a7e48a4c 100644
--- a/Source/Runtime/Measurement Server.lvproj	
+++ b/Source/Runtime/Measurement Server.lvproj	
@@ -111,10 +111,6 @@
 				<Item Name="LVBoundsTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVBoundsTypeDef.ctl"/>
 				<Item Name="BuildHelpPath.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/BuildHelpPath.vi"/>
 				<Item Name="GetHelpDir.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/GetHelpDir.vi"/>
-				<Item Name="VISA gRPC Options.ctl" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA gRPC Options.ctl"/>
-				<Item Name="VISA Format gRPC Resource Name.vi" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA Format gRPC Resource Name.vi"/>
-				<Item Name="VISA Format gRPC URI.vi" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA Format gRPC URI.vi"/>
-				<Item Name="ni.protobuf.types.lvlib" Type="Library" URL="/&lt;vilib&gt;/gRPC/Generated APIs/ni/protobuf/types/ni.protobuf.types.lvlib"/>
 			</Item>
 			<Item Name="instr.lib" Type="Folder">
 				<Item Name="niDCPower Initialize With Independent Channels for gRPC session.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Initialize With Independent Channels for gRPC session.vi"/>
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Discovery/test_DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi b/Source/Tests/Tests.Runtime/Measurement Server/Discovery/test_DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi
index cf42d5369..c356055c8 100644
Binary files a/Source/Tests/Tests.Runtime/Measurement Server/Discovery/test_DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi and b/Source/Tests/Tests.Runtime/Measurement Server/Discovery/test_DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi differ
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Restart Discovery Service.vi b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Restart Discovery Service.vi
index 8e1755ab3..96b8c39d4 100644
Binary files a/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Restart Discovery Service.vi and b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Restart Discovery Service.vi differ
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Start Discovery Service.vi b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Start Discovery Service.vi
new file mode 100644
index 000000000..b53acba46
Binary files /dev/null and b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Start Discovery Service.vi differ
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Wait For Key File.vi b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Wait For Key File.vi
new file mode 100644
index 000000000..78748fd0d
Binary files /dev/null and b/Source/Tests/Tests.Runtime/Measurement Server/Helpers/Wait For Key File.vi differ
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/MeasurementServerTests.lvlib b/Source/Tests/Tests.Runtime/Measurement Server/MeasurementServerTests.lvlib
index 095b85075..4a16e622a 100644
--- a/Source/Tests/Tests.Runtime/Measurement Server/MeasurementServerTests.lvlib	
+++ b/Source/Tests/Tests.Runtime/Measurement Server/MeasurementServerTests.lvlib	
@@ -44,6 +44,8 @@
 		<Item Name="Restart Discovery Service.vi" Type="VI" URL="../Helpers/Restart Discovery Service.vi"/>
 		<Item Name="Fake Session Factory.lvclass" Type="LVClass" URL="../Helpers/Fake Session Factory/Fake Session Factory.lvclass"/>
 		<Item Name="Kill Pin Map Service.vi" Type="VI" URL="../Helpers/Kill Pin Map Service.vi"/>
+		<Item Name="Wait For Key File.vi" Type="VI" URL="../Helpers/Wait For Key File.vi"/>
+		<Item Name="Start Discovery Service.vi" Type="VI" URL="../Helpers/Start Discovery Service.vi"/>
 	</Item>
 	<Item Name="Close Sessions" Type="Folder">
 		<Item Name="Test Inputs" Type="Folder">
diff --git a/Source/Tests/skip_tests.lst b/Source/Tests/skip_tests.lst
index 2276048d8..5124df292 100644
--- a/Source/Tests/skip_tests.lst
+++ b/Source/Tests/skip_tests.lst
@@ -1,7 +1 @@
-test_DefaultTemplateMeasurement_GetUiDetails_CorrectUiPathUrl.vi
-test_NoServicesRegistered_InvalidRegisterRequests_Error.vi
-test_SingleServiceRegistered_DiscoveryApiRoundTrip_AllNodesSucceed.vi
-test_SingleServiceRegistered_InvalidResolveRequests_Error.vi
-test_DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi
-test_DiscoveryWrapper_StopDiscoveryService_WrapperMethodsWorkWithoutError.vi
-test_SessionManagerWrapper_StopSessionManagementService_WrapperMethodsWorkWithoutError.vi
\ No newline at end of file
+test_DefaultTemplateMeasurement_GetUiDetails_CorrectUiPathUrl.vi
\ No newline at end of file