diff --git a/test/unit/Fault_confinement/Fault_confinement_tb.vhd b/test/unit/Fault_confinement/Fault_confinement_tb.vhd
index dafea57fb44cbe8845a1ddaac7bb7e61bf98b0a8..a96025f81d22788ef48eeda836133660b03cf09e 100644
--- a/test/unit/Fault_confinement/Fault_confinement_tb.vhd
+++ b/test/unit/Fault_confinement/Fault_confinement_tb.vhd
@@ -437,9 +437,9 @@ end architecture;
 
 architecture Fault_confinement_unit_test_wrapper of CAN_test_wrapper is
   
-  --Select architecture of the test
-  for test_comp : CAN_test use entity work.CAN_test(Fault_confinement_unit_test);
-  
+    --Select architecture of the test
+    for test_comp : CAN_test use entity work.CAN_test(Fault_confinement_unit_test);
+
     -- Input trigger, test starts running when true 
     signal run              :   boolean;
 
@@ -451,36 +451,36 @@ architecture Fault_confinement_unit_test_wrapper of CAN_test_wrapper is
 
 begin
   
-  -- In this test wrapper generics are directly connected to the signals
-  -- of test entity
-  test_comp : CAN_test
-  port map(
-     run              =>  run,
-     iterations       =>  iterations , 
-     log_level        =>  log_level,
-     error_beh        =>  error_beh,
-     error_tol        =>  error_tol,                                                     
-     status           =>  status_int,
-     errors           =>  errors
-  );
-  
-  status              <= status_int;
-  
-  ------------------------------------
-  -- Starts the test and lets it run
-  ------------------------------------
-  test:process
-  begin
-    run               <= true;
-    wait for 1 ns;
-    
-    --Wait until the only test finishes and then propagate the results
-    wait until (status_int = passed or status_int = failed);  
+    -- In this test wrapper generics are directly connected to the signals
+    -- of test entity
+    test_comp : CAN_test
+    port map(
+        run              =>  run,
+        iterations       =>  iterations , 
+        log_level        =>  log_level,
+        error_beh        =>  error_beh,
+        error_tol        =>  error_tol,                                                     
+        status           =>  status_int,
+        errors           =>  errors
+    );
+
+    status              <= status_int;
+
+    ------------------------------------
+    -- Starts the test and lets it run
+    ------------------------------------
+    test : process
+    begin
+        run               <= true;
+        wait for 1 ns;
+
+        --Wait until the only test finishes and then propagate the results
+        wait until (status_int = passed or status_int = failed);  
+
+        wait for 100 ns;
+        run               <= false;
     
-    wait for 100 ns;
-    run               <= false;
-        
-  end process;
+    end process;
   
   
 end;
diff --git a/test/unit/RX_Buffer/RX_Buffer_tb.vhd b/test/unit/RX_Buffer/RX_Buffer_tb.vhd
index 9c1ed4b4790770816f7eb5b02affaabeaed0bad4..00bfc44268a0ac91d19c39edc5f19e05ca68eb30 100644
--- a/test/unit/RX_Buffer/RX_Buffer_tb.vhd
+++ b/test/unit/RX_Buffer/RX_Buffer_tb.vhd
@@ -560,12 +560,12 @@ begin
     -- Overall amount of errors is sum of errors from all processes
     error_ctr   <=  stim_errs + read_errs + status_errs + cons_errs;               
 
-    -- Common input memory is considered full once there is less space
-    -- than RX buffer size!
-    in_mem_full <= true when in_pointer + buff_size + 1 > 1024 else
+	-- Common input memory is not filled totally so that one iteration
+	-- of test won't take too long!
+    in_mem_full <= true when in_pointer + buff_size + 1 > 300 else
                    false;
                  
-    out_mem_full <= true when out_pointer + buff_size + 1 > 1024 else
+    out_mem_full <= true when out_pointer + buff_size + 1 > 300 else
                  false;
 
     drv_bus(DRV_READ_START_INDEX)   <= drv_read_start;
diff --git a/test/vunittb_wrapper.vhd b/test/vunittb_wrapper.vhd
index 82248b3dc15e597d6cc01cf3fe9195c81af907cd..eccee3a1d85b36e6a89f314fc12fcd27e4a376e6 100644
--- a/test/vunittb_wrapper.vhd
+++ b/test/vunittb_wrapper.vhd
@@ -54,7 +54,7 @@ USE work.CANtestLib.All;
 entity vunittb_wrapper is
   generic (
     xrunner_cfg : string;
-    iterations : natural := 1;
+    iterations : natural := 50;
     log_level  : log_lvl_type := info_l;
     error_beh  : err_beh_type := quit;           -- Test behaviour when error occurs: Quit, or Go on
     error_tol  : natural := 0                    -- Error tolerance, error counter should not