Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r9cc5da6947aa143a10f95519eb7f366c1b095d61 -rf565edd6de62272b1c18fe425e37bc2128aa5832
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9cc5da6947aa143a10f95519eb7f366c1b095d61)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f565edd6de62272b1c18fe425e37bc2128aa5832)
@@ -15,7 +15,7 @@
 *
 ***************************************************************************/
 
-#include <string.h>     // for memcpy()
+#include <string.h>        // for memcpy()
 
 #include "reg_system.h"
 
@@ -3854,4 +3854,163 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestDrainPumpMeasuredCurrentOverride function handles a request
+ * to override the drain pump measured current
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDrainPumpMeasuredCurrentOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetDrainPumpMeasuredCurrentOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetDrainPumpMeasuredCurrentOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestGenIdlePublishIntervalOverride function handles a request
+ * to override the gen idle state publish interval
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestGenIdlePublishIntervalOverride( MESSAGE_T * message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetGenIdleSubstatesPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetGenIdleSubstatesPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestDGROPumpFeedbackVoltageOverrideRequest function handles a request
+ * to override the gen idle state publish interval
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDGROPumpFeedbackVoltageOverrideRequest( MESSAGE_T * message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetROPumpMeasuredFeedbackDutyCycleOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetROPumpMeasuredFeedbackDutyCycleOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestDGFillModeBroadcastOverrideRequest function handles a request
+ * to override the gen idle state publish interval
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDGFillModeBroadcastOverrideRequest( MESSAGE_T * message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFillModeDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetFillModeDataPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+/*********************************************************************//**
+ * @brief
+ * The handleTestDGFillIntegratedVolumeOverrideRequest function handles a request
+ * to override the gen idle state publish interval
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDGFillIntegratedVolumeOverrideRequest( MESSAGE_T * message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetIntegratedVolumeOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetIntegratedVolumeOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/