Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rceeba51c01b896855eb03ab81281a2b0f48c75d2 -r2f4f66fcceb986cc592693b08f1b57767cb1c515
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ceeba51c01b896855eb03ab81281a2b0f48c75d2)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 2f4f66fcceb986cc592693b08f1b57767cb1c515)
@@ -75,8 +75,10 @@
 #define WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML  600.0F                                  ///< Target of second displacement volume in ml.
 #define WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE       0.10F                                   ///< Tolerance on integrated volume as a percentage (10%).
 #define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           20.0F                                   ///< Tolerance on integrated volume in grams.
+#define WET_SELF_TEST_INTEGRATED_VOLUME_WIDER_TOLERANCE     100.0F                                  ///< Wider tolerance on integrated volume in grams, during debug.
 #define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              20.0F                                   ///< Tolerance in the load cell readings of the displacement in grams.
-#define WET_SELF_TEST_DISPLACEMENT_TIME_MS                  ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms.
+#define WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS            ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms (first).
+#define WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS           ( 30 * MS_PER_SECOND )                  ///< Time to displace dialysate in wet self-test in ms (second).
 #define RESERVOIR_SETTLE_TIME_MS                            ( 5 *  MS_PER_SECOND )                  ///< Time allotted for reservoir to settle in ms.
 
 #define MAX_NO_CARTRIDGE_SELF_TEST_TIME                     30                                      ///< Maximum no cartridge self-test time (in seconds).
@@ -592,7 +594,8 @@
     WET_SELF_TESTS_STATE_T priorSubState = currentWetSelfTestsState;
 
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) == SW_CONFIG_ENABLE_VALUE )
+    if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) ||
+         ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) )
     {
         currentWetSelfTestsState = WET_SELF_TESTS_COMPLETE_STATE;
     }
@@ -924,6 +927,13 @@
             else
 #endif
             {
+#ifndef _RELEASE_
+                if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )  // Allow res 1&2 fills now if air pump not disabled
+#endif
+                {
+                    signalAllowDGFillRes1();
+                    signalAllowDGFillRes2();
+                }
                 state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
             }
         }
@@ -1043,7 +1053,7 @@
     else
     {
 #ifndef _RELEASE_
-        if ( SW_CONFIG_DISABLE_VALUE != getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
         {
 
             // Wait for reservoirs to drain before starting this test
@@ -1445,7 +1455,14 @@
                 {
                     state = DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE;
                     syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 3 seconds has elapsed
-                    signalActionToResumeFill();
+#ifndef _RELEASE_
+                    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )  // if no air pump, now we can allow fills to start
+                    {
+                        signalAllowDGFlushFills();
+                        signalAllowDGFillRes1();
+                        signalAllowDGFillRes2();
+                    }
+#endif
                 }
                 else
                 {
@@ -1467,7 +1484,14 @@
     }
     else
     {
-        signalActionToResumeFill();
+#ifndef _RELEASE_
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )  // if no air pump, now we can allow fills to start
+        {
+            signalAllowDGFlushFills();
+            signalAllowDGFillRes1();
+            signalAllowDGFillRes2();
+        }
+#endif
         state = DRY_SELF_TESTS_COMPLETE_STATE;
     }
 
@@ -1763,13 +1787,11 @@
     // Once we've settled (5 sec), integrate flow to volume over duration of fluid transfer
     if ( 0 == settleStartTime )
     {
-        // This is not a volume for now and it is a flow rate.
-        fmdIntegratedVolume += getMeasuredDialInFlowRate();
+        fmdIntegratedVolume += ( getMeasuredDialInFlowRate() / (F32)( ( SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) );
 
-        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_DISPLACEMENT_TIME_MS ) )
+        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
-            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_DISPLACEMENT_TIME_MS ) );
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE;
         }
@@ -1815,7 +1837,7 @@
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_WET_SELF_TEST_WIDER_VOLUME_TOL ) )
     {
-        integrateVolumeToleranceG = 50.0F;
+        integrateVolumeToleranceG = WET_SELF_TEST_INTEGRATED_VOLUME_WIDER_TOLERANCE;
     }
 #endif
 
@@ -1916,12 +1938,11 @@
 
     if ( 0 == settleStartTime )
     {
-        fmdIntegratedVolume += getMeasuredDialInFlowRate();
+        fmdIntegratedVolume += ( getMeasuredDialInFlowRate() / (F32)( ( SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) );
 
-        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_DISPLACEMENT_TIME_MS ) )
+        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
-            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_DISPLACEMENT_TIME_MS ) );
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE;
         }
@@ -1957,7 +1978,7 @@
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_WET_SELF_TEST_WIDER_VOLUME_TOL ) )
     {
-        integrateVolumeToleranceG = 50.0F;
+        integrateVolumeToleranceG = WET_SELF_TEST_INTEGRATED_VOLUME_WIDER_TOLERANCE;
     }
 #endif