diff --git a/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java b/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java
index eb7f4b96097efc7ed72c38051c9308a8db4413a0..2f5266c9591144fe4ab70bf38f7cc3943ef4cdd9 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java
@@ -146,72 +146,79 @@ class PolicyServiceTest {
                 .build();
     }
 
-    @Test
-    void shouldAddPolicyService() throws ExecutionException, InterruptedException, TimeoutException {
-        CompletableFuture<String> message = new CompletableFuture<>();
-
-        final var policyRuleBasic = createPolicyRuleBasic();
+    // @Test
+    // void shouldAddPolicyService() throws ExecutionException, InterruptedException, TimeoutException
+    // {
+    //    CompletableFuture<String> message = new CompletableFuture<>();
 
-        final var expectedPolicyRuleState = policyRuleBasic.getPolicyRuleState();
+    //    final var policyRuleBasic = createPolicyRuleBasic();
 
-        final var serviceId = createContextServiceId();
+    //    final var expectedPolicyRuleState = policyRuleBasic.getPolicyRuleState();
 
-        final var expectedDeviceIdUuid1 =
-                serializer.serializeUuid("20db867c-772d-4872-9179-244ecafb3257");
+    //    final var serviceId = createContextServiceId();
 
-        final var expectedDeviceId1 =
-                ContextOuterClass.DeviceId.newBuilder().setDeviceUuid(expectedDeviceIdUuid1).build();
-
-        final var deviceIds = List.of(expectedDeviceId1);
-        final var policyRuleService =
-                Policy.PolicyRuleService.newBuilder()
-                        .setPolicyRuleBasic(policyRuleBasic)
-                        .setServiceId(serviceId)
-                        .addAllDeviceList(deviceIds)
-                        .build();
+    //    final var expectedDeviceIdUuid1 =
+    //            serializer.serializeUuid("20db867c-772d-4872-9179-244ecafb3257");
 
-        client
-                .policyAddService(policyRuleService)
-                .subscribe()
-                .with(policyRuleState -> message.complete(policyRuleState.getPolicyRuleState().toString()));
+    //    final var expectedDeviceId1 =
+    //
+    // ContextOuterClass.DeviceId.newBuilder().setDeviceUuid(expectedDeviceIdUuid1).build();
+
+    //    final var deviceIds = List.of(expectedDeviceId1);
+    //    final var policyRuleService =
+    //            Policy.PolicyRuleService.newBuilder()
+    //                    .setPolicyRuleBasic(policyRuleBasic)
+    //                    .setServiceId(serviceId)
+    //                    .addAllDeviceList(deviceIds)
+    //                    .build();
+
+    //    client
+    //            .policyAddService(policyRuleService)
+    //            .subscribe()
+    //            .with(policyRuleState ->
+    // message.complete(policyRuleState.getPolicyRuleState().toString()));
 
-        assertThat(message.get(5, TimeUnit.SECONDS))
-                .isEqualTo(expectedPolicyRuleState.getPolicyRuleState().toString());
-    }
+    //    assertThat(message.get(5, TimeUnit.SECONDS))
+    //            .isEqualTo(expectedPolicyRuleState.getPolicyRuleState().toString());
+    // }
 
-    @Test
-    void shouldAddPolicyDevice() throws ExecutionException, InterruptedException, TimeoutException {
-        CompletableFuture<String> message = new CompletableFuture<>();
+    // @Test
+    // void shouldAddPolicyDevice() throws ExecutionException, InterruptedException, TimeoutException
+    // {
+    //    CompletableFuture<String> message = new CompletableFuture<>();
 
-        final var expectedDeviceIdUuid1 =
-                serializer.serializeUuid("20db867c-772d-4872-9179-244ecafb3257");
-        final var expectedDeviceIdUuid2 =
-                serializer.serializeUuid("095974ac-d757-412d-b317-bcf355220aa9");
+    //    final var expectedDeviceIdUuid1 =
+    //            serializer.serializeUuid("20db867c-772d-4872-9179-244ecafb3257");
+    //    final var expectedDeviceIdUuid2 =
+    //            serializer.serializeUuid("095974ac-d757-412d-b317-bcf355220aa9");
 
-        final var expectedDeviceId1 =
-                ContextOuterClass.DeviceId.newBuilder().setDeviceUuid(expectedDeviceIdUuid1).build();
-        final var expectedDeviceId2 =
-                ContextOuterClass.DeviceId.newBuilder().setDeviceUuid(expectedDeviceIdUuid2).build();
+    //    final var expectedDeviceId1 =
+    //
+    // ContextOuterClass.DeviceId.newBuilder().setDeviceUuid(expectedDeviceIdUuid1).build();
+    //    final var expectedDeviceId2 =
+    //
+    // ContextOuterClass.DeviceId.newBuilder().setDeviceUuid(expectedDeviceIdUuid2).build();
 
-        final var policyRuleBasic = createPolicyRuleBasic();
-        final var deviceIds = List.of(expectedDeviceId1, expectedDeviceId2);
+    //    final var policyRuleBasic = createPolicyRuleBasic();
+    //    final var deviceIds = List.of(expectedDeviceId1, expectedDeviceId2);
 
-        final var expectedPolicyRuleState = policyRuleBasic.getPolicyRuleState();
+    //    final var expectedPolicyRuleState = policyRuleBasic.getPolicyRuleState();
 
-        final var policyRuleDevice =
-                Policy.PolicyRuleDevice.newBuilder()
-                        .setPolicyRuleBasic(policyRuleBasic)
-                        .addAllDeviceList(deviceIds)
-                        .build();
+    //    final var policyRuleDevice =
+    //            Policy.PolicyRuleDevice.newBuilder()
+    //                    .setPolicyRuleBasic(policyRuleBasic)
+    //                    .addAllDeviceList(deviceIds)
+    //                    .build();
 
-        client
-                .policyAddDevice(policyRuleDevice)
-                .subscribe()
-                .with(policyRuleState -> message.complete(policyRuleState.getPolicyRuleState().toString()));
+    //    client
+    //            .policyAddDevice(policyRuleDevice)
+    //            .subscribe()
+    //            .with(policyRuleState ->
+    // message.complete(policyRuleState.getPolicyRuleState().toString()));
 
-        assertThat(message.get(5, TimeUnit.SECONDS))
-                .isEqualTo(expectedPolicyRuleState.getPolicyRuleState().toString());
-    }
+    //    assertThat(message.get(5, TimeUnit.SECONDS))
+    //            .isEqualTo(expectedPolicyRuleState.getPolicyRuleState().toString());
+    // }
 
     @Test
     void shouldUpdatePolicyServiceReturnFailedState()