diff --git a/Makefile b/Makefile
index 9a541df2f..8f63122a5 100755
--- a/Makefile
+++ b/Makefile
@@ -131,13 +131,10 @@ $(library):
 	vlib${questa_version} ${library}
 
 sim: build
-	vsim${questa_version} -64 -lib ${library} ${top_level}_optimized +UVM_TESTNAME=${test_case} +BASEDIR=$(riscv-test-dir) \
-	+ASMTEST=$(riscv-test)  $(uvm-flags) +UVM_VERBOSITY=HIGH -coverage -classdebug -sv_lib $(library)/ariane_dpi -do "do tb/wave/wave_core.do"
-
-sim_nopt: build
-	vsim${questa_version} -64 -novopt -lib ${library} ${top_level} +UVM_TESTNAME=${test_case} +BASEDIR=$(riscv-test-dir)  \
-	+ASMTEST=$(riscv-test)  $(uvm-flags) +UVM_VERBOSITY=HIGH -coverage -classdebug -sv_lib $(library)/ariane_dpi -do "do tb/wave/wave_core.do"
-
+	vsim${questa_version} +permissive -64 -lib ${library} +UVM_TESTNAME=${test_case} +BASEDIR=$(riscv-test-dir) \
+	+ASMTEST=$(riscv-test)  $(uvm-flags) +UVM_VERBOSITY=HIGH -coverage -classdebug -gblso $(RISCV)/lib/libfesvr.so \
+	-sv_lib $(library)/ariane_dpi \
+	-do "do tb/wave/wave_core.do"  +permissive-off ${top_level}_optimized
 
 simc: build
 	vsim${questa_version} +permissive -64 -c -lib ${library} +max-cycles=$(max_cycles) +UVM_TESTNAME=${test_case} \
diff --git a/include/ariane_pkg.sv b/include/ariane_pkg.sv
index 159a13b28..612e92d5d 100755
--- a/include/ariane_pkg.sv
+++ b/include/ariane_pkg.sv
@@ -18,8 +18,6 @@
 
 
 package ariane_pkg;
-    timeunit      1ns;
-    timeprecision 1ps;
 
     // ---------------
     // Global Config
diff --git a/src/util/instruction_tracer_pkg.sv b/src/util/instruction_tracer_pkg.sv
index 0be6019a7..74fa56efa 100644
--- a/src/util/instruction_tracer_pkg.sv
+++ b/src/util/instruction_tracer_pkg.sv
@@ -13,8 +13,6 @@
 // Description: Instruction Tracer Package
 
 package instruction_tracer_pkg;
-    timeunit      1ns;
-    timeprecision 1ps;
 
     import ariane_pkg::*;
     `ifndef SYNTHESIS
diff --git a/tb b/tb
index 569685a42..b0c53b63d 160000
--- a/tb
+++ b/tb
@@ -1 +1 @@
-Subproject commit 569685a42f2de5732fafcbb3eaaebdb739746e07
+Subproject commit b0c53b63d9d1209c5676f4cc2c5b5b5e99916283