diff --git a/rtl/accum/tests/Makefile b/rtl/accum/tests/Makefile
index 056aad0..45f5626 100644
--- a/rtl/accum/tests/Makefile
+++ b/rtl/accum/tests/Makefile
@@ -24,7 +24,7 @@ XDC_FILES += ../../../constraints/ax7a035b.xdc
 XDC_FILES += test_timing.xdc
 
 SYN_FILES += out_axis_fifo_tb.sv
-SYN_FILE += accum_full_tb.sv
+SYN_FILES += accum_full_tb.sv
 SIM_TOP = tb_accumulator_top
 
 
diff --git a/rtl/accum/tests/accum_full_tb.sv b/rtl/accum/tests/accum_full_tb.sv
index a7196c5..66d0071 100644
--- a/rtl/accum/tests/accum_full_tb.sv
+++ b/rtl/accum/tests/accum_full_tb.sv
@@ -165,7 +165,7 @@ module tb_accumulator_top;
         tests_total   = tests_total + 1;
         errors_before = total_errors;
 
-        if (smp_num_i <= 0 || smp_num_i > N_MAX || (smp_num_i % WINDOW_SIZE) != 0)
+        if (smp_num_i <= 0 || smp_num_i > N_MAX * WINDOW_SIZE || (smp_num_i % WINDOW_SIZE) != 0)
             $fatal(1, "[%0s] invalid smp_num=%0d", test_name, smp_num_i);
         if (seq_num_i <= 0 || seq_num_i > MAX_SEQ_NUM)
             $fatal(1, "[%0s] invalid seq_num=%0d", test_name, seq_num_i);
@@ -322,10 +322,9 @@ module tb_accumulator_top;
 //        $finish;
         run_test(2, 2,  1 * WINDOW_SIZE, 1'b1, 0,  "random_seq3_smp8");
         run_test(3, 1, 16 * WINDOW_SIZE, 1'b1, 0,  "random_seq5_smp16_multi_packet");
-        // run_test(4, 1,  4, 1'b1, 0,  "random_single_window");
-        run_test(5, 2, 12 * WINDOW_SIZE, 1'b1, 0,  "random_seq7_smp12");
-        run_test(6, 4, 256 * WINDOW_SIZE, 1'b1, 0,  "random_max_smpnum");
-        run_test(7, 2, 1500 * WINDOW_SIZE, 1'b1, 0,  "random_max_smpnum2");
+        run_test(4, 2, 12 * WINDOW_SIZE, 1'b1, 0,  "random_seq7_smp12");
+        run_test(5, 4, 256 * WINDOW_SIZE, 1'b1, 0,  "random_max_smpnum");
+        run_test(6, 2, 1500 * WINDOW_SIZE, 1'b1, 0,  "random_max_smpnum2");
 
         $display("\n========================================");
         $display("ALL TESTS COMPLETED");