diff --git a/test/Core.Test/NotificationHub/NotificationHubPushNotificationServiceTests.cs b/test/Core.Test/NotificationHub/NotificationHubPushNotificationServiceTests.cs
index f4779b4978..9ea3a0d3c4 100644
--- a/test/Core.Test/NotificationHub/NotificationHubPushNotificationServiceTests.cs
+++ b/test/Core.Test/NotificationHub/NotificationHubPushNotificationServiceTests.cs
@@ -759,7 +759,7 @@ public class NotificationHubPushNotificationServiceTests
         );
     }
 
-     [Fact]
+    [Fact]
     public async Task PushSyncSendDeleteAsync_SendExpectedData()
     {
         var userId = Guid.NewGuid();
@@ -1063,7 +1063,7 @@ public class NotificationHubPushNotificationServiceTests
         );
     }
 
-    private async Task VerifyNotificationAsync(Func<NotificationHubPushNotificationService, Task> test, 
+    private async Task VerifyNotificationAsync(Func<NotificationHubPushNotificationService, Task> test,
         PushType type, JsonNode expectedPayload, string tag)
     {
         var installationDeviceRepository = Substitute.For<IInstallationDeviceRepository>();
diff --git a/test/Core.Test/Platform/Push/Services/NotificationsApiPushNotificationServiceTests.cs b/test/Core.Test/Platform/Push/Services/NotificationsApiPushNotificationServiceTests.cs
index 587afbbd2a..e92fd90735 100644
--- a/test/Core.Test/Platform/Push/Services/NotificationsApiPushNotificationServiceTests.cs
+++ b/test/Core.Test/Platform/Push/Services/NotificationsApiPushNotificationServiceTests.cs
@@ -46,7 +46,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
             ["ContextId"] = DeviceIdentifier,
         };
     }
-    protected override JsonNode GetPushSyncCipherUpdatePayload(Cipher cipher, Guid collectionId) 
+    protected override JsonNode GetPushSyncCipherUpdatePayload(Cipher cipher, Guid collectionId)
     {
         return new JsonObject
         {
@@ -62,7 +62,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
             ["ContextId"] = DeviceIdentifier,
         };
     }
-    protected override JsonNode GetPushSyncCipherDeletePayload(Cipher cipher) 
+    protected override JsonNode GetPushSyncCipherDeletePayload(Cipher cipher)
     {
         return new JsonObject
         {
@@ -79,7 +79,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSyncFolderCreatePayload(Folder folder) 
+    protected override JsonNode GetPushSyncFolderCreatePayload(Folder folder)
     {
         return new JsonObject
         {
@@ -94,7 +94,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSyncFolderUpdatePayload(Folder folder) 
+    protected override JsonNode GetPushSyncFolderUpdatePayload(Folder folder)
     {
         return new JsonObject
         {
@@ -109,7 +109,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSyncFolderDeletePayload(Folder folder) 
+    protected override JsonNode GetPushSyncFolderDeletePayload(Folder folder)
     {
         return new JsonObject
         {
@@ -124,7 +124,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSyncCiphersPayload(Guid userId) 
+    protected override JsonNode GetPushSyncCiphersPayload(Guid userId)
     {
         return new JsonObject
         {
@@ -138,7 +138,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSyncVaultPayload(Guid userId) 
+    protected override JsonNode GetPushSyncVaultPayload(Guid userId)
     {
         return new JsonObject
         {
@@ -152,7 +152,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSyncOrganizationsPayload(Guid userId) 
+    protected override JsonNode GetPushSyncOrganizationsPayload(Guid userId)
     {
         return new JsonObject
         {
@@ -166,7 +166,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSyncOrgKeysPayload(Guid userId) 
+    protected override JsonNode GetPushSyncOrgKeysPayload(Guid userId)
     {
         return new JsonObject
         {
@@ -180,7 +180,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSyncSettingsPayload(Guid userId) 
+    protected override JsonNode GetPushSyncSettingsPayload(Guid userId)
     {
         return new JsonObject
         {
@@ -194,7 +194,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushLogOutPayload(Guid userId, bool excludeCurrentContext) 
+    protected override JsonNode GetPushLogOutPayload(Guid userId, bool excludeCurrentContext)
     {
         JsonNode? contextId = excludeCurrentContext ? DeviceIdentifier : null;
 
@@ -210,7 +210,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSendCreatePayload(Send send) 
+    protected override JsonNode GetPushSendCreatePayload(Send send)
     {
         return new JsonObject
         {
@@ -225,7 +225,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSendUpdatePayload(Send send) 
+    protected override JsonNode GetPushSendUpdatePayload(Send send)
     {
         return new JsonObject
         {
@@ -240,7 +240,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSendDeletePayload(Send send) 
+    protected override JsonNode GetPushSendDeletePayload(Send send)
     {
         return new JsonObject
         {
@@ -255,7 +255,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushAuthRequestPayload(AuthRequest authRequest) 
+    protected override JsonNode GetPushAuthRequestPayload(AuthRequest authRequest)
     {
         return new JsonObject
         {
@@ -269,7 +269,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushAuthRequestResponsePayload(AuthRequest authRequest) 
+    protected override JsonNode GetPushAuthRequestResponsePayload(AuthRequest authRequest)
     {
         return new JsonObject
         {
@@ -283,7 +283,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushNotificationResponsePayload(Notification notification, Guid? userId, Guid? organizationId) 
+    protected override JsonNode GetPushNotificationResponsePayload(Notification notification, Guid? userId, Guid? organizationId)
     {
         JsonNode? installationId = notification.Global ? GlobalSettings.Installation.Id : null;
 
@@ -310,7 +310,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushNotificationStatusResponsePayload(Notification notification, NotificationStatus notificationStatus, Guid? userId, Guid? organizationId) 
+    protected override JsonNode GetPushNotificationStatusResponsePayload(Notification notification, NotificationStatus notificationStatus, Guid? userId, Guid? organizationId)
     {
         JsonNode? installationId = notification.Global ? GlobalSettings.Installation.Id : null;
 
@@ -337,7 +337,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSyncOrganizationStatusResponsePayload(Organization organization) 
+    protected override JsonNode GetPushSyncOrganizationStatusResponsePayload(Organization organization)
     {
         return new JsonObject
         {
@@ -351,7 +351,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushSyncOrganizationCollectionManagementSettingsResponsePayload(Organization organization) 
+    protected override JsonNode GetPushSyncOrganizationCollectionManagementSettingsResponsePayload(Organization organization)
     {
         return new JsonObject
         {
@@ -367,7 +367,7 @@ public class NotificationsApiPushNotificationServiceTests : PushTestBase
         };
     }
 
-    protected override JsonNode GetPushPendingSecurityTasksResponsePayload(Guid userId) 
+    protected override JsonNode GetPushPendingSecurityTasksResponsePayload(Guid userId)
     {
         return new JsonObject
         {
diff --git a/test/Core.Test/Platform/Push/Services/PushTestBase.cs b/test/Core.Test/Platform/Push/Services/PushTestBase.cs
index d9b77f9980..2b584aafb4 100644
--- a/test/Core.Test/Platform/Push/Services/PushTestBase.cs
+++ b/test/Core.Test/Platform/Push/Services/PushTestBase.cs
@@ -1,4 +1,4 @@
-// TODO: Move to own file
+// TODO: Move to own file
 using System.IdentityModel.Tokens.Jwt;
 using System.Net;
 using System.Net.Http.Json;
diff --git a/test/Core.Test/Platform/Push/Services/RelayPushNotificationServiceTests.cs b/test/Core.Test/Platform/Push/Services/RelayPushNotificationServiceTests.cs
index c554484f98..4a1fd48376 100644
--- a/test/Core.Test/Platform/Push/Services/RelayPushNotificationServiceTests.cs
+++ b/test/Core.Test/Platform/Push/Services/RelayPushNotificationServiceTests.cs
@@ -57,7 +57,7 @@ public class RelayPushNotificationServiceTests : PushTestBase
     {
         var sut = CreateService();
         await Assert.ThrowsAsync<NotImplementedException>(
-            async () => await sut.SendPayloadToInstallationAsync("installation_id", PushType.AuthRequest, new {}, null)
+            async () => await sut.SendPayloadToInstallationAsync("installation_id", PushType.AuthRequest, new { }, null)
         );
     }
 
@@ -66,7 +66,7 @@ public class RelayPushNotificationServiceTests : PushTestBase
     {
         var sut = CreateService();
         await Assert.ThrowsAsync<NotImplementedException>(
-            async () => await sut.SendPayloadToUserAsync("user_id", PushType.AuthRequest, new {}, null)
+            async () => await sut.SendPayloadToUserAsync("user_id", PushType.AuthRequest, new { }, null)
         );
     }
 
@@ -75,7 +75,7 @@ public class RelayPushNotificationServiceTests : PushTestBase
     {
         var sut = CreateService();
         await Assert.ThrowsAsync<NotImplementedException>(
-            async () => await sut.SendPayloadToOrganizationAsync("organization_id", PushType.AuthRequest, new {}, null)
+            async () => await sut.SendPayloadToOrganizationAsync("organization_id", PushType.AuthRequest, new { }, null)
         );
     }
 
@@ -388,7 +388,7 @@ public class RelayPushNotificationServiceTests : PushTestBase
             ["UserId"] = authRequest.UserId,
             ["OrganizationId"] = null,
             ["DeviceId"] = _deviceId,
-["Identifier"] = DeviceIdentifier,
+            ["Identifier"] = DeviceIdentifier,
             ["Type"] = 15,
             ["Payload"] = new JsonObject
             {