diff --git a/third_party/UHDM b/third_party/UHDM
index ef68042f4e..d64434ea76 160000
--- a/third_party/UHDM
+++ b/third_party/UHDM
@@ -1 +1 @@
-Subproject commit ef68042f4ed5afe8d76b20a9874f0fb494c20528
+Subproject commit d64434ea76e38d9519b6de4f0f9a7a485fd47888
diff --git a/third_party/tests/CoresSweRVMP/CoresSweRVMP.log b/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
index 2689c13923..2785cb420f 100644
--- a/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
+++ b/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
@@ -64,11 +64,11 @@ Running: cd ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_preprocess;
 -- Configuring done
 -- Generating done
 -- Build files have been written to: ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_preprocess
-[  6%] Generating 11_ifu_bp_ctl.sv
-[ 12%] Generating 10_lsu_bus_intf.sv
-[ 18%] Generating 12_beh_lib.sv
+[  6%] Generating 10_lsu_bus_intf.sv
+[ 12%] Generating 12_beh_lib.sv
+[ 18%] Generating 11_ifu_bp_ctl.sv
 [ 25%] Generating 13_ifu_mem_ctl.sv
-[ 37%] Generating 15_exu.sv
+[ 31%] Generating 15_exu.sv
 [ 37%] Generating 14_mem_lib.sv
 [ 43%] Generating 16_dec_decode_ctl.sv
 [ 50%] Generating 1_lsu_stbuf.sv
diff --git a/third_party/tests/Tnoc/Tnoc.log b/third_party/tests/Tnoc/Tnoc.log
index 1730182e53..1248021543 100644
--- a/third_party/tests/Tnoc/Tnoc.log
+++ b/third_party/tests/Tnoc/Tnoc.log
@@ -4143,27 +4143,6 @@ var_select                                           185
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_vc_arbiter.sv:67:37: Non synthesizable construct, get_head_flit_valid
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_vc_arbiter.sv:68:37: Non synthesizable construct, get_tail_flit_ack
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_vc_mux.sv:51:38: Non synthesizable construct, mux
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/router/tnoc_route_selector.sv:48:26: Non synthesizable construct, get_head_flit_valid
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_flit_if_demux.sv:34:48: Non synthesizable construct, demux
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_flit_if_demux.sv:35:48: Non synthesizable construct, mux