Index: NVDataMgmtHDRecords.h
===================================================================
diff -u -r2d70ec910f5e25d5272132139ef27966e710ca59 -ra5567411b96a61631d37c8af70b3d6d1012e9776
--- NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 2d70ec910f5e25d5272132139ef27966e710ca59)
+++ NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision a5567411b96a61631d37c8af70b3d6d1012e9776)
@@ -42,7 +42,7 @@
     SW_CONFIG_DISABLE_ALARM_AUDIO = 0,                                                                         ///< Software configuration disable alarm audio.
     SW_CONFIG_DISABLE_AIR_TRAP_LEVELING_ALARM,                                                                 ///< Software configuration disable air trap leveling alarm.
     SW_CONFIG_DISABLE_ACK_ERRORS,                                                                              ///< Software configuration disable acknowledge errors.
-    SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE,                                                                       ///< Software configuration enable worn out cartridge.
+    SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE,                            // TODO remove                                           ///< Software configuration enable worn out cartridge.
     SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS,                                                                     ///< Software configuration disable motor current checks.
     SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS,                                                                        ///< Software configuration disable pump flow checks.
     SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS,                                                                   ///< Software configuration disable pump direction checks.
@@ -64,7 +64,7 @@
     SW_CONFIG_DISABLE_UI_INTERACTION,                                                                          ///< Software configuration disable UI interaction.
     SW_CONFIG_DISABLE_SAMPLE_WATER,                                                                            ///< Software configuration disable sample water.
     SW_CONFIG_DISABLE_CONSUMABLES_TESTS,                                                                       ///< Software configuration disable consumables tests.
-    SW_CONFIG_DISABLE_DRY_SELF_TESTS,                                                                          ///< Software configuration disable dry self tests.
+    SW_CONFIG_DISABLE_DRY_SELF_TESTS,                         // TODO remove                                                 ///< Software configuration disable dry self tests.
     SW_CONFIG_DISABLE_PRIMING,                                                                                 ///< Software configuration disable priming.
     SW_CONFIG_DISABLE_WET_SELF_TEST,                                                                           ///< Software configuration disable wet self test.
     SW_CONFIG_ENABLE_WET_SELF_TEST_WIDER_VOLUME_TOL,                                                           ///< Software configuration enable wet self test wider volume tolerance.
@@ -82,7 +82,7 @@
     SW_CONFIG_DISABLE_SWITCHES_MONITOR,                                                                        ///< Software configuration disable switches monitor.
     SW_CONFIG_ENABLE_VBA_SPECIAL_POSITION_C,                                                                   ///< Software configuration enable VBA special position C.
     SW_CONFIG_DISABLE_SERVICE_AND_DISINFECT_CHECK,                                                             ///< Software configuration disable service and disinfect checks.
-    SW_CONFIG_DISABLE_AIR_PUMP,                                                                                ///< Software configuration disable air pump.
+    SW_CONFIG_DISABLE_AIR_PUMP,                              // TODO remove                                                  ///< Software configuration disable air pump.
     NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
 } SOFTWARE_CONFIG_T;
 #endif
Index: TestSupport.c
===================================================================
diff -u -re2e28bb9e4896ee2ea33aa701f529491d2953f65 -ra5567411b96a61631d37c8af70b3d6d1012e9776
--- TestSupport.c	(.../TestSupport.c)	(revision e2e28bb9e4896ee2ea33aa701f529491d2953f65)
+++ TestSupport.c	(.../TestSupport.c)	(revision a5567411b96a61631d37c8af70b3d6d1012e9776)
@@ -182,6 +182,9 @@
 #ifdef _DG_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_DG_INVALID_TEST_CONFIG_SELECTED, config )
 #endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED, config )
+#endif
     }
 
     return status;
@@ -210,6 +213,10 @@
 #ifdef _DG_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_DG_INVALID_TEST_CONFIG_SELECTED, config )
 #endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED, config )
+#endif
+
     }
 
     return status;
Index: TestSupport.h
===================================================================
diff -u -re2e28bb9e4896ee2ea33aa701f529491d2953f65 -ra5567411b96a61631d37c8af70b3d6d1012e9776
--- TestSupport.h	(.../TestSupport.h)	(revision e2e28bb9e4896ee2ea33aa701f529491d2953f65)
+++ TestSupport.h	(.../TestSupport.h)	(revision a5567411b96a61631d37c8af70b3d6d1012e9776)
@@ -45,6 +45,7 @@
 {
     TEST_CONFIG_ENABLE_WET_CARTRIDGE_USE = 0,                  ///< Test configuration enable wet cartridge use.
     TEST_CONFIG_FIRST = TEST_CONFIG_ENABLE_WET_CARTRIDGE_USE,  ///< Test configuration first configuration.
+    TEST_CONFIG_ENABLE_WORN_CARTRIDGE_USE,                     ///< Test configuration enable worn cartridge use.
     NUM_OF_TEST_CONFIGS                                        ///< Number of test configuration.
 } TEST_CONFIG_T;
 #endif