From c4186509f627d7a8a897d8fa5881aa79f66783af Mon Sep 17 00:00:00 2001
From: Joseph Doherty <dohejw01@gmail.com>
Date: Mon, 9 Nov 2026 13:11:22 -0500
Subject: [PATCH] refactor(health): move ISiteHealthCollector to Commons;
 Communication drops HealthMonitoring reference (ScadaBridge#87)

Interface now lives in Commons.Interfaces.Services; AuditLog no longer gets it
transitively through Communication. Implementation stays in HealthMonitoring.

Claude-Session: https://claude.ai/code/session_01GT67AEHd2Acv1YPwGfXEoV
---
 .../Site/HealthMetricsAuditRedactionFailureCounter.cs    | 2 +-
 .../Site/HealthMetricsAuditWriteFailureCounter.cs        | 2 +-
 .../Site/SiteAuditBacklogReporter.cs                     | 1 -
 .../Interfaces/Services}/ISiteHealthCollector.cs         | 2 +-
 .../ZB.MOM.WW.ScadaBridge.Communication.csproj           | 1 -
 .../Actors/DataConnectionActor.cs                        | 1 +
 .../Actors/DataConnectionManagerActor.cs                 | 1 +
 .../HealthReportSender.cs                                | 1 +
 .../LocalDbReplicationStatusReporter.cs                  | 1 +
 .../SiteEventLogFailureCountReporter.cs                  | 1 +
 .../SiteHealthCollector.cs                               | 1 +
 .../Actors/AkkaHostedService.cs                          | 9 +++++----
 .../Actors/DeadLetterMonitorActor.cs                     | 1 +
 .../Actors/AlarmActor.cs                                 | 1 +
 .../Actors/DeploymentManagerActor.cs                     | 1 +
 .../Actors/InstanceActor.cs                              | 1 +
 .../Actors/ScriptActor.cs                                | 1 +
 .../Scripts/ScriptSchedulerStatsReporter.cs              | 1 +
 .../Secrets/SecretMirrorStatusReporter.cs                | 1 +
 .../ServiceCollectionExtensions.cs                       | 7 ++++---
 .../SiteRuntimeOptions.cs                                | 1 +
 .../Streaming/SiteStreamAlarmDropReporter.cs             | 1 +
 .../HealthMetricsAuditRedactionFailureCounterTests.cs    | 1 +
 .../Site/HealthMetricsAuditWriteFailureCounterTests.cs   | 1 +
 .../Actors/ConnectionActorNameTests.cs                   | 1 +
 .../Actors/DataConnectionActorBatchTests.cs              | 1 +
 .../Actors/DataConnectionDisconnectRaceTests.cs          | 1 +
 .../Actors/DataConnectionHousekeepingTests.cs            | 1 +
 .../Actors/DataConnectionManagerBrowseHandlerTests.cs    | 1 +
 .../DataConnectionManagerReadTagValuesHandlerTests.cs    | 1 +
 .../Actors/DataConnectionManagerSearchHandlerTests.cs    | 1 +
 .../DataConnectionOpcUaFaultClassificationTests.cs       | 1 +
 .../Actors/DataConnectionProbeSeedTests.cs               | 1 +
 .../Actors/DataConnectionReconfigureTests.cs             | 1 +
 .../Actors/DataConnectionSameAdapterReconnectTests.cs    | 1 +
 .../Actors/DataConnectionStaleCompletionTests.cs         | 1 +
 .../Actors/DataConnectionStaleConnectResultTests.cs      | 1 +
 .../Actors/HighReviewRegressionTests.cs                  | 1 +
 .../DataConnectionActorAlarmIndexTests.cs                | 1 +
 .../DataConnectionActorAlarmTests.cs                     | 1 +
 .../DataConnectionActorTests.cs                          | 1 +
 .../DataConnectionManagerActorTests.cs                   | 1 +
 .../SiteAuditBacklogMetricTests.cs                       | 1 +
 .../SiteEventLogFailureCountReporterTests.cs             | 1 +
 .../SiteEventLogWriteFailuresMetricTests.cs              | 1 +
 .../SiteLocalDbWiringTests.cs                            | 1 +
 .../UnreplicatedSiteLocalDbHealthTests.cs                | 1 +
 .../Actors/AlarmScriptWatchdogTests.cs                   | 1 +
 .../Actors/DeploymentManagerRedeployTests.cs             | 1 +
 .../Actors/DeploymentWarmThenGateTests.cs                | 1 +
 .../Actors/ReconcileStartsInstanceTests.cs               | 1 +
 .../Actors/ScriptRunLauncherParityTests.cs               | 1 +
 .../Scripts/ScriptSchedulerStatsReporterTests.cs         | 1 +
 .../Streaming/SiteStreamAlarmDropReporterTests.cs        | 1 +
 .../TestSupport/DeploymentManagerStartupProbe.cs         | 1 +
 55 files changed, 60 insertions(+), 12 deletions(-)
 rename src/{ZB.MOM.WW.ScadaBridge.HealthMonitoring => ZB.MOM.WW.ScadaBridge.Commons/Interfaces/Services}/ISiteHealthCollector.cs (99%)

diff --git a/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/HealthMetricsAuditRedactionFailureCounter.cs b/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/HealthMetricsAuditRedactionFailureCounter.cs
index 9796690b..d5a0b999 100644
--- a/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/HealthMetricsAuditRedactionFailureCounter.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/HealthMetricsAuditRedactionFailureCounter.cs
@@ -1,5 +1,5 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using ZB.MOM.WW.ScadaBridge.AuditLog.Payload;
-using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
 
 namespace ZB.MOM.WW.ScadaBridge.AuditLog.Site;
 
diff --git a/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/HealthMetricsAuditWriteFailureCounter.cs b/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/HealthMetricsAuditWriteFailureCounter.cs
index 0062f06e..2afd8814 100644
--- a/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/HealthMetricsAuditWriteFailureCounter.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/HealthMetricsAuditWriteFailureCounter.cs
@@ -1,4 +1,4 @@
-using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 
 namespace ZB.MOM.WW.ScadaBridge.AuditLog.Site;
 
diff --git a/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/SiteAuditBacklogReporter.cs b/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/SiteAuditBacklogReporter.cs
index 9350e1b1..f0effd78 100644
--- a/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/SiteAuditBacklogReporter.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.AuditLog/Site/SiteAuditBacklogReporter.cs
@@ -2,7 +2,6 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
-using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
 
 namespace ZB.MOM.WW.ScadaBridge.AuditLog.Site;
 
diff --git a/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/ISiteHealthCollector.cs b/src/ZB.MOM.WW.ScadaBridge.Commons/Interfaces/Services/ISiteHealthCollector.cs
similarity index 99%
rename from src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/ISiteHealthCollector.cs
rename to src/ZB.MOM.WW.ScadaBridge.Commons/Interfaces/Services/ISiteHealthCollector.cs
index ed6d5d0a..b6718d87 100644
--- a/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/ISiteHealthCollector.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.Commons/Interfaces/Services/ISiteHealthCollector.cs
@@ -2,7 +2,7 @@ using ZB.MOM.WW.ScadaBridge.Commons.Messages.Health;
 using ZB.MOM.WW.ScadaBridge.Commons.Types;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
 
-namespace ZB.MOM.WW.ScadaBridge.HealthMonitoring;
+namespace ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 
 /// <summary>
 /// Interface for site-side health metric collection.
diff --git a/src/ZB.MOM.WW.ScadaBridge.Communication/ZB.MOM.WW.ScadaBridge.Communication.csproj b/src/ZB.MOM.WW.ScadaBridge.Communication/ZB.MOM.WW.ScadaBridge.Communication.csproj
index 329f237f..75aa2e4d 100644
--- a/src/ZB.MOM.WW.ScadaBridge.Communication/ZB.MOM.WW.ScadaBridge.Communication.csproj
+++ b/src/ZB.MOM.WW.ScadaBridge.Communication/ZB.MOM.WW.ScadaBridge.Communication.csproj
@@ -39,7 +39,6 @@
 
   <ItemGroup>
     <ProjectReference Include="../ZB.MOM.WW.ScadaBridge.Commons/ZB.MOM.WW.ScadaBridge.Commons.csproj" />
-    <ProjectReference Include="../ZB.MOM.WW.ScadaBridge.HealthMonitoring/ZB.MOM.WW.ScadaBridge.HealthMonitoring.csproj" />
   </ItemGroup>
 
   <!-- gRPC proto generation. The compiled C# is checked in — under SiteStreamGrpc/
diff --git a/src/ZB.MOM.WW.ScadaBridge.DataConnectionLayer/Actors/DataConnectionActor.cs b/src/ZB.MOM.WW.ScadaBridge.DataConnectionLayer/Actors/DataConnectionActor.cs
index 0cc79f85..215f96ef 100644
--- a/src/ZB.MOM.WW.ScadaBridge.DataConnectionLayer/Actors/DataConnectionActor.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.DataConnectionLayer/Actors/DataConnectionActor.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.Event;
 using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Protocol;
diff --git a/src/ZB.MOM.WW.ScadaBridge.DataConnectionLayer/Actors/DataConnectionManagerActor.cs b/src/ZB.MOM.WW.ScadaBridge.DataConnectionLayer/Actors/DataConnectionManagerActor.cs
index 67868676..db8008bf 100644
--- a/src/ZB.MOM.WW.ScadaBridge.DataConnectionLayer/Actors/DataConnectionManagerActor.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.DataConnectionLayer/Actors/DataConnectionManagerActor.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.Event;
 using Microsoft.Extensions.Logging.Abstractions;
diff --git a/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/HealthReportSender.cs b/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/HealthReportSender.cs
index d2339715..ee9356f5 100644
--- a/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/HealthReportSender.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/HealthReportSender.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
diff --git a/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/LocalDbReplicationStatusReporter.cs b/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/LocalDbReplicationStatusReporter.cs
index 3a86c86a..e76ec96a 100644
--- a/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/LocalDbReplicationStatusReporter.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/LocalDbReplicationStatusReporter.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/SiteEventLogFailureCountReporter.cs b/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/SiteEventLogFailureCountReporter.cs
index 19de05f3..52902a21 100644
--- a/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/SiteEventLogFailureCountReporter.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/SiteEventLogFailureCountReporter.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/SiteHealthCollector.cs b/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/SiteHealthCollector.cs
index c7c2e4ec..2721e2fc 100644
--- a/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/SiteHealthCollector.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.HealthMonitoring/SiteHealthCollector.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using System.Collections.Concurrent;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.Health;
 using ZB.MOM.WW.ScadaBridge.Commons.Types;
diff --git a/src/ZB.MOM.WW.ScadaBridge.Host/Actors/AkkaHostedService.cs b/src/ZB.MOM.WW.ScadaBridge.Host/Actors/AkkaHostedService.cs
index 7f572f6a..e76b9caf 100644
--- a/src/ZB.MOM.WW.ScadaBridge.Host/Actors/AkkaHostedService.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.Host/Actors/AkkaHostedService.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.Cluster;
 using Akka.Cluster.Tools.Singleton;
@@ -123,7 +124,7 @@ public class AkkaHostedService : IHostedService
         // Register the dead letter monitor actor
         var loggerFactory = _serviceProvider.GetRequiredService<ILoggerFactory>();
         var dlmLogger = loggerFactory.CreateLogger<DeadLetterMonitorActor>();
-        var dlmHealthCollector = _serviceProvider.GetService<ZB.MOM.WW.ScadaBridge.HealthMonitoring.ISiteHealthCollector>();
+        var dlmHealthCollector = _serviceProvider.GetService<ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services.ISiteHealthCollector>();
         actorSystem.ActorOf(
             Props.Create(() => new DeadLetterMonitorActor(dlmLogger, dlmHealthCollector)),
             "dead-letter-monitor");
@@ -431,7 +432,7 @@ akka {{
     {
         // Feed this central node's hostname into the local health collector so
         // the CentralHealthReportLoop's report identifies the active node.
-        var centralHealthCollector = _serviceProvider.GetService<ZB.MOM.WW.ScadaBridge.HealthMonitoring.ISiteHealthCollector>();
+        var centralHealthCollector = _serviceProvider.GetService<ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services.ISiteHealthCollector>();
         centralHealthCollector?.SetNodeHostname(_nodeOptions.NodeHostname);
 
         // Central→site command transport: gRPC SiteCommandService. This is the ONLY transport since
@@ -771,7 +772,7 @@ akka {{
         IActorRef? dclManager = null;
         if (dclFactory != null)
         {
-            var healthCollector = _serviceProvider.GetRequiredService<ZB.MOM.WW.ScadaBridge.HealthMonitoring.ISiteHealthCollector>();
+            var healthCollector = _serviceProvider.GetRequiredService<ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services.ISiteHealthCollector>();
             var siteEventLogger = _serviceProvider.GetService<ZB.MOM.WW.ScadaBridge.SiteEventLogging.ISiteEventLogger>();
             // The verify-endpoint probe builds an OPC UA ApplicationConfiguration directly,
             // so the manager needs the same deployment-wide OpcUaGlobalOptions the
@@ -802,7 +803,7 @@ akka {{
             ZB.MOM.WW.ScadaBridge.SiteRuntime.Actors.CertStoreActor.WellKnownName);
 
         // Resolve the health collector for the Deployment Manager
-        var siteHealthCollector = _serviceProvider.GetService<ZB.MOM.WW.ScadaBridge.HealthMonitoring.ISiteHealthCollector>();
+        var siteHealthCollector = _serviceProvider.GetService<ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services.ISiteHealthCollector>();
         siteHealthCollector?.SetNodeHostname(_nodeOptions.NodeHostname);
 
         // Notify-and-fetch: the deployment config fetcher pulls a deployment's flattened
diff --git a/src/ZB.MOM.WW.ScadaBridge.Host/Actors/DeadLetterMonitorActor.cs b/src/ZB.MOM.WW.ScadaBridge.Host/Actors/DeadLetterMonitorActor.cs
index 825a78d9..5877d616 100644
--- a/src/ZB.MOM.WW.ScadaBridge.Host/Actors/DeadLetterMonitorActor.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.Host/Actors/DeadLetterMonitorActor.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.Event;
 using Microsoft.Extensions.Logging;
diff --git a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/AlarmActor.cs b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/AlarmActor.cs
index 07d35b15..9a5f8303 100644
--- a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/AlarmActor.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/AlarmActor.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Microsoft.CodeAnalysis.Scripting;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/DeploymentManagerActor.cs b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/DeploymentManagerActor.cs
index 29657541..ba87d8a8 100644
--- a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/DeploymentManagerActor.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/DeploymentManagerActor.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.Cluster;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/InstanceActor.cs b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/InstanceActor.cs
index ddaf5344..286e691b 100644
--- a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/InstanceActor.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/InstanceActor.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Microsoft.CodeAnalysis.Scripting;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/ScriptActor.cs b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/ScriptActor.cs
index 85a7763d..c46b271d 100644
--- a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/ScriptActor.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Actors/ScriptActor.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Microsoft.CodeAnalysis.Scripting;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Scripts/ScriptSchedulerStatsReporter.cs b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Scripts/ScriptSchedulerStatsReporter.cs
index f6a8f121..64350bd4 100644
--- a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Scripts/ScriptSchedulerStatsReporter.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Scripts/ScriptSchedulerStatsReporter.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
diff --git a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Secrets/SecretMirrorStatusReporter.cs b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Secrets/SecretMirrorStatusReporter.cs
index 06c4a556..dbb5b6b5 100644
--- a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Secrets/SecretMirrorStatusReporter.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Secrets/SecretMirrorStatusReporter.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.Health;
diff --git a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/ServiceCollectionExtensions.cs b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/ServiceCollectionExtensions.cs
index 37b2fc1c..f5c9b2dc 100644
--- a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/ServiceCollectionExtensions.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/ServiceCollectionExtensions.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
@@ -102,14 +103,14 @@ public static class ServiceCollectionExtensions
         // Registered via factory-lambda so ISiteHealthCollector (registered by the
         // Host's AddSiteHealthMonitoring) is resolved lazily at host start.
         services.AddHostedService(sp => new ScriptSchedulerStatsReporter(
-            sp.GetRequiredService<HealthMonitoring.ISiteHealthCollector>(),
+            sp.GetRequiredService<Commons.Interfaces.Services.ISiteHealthCollector>(),
             sp.GetRequiredService<IOptions<SiteRuntimeOptions>>().Value,
             sp.GetRequiredService<ILogger<ScriptSchedulerStatsReporter>>()));
 
         // Periodically lift SiteStreamManager's alarm-publish-queue drop count
         // onto the site health report.
         services.AddHostedService(sp => new Streaming.SiteStreamAlarmDropReporter(
-            sp.GetRequiredService<HealthMonitoring.ISiteHealthCollector>(),
+            sp.GetRequiredService<Commons.Interfaces.Services.ISiteHealthCollector>(),
             sp.GetRequiredService<SiteStreamManager>(),
             sp.GetRequiredService<ILogger<Streaming.SiteStreamAlarmDropReporter>>()));
 
@@ -143,7 +144,7 @@ public static class ServiceCollectionExtensions
         // Forward every node's replicated secret_mirror_status row onto the
         // site health report, so the ACTIVE node's report carries the STANDBY's mirror failures.
         services.AddHostedService(sp => new SecretMirrorStatusReporter(
-            sp.GetRequiredService<HealthMonitoring.ISiteHealthCollector>(),
+            sp.GetRequiredService<Commons.Interfaces.Services.ISiteHealthCollector>(),
             sp.GetRequiredService<SiteStorageService>(),
             sp.GetRequiredService<ILogger<SecretMirrorStatusReporter>>(),
             staleAfter: sp.GetRequiredService<IOptions<SiteRuntimeOptions>>().Value.SecretMirrorStatusStaleAfter,
diff --git a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/SiteRuntimeOptions.cs b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/SiteRuntimeOptions.cs
index 597367cb..d220855d 100644
--- a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/SiteRuntimeOptions.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/SiteRuntimeOptions.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 namespace ZB.MOM.WW.ScadaBridge.SiteRuntime;
 
 /// <summary>
diff --git a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Streaming/SiteStreamAlarmDropReporter.cs b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Streaming/SiteStreamAlarmDropReporter.cs
index 6f0dafad..e2d79364 100644
--- a/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Streaming/SiteStreamAlarmDropReporter.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Streaming/SiteStreamAlarmDropReporter.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.AuditLog.Tests/Site/HealthMetricsAuditRedactionFailureCounterTests.cs b/tests/ZB.MOM.WW.ScadaBridge.AuditLog.Tests/Site/HealthMetricsAuditRedactionFailureCounterTests.cs
index 5f094ac6..026646fe 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.AuditLog.Tests/Site/HealthMetricsAuditRedactionFailureCounterTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.AuditLog.Tests/Site/HealthMetricsAuditRedactionFailureCounterTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using NSubstitute;
 using ZB.MOM.WW.ScadaBridge.AuditLog.Site;
 using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.AuditLog.Tests/Site/HealthMetricsAuditWriteFailureCounterTests.cs b/tests/ZB.MOM.WW.ScadaBridge.AuditLog.Tests/Site/HealthMetricsAuditWriteFailureCounterTests.cs
index 838f441f..c23ec5b3 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.AuditLog.Tests/Site/HealthMetricsAuditWriteFailureCounterTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.AuditLog.Tests/Site/HealthMetricsAuditWriteFailureCounterTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using NSubstitute;
 using ZB.MOM.WW.ScadaBridge.AuditLog.Site;
 using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/ConnectionActorNameTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/ConnectionActorNameTests.cs
index e3208a40..7f0f0bc6 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/ConnectionActorNameTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/ConnectionActorNameTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionActorBatchTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionActorBatchTests.cs
index 93b149fa..cc08d7fd 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionActorBatchTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionActorBatchTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionDisconnectRaceTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionDisconnectRaceTests.cs
index 57f98aa5..946cb916 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionDisconnectRaceTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionDisconnectRaceTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionHousekeepingTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionHousekeepingTests.cs
index de660f30..82adc563 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionHousekeepingTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionHousekeepingTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerBrowseHandlerTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerBrowseHandlerTests.cs
index bbcdb478..c04ab41f 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerBrowseHandlerTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerBrowseHandlerTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerReadTagValuesHandlerTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerReadTagValuesHandlerTests.cs
index 90954144..0151026c 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerReadTagValuesHandlerTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerReadTagValuesHandlerTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerSearchHandlerTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerSearchHandlerTests.cs
index c90c3140..74182c66 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerSearchHandlerTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionManagerSearchHandlerTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionOpcUaFaultClassificationTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionOpcUaFaultClassificationTests.cs
index d8707de4..45317b3b 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionOpcUaFaultClassificationTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionOpcUaFaultClassificationTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionProbeSeedTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionProbeSeedTests.cs
index ff0a6b4e..57b5bb7f 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionProbeSeedTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionProbeSeedTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionReconfigureTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionReconfigureTests.cs
index 4423b6af..155edaf2 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionReconfigureTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionReconfigureTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionSameAdapterReconnectTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionSameAdapterReconnectTests.cs
index 56c72b86..6bc25f6f 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionSameAdapterReconnectTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionSameAdapterReconnectTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using System.Collections.Concurrent;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionStaleCompletionTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionStaleCompletionTests.cs
index 374dea26..603c49a5 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionStaleCompletionTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionStaleCompletionTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionStaleConnectResultTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionStaleConnectResultTests.cs
index c6fc7a64..2f2c8f3e 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionStaleConnectResultTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/DataConnectionStaleConnectResultTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/HighReviewRegressionTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/HighReviewRegressionTests.cs
index 5438eae8..761c566a 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/HighReviewRegressionTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/Actors/HighReviewRegressionTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorAlarmIndexTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorAlarmIndexTests.cs
index bbce2b74..e0b63bcc 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorAlarmIndexTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorAlarmIndexTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorAlarmTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorAlarmTests.cs
index ca0bc5d7..fe73db3d 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorAlarmTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorAlarmTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorTests.cs
index dd8b6f30..e9bbd4f9 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionActorTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionManagerActorTests.cs b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionManagerActorTests.cs
index a04f3e18..e823ea0c 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionManagerActorTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests/DataConnectionManagerActorTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using NSubstitute;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteAuditBacklogMetricTests.cs b/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteAuditBacklogMetricTests.cs
index 468eb552..f8724667 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteAuditBacklogMetricTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteAuditBacklogMetricTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using ZB.MOM.WW.ScadaBridge.Commons.Types;
 
 namespace ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteEventLogFailureCountReporterTests.cs b/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteEventLogFailureCountReporterTests.cs
index 3a1d346d..7bf2a47a 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteEventLogFailureCountReporterTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteEventLogFailureCountReporterTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Microsoft.Extensions.Logging.Abstractions;
 
 namespace ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteEventLogWriteFailuresMetricTests.cs b/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteEventLogWriteFailuresMetricTests.cs
index 4debd7d5..cb1b7a18 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteEventLogWriteFailuresMetricTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests/SiteEventLogWriteFailuresMetricTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 namespace ZB.MOM.WW.ScadaBridge.HealthMonitoring.Tests;
 
 /// <summary>
diff --git a/tests/ZB.MOM.WW.ScadaBridge.Host.Tests/SiteLocalDbWiringTests.cs b/tests/ZB.MOM.WW.ScadaBridge.Host.Tests/SiteLocalDbWiringTests.cs
index 653a4c24..43349f38 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.Host.Tests/SiteLocalDbWiringTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.Host.Tests/SiteLocalDbWiringTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.Host.Tests/UnreplicatedSiteLocalDbHealthTests.cs b/tests/ZB.MOM.WW.ScadaBridge.Host.Tests/UnreplicatedSiteLocalDbHealthTests.cs
index 9771fce4..71b1b950 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.Host.Tests/UnreplicatedSiteLocalDbHealthTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.Host.Tests/UnreplicatedSiteLocalDbHealthTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/AlarmScriptWatchdogTests.cs b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/AlarmScriptWatchdogTests.cs
index 2ee7bfff..7594c19d 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/AlarmScriptWatchdogTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/AlarmScriptWatchdogTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit;
 using Akka.TestKit.Xunit2;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/DeploymentManagerRedeployTests.cs b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/DeploymentManagerRedeployTests.cs
index 28f71cec..2e310312 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/DeploymentManagerRedeployTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/DeploymentManagerRedeployTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using Microsoft.Extensions.Logging.Abstractions;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/DeploymentWarmThenGateTests.cs b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/DeploymentWarmThenGateTests.cs
index 6ba683fd..c14859f2 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/DeploymentWarmThenGateTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/DeploymentWarmThenGateTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using Microsoft.Extensions.Logging.Abstractions;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/ReconcileStartsInstanceTests.cs b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/ReconcileStartsInstanceTests.cs
index ef7bf077..797ab7d4 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/ReconcileStartsInstanceTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/ReconcileStartsInstanceTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using System.Collections.Concurrent;
 using System.Text.Json;
 using Akka.Actor;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/ScriptRunLauncherParityTests.cs b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/ScriptRunLauncherParityTests.cs
index 63126208..5a398462 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/ScriptRunLauncherParityTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/ScriptRunLauncherParityTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using System.Diagnostics;
 using Akka.Actor;
 using Akka.Event;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Scripts/ScriptSchedulerStatsReporterTests.cs b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Scripts/ScriptSchedulerStatsReporterTests.cs
index 34fea1f5..f0817fff 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Scripts/ScriptSchedulerStatsReporterTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Scripts/ScriptSchedulerStatsReporterTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
 using ZB.MOM.WW.ScadaBridge.SiteRuntime.Scripts;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Streaming/SiteStreamAlarmDropReporterTests.cs b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Streaming/SiteStreamAlarmDropReporterTests.cs
index bc8707b3..d7799f05 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Streaming/SiteStreamAlarmDropReporterTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Streaming/SiteStreamAlarmDropReporterTests.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using Akka.TestKit.Xunit2;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
diff --git a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/TestSupport/DeploymentManagerStartupProbe.cs b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/TestSupport/DeploymentManagerStartupProbe.cs
index 215ce836..60af624d 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/TestSupport/DeploymentManagerStartupProbe.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/TestSupport/DeploymentManagerStartupProbe.cs
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
 using ZB.MOM.WW.ScadaBridge.HealthMonitoring;