Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r32df017beb715408e7eb1d2097d12f0c83638427 -r3479c42f6bf13fb6c565cc48ba13936e1ec22be9
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 32df017beb715408e7eb1d2097d12f0c83638427)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 3479c42f6bf13fb6c565cc48ba13936e1ec22be9)
@@ -101,7 +101,7 @@
         0
     };
     initPreTxHeparinSetup();
-    //initDrySelfTests();
+    initDrySelfTests();
 }
 
 /*********************************************************************//**
@@ -230,7 +230,7 @@
             break;
 
         case TD_PRE_TREATMENT_SELF_TEST_DRY_STATE:
-            //transitionToDrySelfTests();
+            transitionToDrySelfTests();
             break;
 
         case TD_PRE_TREATMENT_PRIME_STATE:
@@ -308,28 +308,27 @@
     if ( TRUE == alarmActionResumeReceived )
     {
         alarmActionResumeReceived = FALSE;
-        //signalResumeDrySelfTests();
+        signalResumeDrySelfTests();
     }
-
-    //execDrySelfTests();
-
-    // Handle install request to failure path
+    execDrySelfTests();
     if ( TRUE == goToInstallStateRequested )
     {
         goToInstallStateRequested = FALSE;
         initTubeSetInstall();
         state = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
     }
-
-    //if ( DRY_SELF_TESTS_COMPLETE_STATE == getDrySelfTestsState() )
+    else if ( DRY_SELF_TESTS_COMPLETE_STATE == getDrySelfTestsState() )
     {
         if ( submodeCompleteTransitionTimeCounter++ >= SUBMODE_COMPLETE_UI_TRANSITION_TIME_COUNT )
         {
             submodeCompleteTransitionTimeCounter = 0;
             state = TD_PRE_TREATMENT_CONFIRM_RX_STATE;
-//            transitionToPrime();
         }
     }
+    else
+    {
+        submodeCompleteTransitionTimeCounter = 0;
+    }
 
     return state;
 }
@@ -592,7 +591,7 @@
         case ALARM_ACTION_RESUME:
             if ( TD_PRE_TREATMENT_SELF_TEST_DRY_STATE == currentPreTreatmentState )
             {
-               //signalResumeDrySelfTests();
+               signalResumeDrySelfTests();
             }
             else if ( TD_PRE_TREATMENT_RECIRCULATE_STATE == currentPreTreatmentState )
             {
@@ -608,20 +607,6 @@
             }
             break;
 
-//            if ( TD_PRE_TREATMENT_RECIRCULATE_STATE == currentPreTreatmentState )
-//            {
-//                signalResumePreTxRecirculate();
-//            }
-//            else if ( TD_PRE_TREATMENT_HEPARIN_SETUP_STATE == currentPreTreatmentState )
-//            {
-//                signalResumePreTxHeparinSetup();
-//            }
-//            else
-//            {
-//                // No action required.
-//            }
-//            break;
-
         case ALARM_ACTION_ACK:
             if ( ( TD_PRE_TREATMENT_HEPARIN_SETUP_STATE == currentPreTreatmentState ) &&
                  ( TRUE == isPreTxHeparinAwaitingSyringeLoadConfirmation() ) &&
@@ -658,7 +643,7 @@
 
         payload.mSubMode = (U32)currentPreTreatmentState;
         payload.mInstallState = (U32)getTubeSetInstallState();
-        //payload.mSelfTestDryState = getDrySelfTestsState();
+        payload.mSelfTestDryState = getDrySelfTestsState();
         payload.mPrimeState = 0;
         payload.mRecirculateState = getPreTxRecirculateState();
         payload.mConfirmRxState = 0;