diff --git a/src/test/cord-api/Tests/data/AttWhiteList.json b/src/test/cord-api/Tests/data/AttWhiteList.json
new file mode 100644
index 0000000..cd0624a
--- /dev/null
+++ b/src/test/cord-api/Tests/data/AttWhiteList.json
@@ -0,0 +1,10 @@
+{
+    "AttWhiteList" : [
+    {
+            "serial_number": "",
+            "device_id" : "1",
+            "pon_port_id" : "",
+            "owner_id" : "1"
+    }
+  ]
+}
diff --git a/src/test/cord-api/Tests/data/AttWorkFlowDriver.json b/src/test/cord-api/Tests/data/AttWorkFlowDriver.json
new file mode 100644
index 0000000..22572b7
--- /dev/null
+++ b/src/test/cord-api/Tests/data/AttWorkFlowDriver.json
@@ -0,0 +1,7 @@
+{
+    "AttWorkFlowDriver" : [
+    {
+            "name": "att-workflow-driver"
+    }
+  ]
+}
diff --git a/src/test/cord-api/Tests/data/BNGPortMapping.json b/src/test/cord-api/Tests/data/BNGPortMapping.json
new file mode 100644
index 0000000..d69cf92
--- /dev/null
+++ b/src/test/cord-api/Tests/data/BNGPortMapping.json
@@ -0,0 +1,8 @@
+{
+    "BNGPortMapping" : [
+    {
+            "s_tag": "any",
+            "switch_port" : 8
+    }
+  ]
+}
diff --git a/src/test/cord-api/Tests/data/FabricPortInterface.json b/src/test/cord-api/Tests/data/FabricPortInterface.json
index 7a5061b..a0e724f 100644
--- a/src/test/cord-api/Tests/data/FabricPortInterface.json
+++ b/src/test/cord-api/Tests/data/FabricPortInterface.json
@@ -1,12 +1,12 @@
 {
     "FabricPortInterface" : [
     {
-            "name": "OLT Leaf1- Interface-1",
+            "name": "Switch Interface-1",
             "ips": "10.8.2.254/24",
-            "port_id": 8
+            "port_id": 1
     },
     {
-            "name": "OLT Leaf2- Interface-2",
+            "name": "Switch Interface-2",
             "ips": "10.8.3.254/24",
             "vlanUntagged": 100,
             "port_id": 9
diff --git a/src/test/cord-api/Tests/data/FabricSwitch.json b/src/test/cord-api/Tests/data/FabricSwitch.json
index 6f32b22..8c2ac96 100644
--- a/src/test/cord-api/Tests/data/FabricSwitch.json
+++ b/src/test/cord-api/Tests/data/FabricSwitch.json
@@ -2,39 +2,12 @@
     "FabricSwitchInfo" : [
     {
             "driver": "ofdpa3",
-            "ipv4Loopback": "192.168.9.22",
-            "ipv4NodeSid": 18,
-            "isEdgeRouter": true,
-            "name": "Fabric Switch - Leaf1",
-            "ofId": "of:0000cc37abd93769",
-            "routerMac": "00:00:00:00:00:01"
-    },
-    {
-            "driver": "ofdpa3",
-            "ipv4Loopback": "192.168.9.23",
-            "ipv4NodeSid": 17,
-            "isEdgeRouter": true,
-            "name": "Fabric Switch - Leaf2",
-            "ofId": "of:0000cc37abb6b564",
-            "routerMac": "00:00:00:00:00:02"
-    },
-    {
-            "driver": "ofdpa3",
             "ipv4Loopback": "192.168.9.24",
             "ipv4NodeSid": 19,
             "isEdgeRouter": false,
-            "name": "Fabric Switch - Spine1",
+            "name": "Fabric Switch - 1",
             "ofId": "of:0000cc37ab5b6da8",
             "routerMac": "00:00:00:00:00:03"
-    },
-    {
-            "driver": "ofdpa3",
-            "ipv4Loopback": "192.168.9.25",
-            "ipv4NodeSid": 20,
-            "isEdgeRouter": false,
-            "name": "Fabric Switch - Spine2",
-            "ofId": "of:0000cc37abd9386d",
-            "routerMac": "00:00:00:00:00:04"
     }
   ]
 }
diff --git a/src/test/cord-api/Tests/data/FabricSwitchPort.json b/src/test/cord-api/Tests/data/FabricSwitchPort.json
index 712c755..53d282e 100644
--- a/src/test/cord-api/Tests/data/FabricSwitchPort.json
+++ b/src/test/cord-api/Tests/data/FabricSwitchPort.json
@@ -6,8 +6,8 @@
             "host_learning": false
     },
     {
-            "portId": 5,
-            "switch_id" : 6
+            "portId": 8,
+            "switch_id" : 1
     }
   ]
 }
diff --git a/src/test/cord-api/Tests/data/FabricSwitch_2x2.json b/src/test/cord-api/Tests/data/FabricSwitch_2x2.json
new file mode 100644
index 0000000..6f32b22
--- /dev/null
+++ b/src/test/cord-api/Tests/data/FabricSwitch_2x2.json
@@ -0,0 +1,40 @@
+{
+    "FabricSwitchInfo" : [
+    {
+            "driver": "ofdpa3",
+            "ipv4Loopback": "192.168.9.22",
+            "ipv4NodeSid": 18,
+            "isEdgeRouter": true,
+            "name": "Fabric Switch - Leaf1",
+            "ofId": "of:0000cc37abd93769",
+            "routerMac": "00:00:00:00:00:01"
+    },
+    {
+            "driver": "ofdpa3",
+            "ipv4Loopback": "192.168.9.23",
+            "ipv4NodeSid": 17,
+            "isEdgeRouter": true,
+            "name": "Fabric Switch - Leaf2",
+            "ofId": "of:0000cc37abb6b564",
+            "routerMac": "00:00:00:00:00:02"
+    },
+    {
+            "driver": "ofdpa3",
+            "ipv4Loopback": "192.168.9.24",
+            "ipv4NodeSid": 19,
+            "isEdgeRouter": false,
+            "name": "Fabric Switch - Spine1",
+            "ofId": "of:0000cc37ab5b6da8",
+            "routerMac": "00:00:00:00:00:03"
+    },
+    {
+            "driver": "ofdpa3",
+            "ipv4Loopback": "192.168.9.25",
+            "ipv4NodeSid": 20,
+            "isEdgeRouter": false,
+            "name": "Fabric Switch - Spine2",
+            "ofId": "of:0000cc37abd9386d",
+            "routerMac": "00:00:00:00:00:04"
+    }
+  ]
+}
diff --git a/src/test/cord-api/Tests/data/RealOLTDevice.json b/src/test/cord-api/Tests/data/RealOLTDevice.json
index 802c3d1..0ac640d 100644
--- a/src/test/cord-api/Tests/data/RealOLTDevice.json
+++ b/src/test/cord-api/Tests/data/RealOLTDevice.json
@@ -4,7 +4,7 @@
             "device_type": "openolt",
             "host": "10.192.4.218",
             "port": 9191,
-            "switch_datapath_id": "of:0000cc37abd93769",
+            "switch_datapath_id": "of:0000cc37ab5b6da8",
             "switch_port": "7",
             "outer_tpid": "0x8100",
             "name": "olt-1",
diff --git a/src/test/cord-api/Tests/data/Subscriber_TopDown.json b/src/test/cord-api/Tests/data/Subscriber_TopDown.json
index 89c82e2..d9e632c 100644
--- a/src/test/cord-api/Tests/data/Subscriber_TopDown.json
+++ b/src/test/cord-api/Tests/data/Subscriber_TopDown.json
@@ -5,7 +5,8 @@
             "c_tag": 999,
             "mac_address" : "08:35:71:06:b9:69",
             "ip_address" : "10.8.2.105",
-            "onu_device": "ALPHe3d1cfa7"
+            "onu_device": "ALPHe3d1cfa7",
+            "status": "disabled"
      },
      {
             "name": "My House-306",