Index: dialin/common/msg_ids.py
===================================================================
diff -u -r9c740ce9dd2c7353eadc4d494f51a24157486ea7 -rbeb336b685d8e152fdbf31c19bfa4bed6b73f05a
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 9c740ce9dd2c7353eadc4d494f51a24157486ea7)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision beb336b685d8e152fdbf31c19bfa4bed6b73f05a)
@@ -7,8 +7,8 @@
 #
 # @file    msg_ids.py
 #
-# @author  (last)      Dara Navaei
-# @date    (last)      26-Apr-2023
+# @author  (last)      Sean Nash
+# @date    (last)      04-May-2023
 # @author  (original)  Peter Lucia
 # @date    (original)  06-Apr-2021
 #
@@ -370,10 +370,11 @@
     MSG_ID_HD_DIAL_OUT_PUMP_HARD_STOP = 0x8090
     MSG_ID_HD_BLOOD_PUMP_HARD_STOP = 0x8091
     MSG_ID_HD_DIALIN_CHECK_IN = 0x8092
-    MSG_ID_HD_SET_TEST_CONFIGURATION = 0x8093
+    MSG_ID_HD_ENABLE_VENOUS_BUBBLE_ALARM_DETECTION = 0x8093
     MSG_ID_HD_GET_TEST_CONFIGURATION = 0x8094
     MSG_ID_HD_SEND_TEST_CONFIGURATION = 0x8095
     MSG_ID_HD_RESET_ALL_TEST_CONFIGURATIONS = 0x8096
+    MSG_ID_HD_SET_TEST_CONFIGURATION = 0x8097
 
     MSG_ID_DG_TESTER_LOGIN_REQUEST = 0xA000
     MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r428c5c0a653129867b1cb32b5e64f89f68191c4b -rbeb336b685d8e152fdbf31c19bfa4bed6b73f05a
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 428c5c0a653129867b1cb32b5e64f89f68191c4b)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision beb336b685d8e152fdbf31c19bfa4bed6b73f05a)
@@ -50,6 +50,7 @@
 from .sw_configs import HDSoftwareConfigs
 from .battery import HDBattery
 from .usage_info_record import HDUsageNVRecord
+from .hd_test_configs import HDTestConfig
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels
 from ..utils.base import AbstractSubSystem, publish, LogManager
@@ -172,6 +173,7 @@
         self.post_treatment = HDPostTreatment(self.can_interface, self.logger)
         self.battery = HDBattery(self.can_interface, self.logger)
         self.usage_record = HDUsageNVRecord(self.can_interface, self.logger)
+        self.test_configs = HDTestConfig(self.can_interface, self.logger)
 
     def get_operation_mode(self):
         """
Index: tests/dg_tests.py
===================================================================
diff -u -r428c5c0a653129867b1cb32b5e64f89f68191c4b -rbeb336b685d8e152fdbf31c19bfa4bed6b73f05a
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 428c5c0a653129867b1cb32b5e64f89f68191c4b)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision beb336b685d8e152fdbf31c19bfa4bed6b73f05a)
@@ -671,18 +671,19 @@
     hd = HD(log_level='DEBUG')
     hd.cmd_log_in_to_hd()
     sleep(1)
-    """
-    print(dg.test_configs.dg_test_configs)
-    print(hex(dg.test_configs.cmd_get_test_config_status(DGTestConfigOptions.TEST_CONFIG_ENABLE_MIXING_WITH_WATER.value)))
 
-    dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_ENABLE_MIXING_WITH_WATER.value, reset=0)
+    print((hd.test_configs.hd_test_configs))
+    #print(hex(dg.test_configs.cmd_get_test_config_status(DGTestConfigOptions.TEST_CONFIG_ENABLE_MIXING_WITH_WATER.value)))
+
+    #dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_ENABLE_MIXING_WITH_WATER.value, reset=0)
+    #hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_USE_WORN_CARTRIDGE.value, reset=1)
+    hd.test_configs.cmd_reset_all_test_configs()
     sleep(1)
-    """
-    dg.test_configs.cmd_request_test_config_status_from_fw()
 
+    hd.test_configs.cmd_request_test_config_status_from_fw()
+
     while True:
-        print(hex(dg.test_configs.cmd_get_test_config_status(
-            DGTestConfigOptions.TEST_CONFIG_ENABLE_MIXING_WITH_WATER.value)))
+        print(hex(hd.test_configs.hd_test_configs[HDTestConfigOptions.TEST_CONFIG_USE_WORN_CARTRIDGE.name]))
         sleep(1)
 
     #run_heat_disinfect()
@@ -697,7 +698,7 @@
 
     # cmd_set_disinfect_ui_screen()
 
-    collect_treatment_data()
+    #collect_treatment_data()
 
     #collect_hd_treatment()
 
Index: tests/hd_nvm_scripts.py
===================================================================
diff -u -r428c5c0a653129867b1cb32b5e64f89f68191c4b -rbeb336b685d8e152fdbf31c19bfa4bed6b73f05a
--- tests/hd_nvm_scripts.py	(.../hd_nvm_scripts.py)	(revision 428c5c0a653129867b1cb32b5e64f89f68191c4b)
+++ tests/hd_nvm_scripts.py	(.../hd_nvm_scripts.py)	(revision beb336b685d8e152fdbf31c19bfa4bed6b73f05a)
@@ -114,10 +114,10 @@
     if hd.cmd_log_in_to_hd():
 
         # Comment this function if not needed
-        #run_sw_configs_commands()
+        run_sw_configs_commands()
 
         # Comment this function if not needed
-        run_calibration_commands()
+        #run_calibration_commands()
 
         #run_system_commands()