Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r937362196a40d7d55b1b61e33f88c382184fbf2f -r574a47cfa361cb857293bfe86cfc8ccb6b4c4c26
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 937362196a40d7d55b1b61e33f88c382184fbf2f)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 574a47cfa361cb857293bfe86cfc8ccb6b4c4c26)
@@ -632,16 +632,36 @@
 BOOL testBCValveStatesOverride( MESSAGE_T *message )
 {
     DD_BC_VALVE_OVERRIDE_PAYLOAD_T payload;
-    DD_VALVES_T valve;
-    BOOL result = FALSE;
+    DD_VALVES_T valve           = FIRST_BC_VALVE;
+    OVERRIDE_TYPE_T ovType      = OVERRIDE_INVALID;
+    U32 mask                    = 0;
+    VALVE_STATE_NAMES_T pos     = VALVE_STATE_OPEN;
+    BOOL result                 = FALSE;
 
     memcpy( (U08*)(&payload), message->payload, sizeof( DD_BC_VALVE_OVERRIDE_PAYLOAD_T ) );
-    for ( valve = FIRST_BC_VALVE; valve <= LAST_BC_VALVE; valve++ )
+    ovType = ( TRUE == payload.reset ? OVERRIDE_RESET_OVERRIDE : OVERRIDE_OVERRIDE );
+
+    // Verify tester has logged in with f/w and override type is valid
+    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
     {
-        U32                 mask = 0x1 << (valve - FIRST_BC_VALVE);
-        VALVE_STATE_NAMES_T pos  = ( ( ( payload.valveStatesBits & mask ) != 0 ) ? VALVE_STATE_OPEN : VALVE_STATE_CLOSED );
+        for ( valve = FIRST_BC_VALVE; valve <= LAST_BC_VALVE; valve++ )
+        {
+            mask = ( 0x1 << (valve - FIRST_BC_VALVE) );
+            pos  = ( ( ( payload.valveStatesBits & mask ) != 0 ) ? VALVE_STATE_CLOSED : VALVE_STATE_OPEN);
 
-        result = setValveState( valve, pos );
+            if ( OVERRIDE_OVERRIDE == ovType )
+            {
+               result = TRUE;
+               valveStates[ valve ].ovData = pos;
+               valveStates[ valve ].override = OVERRIDE_KEY;
+            }
+            else
+            {
+               result = TRUE;
+               valveStates[ valve ].override = OVERRIDE_RESET;
+               valveStates[ valve ].ovData = valveStates[ valve ].ovInitData;
+            }
+        }
     }
 
     return result;