diff --git a/VERSION b/VERSION
index 36b69a6..37c6fdb 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.8.22
+2.8.23
diff --git a/tests/data/dt-berlin-pod-gpon-sadis-DT.json b/tests/data/dt-berlin-pod-gpon-sadis-DT.json
index 6b25725..36e8a91 100644
--- a/tests/data/dt-berlin-pod-gpon-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-gpon-sadis-DT.json
@@ -11,16 +11,16 @@
         },
         "entries": [
           {
-            "id": "EC1912001814",
-            "hardwareIdentifier": "80:a2:35:4d:24:c0",
-            "nasId": "EC1912001814",
+            "id": "EC1912001823",
+            "hardwareIdentifier": "80:a2:35:4d:2f:c0",
+            "nasId": "EC1912001823",
             "uplinkPort": 1048576
           },
           {
             "id": "SCOM00001c82-1",
             "nasPortId": "SCOM00001c82-1",
             "circuitId": "SCOM00001c82-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [{
               "uniTagMatch": 4096,
               "ponCTag": 4096,
@@ -35,7 +35,7 @@
             "id": "SCOM00001c89-1",
             "nasPortId": "SCOM00001c89-1",
             "circuitId": "SCOM00001c89-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
@@ -51,7 +51,7 @@
             "id": "SCOM00001c96-1",
             "nasPortId": "SCOM00001c96-1",
             "circuitId": "SCOM00001c96-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
@@ -67,7 +67,7 @@
             "id": "SCOM00001c0b-1",
             "nasPortId": "SCOM00001c0b-1",
             "circuitId": "SCOM00001c0b-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
@@ -83,7 +83,7 @@
             "id": "SCOMa0305f84-1",
             "nasPortId": "SCOMa0305f84-1",
             "circuitId": "SCOMa0305f84-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
diff --git a/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json b/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json
index 693fc91..623169f 100644
--- a/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json
@@ -11,9 +11,9 @@
         },
         "entries": [
           {
-            "id": "EC1912001814",
-            "hardwareIdentifier": "80:a2:35:4d:24:c0",
-            "nasId": "EC1912001814",
+            "id": "EC1912001823",
+            "hardwareIdentifier": "80:a2:35:4d:2f:c0",
+            "nasId": "EC1912001823",
             "uplinkPort": 1048576
           },
           {
@@ -26,7 +26,7 @@
             "id": "SCOM00001c82-1",
             "nasPortId": "SCOM00001c82-1",
             "circuitId": "SCOM00001c82-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [{
               "uniTagMatch": 4096,
               "ponCTag": 4096,
@@ -41,7 +41,7 @@
             "id": "SCOM00001c89-1",
             "nasPortId": "SCOM00001c89-1",
             "circuitId": "SCOM00001c89-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
@@ -57,7 +57,7 @@
             "id": "SCOM00001c96-1",
             "nasPortId": "SCOM00001c96-1",
             "circuitId": "SCOM00001c96-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
@@ -105,7 +105,7 @@
             "id": "SCOM00001c0b-1",
             "nasPortId": "SCOM00001c0b-1",
             "circuitId": "SCOM00001c0b-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
@@ -121,7 +121,7 @@
             "id": "SCOMa0305f84-1",
             "nasPortId": "SCOMa0305f84-1",
             "circuitId": "SCOMa0305f84-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
diff --git a/tests/data/dt-berlin-pod-openonugo-sadis-DT.json b/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
index 44708e0..aecf32e 100644
--- a/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
@@ -11,16 +11,16 @@
         },
         "entries": [
           {
-            "id": "EC1912001814",
-            "hardwareIdentifier": "80:a2:35:4d:24:c0",
-            "nasId": "EC1912001814",
+            "id": "EC1912001823",
+            "hardwareIdentifier": "80:a2:35:4d:2f:c0",
+            "nasId": "EC1912001823",
             "uplinkPort": 1048576
           },
           {
             "id": "SCOM00001c82-1",
             "nasPortId": "SCOM00001c82-1",
             "circuitId": "SCOM00001c82-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [{
               "uniTagMatch": 4096,
               "ponCTag": 4096,
@@ -35,7 +35,7 @@
             "id": "SCOM00001c89-1",
             "nasPortId": "SCOM00001c89-1",
             "circuitId": "SCOM00001c89-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
@@ -51,7 +51,7 @@
             "id": "SCOM00001c96-1",
             "nasPortId": "SCOM00001c96-1",
             "circuitId": "SCOM00001c96-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,
@@ -67,7 +67,7 @@
             "id": "SCOM00001c0b-1",
             "nasPortId": "SCOM00001c0b-1",
             "circuitId": "SCOM00001c0b-1",
-            "remoteId": "EC1912001814",
+            "remoteId": "EC1912001823",
             "uniTagList": [
               {
                 "uniTagMatch": 4096,