diff --git a/test/rx/main.cpp b/test/rx/main.cpp
index 8637985..10b8d0c 100644
--- a/test/rx/main.cpp
+++ b/test/rx/main.cpp
@@ -8,7 +8,7 @@
  */
 #define F_CPU 8000000UL
 #include "../../src/mrf24j.h"
-#include "../../lib/usart/src/usart.h"
+#include "../usart.h"
 #include <avr/interrupt.h>
 #include <util/delay.h>
 
diff --git a/test/tx/main.cpp b/test/tx/main.cpp
index c3cc9f4..56cf8f1 100644
--- a/test/tx/main.cpp
+++ b/test/tx/main.cpp
@@ -9,7 +9,7 @@
 
 #define F_CPU 8000000UL
 #include "../../src/mrf24j.h"
-#include "../../lib/usart/src/usart.h"
+#include "../usart.h"
 #include "../../src/driver.h"
 #include <avr/interrupt.h>
 #include <util/delay.h>
diff --git a/test/usart.cpp b/test/usart.cpp
new file mode 100644
index 0000000..65b6719
--- /dev/null
+++ b/test/usart.cpp
@@ -0,0 +1,65 @@
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include "usart.h"
+
+namespace usart
+{
+    namespace {
+        static FILE mystdout;
+    }
+    
+    void init( unsigned long baud) {
+        fdev_setup_stream(&mystdout, put_printf, NULL, _FDEV_SETUP_WRITE);
+        stdout = &mystdout;
+        const unsigned int ubrr =  F_CPU/8/baud-1;
+
+        /*Set baud rate */
+        
+        
+        #if defined __AVR_ATmega328P__
+            UBRR0H = (unsigned char)(ubrr>>8);
+            UBRR0L = (unsigned char)ubrr;
+            UCSR0A |= (1<<U2X0);
+            //Enable receiver and transmitter 
+            UCSR0B = (1<<RXEN0)|(1<<TXEN0);
+            //UCSRB |= (1<< RXCIE)|(1<<TXCIE);
+            /* Set frame format: 8data, 2stop bit */
+            UCSR0C = (1<<USBS0)|(3<<UCSZ00);
+        #elif defined  __AVR_ATmega32__ || defined __AVR_ATmega16__
+            UBRRH = (unsigned char)(ubrr>>8);
+            UBRRL = (unsigned char)ubrr;
+            UCSRA |= (1<<U2X);
+            //Enable receiver and transmitter 
+            UCSRB = (1<<RXEN)|(1<<TXEN);
+            //UCSRB |= (1<< RXCIE)|(1<<TXCIE);
+            /* Set frame format: 8data, 2stop bit */
+            UCSRC = (1 << URSEL)|(3<<UCSZ0);
+        #endif
+    
+    }
+
+    void put(char data) {
+        #if defined __AVR_ATmega328P__
+            while ( !( UCSR0A & (1<<UDRE0)) ); UDR0 = data;
+        #elif defined  __AVR_ATmega32__ || defined __AVR_ATmega16__
+            while ( !( UCSRA & (1<<UDRE)) ); UDR = data;
+        #endif
+        
+       
+    }
+
+    char get( void ) {
+        #if defined __AVR_ATmega328P__
+            while ( !(UCSR0A & (1<<RXC0)) ); return UDR0;
+        #elif defined  __AVR_ATmega32__ || defined __AVR_ATmega16__
+            while ( !(UCSRA & (1<<RXC)) ); return UDR;
+        #endif
+    }       
+   
+    int put_printf(char var, FILE *stream) {
+        put(var);
+        return 0;
+    }
+} // namespace usart
+
+
diff --git a/test/usart.h b/test/usart.h
new file mode 100644
index 0000000..b2a4855
--- /dev/null
+++ b/test/usart.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <stdio.h>
+
+namespace usart
+{
+    void init(unsigned long baud);
+    void put(char data );
+    char get();
+    int put_printf(char var, FILE *stream);
+} // namespace usart
+
+
+