diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79b3511dd..680ba7ad0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,8 +76,8 @@ test_core_asm:
     - make build library=core_lib
   script:
     - make run-asm-tests library=core_lib
-    - vcover report core.ucdb
-    - vcover report -html core.ucdb
+    - vcover report run-asm-tests.ucdb
+    - vcover report -html run-asm-tests.ucdb
   artifacts:
     paths:
       - covhtmlreport
diff --git a/Makefile b/Makefile
index 3409b6b83..84c6cc250 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,8 @@ riscv-tests = rv64ui-p-add rv64ui-p-addi rv64ui-p-slli rv64ui-p-addiw rv64ui-p-a
 				rv64ui-p-sraiw rv64ui-p-sraw rv64ui-p-srl rv64ui-p-srli rv64ui-p-srliw rv64ui-p-srlw \
 				rv64ui-p-lb rv64ui-p-lbu rv64ui-p-ld rv64ui-p-lh rv64ui-p-lhu rv64ui-p-lui \
 				rv64ui-p-lw rv64ui-p-lwu \
-				rv64mi-p-csr rv64mi-p-mcsr rv64mi-p-illegal rv64mi-p-ma_addr rv64mi-p-ma_fetch
+				rv64mi-p-csr rv64mi-p-mcsr rv64mi-p-illegal rv64mi-p-ma_addr rv64mi-p-ma_fetch \
+				rv64mi-p-sbreak rv64mi-p-scall
 
 riscv-test = rv64ui-p-add
 # Search here for include files (e.g.: non-standalone components)
diff --git a/README.md b/README.md
index 8b9306d39..358feb317 100644
--- a/README.md
+++ b/README.md
@@ -66,8 +66,8 @@ Check out the [contribution guide](CONTRIBUTING.md)
 
 ## Machine Mode Tests
 
-| **Test Name** |      **P/F/U**       | **Test Name** |      **P/F/U**       | **Test Name** |     **P/F/U**      |
-|---------------|----------------------|---------------|----------------------|---------------|--------------------|
-| csr           | :white_check_mark:   | illegal       | :white_check_mark:   | mcsr          | :white_check_mark: |
-| breakpoint    | :white_large_square: | ma_addr       | :white_check_mark:   | ma_fetch      | :white_check_mark: |
-| sbreak        | :white_large_square: | scall         | :white_large_square: |               |                    |
+| **Test Name** |      **P/F/U**       | **Test Name** |     **P/F/U**      | **Test Name** |     **P/F/U**      |
+|---------------|----------------------|---------------|--------------------|---------------|--------------------|
+| csr           | :white_check_mark:   | illegal       | :white_check_mark: | mcsr          | :white_check_mark: |
+| breakpoint    | :white_large_square: | ma_addr       | :white_check_mark: | ma_fetch      | :white_check_mark: |
+| sbreak        | :white_check_mark:   | scall         | :white_check_mark: |               |                    |