Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -ra53ec9a732b139e0c6650bd14093d8100301357c -r9279d01e7e539ad1e788b85db4ea2288965b03c6
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a53ec9a732b139e0c6650bd14093d8100301357c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9279d01e7e539ad1e788b85db4ea2288965b03c6)
@@ -25,6 +25,7 @@
 #include "ConductivitySensors.h"
 #include "FPGA.h"
 #include "Heaters.h"
+#include "ModeFill.h"
 #include "ModeFlush.h"
 #include "ModeGenIdle.h"
 #include "ModeInitPOST.h"
@@ -3404,4 +3405,68 @@
     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 );
+}
+
 /**@}*/