Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r3d72b777cf1ceb673d118341c46e2d6d5b7b75f5 -r596b96528f155bd9f663ed1773fdc80761fc7b31
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 3d72b777cf1ceb673d118341c46e2d6d5b7b75f5)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 596b96528f155bd9f663ed1773fdc80761fc7b31)
@@ -632,7 +632,7 @@
     selfTestStartTime = getMSTimerCount();
 
     // TODO: Use appropriate sensor driver
-    if ( STATE_CLOSED == getFPGADoorState() )
+    if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
     {
         state = NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
@@ -816,7 +816,7 @@
     selfTestStartTime = getMSTimerCount();
 
     // TODO: Use appropriate sensor driver
-    if ( STATE_CLOSED == getFPGADoorState() )
+    if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
     {
         state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );