Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r054fa08b67ed2a31f7848b179fbcd1b4da501b0f -r6463655c18b173e335b6d475ac7289336f1bf092
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 054fa08b67ed2a31f7848b179fbcd1b4da501b0f)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 6463655c18b173e335b6d475ac7289336f1bf092)
@@ -940,7 +940,7 @@
 /*************************************************************************
  * @brief
  * The testSetTargetBloodFlowRateOverride function overrides the target \n
- * blood flow rate. \n
+ * blood flow rate.
  * @details
  * Inputs : none
  * Outputs : targetBloodFlowRate
@@ -999,73 +999,238 @@
 }
 
 /*************************************************************************
- * @brief testSetMeasuredBloodFlowRateOverride and testResetMeasuredBloodFlowRateOverride
+ * @brief
  * The testResetMeasuredBloodFlowRateOverride function overrides the measured \n
- * blood flow rate. \n
- * The testResetOffButtonStateOverride function resets the override of the \n
- * measured blood flow rate.
+ * blood flow rate.
  * @details
  * Inputs : none
  * Outputs : measuredBloodFlowRate
  * @param value : override measured blood flow rate (in mL/min)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredBloodFlowRateOverride, testResetMeasuredBloodFlowRateOverride, measuredBloodFlowRate )
+BOOL testSetMeasuredBloodFlowRateOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        measuredBloodFlowRate.ovData = value;
+        measuredBloodFlowRate.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredBloodPumpRotorSpeedOverride and testResetMeasuredBloodPumpRotorSpeedOverride
+ * @brief
+ * The testResetOffButtonStateOverride function resets the override of the \n
+ * measured blood flow rate.
+ * @details
+ * Inputs : none
+ * Outputs : measuredBloodFlowRate
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredBloodFlowRateOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        measuredBloodFlowRate.override = OVERRIDE_RESET;
+        measuredBloodFlowRate.ovData = measuredBloodFlowRate.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredBloodPumpRotorSpeedOverride function overrides the measured \n
- * blood pump rotor speed. \n
- * The testResetMeasuredBloodPumpRotorSpeedOverride function resets the override of the \n
- * measured blood pump rotor speed.
+ * blood pump rotor speed.
  * @details
  * Inputs : none
  * Outputs : bloodPumpRotorSpeedRPM
  * @param value : override measured blood pump rotor speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredBloodPumpRotorSpeedOverride, testResetMeasuredBloodPumpRotorSpeedOverride, bloodPumpRotorSpeedRPM )
+BOOL testSetMeasuredBloodPumpRotorSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpRotorSpeedRPM.ovData = value;
+        bloodPumpRotorSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredBloodPumpSpeedOverride and testResetMeasuredBloodPumpSpeedOverride
+ * @brief
+ * The testResetMeasuredBloodPumpRotorSpeedOverride function resets the override of the \n
+ * measured blood pump rotor speed.
+ * @details
+ * Inputs : none
+ * Outputs : bloodPumpRotorSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredBloodPumpRotorSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpRotorSpeedRPM.override = OVERRIDE_RESET;
+        bloodPumpRotorSpeedRPM.ovData = bloodPumpRotorSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredBloodPumpSpeedOverride function overrides the measured \n
- * blood pump motor speed. \n
- * The testResetMeasuredBloodPumpSpeedOverride function resets the override of the \n
- * measured blood pump motor speed.
+ * blood pump motor speed.
  * @details
  * Inputs : none
  * Outputs : bloodPumpSpeedRPM
  * @param value : override measured blood pump motor speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredBloodPumpSpeedOverride, testResetMeasuredBloodPumpSpeedOverride, bloodPumpSpeedRPM )
+BOOL testSetMeasuredBloodPumpSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpSpeedRPM.ovData = value;
+        bloodPumpSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredBloodPumpMCSpeedOverride and testResetMeasuredBloodPumpMCSpeedOverride
- * The testSetMeasuredBloodPumpMCSpeedOverride function overrides the measured \n
- * blood pump motor speed. \n
- * The testResetMeasuredBloodPumpMCSpeedOverride function resets the override of the \n
+ * @brief
+ * The testResetMeasuredBloodPumpSpeedOverride function resets the override of the \n
  * measured blood pump motor speed.
  * @details
  * Inputs : none
+ * Outputs : bloodPumpSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredBloodPumpSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpSpeedRPM.override = OVERRIDE_RESET;
+        bloodPumpSpeedRPM.ovData = bloodPumpSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
+ * The testSetMeasuredBloodPumpMCSpeedOverride function overrides the measured \n
+ * blood pump motor speed.
+ * @details
+ * Inputs : none
  * Outputs : adcBloodPumpMCSpeedRPM
  * @param value : override measured blood pump speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredBloodPumpMCSpeedOverride, testResetMeasuredBloodPumpMCSpeedOverride, adcBloodPumpMCSpeedRPM )
+BOOL testSetMeasuredBloodPumpMCSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcBloodPumpMCSpeedRPM.ovData = value;
+        adcBloodPumpMCSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredBloodPumpMCCurrentOverride and testResetMeasuredBloodPumpMCCurrentOverride
+ * @brief
+ * The testResetMeasuredBloodPumpMCSpeedOverride function resets the override of the \n
+ * measured blood pump motor speed.
+ * @details
+ * Inputs : none
+ * Outputs : adcBloodPumpMCSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredBloodPumpMCSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcBloodPumpMCSpeedRPM.override = OVERRIDE_RESET;
+        adcBloodPumpMCSpeedRPM.ovData = adcBloodPumpMCSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredBloodPumpMCCurrentOverride function overrides the measured \n
- * blood pump motor current. \n
- * The testResetMeasuredBloodPumpMCCurrentOverride function resets the override of the \n
- * measured blood pump motor current.
+ * blood pump motor current.
  * @details
  * Inputs : none
  * Outputs : adcBloodPumpMCCurrentmA
  * @param value : override measured blood pump current (in mA)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredBloodPumpMCCurrentOverride, testResetMeasuredBloodPumpMCCurrentOverride, adcBloodPumpMCCurrentmA )
+BOOL testSetMeasuredBloodPumpMCCurrentOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcBloodPumpMCCurrentmA.ovData = value;
+        adcBloodPumpMCCurrentmA.override = OVERRIDE_KEY;
+    }
 
+    return result;
+}
+
+/*************************************************************************
+ * @brief
+ * The testResetMeasuredBloodPumpMCCurrentOverride function resets the override of the \n
+ * measured blood pump motor current.
+ * @details
+ * Inputs : none
+ * Outputs : adcBloodPumpMCCurrentmA
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredBloodPumpMCCurrentOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcBloodPumpMCCurrentmA.override = OVERRIDE_RESET;
+        adcBloodPumpMCCurrentmA.ovData = adcBloodPumpMCCurrentmA.ovInitData;
+    }
+
+    return result;
+}
+
+
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r054fa08b67ed2a31f7848b179fbcd1b4da501b0f -r6463655c18b173e335b6d475ac7289336f1bf092
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 054fa08b67ed2a31f7848b179fbcd1b4da501b0f)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 6463655c18b173e335b6d475ac7289336f1bf092)
@@ -983,73 +983,238 @@
 }
 
 /*************************************************************************
- * @brief testSetMeasuredDialInFlowRateOverride and testResetMeasuredDialInFlowRateOverride
+ * @brief
  * The testResetMeasuredDialInFlowRateOverride function overrides the measured \n
- * dialIn flow rate. \n
- * The testResetOffButtonStateOverride function resets the override of the \n
- * measured dialIn flow rate.
+ * dialIn flow rate.
  * @details
  * Inputs : none
  * Outputs : measuredDialInFlowRate
  * @param value : override measured dialIn flow rate (in mL/min)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredDialInFlowRateOverride, testResetMeasuredDialInFlowRateOverride, measuredDialInFlowRate )
+BOOL testSetMeasuredDialInFlowRateOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        measuredDialInFlowRate.ovData = value;
+        measuredDialInFlowRate.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredDialInPumpRotorSpeedOverride and testResetMeasuredDialInPumpRotorSpeedOverride
+ * @brief
+ * The testResetMeasuredDialInFlowRateOverride function resets the override of the \n
+ * measured dialIn flow rate.
+ * @details
+ * Inputs : none
+ * Outputs : measuredDialInFlowRate
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredDialInFlowRateOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        measuredDialInFlowRate.override = OVERRIDE_RESET;
+        measuredDialInFlowRate.ovData = measuredDialInFlowRate.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredDialInPumpRotorSpeedOverride function overrides the measured \n
- * dialIn pump rotor speed. \n
- * The testResetMeasuredDialInPumpRotorSpeedOverride function resets the override of the \n
- * measured dialIn pump rotor speed.
+ * dialIn pump rotor speed.
  * @details
  * Inputs : none
  * Outputs : dialInPumpRotorSpeedRPM
  * @param value : override measured dialIn pump rotor speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredDialInPumpRotorSpeedOverride, testResetMeasuredDialInPumpRotorSpeedOverride, dialInPumpRotorSpeedRPM )
+BOOL testSetMeasuredDialInPumpRotorSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpRotorSpeedRPM.ovData = value;
+        dialInPumpRotorSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredDialInPumpSpeedOverride and testResetMeasuredDialInPumpSpeedOverride
+ * @brief
+ * The testResetMeasuredDialInPumpRotorSpeedOverride function resets the override of the \n
+ * measured dialIn pump rotor speed.
+ * @details
+ * Inputs : none
+ * Outputs : dialInPumpRotorSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredDialInPumpRotorSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpRotorSpeedRPM.override = OVERRIDE_RESET;
+        dialInPumpRotorSpeedRPM.ovData = dialInPumpRotorSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredDialInPumpSpeedOverride function overrides the measured \n
- * dialIn pump motor speed. \n
- * The testResetMeasuredDialInPumpSpeedOverride function resets the override of the \n
- * measured dialIn pump motor speed.
+ * dialIn pump motor speed.
  * @details
  * Inputs : none
  * Outputs : dialInPumpSpeedRPM
  * @param value : override measured dialIn pump motor speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredDialInPumpSpeedOverride, testResetMeasuredDialInPumpSpeedOverride, dialInPumpSpeedRPM )
+BOOL testSetMeasuredDialInPumpSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpSpeedRPM.ovData = value;
+        dialInPumpSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredDialInPumpMCSpeedOverride and testResetMeasuredDialInPumpMCSpeedOverride
- * The testSetMeasuredDialInPumpMCSpeedOverride function overrides the measured \n
- * dialIn pump motor speed. \n
- * The testResetMeasuredDialInPumpMCSpeedOverride function resets the override of the \n
+ * @brief
+ * The testResetMeasuredDialInPumpSpeedOverride function resets the override of the \n
  * measured dialIn pump motor speed.
  * @details
  * Inputs : none
+ * Outputs : dialInPumpSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredDialInPumpSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpSpeedRPM.override = OVERRIDE_RESET;
+        dialInPumpSpeedRPM.ovData = dialInPumpSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
+ * The testSetMeasuredDialInPumpMCSpeedOverride function overrides the measured \n
+ * dialIn pump motor speed.
+ * @details
+ * Inputs : none
  * Outputs : adcDialInPumpMCSpeedRPM
  * @param value : override measured dialIn pump speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredDialInPumpMCSpeedOverride, testResetMeasuredDialInPumpMCSpeedOverride, adcDialInPumpMCSpeedRPM )
+BOOL testSetMeasuredDialInPumpMCSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcDialInPumpMCSpeedRPM.ovData = value;
+        adcDialInPumpMCSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredDialInPumpMCCurrentOverride and testResetMeasuredDialInPumpMCCurrentOverride
+ * @brief
+ * The testResetMeasuredDialInPumpMCSpeedOverride function resets the override of the \n
+ * measured dialIn pump motor speed.
+ * @details
+ * Inputs : none
+ * Outputs : adcDialInPumpMCSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredDialInPumpMCSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcDialInPumpMCSpeedRPM.override = OVERRIDE_RESET;
+        adcDialInPumpMCSpeedRPM.ovData = adcDialInPumpMCSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredDialInPumpMCCurrentOverride function overrides the measured \n
- * dialIn pump motor current. \n
- * The testResetMeasuredDialInPumpMCCurrentOverride function resets the override of the \n
- * measured dialIn pump motor current.
+ * dialIn pump motor current.
  * @details
  * Inputs : none
  * Outputs : adcDialInPumpMCCurrentmA
  * @param value : override measured dialIn pump current (in mA)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredDialInPumpMCCurrentOverride, testResetMeasuredDialInPumpMCCurrentOverride, adcDialInPumpMCCurrentmA )
+BOOL testSetMeasuredDialInPumpMCCurrentOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcDialInPumpMCCurrentmA.ovData = value;
+        adcDialInPumpMCCurrentmA.override = OVERRIDE_KEY;
+    }
 
+    return result;
+}
+
+/*************************************************************************
+ * @brief
+ * The testResetMeasuredDialInPumpMCCurrentOverride function resets the override of the \n
+ * measured dialIn pump motor current.
+ * @details
+ * Inputs : none
+ * Outputs : adcDialInPumpMCCurrentmA
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredDialInPumpMCCurrentOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcDialInPumpMCCurrentmA.override = OVERRIDE_RESET;
+        adcDialInPumpMCCurrentmA.ovData = adcDialInPumpMCCurrentmA.ovInitData;
+    }
+
+    return result;
+}
+
+
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rd954cab1e721ac955f98feb260d7b978ec14ccab -r6463655c18b173e335b6d475ac7289336f1bf092
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision d954cab1e721ac955f98feb260d7b978ec14ccab)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 6463655c18b173e335b6d475ac7289336f1bf092)
@@ -904,11 +904,11 @@
 /*********************************************************************//**
  * @brief
  * The testSetDialOutPumpAndLoadCellDataPublishIntervalOverride function overrides the \n
- * dialout vol data publish interval.
+ * dialout data publish interval.
  * @details
  * Inputs : none
  * Outputs : dialOutDataPublishInterval
- * @param value : override dialout vol data publish interval with (in ms)
+ * @param value : override dialout data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetDialOutPumpAndLoadCellDataPublishIntervalOverride( U32 value )
@@ -930,11 +930,11 @@
 /*********************************************************************//**
  * @brief
  * The testResetDialOutPumpAndLoadCellDataPublishIntervalOverride function resets the override \n
- * of the dialout vol data publish interval.
+ * of the dialout data publish interval.
  * @details
  * Inputs : none
  * Outputs : dialOutDataPublishInterval
- * @return TRUE if override reset successful, FALSE if not
+ * @return TRUE if reset reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetDialOutPumpAndLoadCellDataPublishIntervalOverride( void )
 {
@@ -953,7 +953,7 @@
 /*********************************************************************//**
  * @brief
  * The testSetDialOutUFRefVolumeOverride function overrides the target \n
- * dialout vol rate. \n
+ * dialout vol rate.
  * @details
  * Inputs : referenceUFVolumeInMl
  * Outputs : referenceUFVolumeInMl
@@ -981,7 +981,7 @@
  * @details
  * Inputs : referenceUFVolumeInMl
  * Outputs : referenceUFVolumeInMl
- * @return TRUE if override reset successful, FALSE if not
+ * @return TRUE if reset reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetDialOutUFRefVolumeOverride( void )
 {
@@ -1000,7 +1000,7 @@
 /*********************************************************************//**
  * @brief
  * The testSetDialOutUFTotVolumeOverride function overrides the measured \n
- * dialout vol rate. \n
+ * dialout vol rate.
  * @details
  * Inputs : totalMeasuredUFVolumeInMl
  * Outputs : totalMeasuredUFVolumeInMl
@@ -1028,7 +1028,7 @@
  * @details
  * Inputs : totalMeasuredUFVolumeInMl
  * Outputs : totalMeasuredUFVolumeInMl
- * @return TRUE if override reset successful, FALSE if not
+ * @return TRUE if reset reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetDialOutUFTotVolumeOverride( void )
 {
@@ -1047,7 +1047,7 @@
 /*********************************************************************//**
  * @brief
  * The testSetMeasuredDialOutPumpRotorSpeedOverride function overrides the measured \n
- * dialOut pump rotor speed. \n
+ * dialOut pump rotor speed.
  * @details
  * Inputs : DialOutPumpRotorSpeedRPM
  * Outputs : DialOutPumpRotorSpeedRPM
@@ -1075,7 +1075,7 @@
  * @details
  * Inputs : DialOutPumpRotorSpeedRPM
  * Outputs : DialOutPumpRotorSpeedRPM
- * @return TRUE if override reset successful, FALSE if not
+ * @return TRUE if reset reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetMeasuredDialOutPumpRotorSpeedOverride( void )
 {
@@ -1094,7 +1094,7 @@
 /*********************************************************************//**
  * @brief
  * The testSetMeasuredDialOutPumpSpeedOverride function overrides the measured \n
- * dialOut pump motor speed. \n
+ * dialOut pump motor speed.
  * @details
  * Inputs : dialOutPumpSpeedRPM
  * Outputs : dialOutPumpSpeedRPM
@@ -1122,7 +1122,7 @@
  * @details
  * Inputs : dialOutPumpSpeedRPM
  * Outputs : dialOutPumpSpeedRPM
- * @return TRUE if override reset successful, FALSE if not
+ * @return TRUE if reset reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetMeasuredDialOutPumpSpeedOverride( void )
 {
@@ -1169,7 +1169,7 @@
  * @details
  * Inputs : dialOutPumpMCSpeedRPM
  * Outputs : dialOutPumpMCSpeedRPM
- * @return TRUE if override reset successful, FALSE if not
+ * @return TRUE if reset reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetMeasuredDialOutPumpMCSpeedOverride( void )
 {
@@ -1216,7 +1216,7 @@
  * @details
  * Inputs : dialOutPumpMCCurrentmA
  * Outputs : dialOutPumpMCCurrentmA
- * @return TRUE if override reset successful, FALSE if not
+ * @return TRUE if reset reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetMeasuredDialOutPumpMCCurrentOverride( void )
 {
@@ -1268,7 +1268,7 @@
  * Inputs : loadCellWeightInGrams[]
  * Outputs : loadCellWeightInGrams[]
  * @param sensor : ID of load cell sensor to override weight for
- * @return TRUE if override successful, FALSE if not
+ * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetDialOutLoadCellWeightOverride( U32 sensor )
 {
Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r968f9908941a8f8ceeacdb6aa40655abf54c1ef4 -r6463655c18b173e335b6d475ac7289336f1bf092
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 968f9908941a8f8ceeacdb6aa40655abf54c1ef4)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 6463655c18b173e335b6d475ac7289336f1bf092)
@@ -441,70 +441,235 @@
  * @brief
  * The testSetArterialPressureOverride function overrides the measured arterial \n
  * pressure.
- * The testResetArterialPressureOverride function resets the override of the \n
- * arterial pressure.
  * @details
  * Inputs : none
  * Outputs : arterialPressure
  * @param value : override arterial pressure (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetArterialPressureOverride, testResetArterialPressureOverride, arterialPressure )
+BOOL testSetArterialPressureOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        arterialPressure.ovData = value;
+        arterialPressure.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
+ * The testResetArterialPressureOverride function resets the override of the \n
+ * arterial pressure.
+ * @details
+ * Inputs : none
+ * Outputs : arterialPressure
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetArterialPressureOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        arterialPressure.override = OVERRIDE_RESET;
+        arterialPressure.ovData = arterialPressure.ovInitData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The testSetVenousPressureOverride function overrides the measured venous \n
  * pressure.
+ * @details
+ * Inputs : none
+ * Outputs : venousPressure
+ * @param value : override measured venous pressure with (in mmHg)
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testSetVenousPressureOverride( F32 value )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        venousPressure.ovData = value;
+        venousPressure.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The testResetVenousPressureOverride function resets the override of the \n
  * venous pressure.
  * @details
  * Inputs : none
  * Outputs : venousPressure
- * @param value : override measured vensous pressure with (in mmHg)
- * @return TRUE if override successful, FALSE if not
+ * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetVenousPressureOverride, testResetVenousPressureOverride, venousPressure )
+BOOL testResetVenousPressureOverride( void )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        venousPressure.override = OVERRIDE_RESET;
+        venousPressure.ovData = venousPressure.ovInitData;
+    }
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
  * The testSetBloodPumpOcclusionOverride function overrides the measured \n
- * blood pump occlusion pressure. \n
- * The testResetBloodPumpOcclusionOverride function resets the override of the \n
- * measured blood pump occlusion pressure.
+ * blood pump occlusion pressure.n
  * @details
  * Inputs : none
  * Outputs : bloodPumpOcclusion
  * @param value : override measured blood pump occlusion pressure with (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetBloodPumpOcclusionOverride, testResetBloodPumpOcclusionOverride, bloodPumpOcclusion )
+BOOL testSetBloodPumpOcclusionOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpOcclusion.ovData = value;
+        bloodPumpOcclusion.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
+ * The testResetBloodPumpOcclusionOverride function resets the override of the \n
+ * measured blood pump occlusion pressure.
+ * @details
+ * Inputs : none
+ * Outputs : bloodPumpOcclusion
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetBloodPumpOcclusionOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpOcclusion.override = OVERRIDE_RESET;
+        bloodPumpOcclusion.ovData = bloodPumpOcclusion.ovInitData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The testSetDialInPumpOcclusionOverride function overrides the measured \n
- * dialysate inlet pump occlusion pressure. \n
- * The testResetDialInPumpOcclusionOverride function resets the override of the \n
- * measured dialysate inlet pump occlusion pressure.
+ * dialysate inlet pump occlusion pressure.n
  * @details
  * Inputs : none
  * Outputs : dialInPumpOcclusion
  * @param value : override measured dialysate inlet pump occlusion pressure (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetDialInPumpOcclusionOverride, testResetDialInPumpOcclusionOverride, dialInPumpOcclusion )
+BOOL testSetDialInPumpOcclusionOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpOcclusion.ovData = value;
+        dialInPumpOcclusion.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
+ * The testResetDialInPumpOcclusionOverride function resets the override of the \n
+ * measured dialysate inlet pump occlusion pressure.
+ * @details
+ * Inputs : none
+ * Outputs : dialInPumpOcclusion
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetDialInPumpOcclusionOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpOcclusion.override = OVERRIDE_RESET;
+        dialInPumpOcclusion.ovData = dialInPumpOcclusion.ovInitData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The testSetDialOutPumpOcclusionOverride function overrides the measured \n
- * dialysate outlet pump occlusion pressure. \n
- * The testResetDialOutPumpOcclusionOverride function resets the override of the \n
- * measured dialysate outlet pump occlusion pressure.
+ * dialysate outlet pump occlusion pressure.
  * @details
  * Inputs : none
  * Outputs : dialOutPumpOcclusion
  * @param value : override measured dialysate outlet pump occlusion pressure (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetDialOutPumpOcclusionOverride, testResetDialOutPumpOcclusionOverride, dialOutPumpOcclusion )
+BOOL testSetDialOutPumpOcclusionOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialOutPumpOcclusion.ovData = value;
+        dialOutPumpOcclusion.override = OVERRIDE_KEY;
+    }
 
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetDialOutPumpOcclusionOverride function resets the override of the \n
+ * measured dialysate outlet pump occlusion pressure.
+ * @details
+ * Inputs : none
+ * Outputs : dialOutPumpOcclusion
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetDialOutPumpOcclusionOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialOutPumpOcclusion.override = OVERRIDE_RESET;
+        dialOutPumpOcclusion.ovData = dialOutPumpOcclusion.ovInitData;
+    }
+
+    return result;
+}
+
+