Index: TestSupport.c
===================================================================
diff -u -r2cc7bf0516d1be26f64477849fd06a482cb7419d -re2e28bb9e4896ee2ea33aa701f529491d2953f65
--- TestSupport.c	(.../TestSupport.c)	(revision 2cc7bf0516d1be26f64477849fd06a482cb7419d)
+++ TestSupport.c	(.../TestSupport.c)	(revision e2e28bb9e4896ee2ea33aa701f529491d2953f65)
@@ -259,9 +259,12 @@
 #ifdef _DG_
         msg.hdr.msgID = MSG_ID_DG_SEND_TEST_CONFIGURATION;
 #endif
+#ifdef _HD_
+        msg.hdr.msgID = MSG_ID_HD_SEND_TEST_CONFIGURATION;
+#endif
         msg.hdr.payloadLen = sizeof( testConfig );
 
-        for ( config = TEST_CONFIG_ENABLE_MIXING_WITH_WATER; config < NUM_OF_TEST_CONFIGS; ++config )
+        for ( config = TEST_CONFIG_FIRST; config < NUM_OF_TEST_CONFIGS; ++config )
         {
             configStatus = (U32)getTestConfigStatus( config );
 
@@ -292,7 +295,7 @@
     {
         TEST_CONFIG_T config;
 
-        for ( config = TEST_CONFIG_ENABLE_MIXING_WITH_WATER; config < NUM_OF_TEST_CONFIGS; ++config )
+        for ( config = TEST_CONFIG_FIRST; config < NUM_OF_TEST_CONFIGS; ++config )
         {
             testConfig[ config ] = TEST_CONFIG_DISABLE_KEY;
         }
Index: TestSupport.h
===================================================================
diff -u -r2cc7bf0516d1be26f64477849fd06a482cb7419d -re2e28bb9e4896ee2ea33aa701f529491d2953f65
--- TestSupport.h	(.../TestSupport.h)	(revision 2cc7bf0516d1be26f64477849fd06a482cb7419d)
+++ TestSupport.h	(.../TestSupport.h)	(revision e2e28bb9e4896ee2ea33aa701f529491d2953f65)
@@ -43,9 +43,8 @@
 /// HD test software configurations
 typedef enum test_Config
 {
-    // TODO update this enum in HD
-    TEST_CONFIG_FIRST = 0,                                     ///< Test configuration first configuration.
-    TEST_CONFIG_ENABLE_MIXING_WITH_WATER = TEST_CONFIG_FIRST,  ///< Test configuration enable mixing with water.
+    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.
     NUM_OF_TEST_CONFIGS                                        ///< Number of test configuration.
 } TEST_CONFIG_T;
 #endif