Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rbc8403b288e167f51c9e991c2a07bb455c77c19a -rc7f14267973d4c9731fa0dc42607eeea23722b13
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision bc8403b288e167f51c9e991c2a07bb455c77c19a)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision c7f14267973d4c9731fa0dc42607eeea23722b13)
@@ -61,6 +61,9 @@
 {
     currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE;
 
+    initPrime();
+    initSelfTests();
+
     resetSignalFlags();
 }
 
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r30b1f6126c37f7b99cf699f63b4bcee9d1a1745f -rc7f14267973d4c9731fa0dc42607eeea23722b13
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 30b1f6126c37f7b99cf699f63b4bcee9d1a1745f)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision c7f14267973d4c9731fa0dc42607eeea23722b13)
@@ -796,7 +796,7 @@
     BOOL const isADADetectedAir = getFPGAArterialAirBubbleStatus();
     BOOL const isADVDetectedAir = getFPGAVenousAirBubbleStatus();
 
-    if ( ( TRUE == isADADetectedAir ) && ( TRUE == isADADetectedAir ) )
+    if ( ( TRUE == isADADetectedAir ) && ( TRUE == isADVDetectedAir ) )
     {
         state = DRY_SELF_TESTS_AIR_TRAP_STATE;
     }
@@ -1051,7 +1051,7 @@
     BOOL const isADADetectedAir = getFPGAArterialAirBubbleStatus();
     BOOL const isADVDetectedAir = getFPGAVenousAirBubbleStatus();
 
-    if ( ( FALSE == isADADetectedAir ) && ( FALSE == isADADetectedAir ) )
+    if ( ( FALSE == isADADetectedAir ) && ( FALSE == isADVDetectedAir ) )
     {
         settleStartTime = getMSTimerCount();
         currentWetSelfTestsState = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;