diff --git a/astyle-branch.out b/astyle-branch.out
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/astyle-branch.out
diff --git a/tools/test_configs/MACTester.json b/tools/test_configs/MACTester.json
new file mode 100644
index 0000000..a47277b
--- /dev/null
+++ b/tools/test_configs/MACTester.json
@@ -0,0 +1,48 @@
+{
+    "config": {
+        "radio-type":{
+            "help": "options are ATMEL, MCR20, OTHER",
+            "value": "ATMEL"
+        },
+        "header-file": {
+            "help" : "String for including your driver header file",
+            "value" : "\"EthernetInterface.h\""
+        },
+        "object-construction" : {
+            "value" : "new EthernetInterface()"
+        },
+        "connect-statement" : {
+            "help" : "Must use 'net' variable name",
+            "value" : "net->connect()"
+        },
+        "echo-server-addr" : {
+            "help" : "IP address of echo server",
+            "value" : "\"echo.mbedcloudtesting.com\""
+        },
+        "echo-server-port" : {
+            "help" : "Port of echo server",
+            "value" : "7"
+        },
+        "tcp-echo-prefix" : {
+            "help" : "Some servers send a prefix before echoed message",
+            "value" : null
+        },
+        "sim-blockdevice": {
+            "help": "Simulated block device, requires sufficient heap",
+            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
+            "value": "HeapBlockDevice"
+        }
+    },
+    "macros": ["YOTTA_CFG_MBED_TRACE_LINE_LENGTH=200", "OS_TASKCNT=4", "OS_IDLESTKSIZE=32"],
+    "target_overrides": {
+        "*": {
+            "target.features_add": ["NANOSTACK", "LOWPAN_HOST", "COMMON_PAL", "LWIP"],
+            "platform.stdio-convert-newlines": true,
+            "platform.stdio-baud-rate": 115200,
+            "mbed-mesh-api.heap-size": 6000,
+            "nanostack-hal.event_loop_thread_stack_size": 2000,
+            "mbed-trace.enable": true,
+            "nsapi.default-stack": "LWIP"
+        }
+    }
+}
diff --git a/tools/test_configs/config_paths.json b/tools/test_configs/config_paths.json
index 34244ca..27f2a8d 100644
--- a/tools/test_configs/config_paths.json
+++ b/tools/test_configs/config_paths.json
@@ -3,6 +3,9 @@
     "HEAPBLOCKDEVICE": "HeapBlockDevice.json",
     "HEAPBLOCKDEVICE_AND_ETHERNET": "HeapBlockDeviceAndEthernetInterface.json",
     "HEAPBLOCKDEVICE_AND_WIFI": "HeapBlockDeviceAndWifiInterface.json",
+    "ODIN_WIFI" : "OdinInterface.json",
+    "ODIN_ETHERNET" : "Odin_EthernetInterface.json",
+    "REALTEK_WIFI" : "RealtekInterface.json",
     "ESP8266_WIFI" : "ESP8266Interface.json",
     "ISM43362_WIFI" : "ISM43362Interface.json",
     "IDW0XX1_WIFI" : "SpwfSAInterface.json",
@@ -10,4 +13,5 @@
     "6LOWPAN_ROUTER" : "6lowpanInterface_router.json",
     "THREAD_END_DEVICE" : "ThreadInterface_end_device.json",
     "THREAD_ROUTER" : "ThreadInterface_router.json"
+    "MAC_TESTER" : "MACTester.json"
 }
diff --git a/tools/test_configs/target_configs.json b/tools/test_configs/target_configs.json
index 85af0ae..e74e6db 100644
--- a/tools/test_configs/target_configs.json
+++ b/tools/test_configs/target_configs.json
@@ -9,11 +9,11 @@
     },
     "K64F": {
         "default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
-        "test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET", "ESP8266_WIFI", "ETHERNET"]
+        "test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET", "MAC_TESTER", "ESP8266_WIFI", "ETHERNET"]
     },
     "NUCLEO_F429ZI": {
         "default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
-        "test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET"]
+        "test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET", "MAC_TESTER"]
     },
     "DISCO_L475VG_IOT01A": {
         "default_test_configuration": "NONE",