diff --git a/templates/maixduino/test b/templates/maixduino/test
index 846fe40..4e0dab5 100755
--- a/templates/maixduino/test
+++ b/templates/maixduino/test
@@ -3,191 +3,105 @@
 import os
 import sys
 import time
-import struct
-import serial
 import subprocess
+import serial.tools.list_ports
+from test_common import (
+    LogicMultiplexerTimeMeasurements,
+    parse_nist_aead_test_vectors,
+    DeviceUnderTestAeadUARTP,
+    eprint,
+    run_nist_aead_test_line,
+)
 
 
+def get_serial():
+    import serial.tools.list_ports
+    ports = serial.tools.list_ports.comports()
+    ports = [
+        c
+        for c in ports
+        if c.product == 'Sipeed-Debug'
+    ]
+    ports.sort(key=lambda d: d.location)
+    return ports[0].device
 
-def eprint(*args, **kargs):
-    print(*args, file=sys.stderr, **kargs)
 
+class Maixduino(DeviceUnderTestAeadUARTP):
 
-def flash(tty=None):
-    pipe = subprocess.PIPE
-    cmd = ['platformio', 'run', '--target', 'upload']
-    if tty is not None:
-        cmd.extend(['--upload-port', tty])
-    p = subprocess.Popen(cmd,
-            stdout=sys.stderr, stdin=pipe)
-    stdout, stderr = p.communicate("") 
+    def __init__(self, build_dir):
+        DeviceUnderTestAeadUARTP.__init__(self)
 
-def get_serial():
-    import serial.tools.list_ports
-    ports = serial.tools.list_ports.comports()
-    sipeed_devices = [ c.device
-            for c in ports
-            if c.product == 'Sipeed-Debug']
-    sipeed_devices.sort()
-    return sipeed_devices[0]
-
-
-class UARTP:
-    def __init__(self, ser):
-        UARTP.SYN = 0xf9
-        UARTP.FIN = 0xf3
-        self.ser = ser
-
-    def uart_read(self):
-        r = self.ser.read(1)
-        if len(r) != 1:
-            raise Exception("Serial read error")
-        return r[0]
-
-    def uart_write(self, c):
-        b = struct.pack("B", c)
-        r = self.ser.write(b)
-        if r != len(b):
-            raise Exception("Serial write error")
-        return r
-
-    def send(self, buf):
-        self.uart_write(UARTP.SYN)
-        len_ind_0 = 0xff & len(buf)
-        len_ind_1 = 0xff & (len(buf) >> 7)
-        if len(buf) < 128:
-            self.uart_write(len_ind_0)
-        else:
-            self.uart_write(len_ind_0 | 0x80)
-            self.uart_write(len_ind_1)
-        fcs = 0
-        for i in range(len(buf)):
-            info = buf[i]
-            fcs = (fcs + info) & 0xff
-            self.uart_write(buf[i])
-        fcs = (0xff - fcs) & 0xff
-        self.uart_write(fcs)
-        self.uart_write(UARTP.FIN)
-        eprint("sent frame '%s'" % buf.hex())
-
-    def recv(self):
-        tag_old = UARTP.FIN
-        while 1:
-            tag = tag_old
-            while 1:
-                if tag_old == UARTP.FIN:
-                    if tag == UARTP.SYN:
-                        break
-                tag_old = tag
-                tag = self.uart_read()
-            tag_old = tag
-            
-            l = self.uart_read()
-            if l & 0x80:
-                l &= 0x7f
-                l |= self.uart_read() << 7
-
-            fcs = 0
-            buf = []
-            for i in range(l):
-                info = self.uart_read()
-                buf.append(info)
-                fcs = (fcs + info) & 0xff
-            fcs = (fcs + self.uart_read()) & 0xff
-
-            tag = self.uart_read()
-            if fcs == 0xff:
-                if tag == UARTP.FIN:
-                    buf = bytes(buf)
-                    eprint("rcvd frame '%s'" % buf.hex())
-                    if len(buf) >= 1 and buf[0] == 0xde:
-                        sys.stderr.buffer.write(buf[1:])
-                        sys.stderr.flush()
-                    else:
-                        return buf
-
-
-def stdin_read(n):
-    b = sys.stdin.buffer.read(n)
-    if len(b) != n:
-        sys.exit(1)
-    return b
-
-
-def stdin_readvar():
-    l = stdin_read(4)
-    (l, ) = struct.unpack("<I", l)
-    v = stdin_read(l)
-    return v
+        self.build_dir = build_dir
+
+    def flash(self):
+        pipe = subprocess.PIPE
+        previous_dir = os.path.abspath(os.curdir)
+        os.chdir(self.build_dir)
+        cmd = ['platformio', 'run', '-e', 'sipeed-maixduino']
+        cmd.extend(['--target', 'upload'])
+        cmd.extend(['--upload-port', get_serial()])
+        cmd.extend(['--upload-port', get_serial()])
+        p = subprocess.Popen(
+            cmd, stdout=sys.stderr, stdin=pipe)
+        stdout, stderr = p.communicate("")
+        eprint("Firmware flashed.")
+        os.chdir(previous_dir)
+
+    def dump_ram(self):
+        return None
 
 
 def main(argv):
-    eprint(argv[0])
-    script_dir = os.path.split(argv[0])[0]
-    if len(script_dir) > 0:
-        os.chdir(script_dir)
-
-
-    dev = get_serial()
-    flash(dev)
-    eprint("Flashed")
-    time.sleep(0.1)
-    ser = serial.Serial(dev, baudrate=1500000, timeout=5)
-    uartp = UARTP(ser)
-    
-    ser.setRTS(True)
-    time.sleep(0.1)
-    ser.setRTS(False)
-    time.sleep(0.1)
-    ser.setRTS(True)
-    time.sleep(1)
-
-    exp_hello = b"Hello, World!"
-    hello = ser.read(len(exp_hello))
-    if hello != exp_hello:
-        eprint("Improper board initialization message: ")
+    if len(argv) != 3:
+        print("Usage: test LWC_AEAD_KAT.txt build_dir")
         return 1
-    eprint("Board initialized properly")
-    sys.stdout.write("Hello, World!\n")
-    sys.stdout.flush()
-
-    while 1:
-        action = stdin_read(1)[0]
-        eprint("Command %c from stdin" % action)
-
-        if action in b"ackmps":
-            v = stdin_readvar()
-            uartp.send(struct.pack("B", action) + v)
-            ack = uartp.recv()
-            if len(ack) != 1 or ack[0] != action:
-                raise Exception("Unacknowledged variable transfer")
-            eprint("Var %c successfully sent to board" % action)
-
-        elif action in b"ACKMPS":
-            c = struct.pack("B", action)
-            uartp.send(c)
-            v = uartp.recv()
-            if len(v) < 1 or v[0] != action:
-                raise Exception("Could not obtain variable from board")
-            v = v[1:]
-            eprint("Var %c received from board: %s" % (action, v.hex()))
-            l = struct.pack("<I", len(v))
-            sys.stdout.buffer.write(l + v)
-            sys.stdout.flush()
-
-        elif action in b"ed":
-            c = struct.pack("B", action)
-            uartp.send(c)
-            ack = uartp.recv()
-            if len(ack) < 1 or ack[0] != action:
-                raise Exception("Unacknowledged variable transfer")
-            eprint("Operation %c completed successfully" % action)
-
-        else:
-            raise Exception("Unknown action %c" % action)
-        
-    
-    return 0
+
+    kat = list(parse_nist_aead_test_vectors(argv[1]))
+    build_dir = argv[2]
+
+    dut = Maixduino(build_dir)
+
+    try:
+        tool = LogicMultiplexerTimeMeasurements(0x00c0)
+        tool.begin_measurement()
+
+        dut.flash()
+
+        ser = serial.Serial(
+            get_serial(),
+            baudrate=1500000,
+            timeout=5)
+
+        ser.setRTS(True)
+        time.sleep(0.1)
+        ser.setRTS(False)
+        time.sleep(0.1)
+        ser.setRTS(True)
+        time.sleep(1)
+
+        dut.ser = ser
+
+        dut.prepare()
+        sys.stdout.write("Board prepared\n")
+        sys.stdout.flush()
+
+        for i, m, ad, k, npub, c in kat:
+            tool.arm()
+            run_nist_aead_test_line(dut, i, m, ad, k, npub, c)
+            tool.unarm()
+
+    except Exception as ex:
+        print("TEST FAILED")
+        raise ex
+
+    finally:
+        tool.end_measurement()
+        sys.stdout.flush()
+        sys.stderr.flush()
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
 
 
 if __name__ == "__main__":
diff --git a/templates/uno/test b/templates/uno/test
index 8fcf8e3..f11b503 100755
--- a/templates/uno/test
+++ b/templates/uno/test
@@ -25,7 +25,7 @@ def get_serial():
     return devices[0]
 
 
-class ESP32(DeviceUnderTestAeadUARTP):
+class Uno(DeviceUnderTestAeadUARTP):
 
     def __init__(self, build_dir):
         DeviceUnderTestAeadUARTP.__init__(self)
@@ -57,7 +57,7 @@ def main(argv):
     kat = list(parse_nist_aead_test_vectors(argv[1]))
     build_dir = argv[2]
 
-    dut = ESP32(build_dir)
+    dut = Uno(build_dir)
 
     try:
         tool = LogicMultiplexerTimeMeasurements(0x0c00)
@@ -98,4 +98,3 @@ def main(argv):
 
 if __name__ == "__main__":
     sys.exit(main(sys.argv))
-