Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rf4f7e0ee3baef51d91de64d44a0a00ff967f56c0 -rf9c0896317f27b4fe62fc51c3938b242a40d69ce
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision f4f7e0ee3baef51d91de64d44a0a00ff967f56c0)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision f9c0896317f27b4fe62fc51c3938b242a40d69ce)
@@ -861,13 +861,14 @@
              ( FALSE == isValveCloseToCommandedPosition( valve, valvesStatus[ valve ].pendingCommandedPosition ) ) )
         {
             // Just set the valves to transition so it will not be in a known position for a while
-            valvesStatus[ valve ].commandedPosition          = valvesStatus[ valve ].pendingCommandedPosition;
-            valvesStatus[ valve ].transitionStartTime        = getMSTimerCount();
-            valvesStatus[ valve ].hasTransitionBeenRequested = FALSE;
+            valvesStatus[ valve ].commandedPosition   = valvesStatus[ valve ].pendingCommandedPosition;
+            valvesStatus[ valve ].transitionStartTime = getMSTimerCount();
+
             setValveNextStep( valve, TRANSITION_STEP_CHANGE_IN_COUNTS );
 
             state = VALVE_STATE_IN_TRANSITION;
         }
+        valvesStatus[ valve ].hasTransitionBeenRequested = FALSE;
     }
 // This option is only available in a debug build
 #ifdef DEBUG_ENABLED
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rf53ecc014c076fc476e7963b67d688b7233579ee -rf9c0896317f27b4fe62fc51c3938b242a40d69ce
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f53ecc014c076fc476e7963b67d688b7233579ee)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f9c0896317f27b4fe62fc51c3938b242a40d69ce)
@@ -7,8 +7,8 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      09-May-2023
+* @author  (last)      Sean Nash
+* @date    (last)      15-May-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -1484,7 +1484,7 @@
 
     if ( TRUE == didTimeout( syringeOcclusionDelayStartTime, SYRINGE_PUMP_OCCLUSION_CHECK_DELAY ) )
     {
-        if ( FALSE == checkForSyringeOcclusion() )  // transition to complete state only when occlusion is removed
+        if ( FALSE == checkForSyringeOcclusion( FALSE ) )  // transition to complete state only when occlusion is removed
         {
             state = DRY_SELF_TESTS_COMPLETE_STATE;
         }