Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r51f42cd88bd9c50ed9096a2d1d8ff859a95aff95 -ra5560a2917aa62bcafd8e6a81041ace723237109
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 51f42cd88bd9c50ed9096a2d1d8ff859a95aff95)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision a5560a2917aa62bcafd8e6a81041ace723237109)
@@ -177,8 +177,8 @@
 {
 //    PRESSURE_LIMIT_CHANGE_RESPONSE_T respRecord;
 
-    // don't re-initialize treatment if tester is returning to treatment mode from a fault
-    if ( getPreviousOperationMode() != MODE_FAUL )
+    // don't re-initialize treatment if tester is jumping to Tx mode
+//    if ( getPreviousOperationMode() != MODE_PRET )
     {
         // Initialize treatment mode each time we transition to it
         initTreatmentMode();
@@ -196,8 +196,10 @@
 
     setCurrentSubState( NO_SUB_STATE );
 
+#ifndef TEST_UI_ONLY
     // Enable venous bubble detection in treatment mode
     setVenousBubbleDetectionEnabled( H18_BBLD, TRUE );
+#endif
 
     // Set treatment parameters
     presTreatmentTimeSecs = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) * SEC_PER_MIN;
@@ -475,10 +477,19 @@
  *************************************************************************/
 static TREATMENT_STATE_T handleTreatmentStartState( void )
 {
+#ifndef TEST_UI_ONLY
     TREATMENT_STATE_T result = TREATMENT_BLOOD_PRIME_STATE;
+#else
+    TREATMENT_STATE_T result = TREATMENT_DIALYSIS_STATE;
+#endif
 
     lastTreatmentTimeStamp = getMSTimerCount();
-//    transitionToBloodPrime();
+#ifndef TEST_UI_ONLY
+    transitionToBloodPrime();
+#else
+    setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
+    transitionToDialysis();
+#endif
 
     return result;
 }
@@ -828,10 +839,12 @@
         payload.treatmentSubMode = (U32)currentTreatmentState;
         payload.bldPrimeState = 0; // getCurrentBloodPrimeState();
         payload.dialysisState = getDialysisState();
-        payload.txStopState = 0; // getCurrentTreatmentStopState();
+        payload.txStopState = getCurrentTreatmentPausedState();
         payload.rinsebackState = 0; // getCurrentRinsebackState();
         payload.txRecircState = 0; // getCurrentTreatmentRecircState();
         payload.txEndState = 0; // getCurrentTreatmentEndState();
+        payload.txSalBolusState = 0; //
+        payload.txHepState = 0; //
 
         sendMessage( MSG_ID_TD_TREATMENT_STATE_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)(&payload), sizeof( TREATMENT_STATE_DATA_T ) );
     }