Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -ree84e20f729b0aace2b1728c16de9a89e06eee38 -r25aeff9e9994d2e7aab3b4e6171c56fdac6a01fe
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ee84e20f729b0aace2b1728c16de9a89e06eee38)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 25aeff9e9994d2e7aab3b4e6171c56fdac6a01fe)
@@ -22,6 +22,7 @@
 #include "DDInterface.h"
 #include "ModePreTreat.h"
 #include "OperationModes.h"
+#include "Prime.h"
 #include "StatePreTxRecirculate.h"
 #include "SyringePump.h"
 #include "Timers.h"
@@ -83,13 +84,13 @@
 {
     initPreTreatmentMode();
     initTubeSetInstall();
+    initPrime();
 
     // TODO: remove after implementing blood pump homing in some state
     homeBloodPump();
 
-    // TODO: remove these homeValve() when SELF_TEST_NO_CART_STATE is implemented (homing valves is handled over there).
-    homeValve(H1_VALV, FALSE, FALSE);
-    homeValve(H19_VALV, FALSE, FALSE);
+    setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
 
     return (U32)currentPreTreatmentState;
 }
@@ -266,6 +267,8 @@
 
     if ( PRIME_COMPLETE_STATE == getCurrentPrimeState() )
     {
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_PRIME_COMPLETE, (U32)getCurrentPrimeState() );
+        transitionToPreTxRecirculate();
         state = TD_PRE_TREATMENT_RECIRCULATE_STATE;
     }