Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r1d07de4e970f54f2ae1786ef546cf5567df9ba8e -r5bebdd7e61c161919563a4e42f3c98c28f47c44c
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 1d07de4e970f54f2ae1786ef546cf5567df9ba8e)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 5bebdd7e61c161919563a4e42f3c98c28f47c44c)
@@ -190,6 +190,7 @@
         {
             if ( getSwitchStatus( PUMP_TRACK_SWITCH ) != STATE_CLOSED )
             {
+                clearAlarmCondition( ALARM_ID_HD_PRE_TREATMENT_WET_PRIME_TEST_FAILURE );                    // Spurious bubble alarms occur when the cartridge is disturbed (unlatched)
                 activateAlarmNoData( ALARM_ID_HD_PUMP_TRACK_LATCH_OPENED );
             }
         }
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r9353792f6dbd624a1d55cf1e87fa848e8fbaea71 -r5bebdd7e61c161919563a4e42f3c98c28f47c44c
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9353792f6dbd624a1d55cf1e87fa848e8fbaea71)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 5bebdd7e61c161919563a4e42f3c98c28f47c44c)
@@ -1684,7 +1684,7 @@
             state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
         }
     }
-    else
+    else if ( STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) )
     {
         activateAlarmNoData( ALARM_ID_HD_PRE_TREATMENT_WET_PRIME_TEST_FAILURE );
     }