diff --git a/vhdl/io/uart/uart_rx.vhdl b/vhdl/io/uart/uart_rx.vhdl
index 9b532b7..61912ad 100644
--- a/vhdl/io/uart/uart_rx.vhdl
+++ b/vhdl/io/uart/uart_rx.vhdl
@@ -19,11 +19,10 @@ entity uart_rx is
 end entity;
 
 
-architecture rtl of uart_rx is
+architecture behav of uart_rx is
     type STATE is (IDLE, START, DATA, STOP);
     signal state_reg : STATE;
     signal state_next : STATE;
-
     signal baud_reg : std_logic_vector( 4  downto 0  );
     signal baud_next : std_logic_vector( 4  downto 0  );
     signal n_reg : std_logic_vector( 3  downto 0  );
@@ -31,24 +30,22 @@ architecture rtl of uart_rx is
     signal d_reg : std_logic_vector( 7  downto 0  );
     signal d_next : std_logic_vector( 7  downto 0  );
     begin
-        process
+        a: process (clk, reset) is
         begin
-            wait until ( ( reset'EVENT and ( reset = '1' )  )  or ( clk'EVENT and ( clk = '1' )  )  ) ;
             if ( reset = '1' ) then
                 state_reg <= IDLE;
                 baud_reg <= (others => '0');
                 n_reg <= (others => '0');
                 d_reg <= (others => '0');
-            else
+            elsif (clk'EVENT and (clk = '1')) then
                 state_reg <= state_next;
                 baud_reg <= baud_next;
                 n_reg <= n_next;
                 d_reg <= d_next;
             end if;
         end process;
-        process
+        b: process
         begin
-            wait ;
             state_next <= state_reg;
             rx_done_tick <= '0';
             baud_next <= baud_reg;
diff --git a/vhdl/io/uart/uart_tx.vhdl b/vhdl/io/uart/uart_tx.vhdl
index e009f80..382f130 100644
--- a/vhdl/io/uart/uart_tx.vhdl
+++ b/vhdl/io/uart/uart_tx.vhdl
@@ -19,7 +19,7 @@ entity uart_tx is
 end entity;
 
 
-architecture rtl of uart_tx is
+architecture behav of uart_tx is
     type STATE is (IDLE, START, DATA, STOP);
     signal state_reg : STATE;
     signal state_next : STATE;
@@ -33,16 +33,15 @@ architecture rtl of uart_tx is
     signal tx_reg : std_logic;
     signal tx_next : std_logic;
     begin
-        process
-        begin
-            wait until ( ( reset'EVENT and ( reset = '1' )  )  or ( clk'EVENT and ( clk = '1' )  )  ) ;
-            if ( reset = '1' ) then
-                state_reg <= IDLE;
-                baud_reg <= (others => '0');
-                n_reg <= (others => '0');
+	a: process (clk, reset) is
+	begin
+    	    if (reset = '1' ) then
+      		state_reg <= IDLE;
+        	baud_reg <= (others => '0');
+		n_reg <= (others => '0');
                 d_reg <= (others => '0');
                 tx_reg <= '1';
-            else
+	    elsif (clk'EVENT and (clk = '1')) then
                 state_reg <= STATE_NEXT;
                 baud_reg <= baud_next;
                 n_reg <= n_next;
diff --git a/vhdl/tb/uart_tb.vhdl b/vhdl/tb/uart_tb.vhdl
new file mode 100644
index 0000000..40f3e3a
--- /dev/null
+++ b/vhdl/tb/uart_tb.vhdl
@@ -0,0 +1,84 @@
+library ieee;
+library work;
+use ieee.std_logic_1164.all;
+use ieee.numeric_std.all;
+use ieee.std_logic_misc.all;
+use work.arch_defs.all;
+use work.utils.all;
+
+entity uart_tb is
+port(
+	baud_tick: in std_logic; --19200
+	clk: in std_logic --system clock
+);
+end uart_tb;
+
+architecture behav of uart_tb is
+
+component uart_rx is
+port (
+        clk :  in std_logic;
+        reset :  in std_logic;
+        rx :  in std_logic;
+        baud_tick :  in std_logic;
+        rx_done_tick :  out std_logic;
+        rx_data :  out std_logic_vector( 7  downto 0  )
+);
+end component;
+component uart_tx is
+port(
+        clk :  in std_logic;
+        reset :  in std_logic;
+        tx_start :  in std_logic;
+        baud_tick :  in std_logic;
+        tx_data :  in std_logic_vector( 7  downto 0  );
+        tx_done_tick :  out std_logic;
+        tx :  out std_logic
+);
+end component;
+type state_t is (idle, received, transmit);
+signal rx_data: std_logic_vector(7 downto 0);
+signal rx_done_tick, tx_done_tick: std_logic;
+signal tx_data_next, tx_data: std_logic_vector(7 downto 0);
+signal tx_start: std_logic;
+signal reset, rx, tx: std_logic;
+signal state_next, state: state_t;
+
+begin
+
+tx_instance: uart_tx
+port map (clk, reset, tx_start, baud_tick, tx_data, tx_done_tick, tx);
+rx_instance: uart_rx
+port map (clk, reset, rx, baud_tick, rx_done_tick, rx_data);
+
+reset_ctrl: process (clk, reset) is
+begin
+	if reset = '1' then
+		tx_data <= "00000000";
+	elsif (clk'EVENT and (clk = '1')) then
+		tx_data <= tx_data_next;
+	end if;
+end process;
+test: process (state, rx_done_tick, tx_done_tick) is
+begin
+	state_next <= state;
+	case(state) is
+	when idle =>
+		if(rx_done_tick = '1') then
+			tx_data_next <= rx_data;
+			tx_start <= '0';
+			state_next <= received;
+		end if;
+	when received => 
+		tx_start <= '1';
+		state_next <= transmit;
+	when transmit => 
+		if(tx_done_tick = '1') then
+			tx_start <= '0';
+			state_next <= idle;
+		end if;
+	end case;
+end process;
+end behav;
+
+