Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -rcf0f5e54c1a7af4d8a739cbd677d899d95e4019b
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision cf0f5e54c1a7af4d8a739cbd677d899d95e4019b)
@@ -975,13 +975,20 @@
     {
         if ( TRUE == isSyringePlungerFound() )
         {
-            if ( TRUE == isSyringePumpPrimed() )
+            if ( TRUE == isSyringeVolumeAdequate() )
             {
-                state = DRY_SELF_TESTS_COMPLETE_STATE;
+                if ( TRUE == isSyringePumpPrimed() )
+                {
+                    state = DRY_SELF_TESTS_COMPLETE_STATE;
+                }
+                else
+                {
+                    primeSyringePump();
+                }
             }
             else
             {
-                primeSyringePump();
+                retractSyringePump();
             }
         }
         else