Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r975a29bff552a9e657364bd36b11c4d491cf7fae -rbcabc6be0c3b6cc916d1c7f9b0983082834870ca
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 975a29bff552a9e657364bd36b11c4d491cf7fae)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision bcabc6be0c3b6cc916d1c7f9b0983082834870ca)
@@ -34,7 +34,7 @@
 
 #define AIR_TRAP_DATA_PUB_INTERVAL          ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )      ///< interval (ms/task time) at which the air trap data is published on the CAN bus.
 #define AIR_TRAP_ILLEGAL_LEVELS_PERSISTENCE ( MS_PER_SECOND * 2 / TASK_PRIORITY_INTERVAL )  ///< persistence period for illegal level sensors fault.
-#define VENOUS_LINE_VOLUME_ML               ( 50.0 )                                        ///< TODO volume (in mL) of venous portion of blood circuit line.
+#define VENOUS_LINE_VOLUME_ML               ( 200.0 )                                       ///< TODO volume (in mL) of venous portion of blood circuit line.
 
 /// Defined states for the air trap controller state machine.
 typedef enum AirTrap_States
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r37a8a58b766a496b39241dd7ae46dc10dbda35e4 -rbcabc6be0c3b6cc916d1c7f9b0983082834870ca
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 37a8a58b766a496b39241dd7ae46dc10dbda35e4)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision bcabc6be0c3b6cc916d1c7f9b0983082834870ca)
@@ -87,7 +87,7 @@
 
     // TODO - send POST status on CAN
 
-    // execute current POST state
+    // execute current POST state     *Note - these switch cases must be in same order as enum HD_POST_States
     switch ( postState )
     {
         case POST_STATE_START:
@@ -96,13 +96,17 @@
             postState = POST_STATE_COMPLETED;
 #endif
 #ifdef SKIP_POST
+#ifndef DISABLE_UI_TREATMENT_WORKFLOW
+            postState = POST_STATE_VALVES;
+#else
             postState = POST_STATE_COMPLETED;
 #endif
+#endif
             break;
 
         case POST_STATE_WATCHDOG:
             testStatus = execWatchdogTest();
-            postState = handlePOSTStatus( testStatus );  // ignoring return value because last test
+            postState = handlePOSTStatus( testStatus );
             break;
 
         case POST_STATE_ALARM_LAMP:
@@ -152,7 +156,7 @@
         // Should be last POST
         case POST_STATE_STUCK_BUTTON:
             testStatus = execStuckButtonTest();
-            handlePOSTStatus( testStatus );
+            handlePOSTStatus( testStatus );  // ignoring return value because last test
 
             if ( TRUE == tempPOSTPassed )
             {
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r37a8a58b766a496b39241dd7ae46dc10dbda35e4 -rbcabc6be0c3b6cc916d1c7f9b0983082834870ca
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 37a8a58b766a496b39241dd7ae46dc10dbda35e4)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision bcabc6be0c3b6cc916d1c7f9b0983082834870ca)
@@ -63,18 +63,6 @@
 {
     treatStartReqReceived = FALSE;
 
-    // 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 );
-#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
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r37a8a58b766a496b39241dd7ae46dc10dbda35e4 -rbcabc6be0c3b6cc916d1c7f9b0983082834870ca
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 37a8a58b766a496b39241dd7ae46dc10dbda35e4)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision bcabc6be0c3b6cc916d1c7f9b0983082834870ca)
@@ -214,10 +214,6 @@
             homeBloodPump();
             homeDialInPump();
             homeDialOutPump();
-            homeValve( VDI );
-            homeValve( VDO );
-            homeValve( VBA );
-            homeValve( VBV );
 #ifdef EMC_TEST_BUILD
             startAirTrapControl();
 #endif