Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rc053f97a780d6ccaefdb2bad386371e2fafed079 -r5404c0f29a5deafa1f57e5de4eb962081b1a9a38
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision c053f97a780d6ccaefdb2bad386371e2fafed079)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 5404c0f29a5deafa1f57e5de4eb962081b1a9a38)
@@ -763,7 +763,10 @@
  *************************************************************************/
 BOOL testROPumpTargetPressureOverride( MESSAGE_T *message )
 {
-    if ( targetROPumpPressure.override == OVERRIDE_RESET )
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    OVERRIDE_TYPE_T ovType = getOverridePayloadFromMessage( message, &payload );
+
+    if ( ovType == OVERRIDE_RESET_OVERRIDE )
     {
         // Restore previous flow and pressure values
         targetROPumpPressure.data = targetROPumpPressure.ovInitData;
@@ -804,7 +807,10 @@
  *************************************************************************/
 BOOL testROPumpTargetFlowOverride( MESSAGE_T *message )
 {
-    if ( targetROPumpFlowRate.override == OVERRIDE_RESET )
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    OVERRIDE_TYPE_T ovType = getOverridePayloadFromMessage( message, &payload );
+
+    if ( ovType == OVERRIDE_RESET_OVERRIDE )
     {
         // Restore previous flow and pressure values
         targetROPumpFlowRate.data = targetROPumpFlowRate.ovInitData;
@@ -845,7 +851,10 @@
  *************************************************************************/
 BOOL testROPumpTargetDutyCycleOverride( MESSAGE_T *message )
 {
-    if ( roPumpOpenLoopTargetDutyCycle.override == OVERRIDE_RESET )
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    OVERRIDE_TYPE_T ovType = getOverridePayloadFromMessage( message, &payload );
+
+    if ( ovType == OVERRIDE_RESET_OVERRIDE )
     {
         // Restore previous flow and pressure values
         roPumpOpenLoopTargetDutyCycle.data = roPumpOpenLoopTargetDutyCycle.ovInitData;