Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r9279d01e7e539ad1e788b85db4ea2288965b03c6 -r23fd3843b6e50ff90b4db987be553c823bfd6597
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9279d01e7e539ad1e788b85db4ea2288965b03c6)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 23fd3843b6e50ff90b4db987be553c823bfd6597)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      02-Mar-2022
+* @date    (last)      31-Mar-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -3278,14 +3278,43 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleSetFansDutyCycleOverrideRequest function handles a
- * request to override the fans duty cycle.
+ * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
+ * request to override the acid volume.
  * @details Inputs: none
  * @details Outputs: message handled
- * @param message a pointer to the message to handle
+ * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
+void handleTestUsedAcidVolumeMLOverrideRequest( 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 = testSetUsedAcidVolumeMLOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetUsedAcidVolumeMLOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+/*********************************************************************//**
+* The handleSetFansDutyCycleOverrideRequest function handles a
+* request to override the fans duty cycle.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
 void handleSetFansDutyCycleOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
@@ -3311,6 +3340,38 @@
 }
 
 /*********************************************************************//**
+ * @brief
+ * The handleTestUsedBicarbVolumeMLOverrideRequest function handles a
+ * request to override the used bicarb volume.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestUsedBicarbVolumeMLOverrideRequest( 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 = testSetUsedBicarbVolumeMLOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetUsedBicarbVolumeMLOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
 * @brief
 * The handleGetDGSoftwareConfigRecord function handles a request to get the DG
 * software configuration record.
@@ -3405,68 +3466,4 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*********************************************************************//**
- * @brief
- * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
- * request to override the acid volume.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestUsedAcidVolumeMLOverrideRequest( 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 = testSetUsedAcidVolumeMLOverride( payload.state.f32 );
-        }
-        else
-        {
-            result = testResetUsedAcidVolumeMLOverride();
-        }
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
- * The handleTestUsedBicarbVolumeMLOverrideRequest function handles a
- * request to override the used bicarb volume.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestUsedBicarbVolumeMLOverrideRequest( 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 = testSetUsedBicarbVolumeMLOverride( payload.state.f32 );
-        }
-        else
-        {
-            result = testResetUsedBicarbVolumeMLOverride();
-        }
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
 /**@}*/