Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r37a8a58b766a496b39241dd7ae46dc10dbda35e4 -rfd12aa494e60cc32852a32d1c3aa2b49eb013fdf
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 37a8a58b766a496b39241dd7ae46dc10dbda35e4)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision fd12aa494e60cc32852a32d1c3aa2b49eb013fdf)
@@ -669,6 +669,16 @@
 {
     VALVE_STATE_T state = VALVE_STATE_IDLE;
 
+#ifdef TST_3WAY_VALVES_ALWAYS_OPEN
+    static BOOL valvesOpenedForSarina[NUM_OF_VALVES] = { FALSE, FALSE, FALSE, FALSE };
+
+    if ( FALSE == valvesOpenedForSarina[ valve ] )
+    {
+        valvesOpenedForSarina[ valve ] = TRUE;
+        setValvePosition( valve, VALVE_POSITION_B_OPEN );
+    }
+#endif
+
     if ( valvesStatus[ valve ].hasHomingBeenRequested )
     {
         state = VALVE_STATE_HOMING_NOT_STARTED;
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r975a29bff552a9e657364bd36b11c4d491cf7fae -rfd12aa494e60cc32852a32d1c3aa2b49eb013fdf
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 975a29bff552a9e657364bd36b11c4d491cf7fae)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision fd12aa494e60cc32852a32d1c3aa2b49eb013fdf)
@@ -25,30 +25,31 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        4
 #define HD_VERSION_MICRO        5
-#define HD_VERSION_BUILD        8
+#define HD_VERSION_BUILD        0
 
 // ********** development build switches **********
 
 #ifndef _RELEASE_
 #define UF_TEST_ENABLED                     1           // ultrafiltration test build (hard codes treatment params, re-purposes off/stop buttons)
 #define UF_TEST_WITH_DG                     1           // ultrafiltration test build (sets up DG in standby mode)
 #ifndef _VECTORCAST_
-//    #define DISABLE_UI_TREATMENT_WORKFLOW   1           // disable UI treatment workflow
+    #define DISABLE_UI_TREATMENT_WORKFLOW   1           // disable UI treatment workflow
 //    #define RM46_EVAL_BOARD_TARGET          1           // limited build runs on RM46 eval board
 //    #define BREADBOARD_TARGET               1           // old breadboard system build - no longer used?
 //    #define SIMULATE_UI                     1           // build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes alarm lamp pins for task timing
     #define SKIP_POST                       1           // skip POST tests - all pass
 //    #define LIMITED_NVDATA_CRC_CHECKS       1           // only perform POST CRC checks on nv-data records that are implemented so far
     #define DISABLE_3WAY_VALVES             1           // disable 3-way valves
+    #define TST_3WAY_VALVES_ALWAYS_OPEN     1           // after POST and homing, open all 4 valves
     #define DISABLE_ACCELS                  1           // disable accelerometer POST and monitoring
     #define DISABLE_CRC_ERROR               1           // do not error on bad CRC for CAN messages
     #define DISABLE_ACK_ERRORS              1           // do not error on failure of other node(s) to ACK a message
-    #define DISABLE_MOTOR_CURRENT_CHECKS    1           // do not error on HD pump current checks
-    #define DISABLE_PUMP_FLOW_CHECKS        1           // do not error on HD pump flow checks
-    #define DISABLE_PUMP_SPEED_CHECKS       1           // do not error on HD pump speed checks
-    #define DISABLE_PUMP_DIRECTION_CHECKS   1           // do not error on HD pump direction checks
-    #define DISABLE_PRESSURE_CHECKS         1           // do not error on HD pressure checks
+//    #define DISABLE_MOTOR_CURRENT_CHECKS    1           // do not error on HD pump current checks
+//    #define DISABLE_PUMP_FLOW_CHECKS        1           // do not error on HD pump flow checks
+//    #define DISABLE_PUMP_SPEED_CHECKS       1           // do not error on HD pump speed checks
+//    #define DISABLE_PUMP_DIRECTION_CHECKS   1           // do not error on HD pump direction checks
+//    #define DISABLE_PRESSURE_CHECKS         1           // do not error on HD pressure checks
     #define DISABLE_UF_ALARMS               1           // do not error on HD ultrafiltration checks
 //    #define RUN_PUMPS_OPEN_LOOP             1           // BP and DPi pumps will be run open loop (no flow sensor feedback)
 //    #define RAW_FLOW_SENSOR_DATA            1           // test build will not filter flow sensor data
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rbcabc6be0c3b6cc916d1c7f9b0983082834870ca -rfd12aa494e60cc32852a32d1c3aa2b49eb013fdf
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision bcabc6be0c3b6cc916d1c7f9b0983082834870ca)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision fd12aa494e60cc32852a32d1c3aa2b49eb013fdf)
@@ -100,6 +100,7 @@
             postState = POST_STATE_VALVES;
 #else
             postState = POST_STATE_COMPLETED;
+            postState = POST_STATE_VALVES;
 #endif
 #endif
             break;
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rbcabc6be0c3b6cc916d1c7f9b0983082834870ca -rfd12aa494e60cc32852a32d1c3aa2b49eb013fdf
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision bcabc6be0c3b6cc916d1c7f9b0983082834870ca)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision fd12aa494e60cc32852a32d1c3aa2b49eb013fdf)
@@ -112,9 +112,9 @@
             // temporary test code - TODO - remove later
             if ( TRUE == isDGCommunicating() )
             {
-                //homeBloodPump();
-                //homeDialInPump();
-                //homeDialOutPump();
+                homeBloodPump();
+                homeDialInPump();
+                homeDialOutPump();
                 cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
                 cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
                 cmdStartDG();
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -raf2674758d7b9dbe05e348b318845975b423509f -rfd12aa494e60cc32852a32d1c3aa2b49eb013fdf
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision af2674758d7b9dbe05e348b318845975b423509f)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision fd12aa494e60cc32852a32d1c3aa2b49eb013fdf)
@@ -28,6 +28,7 @@
 #include "SystemCommMessages.h"
 #include "Timers.h"
 #include "TreatmentStop.h"
+#include "Valves.h"
 #include "ModeTreatment.h"
 #ifdef RM46_EVAL_BOARD_TARGET
     #include "Timers.h"