Index: firmware/App/Drivers/BubbleDetector.c
===================================================================
diff -u -r0c8ae7b952186d912c77d8c2cfb7dad809fa5225 -r3a8cf075eb6f0d255f516ac26bac7fbaacfde14a
--- firmware/App/Drivers/BubbleDetector.c	(.../BubbleDetector.c)	(revision 0c8ae7b952186d912c77d8c2cfb7dad809fa5225)
+++ firmware/App/Drivers/BubbleDetector.c	(.../BubbleDetector.c)	(revision 3a8cf075eb6f0d255f516ac26bac7fbaacfde14a)
@@ -115,38 +115,8 @@
  *************************************************************************/
 BOOL testBubbleDetectOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
+    BOOL result = u32ArrayOverride( message, &currentBubbleState[0], NUM_OF_BUBBLE_DETECTORS - 1, 0, NUM_OF_BUBBLE_DETECTION_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 sensor = override.index;
-
-        // Verify bubble detector index of override
-        if ( sensor < NUM_OF_BUBBLE_DETECTORS )
-        {
-            if ( OVERRIDE_OVERRIDE == ovType )
-            {
-                U32 value = override.state.u32;
-
-                if ( value < NUM_OF_BUBBLE_DETECTION_STATES )
-                {
-                    result = TRUE;
-                    currentBubbleState[ sensor ].ovData = value;
-                    currentBubbleState[ sensor ].override = OVERRIDE_KEY;
-                }
-            }
-            else
-            {
-                result = TRUE;
-                currentBubbleState[ sensor ].override = OVERRIDE_RESET;
-                currentBubbleState[ sensor ].ovData = currentBubbleState[ sensor ].ovInitData;
-            }
-        }
-    }
-
     return result;
 }