diff --git a/Firmware/boards/emgdmm_v3.json b/Firmware/boards/emgdmm_v3.json
index 67ea2ba..d3359a5 100644
--- a/Firmware/boards/emgdmm_v3.json
+++ b/Firmware/boards/emgdmm_v3.json
@@ -15,20 +15,26 @@
     "name": "EMG DMM Board",
     "upload": {
         "maximum_ram_size": 16384,
-        "maximum_size": 126976,
-        "protocol": "stk500",
+        "maximum_size": 130048,
+        "protocol": "arduino",
         "require_upload_port": true
     },
     "bootloader": {
-        "file": "boards/stk500boot.hex",
+        "file": "boards/optiboot_atmega1284p.hex",
         "lfuse": "0xFF",
-        "hfuse": "0x98",
-        "efuse": "0xFF",
+        "hfuse": "0x9C",
+        "efuse": "0xFC",
         "lock_bits": "0xFF"
     },
+    "debug": {
+        "simavr_target": "atmega1284p",
+        "avr-stub": {
+            "speed": 115200
+        }
+    },
     "test": {
-        "speed": 9600
+        "speed": 115200
     },
     "url": "https://www.emg.tu-bs.de/lehre/vl/vl_dmm_d.html",
-    "vendor": "EMG, TU braunschweig"
+    "vendor": "EMG, TU Braunschweig"
 }
diff --git a/Firmware/boards/optiboot_atmega1284p.hex b/Firmware/boards/optiboot_atmega1284p.hex
new file mode 100644
index 0000000..9378ba7
--- /dev/null
+++ b/Firmware/boards/optiboot_atmega1284p.hex
@@ -0,0 +1,55 @@
+:020000021000EC
+:10FC000001C01BC1112484B7882369F0982F9A7012
+:10FC1000923049F081FF02C097EF94BF282E80E018
+:10FC2000F7D00C94000085E08093810082E08093FF
+:10FC3000C00088E18093C10086E08093C20080E12B
+:10FC40008093C4008EE0E4D0239A86E020E33CEF6A
+:10FC500091E0309385002093840096BBB09BFECF4B
+:10FC60001B9AA8954091C00047FD02C0815089F7BA
+:10FC700043E0B42EAA24A39451E1752EBDD0813463
+:10FC800071F4BAD0C82FCAD081E0C23821F088E020
+:10FC9000C13809F083E0A9D080E1A7D0EFCF82344A
+:10FCA00019F484E1C3D0F8CF853411F485E0FACF9C
+:10FCB000853581F4A1D0082F9FD0182F87FF07C06A
+:10FCC0008BB781608BBF000F111FA8D0E5CF8BB71A
+:10FCD0008E7FF8CF863581F48FD08D3459F48CD057
+:10FCE000CBB78AD0C170880F8C2B8BBF81E09ED0A0
+:10FCF00080E0D1CF83E0FBCF843609F046C07CD0D2
+:10FD0000E82EF12CFE2CEE2477D0E82A75D0682E50
+:10FD1000E701C12CDD24D39446018FEFC81AD80A1D
+:10FD20006BD0F40180832197B9F778D0F5E46F1296
+:10FD30000DC0FE01F395EC16FD0609F4ADCF608110
+:10FD4000CE01800F911F91D02196F3CFF801B7BE5D
+:10FD5000E89507B600FCFDCFFE01E00FF11FDE01C4
+:10FD6000B3958D919C910C01A7BEE8951124229624
+:10FD7000EC16FD0689F785E0F80187BFE89507B620
+:10FD800000FCFDCF77BEE89587CF8437F9F434D0F7
+:10FD9000C82FD0E0DC2FCC272FD0C82B2DD0D82EC9
+:10FDA0003DD07801F5E4DF120AC0C70156D01DD05E
+:10FDB00021978FEFE81AF80A2097B9F76DCFF7016E
+:10FDC00087917F0112D02197D1F766CF853739F41B
+:10FDD00025D08EE10AD087E908D085E05CCF813557
+:10FDE00009F073CF88E014D070CF9091C00095FFD8
+:10FDF000FCCF8093C60008958091C00087FFFCCFA0
+:10FE00008091C00084FD01C0A8958091C60008952E
+:10FE1000E0E6F0E098E1908380830895EDDF8032A2
+:10FE200019F088E0F5DFFFCF84E1DFCFCF93C82F53
+:10FE3000E3DFC150E9F7CF91F1CFFC010A0167BFC1
+:10FE4000E895112407B600FCFDCF667029F0452B1C
+:10FE500019F481E187BFE8950895F999FECF92BD25
+:10FE600081BDF89A992780B50895262FF999FECF7C
+:10FE70001FBA92BD81BD20BD0FB6F894FA9AF99AC7
+:10FE80000FBE0196089556657273696F6E3D382EE8
+:10FE900031004F505449424F4F545F435553544FD4
+:10FEA0004D5645523D30004465766963653D617449
+:10FEB0006D656761313238347000465F4350553D9F
+:10FEC00031363030303030304C00424947424F4FAD
+:10FED000543D31004275696C743A4170722031387A
+:10FEE00020323032313A31343A32343A35330055F7
+:10FEF0004152543D3000424155445F524154453DCA
+:10FF0000313135323030004C45443D4233004C45B0
+:10FF1000445F53544152545F464C41534845533D0E
+:02FF20003300AC
+:02FFFE000108F8
+:040000031000FC00ED
+:00000001FF
diff --git a/Firmware/boards/stk500boot.hex b/Firmware/boards/stk500boot.hex
deleted file mode 100644
index 420ca57..0000000
--- a/Firmware/boards/stk500boot.hex
+++ /dev/null
@@ -1,105 +0,0 @@
-:020000021000EC
-:10F800008FEF90E49EBF8DBF11241FBE00C0CDB707
-:10F81000DEB7C852D140DEBFCDBF81B1877081B99C
-:10F8200082B1886F82B99FE094B985B18F6085B944
-:10F830000699BEC294B98EE085B98091C0008260FD
-:10F840008093C00080E190E09093C5008093C40055
-:10F8500088E18093C10088249924540144245524CC
-:10F8600032012224332460E0C05EDE4F1882C05291
-:10F87000D14021E0C15EDE4F2883CF51D14042E02C
-:10F8800050E04C0F5D1F4E5F5F4FC95DDE4F5983E7
-:10F890004883C752D14088C22B988091C00087FF0F
-:10F8A000FCCF85B1A8E08A2785B93091C600933096
-:10F8B000A9F1943028F4913079F0923050F507C0D6
-:10F8C0009530D1F1953088F1963031F747C03B3112
-:10F8D00019F791E06BE1E0CF313071F0C15EDE4F9E
-:10F8E000B881CF51D140BB2339F4C05EDE4FE881EF
-:10F8F000C052D1403E17A9F56327C05EDE4F388362
-:10F90000C052D14092E0C15EDE4F1882CF51D1404B
-:10F91000C3CF532F40E0632793E0BECF832F90E007
-:10F92000482B592B632794E0B7CF3E30D1F463279F
-:10F9300095E022243324B0CFE2E0F0E0EC0FFD1F8D
-:10F94000E20DF31D30830894211C311C632724161B
-:10F95000350609F0A1CFA10196E09ECF361709F434
-:10F9600030C290E099CF299A1B82F8E0FC8323E50E
-:10F970002D8384E58E838BE48F8385E3888780E302
-:10F9800089878A878FE58B8782E38C874BE050E0FD
-:10F9900096C119828B81813991F0823938F481388E
-:10F9A000B1F0803951F0803899F411C0843961F098
-:10F9B000853969F0823961F405C08FE006C032E014
-:10F9C000398306C08AE001C082E3898301C01982BD
-:10F9D0001B8289818C8343E050E071C18E81882332
-:10F9E00011F48EE12CC0813011F085E028C087E948
-:10F9F00026C01B8229E0E1E0F0E0209357008491CB
-:10FA00008C831D8244E050E05AC18C81803589F49A
-:10FA10008D81883039F429E0E2E0F0E0209357004E
-:10FA200084910DC029E0E0E0F0E02093570084913C
-:10FA300006C029E0E3E0F0E02093570084911B82A8
-:10FA4000DFCF80E090E0A0E0B0E033E0FC01A093E5
-:10FA50005B0030935700E89507B600FCFDCF80505F
-:10FA60009F4FAF4FBF4F80304CEF940740E0A4074B
-:10FA700040E0B40751F71B824424552432011DC1D4
-:10FA80008B8190E0A0E0B0E0B82EAA2499248824CD
-:10FA90008C8190E0A0E0B0E0DC0199278827882ADB
-:10FAA000992AAA2ABB2A8E8190E0A0E0B0E0882A99
-:10FAB000992AAA2ABB2A8D8190E0A0E0B0E0BA2F53
-:10FAC000A92F982F8827882A992AAA2ABB2A880C26
-:10FAD000991CAA1CBB1C1B82F0C05FEF45165BEF94
-:10FAE000550650E0650650E0750690F483E0F2019B
-:10FAF00060925B0080935700E89507B600FCFDCF4D
-:10FB000020E031E040E050E0420E531E641E751EBE
-:10FB1000B501A4018E01045F1F4FF801808121818E
-:10FB20000E5F1F4FCC5DDE4F2883C452D140CD5DA8
-:10FB3000DE4F1882C352D14090E0CD5DDE4F288168
-:10FB40003981C352D140822B932B31E00C01FA0151
-:10FB500060935B0030935700E89511244E5F5F4F30
-:10FB60006F4F7F4F1297C9F685E0F401A0925B00BA
-:10FB700080935700E89507B600FCFDCF91E1909384
-:10FB80005700E89525C0B501A401FE013C961197E8
-:10FB90008D0120E030E00F5F1F4F2F4F3F4F080DCA
-:10FBA000191D2A1D3B1D41BDBB27A72F962F852F51
-:10FBB00082BD4F5F5F4F6F4F7F4F819180BDFA9A3B
-:10FBC000F99AF999FECF401751076207730759F761
-:10FBD0001B822A984A015B0170C0AB81CA5DDE4F6F
-:10FBE000A883C652D140CB5DDE4F1882C552D140AA
-:10FBF0008C81C82EDD24CB5DDE4FE881F981C552B2
-:10FC0000D140CE2ADF2A1B828A818431F9F4A601F1
-:10FC1000C95DDE4FE880F980C752D140ABBEF40128
-:10FC200087919691D7018C9311969C93E2E0F0E036
-:10FC3000EE0EFF1E82E090E0A0E0B0E0880E991E7C
-:10FC4000AA1EBB1E4250504049F72FC0B501A40167
-:10FC5000C95DDE4FE880F980C752D1400894C108E1
-:10FC6000D108860120E030E00894C11CD11C0F5F50
-:10FC70001F4F2F4F3F4F080D191D2A1D3B1D41BD22
-:10FC8000BB27A72F962F852F82BD4F5F5F4F6F4FEA
-:10FC90007F4FF89A80B5D7018D937D0140175107AA
-:10FCA0006207730761F74A015B01A6014D5F5F4F71
-:10FCB000F701108204C080EC8B8342E050E0FBE14E
-:10FCC000F093C6008091C00086FFFCCF8091C000F9
-:10FCD00080648093C000C05EDE4F2881C052D14056
-:10FCE0002093C6008091C00086FFFCCF8091C000A9
-:10FCF00080648093C000352F5093C6008091C0006F
-:10FD000086FFFCCF8091C00080648093C000942F58
-:10FD10004093C6008091C00086FFFCCF8091C00058
-:10FD200080648093C0008EE08093C6008091C00004
-:10FD300086FFFCCF8091C00080648093C00065E1A5
-:10FD4000C05EDE4F8881C052D14068276927632793
-:10FD5000FE01329610C090819093C6008091C00041
-:10FD600086FFFCCF31968091C00080648093C000F4
-:10FD70006927415050404115510569F76093C6000D
-:10FD80008091C00086FFFCCF8091C000806480938A
-:10FD9000C000C05EDE4F9881C052D1409F5FC05E00
-:10FDA000DE4F9883C052D14090E040E050E074CDE7
-:10FDB00081E180935700E89511241F921F920895C6
-:10FDC000FFCF9A81923109F43CCE9331B0F4933055
-:10FDD00009F4DFCD943038F4913009F4C4CD923079
-:10FDE00009F069CF78CE963009F44ACE963008F4FF
-:10FDF00062CF903108F45FCF6ECE963109F4EDCE2C
-:10FE00009731F0F4943109F4E8CEAB81CE5DDE4F4A
-:10FE1000A883C252D140CF5DDE4F1882C152D1407B
-:10FE20008C81A82FB0E0CF5DDE4FE881F981C1520F
-:10FE3000D140AE2BBF2B2A9A933109F0A4CE4DCEE0
-:10FE40009A3109F4D6CD9B3109F4C8CD983109F027
-:04FE500032CFDBCD05
-:040000031000F800F1
-:00000001FF
diff --git a/Firmware/platformio.ini b/Firmware/platformio.ini
index 0d8fbcd..6ebeb44 100644
--- a/Firmware/platformio.ini
+++ b/Firmware/platformio.ini
@@ -17,7 +17,7 @@ platform = atmelavr
 board = emgdmm_v3
 
 test_transport = custom
-test_speed = 9600
+test_speed = 115200
 
 lib_deps = 
   git@teach.emg.ing.tu-bs.de:dmm/dmm-libs.git
diff --git a/Firmware/test/unittest_transport.h b/Firmware/test/unittest_transport.h
index f01e01c..0910c2e 100644
--- a/Firmware/test/unittest_transport.h
+++ b/Firmware/test/unittest_transport.h
@@ -7,12 +7,12 @@
 
 void unittest_uart_begin()
 {
-    // Set Baudrate according to datasheet (16MHz -> 9600 Baud -> 103)
-    UBRR0 = 103;
+    // Set Baudrate according to datasheet (16MHz -> 115200 Baud, U2X=1)
+    UBRR0 = 0x10;
     UCSR0B |= (1<<TXEN0);
 
     // Reset Complete-Flags
-    UCSR0A = (1 << RXC0) | (1 << TXC0);
+    UCSR0A = (1 << RXC0) | (1 << TXC0) | (1 << U2X0);
 }
 
 void unittest_uart_putchar(char c)