diff --git a/src/hwpe/tb/ita_hwpe_tb.sv b/src/hwpe/tb/ita_hwpe_tb.sv
index 7f8e30c..ae71983 100644
--- a/src/hwpe/tb/ita_hwpe_tb.sv
+++ b/src/hwpe/tb/ita_hwpe_tb.sv
@@ -26,7 +26,7 @@ module ita_hwpe_tb;
   parameter integer PROJECTION_SPACE = `ifdef PROJ_SPACE `PROJ_SPACE `else M_TILE_LEN `endif;
   parameter integer EMBEDDING_SIZE = `ifdef EMBED_SIZE `EMBED_SIZE `else M_TILE_LEN `endif;
   parameter integer FEEDFORWARD_SIZE = `ifdef FF_SIZE `FF_SIZE `else M_TILE_LEN `endif;
-  parameter activation_e ACTIVATION = `ifdef ACTIVATION `ACTIVATION `else Identity `endif;
+  parameter activation_e ACTIVATION = `ifdef ACTIVATION activation_e'(`ACTIVATION) `else Identity `endif;
   parameter integer SINGLE_ATTENTION = `ifdef SINGLE_ATTENTION `SINGLE_ATTENTION `else 0 `endif;
 
   integer N_TILES_SEQUENCE_DIM, N_TILES_EMBEDDING_DIM, N_TILES_PROJECTION_DIM, N_TILES_FEEDFORWARD_DIM;
@@ -60,11 +60,11 @@ module ita_hwpe_tb;
 
   integer BASE_PTR[23];
 
-  logic [N_STATES][31:0] BASE_PTR_INPUT;
-  logic [N_STATES][31:0] BASE_PTR_WEIGHT0;
-  logic [N_STATES][31:0] BASE_PTR_WEIGHT1;
-  logic [N_STATES][31:0] BASE_PTR_BIAS;
-  logic [N_STATES][31:0] BASE_PTR_OUTPUT;
+  logic [N_STATES-1:0][31:0] BASE_PTR_INPUT;
+  logic [N_STATES-1:0][31:0] BASE_PTR_WEIGHT0;
+  logic [N_STATES-1:0][31:0] BASE_PTR_WEIGHT1;
+  logic [N_STATES-1:0][31:0] BASE_PTR_BIAS;
+  logic [N_STATES-1:0][31:0] BASE_PTR_OUTPUT;
 
   // HWPE Parameters
   localparam unsigned ITA_REG_OFFSET  = 32'h20;
@@ -759,9 +759,9 @@ endfunction
   task automatic ita_reg_eps_mult_val_compute(
     output logic [5:0][31:0] reg_val
   );
-    logic [N_REQUANT_CONSTS][EMS-1:0] eps_mult;
-    logic [N_REQUANT_CONSTS][EMS-1:0] right_shift;
-    logic [N_REQUANT_CONSTS][ WI-1:0] add;
+    logic [N_REQUANT_CONSTS-1:0][EMS-1:0] eps_mult;
+    logic [N_REQUANT_CONSTS-1:0][EMS-1:0] right_shift;
+    logic [N_REQUANT_CONSTS-1:0][ WI-1:0] add;
     read_ITA_rqs(eps_mult, right_shift, add);
     reg_val[0] = eps_mult[0] | eps_mult[1] << 8 | eps_mult[2] << 16 | eps_mult[3] << 24;
     reg_val[1] = eps_mult[4] | eps_mult[5] << 8 | eps_mult[6] << 16 | eps_mult[7] << 24;
@@ -794,9 +794,9 @@ endfunction
   endtask
 
   task read_ITA_rqs(
-    output logic [N_REQUANT_CONSTS][EMS-1:0]  eps_mult,
-    output logic [N_REQUANT_CONSTS][EMS-1:0]  right_shift,
-    output logic [N_REQUANT_CONSTS][ WI-1:0]  add
+    output logic [N_REQUANT_CONSTS-1:0][EMS-1:0]  eps_mult,
+    output logic [N_REQUANT_CONSTS-1:0][EMS-1:0]  right_shift,
+    output logic [N_REQUANT_CONSTS-1:0][ WI-1:0]  add
   );
     integer stim_fd_mul, stim_fd_shift, stim_fd_add;
     integer ret_code;