diff --git a/src/test/cord-api/Tests/data/PONPort.json b/src/test/cord-api/Tests/data/PONPort.json
index f40c058..13ef0f6 100644
--- a/src/test/cord-api/Tests/data/PONPort.json
+++ b/src/test/cord-api/Tests/data/PONPort.json
@@ -4,19 +4,19 @@
             "name": "volt-port-1",
             "s_tag": 222,
             "olt_device_id": 1,
-            "port_id" : "of:0000000000000002/1"
+            "port_no" : 1
     },
     {
             "name": "volt-port-2",
             "s_tag": 444,
             "olt_device_id": 1,
-            "port_id" : "of:0000000000000001/2"
+            "port_no" : 2
     },
     {
             "name": "volt-port-3",
             "s_tag": 333,
             "olt_device_id": 1,
-            "port_id" : "of:0000000000000001/1"
+            "port_no" : 3
     }
   ]
 }
diff --git a/src/test/cord-api/Tests/data/RCORDLite_Subscriber.json b/src/test/cord-api/Tests/data/RCORDLite_Subscriber.json
index 14d777a..41a1b35 100644
--- a/src/test/cord-api/Tests/data/RCORDLite_Subscriber.json
+++ b/src/test/cord-api/Tests/data/RCORDLite_Subscriber.json
@@ -1,23 +1,11 @@
 {
     "SubscriberInfo" : [
     {
-            "cdn_enable": true,
-            "uplink_speed": 1000000000,
-            "downlink_speed": 1000000000,
-            "enable_uverse": true,
-            "status": "enabled",
-            "service_specific_id": "304",
             "name": "My House-304",
             "c_tag": 888,
             "onu_device": "ONUSerialNumber1"
     },
     {
-            "cdn_enable": false,
-            "uplink_speed": 500000000,
-            "downlink_speed": 500000000,
-            "enable_uverse": false,
-            "status": "enabled",
-            "service_specific_id": "305",
             "name": "My House-305",
             "c_tag": 999,
             "mac_address" : "00:AA:00:00:00:01",
@@ -25,9 +13,6 @@
             "onu_device": "ONUSerialNumber2"
     },
     {
-            "cdn_enable": true,
-            "uplink_speed": 500000000,
-            "service_specific_id": "306",
             "name": "My House-306",
             "c_tag": 661,
             "onu_device": "ONUSerialNumber3"