diff --git a/tests/data/onlab-pod1-sadis.json b/tests/data/onlab-pod1-sadis.json
index 4b451b7..64d9f90 100644
--- a/tests/data/onlab-pod1-sadis.json
+++ b/tests/data/onlab-pod1-sadis.json
@@ -21,8 +21,8 @@
             "id": "ALPHe3d1cfde-1",
             "cTag": 112,
             "sTag": 111,
-            "nasPortId": "ALPHe3d1cfde-1",
-            "circuitId": "ALPHe3d1cfde-1",
+            "nasPortId": "",
+            "circuitId": "",
             "remoteId": "",
             "technologyProfileId": 64,
             "upstreamBandwidthProfile": "Default",
@@ -73,10 +73,10 @@
             "downstreamBandwidthProfile": "Default"
           },
           {
-            "id": "EC1721000216",
+            "id": "EC1838000853",
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
-            "ipAddress": "10.90.0.114",
-            "nasId": "EC1721000216",
+            "ipAddress": "10.192.20.206",
+            "nasId": "EC1838000853",
             "uplinkPort": 65536
           }
         ]
@@ -93,10 +93,10 @@
               {
                   "id": "Default",
                   "air": 100000,
-                  "cbs": 300,
-                  "cir": 8000,
-                  "ebs": 300,
-                  "eir": 8000
+                  "cbs": 30,
+                  "cir": 600,
+                  "ebs": 30,
+                  "eir": 400
               },
               {
                   "id": "User_Bandwidth1",
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index 95479fc..e347a71 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -83,7 +83,7 @@
         ...    ${src['pass']}    ${src['container_type']}    ${src['container_name']}    ${dst['dp_iface_name']}
         ...    ${dst['ip']}    ${dst['user']}    ${dst['pass']}    ${dst['container_type']}    ${dst['container_name']}
 
-        Wait Until Keyword Succeeds    ${timeout}    2s    Validate Subscriber DHCP Allocation    ${k8s_node_ip}    ${ONOS_SSH_PORT}    ${onu_port}
+        Wait Until Keyword Succeeds    ${timeout}    2s    Run Keyword And Continue On Failure    Validate Subscriber DHCP Allocation    ${k8s_node_ip}    ${ONOS_SSH_PORT}    ${onu_port}
     END
 
 *** Keywords ***