Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -raa0c1b0150e1eeb2ff5f7cac8715ecacb6aca119
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision aa0c1b0150e1eeb2ff5f7cac8715ecacb6aca119)
@@ -147,6 +147,10 @@
             homeDialInPump();
             homeDialOutPump();
 #ifdef EMC_TEST_BUILD
+            setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
             startAirTrapControl();
 #endif
             break;
@@ -160,44 +164,43 @@
             // TODO - test code
             if ( TRUE == stop )
             {
+#ifndef EMC_TEST_BUILD
                 treatStartReqReceived = FALSE;
                 setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
                 setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
                 setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
                 setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
                 requestNewOperationMode( MODE_TPAR );
-#ifdef EMC_TEST_BUILD
+#else
                 if ( stop != button_state )
                 {
                     toggle = INC_WRAP( toggle, 0, 3 );
                     switch ( toggle )
                     {
                         case 0: // Pumps and valves off
+                            setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
                             setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
                             setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
                             setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
                             setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
                             break;
 
-                        case 1: // Pumps on, valves off
-                            setBloodPumpTargetFlowRate( 200, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                        case 1: // Pumps off, valves in pos A
+                            setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
+                            setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );
+                            setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
+                            setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
+                            break;
+
+                        case 2: // Pumps on, valves in pos A
+                            setBloodPumpTargetFlowRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
                             setDialInPumpTargetFlowRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
                             setDialOutPumpTargetRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
                             break;
 
-                        case 2: // Pumps on, valves on
-                            setValvePosition( VDI, VALVE_POSITION_B_OPEN );
-                            setValvePosition( VDO, VALVE_POSITION_B_OPEN );
-                            setValvePosition( VBA, VALVE_POSITION_B_OPEN );
-                            setValvePosition( VBV, VALVE_POSITION_B_OPEN );
-                            break;
 
-                        case 3: // Pumps off, valves on
-                            setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            break;
-
                         default: // Should not get here, reset if we do
                             toggle = 0;
                             setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );