Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r03bd494bf7b7c96f79cf9b8bd0f99432982b9571 -r5d9c5362b537331248dc592e05b6b016267eb6d3
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 03bd494bf7b7c96f79cf9b8bd0f99432982b9571)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 5d9c5362b537331248dc592e05b6b016267eb6d3)
@@ -115,7 +115,7 @@
 static U32 displacementStartTime;                                   ///< Dialysate displacement starting time.
 static F32 fmdIntegratedVolume;                                     ///< FMD integrated volume over displacement time.
 static F32 reservoirVolume[ NUM_OF_DG_RESERVOIRS ];                 ///< Hold the current volume of all reservoirs.
-static BOOL isValvesSettingSent;                                    ///< Flag indicates valve setting change has been send to DG.
+static BOOL isValvesSettingSent;                                    ///< Flag indicates valve setting change has been sent to DG.
 
 static U32 selfTestStartTime;                                       ///< Starting time of self-test (in ms).
 static U32 selfTestPreviousPublishDataTime;                         ///< Last time self-test time data is being published (in ms).
@@ -603,11 +603,11 @@
             currentWetSelfTestsState = handleWetSelfTestStartState();
             break;
 
-        case WET_SELF_TESTS_SETUP_STATE:
+        case WET_SELF_TESTS_BUBBLE_CHECK_SETUP_STATE:
             currentWetSelfTestsState = handleWetSelfTestSetupState();
             break;
 
-        case WET_SELF_TESTS_BUBBLES_STATE:
+        case WET_SELF_TESTS_BUBBLE_CHECK_STATE:
             currentWetSelfTestsState = handleWetSelfTestBubblesState();
             break;
 
@@ -1480,14 +1480,14 @@
         selfTestsResumeRequested = FALSE;
         doorClosedRequired( TRUE, TRUE );
 #ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
         {
-            state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+            state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
         }
         else
 #endif
         {
-            state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+            state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
         }
     }
 
@@ -1498,21 +1498,19 @@
  * @brief
  * The handleWetSelfTestStartState function handles setup state for wet
  * self-tests sub-mode.
- * @details Inputs: reservoir one weight
- * @details Outputs: setup valves and dialysate inlet pump
+ * @details Inputs: heparin bolus volume setting
+ * @details Outputs: setup valves
  * @return the next state of wet self-tests state machine
  *************************************************************************/
 static WET_SELF_TESTS_STATE_T handleWetSelfTestStartState( void )
 {
-    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_SETUP_STATE;
-    F32 resOneWeight             = getReservoirWeightLargeFilter( DG_RESERVOIR_1 );
+    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BUBBLE_CHECK_SETUP_STATE;
     F32 bolusVol                 = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
 
-    isValvesSettingSent = TRUE;
     setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
     setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-    fmdIntegratedVolume = 0.0F;
 
+    // if user set a Heparin bolus volume, request bolus to be initiated now
     if ( ( bolusVol > 0.0F ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
     {
         startHeparinBolus();            // moved here from startHeparinPump() in Dialysis.c
@@ -1529,15 +1527,15 @@
 
 /*********************************************************************//**
  * @brief
- * The handleWetSelfTestSetupState function setup reservoir one before
- * the start of wet self-tests.
- * @details Inputs: dialysate inlet flow rate
- * @details Outputs: stop dialysate inlet pump
+ * The handleWetSelfTestSetupState function setup for bubble self-test
+ * check.
+ * @details Inputs: none
+ * @details Outputs: bubble detector self-test requested
  * @return the next state of wet self-tests state machine
  *************************************************************************/
 static WET_SELF_TESTS_STATE_T handleWetSelfTestSetupState( void )
 {
-    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BUBBLES_STATE;
+    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BUBBLE_CHECK_STATE;
 
     selfTestBubble( ADV );
 
@@ -1560,7 +1558,7 @@
  *************************************************************************/
 static WET_SELF_TESTS_STATE_T handleWetSelfTestBubblesState( void )
 {
-    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BUBBLES_STATE;
+    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BUBBLE_CHECK_STATE;
 
     if ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADV ) )
     {
@@ -1675,9 +1673,9 @@
 
     if ( ( TRUE == isValvesSettingSent ) && ( TRUE == getDGCommandResponse( DG_CMD_VALVE_SETTING, &cmdResp ) ) )
     {
-        // Re-send command if DG rejects
         isValvesSettingSent = FALSE;
 
+        // Re-send command if DG rejects
         if ( DG_CMD_REQUEST_REJECT_REASON_NONE == cmdResp.rejectCode )
         {
             setDialInPumpTargetFlowRate( DIP_FLOW_RATE_FIRST_DISPLACEMENT_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
@@ -1707,15 +1705,7 @@
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_FIRST_DISPLACEMENT_STATE;
 
-    if ( ( TRUE == didTimeout( settleStartTime, RESERVOIR_SETTLE_TIME_MS ) ) && ( settleStartTime != 0 ) )
-    {
-        reservoirVolume[ DG_RESERVOIR_1 ] = getReservoirWeight( DG_RESERVOIR_1 );
-        reservoirVolume[ DG_RESERVOIR_2 ] = getReservoirWeight( DG_RESERVOIR_2 );
-        displacementStartTime             = getMSTimerCount();
-        fmdIntegratedVolume               = 0.0F;
-        settleStartTime                   = 0;
-    }
-
+    // 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.
@@ -1730,6 +1720,16 @@
         }
     }
 
+    // Wait for settle time, then initiate transfer test
+    if ( ( TRUE == didTimeout( settleStartTime, RESERVOIR_SETTLE_TIME_MS ) ) && ( settleStartTime != 0 ) )
+    {
+        reservoirVolume[ DG_RESERVOIR_1 ] = getReservoirWeight( DG_RESERVOIR_1 );
+        reservoirVolume[ DG_RESERVOIR_2 ] = getReservoirWeight( DG_RESERVOIR_2 );
+        displacementStartTime             = getMSTimerCount();
+        fmdIntegratedVolume               = 0.0F;
+        settleStartTime                   = 0;
+    }
+
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         state = WET_SELF_TESTS_STOPPED_STATE;
@@ -1818,9 +1818,9 @@
 
     if ( ( TRUE == isValvesSettingSent ) && ( TRUE == getDGCommandResponse( DG_CMD_VALVE_SETTING, &cmdResp ) ) )
     {
-        // Re-send command if DG rejects
         isValvesSettingSent = FALSE;
 
+        // Re-send command if DG rejects
         if ( DG_CMD_REQUEST_REJECT_REASON_NONE == cmdResp.rejectCode )
         {
             setDialInPumpTargetFlowRate( DIP_FLOW_RATE_SECOND_DISPLACEMENT_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
@@ -1954,7 +1954,7 @@
     {
         doorClosedRequired( TRUE, TRUE );
         selfTestsResumeRequested = FALSE;
-        state = WET_SELF_TESTS_START_STATE;
+        state = WET_SELF_TESTS_START_STATE;  // TODO - should start state make sure there is sufficient/appropriate res volumes to restart wet self-tests?  and if not, should it signal res mgmt to drain and fill R1 and R2 before resuming wet self-tests?
     }
 
     return state;