Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r52921ebabd1262de9e242479fb29f6a648268cfa -r8c00197ce69e80f1967aa3f2eb36beb3573f36f3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 52921ebabd1262de9e242479fb29f6a648268cfa)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8c00197ce69e80f1967aa3f2eb36beb3573f36f3)
@@ -27,7 +27,8 @@
 #include "ModePreTreat.h"
 #include "ModeStandby.h"
 #include "ModeTreatment.h"
-#include "ModeTreatmentParams.h"
+#include "ModeTreatmentParams.h"
+#include "OperationModes.h"
 #include "PresOccl.h"
 #include "RTC.h"
 #include "SafetyShutdown.h"
@@ -4169,8 +4170,32 @@
 
         memcpy( &key, message->payload, sizeof(U32) );
         result = testClearAllAlarms( key );
+    }
 
-        result = TRUE;
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestSetOpModeRequest function handles a request to set the
+ * HD operation mode.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSetOpModeRequest( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof(U32) )
+    {
+        U32 mode;
+
+        memcpy( &mode, message->payload, sizeof(U32) );
+        result = testSetOperationMode( (HD_OP_MODE_T)mode );
     }
 
     // Respond to request