diff --git a/Makefile b/Makefile
index 3821d9aab..ed4614069 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ incdir = ./includes
 test_case = alu_test
 # QuestaSim Version
 questa_version = -10.5c
-compile_flag = +cover=bcfst+/dut -lint
+compile_flag = +cover=bcfst+/dut
 
 # Iterate over all include directories and write them with +incdir+ prefixed
 # +incdir+ works for Verilator and QuestaSim
@@ -68,6 +68,8 @@ $(tests):
 	vopt${questa_version} ${compile_flag} $@_tb -o $@_tb_optimized +acc -check_synthesis
 	# vsim${questa_version} $@_tb_optimized
 	# vsim${questa_version} +UVM_TESTNAME=$@_test -coverage -classdebug $@_tb_optimized
+	vsim${questa_version} +UVM_TESTNAME=$@_test -c -coverage -classdebug -do "coverage save -onexit $@.ucdb; run -a; quit -code [coverage attribute -name TESTSTATUS -concise]" $@_tb_optimized
+
 # User Verilator to lint the target
 lint:
 	verilator ${src} --lint-only \
@@ -77,4 +79,4 @@ clean:
 	rm -rf work/ *.ucdb
 
 .PHONY:
-	build lint
\ No newline at end of file
+	build lint
diff --git a/uvm-scaffold b/uvm-scaffold
index 1e44fd194..2cefe0eae 160000
--- a/uvm-scaffold
+++ b/uvm-scaffold
@@ -1 +1 @@
-Subproject commit 1e44fd194a380805913add53a590009c4523b410
+Subproject commit 2cefe0eae7a0bd0d7ec6177b240d64f6e9aea332