Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r0d8381c50f7189c4cfbc2794a4aedf297eea7d15 -r7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0d8381c50f7189c4cfbc2794a4aedf297eea7d15)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9)
@@ -1351,9 +1351,7 @@
         }
         if ( ctrlMode < NUM_OF_PUMP_CONTROL_MODES )
         {
-            targetBloodFlowRate.ovInitData = targetBloodFlowRate.data; // backup current target flow rate
-            targetBloodFlowRate.ovData = value;
-            targetBloodFlowRate.override = OVERRIDE_KEY;
+            targetBloodFlowRate.data = value;
             result = setBloodPumpTargetFlowRate( abs(value), dir, (PUMP_CONTROL_MODE_T)ctrlMode );
         }
     }
@@ -1363,31 +1361,6 @@
 
 /*********************************************************************//**
  * @brief
- * The testResetTargetBloodFlowRateOverride function resets the override of the
- * target blood flow rate.
- * @details
- * Inputs : none
- * Outputs : targetBloodFlowRate
- * @return TRUE if override reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetTargetBloodFlowRateOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        targetBloodFlowRate.data = targetBloodFlowRate.ovInitData;  // restore pre-override target flow rate
-        targetBloodFlowRate.override = OVERRIDE_RESET;
-        targetBloodFlowRate.ovInitData = 0;
-        targetBloodFlowRate.ovData = 0;
-        result = setBloodPumpTargetFlowRate( targetBloodFlowRate.data, bloodPumpDirection, bloodPumpControlMode );
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The testResetMeasuredBloodFlowRateOverride function overrides the measured
  * blood flow rate.
  * @details
Index: firmware/App/Controllers/BloodFlow.h
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9
--- firmware/App/Controllers/BloodFlow.h	(.../BloodFlow.h)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Controllers/BloodFlow.h	(.../BloodFlow.h)	(revision 7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9)
@@ -59,7 +59,6 @@
 BOOL testSetBloodFlowDataPublishIntervalOverride( U32 value );
 BOOL testResetBloodFlowDataPublishIntervalOverride( void );
 BOOL testSetTargetBloodFlowRateOverride( S32 value, U32 bloodPumpControlMode );
-BOOL testResetTargetBloodFlowRateOverride( void );
 BOOL testSetMeasuredBloodFlowRateOverride( F32 value );
 BOOL testResetMeasuredBloodFlowRateOverride( void );
 BOOL testSetMeasuredBloodPumpRotorSpeedOverride( F32 value );
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r0d8381c50f7189c4cfbc2794a4aedf297eea7d15 -r7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 0d8381c50f7189c4cfbc2794a4aedf297eea7d15)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9)
@@ -1323,9 +1323,7 @@
         }
         if ( ctrlMode < NUM_OF_PUMP_CONTROL_MODES )
         {
-            targetDialInFlowRate.ovInitData = targetDialInFlowRate.data; // backup current target flow rate
-            targetDialInFlowRate.ovData = value;
-            targetDialInFlowRate.override = OVERRIDE_KEY;
+            targetDialInFlowRate.data = value;
             result = setDialInPumpTargetFlowRate( abs(value), dir, (PUMP_CONTROL_MODE_T)ctrlMode );
         }
     }
@@ -1335,31 +1333,6 @@
 
 /*********************************************************************//**
  * @brief
- * The testResetTargetDialInFlowRateOverride function resets the override of the
- * target dialysate inlet flow rate.
- * @details
- * Inputs : none
- * Outputs : targetDialInFlowRate
- * @return TRUE if override reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetTargetDialInFlowRateOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        targetDialInFlowRate.data = targetDialInFlowRate.ovInitData;  // restore pre-override target flow rate
-        targetDialInFlowRate.override = OVERRIDE_RESET;
-        targetDialInFlowRate.ovInitData = 0;
-        targetDialInFlowRate.ovData = 0;
-        result = setDialInPumpTargetFlowRate( targetDialInFlowRate.data, dialInPumpDirection, dialInPumpControlMode );
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The testResetMeasuredDialInFlowRateOverride function overrides the measured
  * dialIn flow rate.
  * @details
Index: firmware/App/Controllers/DialInFlow.h
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9
--- firmware/App/Controllers/DialInFlow.h	(.../DialInFlow.h)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Controllers/DialInFlow.h	(.../DialInFlow.h)	(revision 7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9)
@@ -59,7 +59,6 @@
 BOOL testSetDialInFlowDataPublishIntervalOverride( U32 value );
 BOOL testResetDialInFlowDataPublishIntervalOverride( void );
 BOOL testSetTargetDialInFlowRateOverride( S32 value, U32 ctrlMode );
-BOOL testResetTargetDialInFlowRateOverride( void );
 BOOL testSetMeasuredDialInFlowRateOverride( F32 value );
 BOOL testResetMeasuredDialInFlowRateOverride( void );
 BOOL testSetMeasuredDialInPumpRotorSpeedOverride( F32 value );
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r0d8381c50f7189c4cfbc2794a4aedf297eea7d15 -r7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 0d8381c50f7189c4cfbc2794a4aedf297eea7d15)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9)
@@ -1245,27 +1245,6 @@
 
 /*********************************************************************//**
  * @brief
- * The testResetTargetDialOutFlowRateOverride function resets the override of the
- * target dialysate outlet flow rate.
- * @details
- * Inputs : none
- * Outputs : pump stopped
- * @return TRUE if override reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetTargetDialOutFlowRateOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        result = setDialOutPumpTargetRate( 0, dialOutPumpDirection, dialOutPumpControlMode );
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The testSetDialOutUFRefVolumeOverride function overrides the target
  * dialout vol rate.
  * @details
Index: firmware/App/Controllers/DialOutFlow.h
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9
--- firmware/App/Controllers/DialOutFlow.h	(.../DialOutFlow.h)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Controllers/DialOutFlow.h	(.../DialOutFlow.h)	(revision 7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9)
@@ -84,7 +84,6 @@
 BOOL testSetDialOutPumpAndLoadCellDataPublishIntervalOverride( U32 value );
 BOOL testResetDialOutPumpAndLoadCellDataPublishIntervalOverride( void );
 BOOL testSetTargetDialOutFlowRateOverride( S32 value, U32 ctrlMode );
-BOOL testResetTargetDialOutFlowRateOverride( void );
 BOOL testSetDialOutUFRefVolumeOverride( F32 value );
 BOOL testResetDialOutUFRefVolumeOverride( void );
 BOOL testSetDialOutUFTotVolumeOverride( F32 value );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5e77f78c5dee9dfb441bd5d2053f7f4ac50dc619 -r7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5e77f78c5dee9dfb441bd5d2053f7f4ac50dc619)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7218f3c5a0afef9ebbf47655a00f37fc2eefd0f9)
@@ -2175,14 +2175,7 @@
     if ( sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetTargetBloodFlowRateOverride( payload.setPt, payload.ctrlMode );
-        }
-        else
-        {
-            result = testResetTargetBloodFlowRateOverride();
-        }
+        result = testSetTargetBloodFlowRateOverride( payload.setPt, payload.ctrlMode );
     }
 
     // respond to request
@@ -2406,14 +2399,7 @@
     if ( sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetTargetDialInFlowRateOverride( payload.setPt, payload.ctrlMode );
-        }
-        else
-        {
-            result = testResetTargetDialInFlowRateOverride();
-        }
+        result = testSetTargetDialInFlowRateOverride( payload.setPt, payload.ctrlMode );
     }
 
     // respond to request
@@ -2439,14 +2425,7 @@
     if ( sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetTargetDialOutFlowRateOverride( payload.setPt, payload.ctrlMode );
-        }
-        else
-        {
-            result = testResetTargetDialOutFlowRateOverride();
-        }
+        result = testSetTargetDialOutFlowRateOverride( payload.setPt, payload.ctrlMode );
     }
 
     // respond to request