Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -red94e224d840fc75f9d287f4f307356421c944f3 -r7da76d7131d824ab15f58857eeeedcf128e57391
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision ed94e224d840fc75f9d287f4f307356421c944f3)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 7da76d7131d824ab15f58857eeeedcf128e57391)
@@ -45,7 +45,10 @@
     // Initialize all the switches
     for ( i = 0; i < NUM_OF_DOORS_AND_CAPS; i++ )
     {
-        switchStatus[ i ].data = (U32)STATE_CLOSED;
+        switchStatus[ i ].data       = (U32)STATE_CLOSED;
+        switchStatus[ i ].ovData     = (U32)STATE_CLOSED;
+        switchStatus[ i ].ovInitData = (U32)STATE_CLOSED;
+        switchStatus[ i ].override   = OVERRIDE_RESET;
     }
 }
 
@@ -215,8 +218,8 @@
         if ( isTestingActivated() )
         {
             result = TRUE;
-            switchStatus[ switchId ].ovData     = status;
-            switchStatus[ switchId ].override   = OVERRIDE_KEY;
+            switchStatus[ switchId ].ovData   = status;
+            switchStatus[ switchId ].override = OVERRIDE_KEY;
         }
     }