Index: firmware/App/Modes/ModeOpParams.c
===================================================================
diff -u -ra74a984a7059f75d86ad87d6d9499bd8f94cc976 -r57ee0134869672b53ab5b7146b8988ede8f828d6
--- firmware/App/Modes/ModeOpParams.c	(.../ModeOpParams.c)	(revision a74a984a7059f75d86ad87d6d9499bd8f94cc976)
+++ firmware/App/Modes/ModeOpParams.c	(.../ModeOpParams.c)	(revision 57ee0134869672b53ab5b7146b8988ede8f828d6)
@@ -56,10 +56,13 @@
  *************************************************************************/
 void transitionToOpParamsMode( void )
 {
-    // temporary test code - alarm lamp fault
+    // temporary test code.  TODO - remove later
+#ifndef UF_TEST_ENABLED
     setBloodPumpTargetFlowRate( 300, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
     setDialInPumpTargetFlowRate( 300, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
     setDialOutPumpTargetRate( 325, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+#else
+#endif
 #ifdef RM46_EVAL_BOARD_TARGET
     start = getMSTimerCount();
 #endif
@@ -78,7 +81,9 @@
 {
     BOOL stop = isStopButtonPressed();
 
+#ifndef UF_TEST_ENABLED
     if ( TRUE == stop )
+#endif
     {
         requestNewOperationMode( MODE_PRET );
     }