Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rf7c714a1a09b10d85a8b013712532d37b4d7b97a -re7fe0454b5b2d39009dc784dc8c156856df8bc86
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision f7c714a1a09b10d85a8b013712532d37b4d7b97a)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision e7fe0454b5b2d39009dc784dc8c156856df8bc86)
@@ -449,29 +449,8 @@
  *************************************************************************/
 BOOL testValvesStatesPublishIntervalOverride( MESSAGE_T *message )
 {
-    BOOL                    result = FALSE;
-    TEST_OVERRIDE_PAYLOAD_T override;
-    OVERRIDE_TYPE_T         ovType = getOverridePayloadFromMessage( message, &override );
+    BOOL result = u32BroadcastIntervalOverride( message, &valvesStatesPublishInterval, TASK_PRIORITY_INTERVAL );
 
-    // Verify tester has logged in with TD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    {
-        if ( OVERRIDE_OVERRIDE == ovType )
-        {
-            U32 intvl = override.state.u32 / TASK_PRIORITY_INTERVAL;
-
-            result = TRUE;
-            valvesStatesPublishInterval.ovData      = intvl;
-            valvesStatesPublishInterval.override    = OVERRIDE_KEY;
-        }
-        else
-        {
-            result = TRUE;
-            valvesStatesPublishInterval.override    = OVERRIDE_RESET;
-            valvesStatesPublishInterval.ovData      = valvesStatesPublishInterval.ovInitData;
-        }
-    }
-
     return result;
 }
 
@@ -487,35 +466,8 @@
  *************************************************************************/
 BOOL testValveStateOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
+    BOOL result = u32ArrayOverride( message, &valveStates[0], NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 );
 
-    // Verify tester has logged in with TD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    {
-        U32 valveID = override.index;
-
-        // Verify bubble detector index of override
-        if ( valveID < NUM_OF_VALVES )
-        {
-            if ( OVERRIDE_OVERRIDE == ovType )
-            {
-                U32 value = override.state.u32;
-
-                valveStates[ valveID ].ovData   = value;
-                valveStates[ valveID ].override = OVERRIDE_KEY;
-                result                          = TRUE;
-            }
-            else
-            {
-                valveStates[ valveID ].override = OVERRIDE_RESET;
-                valveStates[ valveID ].ovData   = valveStates[ valveID ].ovInitData;
-                result                          = TRUE;
-            }
-        }
-    }
-
     return result;
 }
 
@@ -531,35 +483,8 @@
  *************************************************************************/
 BOOL testValveSensedStateOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
+    BOOL result = u32ArrayOverride( message, &valveSensedStates[0], NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 );
 
-    // Verify tester has logged in with TD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    {
-        U32 valveID = override.index;
-
-        // Verify bubble detector index of override
-        if ( valveID < NUM_OF_VALVES )
-        {
-            if ( OVERRIDE_OVERRIDE == ovType )
-            {
-                U32 value = override.state.u32;
-
-                valveSensedStates[ valveID ].ovData     = value;
-                valveSensedStates[ valveID ].override   = OVERRIDE_KEY;
-                result                                  = TRUE;
-            }
-            else
-            {
-                valveSensedStates[ valveID ].override   = OVERRIDE_RESET;
-                valveSensedStates[ valveID ].ovData     = valveStates[ valveID ].ovInitData;
-                result                                  = TRUE;
-            }
-        }
-    }
-
     return result;
 }