diff --git a/src/Api/Storage/Payload.cs b/src/Api/Storage/Payload.cs
index 46115f63e..cccb148ec 100755
--- a/src/Api/Storage/Payload.cs
+++ b/src/Api/Storage/Payload.cs
@@ -86,6 +86,8 @@ public TimeSpan Elapsed
 
         public int FilesFailedToUpload { get => Files.Count(p => p.IsUploadFailed); }
 
+        public Payload() { }
+
         public Payload(string key, string correlationId, string? workflowInstanceId, string? taskId, DataOrigin dataTrigger, uint timeout)
         {
             Guard.Against.NullOrWhiteSpace(key, nameof(key));
diff --git a/src/InformaticsGateway/Repositories/MonaiServiceLocator.cs b/src/InformaticsGateway/Repositories/MonaiServiceLocator.cs
index 4fab79749..3fd78bfc2 100755
--- a/src/InformaticsGateway/Repositories/MonaiServiceLocator.cs
+++ b/src/InformaticsGateway/Repositories/MonaiServiceLocator.cs
@@ -57,8 +57,7 @@ public Dictionary<string, ServiceStatus> GetServiceStatus()
             if (TypeInterface is null)
             {
                 var service = _serviceProvider.GetServices<IHostedService>()?.FirstOrDefault(i => i.GetType().Name == type.Name);
-                return null;
-                //return service as IMonaiService;
+                return service as IMonaiService;
             }
             return (_serviceProvider.GetService(TypeInterface) as IMonaiService);
 
diff --git a/tests/Integration.Test/Drivers/EfDataProvider.cs b/tests/Integration.Test/Drivers/EfDataProvider.cs
old mode 100644
new mode 100755
index cda1b3b47..63b0bbb15
--- a/tests/Integration.Test/Drivers/EfDataProvider.cs
+++ b/tests/Integration.Test/Drivers/EfDataProvider.cs
@@ -62,7 +62,14 @@ public void ClearAllData()
             DumpAndClear("SourceApplicationEntities", _dbContext.SourceApplicationEntities.ToList());
             DumpAndClear("MonaiApplicationEntities", _dbContext.MonaiApplicationEntities.ToList());
             DumpAndClear("VirtualApplicationEntities", _dbContext.VirtualApplicationEntities.ToList());
-            DumpAndClear("Payloads", _dbContext.Payloads.ToList());
+            try
+            {
+                DumpAndClear("Payloads", _dbContext.Payloads.ToList());
+            }
+            catch (Exception)
+            {
+            }
+
             DumpAndClear("InferenceRequests", _dbContext.InferenceRequests.ToList());
             DumpAndClear("StorageMetadataWrapperEntities", _dbContext.StorageMetadataWrapperEntities.ToList());
             _dbContext.SaveChanges();