diff --git a/tests/atests/build/aaa_json b/tests/atests/build/aaa_json
new file mode 100644
index 0000000..491b594
--- /dev/null
+++ b/tests/atests/build/aaa_json
@@ -0,0 +1,24 @@
+{
+  "org.opencord.aaa":{
+    "AAA":{	
+  "radiusIp":"192.168.249.222",
+      "nasIp":"5.6.7.8",
+      "radiusServerPort":"1812",
+      "radiusSecret":"SECRET",
+      "bindings":[
+        {	
+          "mac":"de:ad:be:ef:ba:11",
+          "s-tag":2,
+          "c-tag":2,
+          "nas_port_id":"location"
+        },
+        {	
+          "mac":"de:ad:be:ef:ca:fe",
+          "s-tag":2,
+          "c-tag":122,
+          "nas_port_id":"location"
+        }
+      ]
+    }
+  }
+}
diff --git a/tests/atests/build/devices_json b/tests/atests/build/devices_json
index 6fbc4d5..74c0aca 100644
--- a/tests/atests/build/devices_json
+++ b/tests/atests/build/devices_json
@@ -1 +1,65 @@
-{"of:0001000000000005":{"basic":{"driver":"voltha"},"accessDevice":{"uplink":"0","vlan":"1004"}},"of:0001000000000006":{"basic":{"driver":"voltha"},"accessDevice":{"uplink":"0","vlan":"1005"}},"of:0001000000000003":{"basic":{"driver":"voltha"},"accessDevice":{"uplink":"0","vlan":"1002"}},"of:0001000000000004":{"basic":{"driver":"voltha"},"accessDevice":{"uplink":"0","vlan":"1003"}},"of:0000aabbccddeeff":{"basic":{"driver":"voltha"},"accessDevice":{"uplink":"0","vlan":"2"}},"of:0001000000000002":{"basic":{"driver":"voltha"},"accessDevice":{"uplink":"0","vlan":"1001"}},"of:0001aabbccddeeff":{"basic":{"driver":"voltha"},"accessDevice":{"uplink":"0","vlan":"2"}}}
+{
+  "of:0001000000000005":{
+    "basic":{
+      "driver":"voltha"
+    },
+    "accessDevice":{
+      "uplink":"0",
+      "vlan":"1004"
+    }
+  },
+  "of:0001000000000006":{
+    "basic":{
+      "driver":"voltha"
+    },
+    "accessDevice":{
+      "uplink":"0",
+      "vlan":"1005"
+    }
+  },
+  "of:0001000000000003":{
+    "basic":{
+      "driver":"voltha"
+    },
+    "accessDevice":{
+      "uplink":"0",
+      "vlan":"1002"
+    }
+  },
+  "of:0001000000000004":{
+    "basic":{
+      "driver":"voltha"
+    },
+    "accessDevice":{
+      "uplink":"0",
+      "vlan":"1003"
+    }
+  },
+  "of:0000aabbccddeeff":{
+    "basic":{
+      "driver":"voltha"
+    },
+    "accessDevice":{
+      "uplink":"0",
+      "vlan":"2"
+    }
+  },
+  "of:0001000000000002":{
+    "basic":{
+      "driver":"voltha"
+    },
+    "accessDevice":{
+      "uplink":"0",
+      "vlan":"1001"
+    }
+  },
+  "of:0001aabbccddeeff":{
+    "basic":{
+      "driver":"voltha"
+    },
+    "accessDevice":{
+      "uplink":"0",
+      "vlan":"2"
+    }
+  }
+}
diff --git a/tests/atests/build/sadis_json b/tests/atests/build/sadis_json
index fc613b7..fcded75 100644
--- a/tests/atests/build/sadis_json
+++ b/tests/atests/build/sadis_json
@@ -1,32 +1,31 @@
 {  
-   "org.opencord.sadis":{  
-      "sadis":{  
-         "integration":{  
-            "cache":{  
-               "enabled":true,
-               "maxsize":50,
-               "ttl":"PT1m"
-            }
-         },
-         "entries":[  
-            {  
-               "id":"PSMO12345678",
-               "cTag":33,
-               "sTag":44,
-               "nasPortId":"PSMO12345678"
-            },
-            {  
-               "id":"1d1d1d1d1d1d11",
-               "hardwareIdentifier":"00:1b:22:00:b1:78",
-               "ipAddress":"192.168.1.252",
-               "nasId":"B100-NASID"
-            },
-            {  
-               "id":"olt.voltha.svc:50060",
-               "uplinkPort":2
-            }
-         ]
-      }
-   }
+  "org.opencord.sadis":{  
+    "sadis":{  
+      "integration":{  
+        "cache":{  
+          "enabled":true,
+          "maxsize":50,
+          "ttl":"PT1m"
+        }
+      },
+      "entries":[  
+        {  
+          "id":"PSMO12345678",
+          "cTag":33,
+          "sTag":44,
+          "nasPortId":"PSMO12345678"
+        },
+        {  
+          "id":"1d1d1d1d1d1d11",
+          "hardwareIdentifier":"00:1b:22:00:b1:78",
+          "ipAddress":"192.168.1.252",
+          "nasId":"B100-NASID"
+        },
+        {  
+          "id":"olt.voltha.svc:50060",
+          "uplinkPort":2
+        }
+      ]
+    }
+  }
 }
-