Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -r101bf85b0b425e919b01b4b7fabcbd15fd5bbde5
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision de5a0d43bdef611d963d11855bc958a8d8899a09)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 101bf85b0b425e919b01b4b7fabcbd15fd5bbde5)
@@ -27,59 +27,61 @@
     static U32 start;
 #endif
 
-    /**
-     *  @addtogroup HDPreTreatmentMode
-     *  @{
-     */
+/**
+ *  @addtogroup HDPreTreatmentMode
+ *  @{
+ */
 
 // ********** private data **********
 
 // ********** private function prototypes **********
 
-/*************************************************************************
- * @brief initPreTreatmentMode
+/*********************************************************************//**
+ * @brief
  * The initPreTreatmentMode function initializes the Pre-Treatment Mode module.
  * @details
  * Inputs : none
  * Outputs : Pre-Treatment Mode module initialized.
- * @param none
  * @return none
 *************************************************************************/
 void initPreTreatmentMode( void )
 {
 }
 
-/*************************************************************************
- * @brief transitionToPreTreatmentMode
- * The transitionToPreTreatmentMode function prepares for transition to \n
+/*********************************************************************//**
+ * @brief
+ * The transitionToPreTreatmentMode function prepares for transition to
  * pre-treatment mode.
  * @details
  * Inputs : none
- * Outputs :
- * @param none
+ * Outputs : none
  * @return none
 *************************************************************************/
 void transitionToPreTreatmentMode( void )
 {
    // temporary test code.  TODO - remove later
 #ifndef UF_TEST_ENABLED
+#ifndef RUN_PUMPS_OPEN_LOOP
     setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-    setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
 #else
+    setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+    setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
 #endif
+    setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+#else
+#endif
 #ifdef RM46_EVAL_BOARD_TARGET
     start = getMSTimerCount();
 #endif
 }
 
-/*************************************************************************
- * @brief execPreTreatmentMode
+/*********************************************************************//**
+ * @brief
  * The execFaultMode function executes the Pre-Treatment Mode state machine.
  * @details
  * Inputs : none
- * Outputs :
- * @param none
+ * Outputs : none
  * @return current state (sub-mode)
 *************************************************************************/
 U32 execPreTreatmentMode( void )