Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r544e9782a1b8d444224f41efef38a5204c262722 -r6ce44043f6a5fb452ca10c9eca4f081967656a7d
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 544e9782a1b8d444224f41efef38a5204c262722)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6ce44043f6a5fb452ca10c9eca4f081967656a7d)
@@ -23,7 +23,6 @@
 #include "Compatible.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
-#include "Fans.h"
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeFill.h"
@@ -365,7 +364,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -1364,6 +1362,56 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleTestSetOpModeRequest function handles a request to set the
+ * DG operation mode.
+ * @details Inputs: none
+ * @details 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( (DG_OP_MODE_T)mode );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestTareReservoirRequest function handles a request to tare a
+ * given reservoir's weight.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestTareReservoirRequest( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof(U32) )
+    {
+        U32 res;
+
+        memcpy( &res, message->payload, sizeof(U32) );
+        result = testTareReservoir( res );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleSetHDOperationMode function receives the HD operation modes data
  * publish message.
  * @details Inputs: none
@@ -3152,37 +3200,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleFansRPMOverride function handles a request to override a fans RPM value.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleFansRPMOverride( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
-        }
-        else
-        {
-            result = testResetFanRPMOverride( payload.index );
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleStopDGRTCClock function handles a request to stop the RTC clock.
 * @details Inputs: none
@@ -3321,10 +3338,41 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
- * request to set the fans RPM alarm start time offset.
+ * The handleFansRPMOverride function handles a request to override a fans RPM value.
  * @details Inputs: none
  * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleFansRPMOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFanRPMOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
+ * request to override the fan RPM alarm start time.
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -3347,7 +3395,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
  * request to override the acid volume.
  * @details Inputs: none