diff --git a/tests/data/berlin-community-pod-1-gpon-sadis-DT.json b/tests/data/berlin-community-pod-1-gpon-sadis-DT.json
index b170495..238e11d 100644
--- a/tests/data/berlin-community-pod-1-gpon-sadis-DT.json
+++ b/tests/data/berlin-community-pod-1-gpon-sadis-DT.json
@@ -11,16 +11,16 @@
         },
         "entries": [
           {
-            "id": "EC1912001823",
-            "hardwareIdentifier": "80:a2:35:4d:2f:c0",
-            "nasId": "EC1912001823",
+            "id": "722033038194",
+            "hardwareIdentifier": "28:b9:d9:e3:59:98",
+            "nasId": "722033038194",
             "uplinkPort": 16777216
           },
           {
             "id": "SCOM00001c82-1",
             "nasPortId": "SCOM00001c82-1",
             "circuitId": "SCOM00001c82-1",
-            "remoteId": "EC1912001823",
+            "remoteId": "722033038194",
             "uniTagList": [{
               "uniTagMatch": 4096,
               "ponCTag": 4096,
@@ -35,7 +35,7 @@
             "id": "SCOM00001c89-1",
             "nasPortId": "SCOM00001c89-1",
             "circuitId": "SCOM00001c89-1",
-            "remoteId": "EC1912001823",
+            "remoteId": "722033038194",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
@@ -51,7 +51,7 @@
             "id": "SCOM00001c96-1",
             "nasPortId": "SCOM00001c96-1",
             "circuitId": "SCOM00001c96-1",
-            "remoteId": "EC1912001823",
+            "remoteId": "722033038194",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
@@ -67,7 +67,7 @@
             "id": "SCOM00001c0b-1",
             "nasPortId": "SCOM00001c0b-1",
             "circuitId": "SCOM00001c0b-1",
-            "remoteId": "EC1912001823",
+            "remoteId": "722033038194",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
@@ -83,7 +83,7 @@
             "id": "SCOMa0305f84-1",
             "nasPortId": "SCOMa0305f84-1",
             "circuitId": "SCOMa0305f84-1",
-            "remoteId": "EC1912001823",
+            "remoteId": "722033038194",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
diff --git a/tests/data/berlin-community-pod-1-gpon-sadis-TT.json b/tests/data/berlin-community-pod-1-gpon-sadis-TT.json
index 3fb5cd0..c0d8409 100644
--- a/tests/data/berlin-community-pod-1-gpon-sadis-TT.json
+++ b/tests/data/berlin-community-pod-1-gpon-sadis-TT.json
@@ -158,9 +158,9 @@
             "serviceName" : "MC"
           } ]
         }, {
-          "id" : "EC1912001823",
-          "hardwareIdentifier" : "80:a2:35:4d:2f:c0",
-          "nasId": "EC1912001823",
+          "id" : "722033038194",
+          "hardwareIdentifier" : "28:b9:d9:e3:59:98",
+          "nasId": "722033038194",
           "uplinkPort" : "16777216"
         } ]
       }