Index: TestSupport.c
===================================================================
diff -u -r2cc7bf0516d1be26f64477849fd06a482cb7419d -rcfcb74543a2ed539a5b224723bc8fd2990c14a86
--- TestSupport.c	(.../TestSupport.c)	(revision 2cc7bf0516d1be26f64477849fd06a482cb7419d)
+++ TestSupport.c	(.../TestSupport.c)	(revision cfcb74543a2ed539a5b224723bc8fd2990c14a86)
@@ -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,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;
@@ -259,9 +265,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 +301,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;
         }