Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r573a26b2a0273a4983b1de1cbff5bed63e01dce0 -r12929ac400de74684371b01b962926f868922448
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 573a26b2a0273a4983b1de1cbff5bed63e01dce0)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 12929ac400de74684371b01b962926f868922448)
@@ -41,6 +41,7 @@
 #include "SafetyShutdown.h"
 #include "SystemCommDD.h"
 #include "Temperature.h"
+#include "TestSupport.h"
 #include "TDInterface.h"
 #include "Utilities.h"
 #include "Ultrafiltration.h"
@@ -163,6 +164,9 @@
     { MSG_ID_FW_VERSIONS_REQUEST,                                                   &handleVersionRequestMessage },
     { MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST,                                   &testSetResetSafetyShutdownOverride },
     { MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST,                                   &testDDUFDataPublishIntervalOverride },
+    { MSG_ID_DD_SET_TEST_CONFIGURATION,                                             &handleSetTestConfiguration },
+    { MSG_ID_DD_GET_TEST_CONFIGURATION,                                             &handleGetTestConfiguration },
+    { MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS,                                      &handleResetAllTestConfigurations },
 #ifdef __PUMPTEST__
     { MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST,                          &testDDPistonPumpControlDataPublishIntervalOverride },
     { MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST,                            &testDDPistonPumpStartStopOverride },
@@ -716,9 +720,90 @@
         setSystemREG1_SYSECR( (0x2) << 14 );  // Reset processor
     }
 
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+    return result;
+}
 
+/*********************************************************************//**
+ * @brief
+ * The handleSetTestConfiguration function handles a request to set a
+ * test configuration.
+ * @details \b Inputs: none
+ * @details \b Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return TRUE if command accepted, FALSE if rejected
+ *************************************************************************/
+BOOL handleSetTestConfiguration( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( TEST_CONFIG_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        TEST_CONFIG_PAYLOAD_T payload;
+
+        // copy message payload to local variable
+        memcpy( (U08*)&payload, &message->payload[0], sizeof( TEST_CONFIG_PAYLOAD_T ) );
+
+        // Verify given test configuration is valid
+        if ( payload.config < NUM_OF_TEST_CONFIGS )
+        {
+            result = TRUE;
+            if ( FALSE == payload.reset )
+            {
+                setTestConfig( (TEST_CONFIG_T)payload.config );
+            }
+            else
+            {
+                resetTestConfig( (TEST_CONFIG_T)payload.config );
+            }
+        }
+    }
+
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleGetTestConfiguration function handles a request to get a
+ * test configuration.
+ * @details \b Inputs: none
+ * @details \b Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+BOOL handleGetTestConfiguration( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        result = sendTestConfigStatusToDialin();
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleResetTestConfiguration function handles a request to reset all
+ * test configurations.
+ * @details \b Inputs: none
+ * @details \b Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+BOOL handleResetAllTestConfigurations( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        result = resetAllTestConfigs();
+    }
+
+    return result;
+}
+
 /**@}*/