Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r6a6c064bdab77b9b42d25910d94da55812d00ffa -r38e9e1791f490f7a95b7a7040973a6761f7603ff
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 6a6c064bdab77b9b42d25910d94da55812d00ffa)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 38e9e1791f490f7a95b7a7040973a6761f7603ff)
@@ -1002,6 +1002,7 @@
 F32 getLoadCellWeightInGrams( U32 loadCellID )
 {
     F32 result = 0.0;
+
     if ( loadCellID <= NUM_OF_LOAD_CELLS - 1 )
     {
         if ( OVERRIDE_KEY == loadCellWeightInGrams[ loadCellID ].override )
@@ -1017,6 +1018,7 @@
     {
         activateAlarmNoData( ALARM_ID_SOFTWARE_FAULT );
     }
+
     return result;
 }
 
@@ -1031,10 +1033,12 @@
 F32 getTotalTargetDialOutUFVolumeInMl( void )
 {
     F32 result = referenceUFVolumeInMl.data;
+
     if ( OVERRIDE_KEY == referenceUFVolumeInMl.override )
     {
         result = referenceUFVolumeInMl.ovData;
     }
+
     return result;
 }
 
@@ -1049,10 +1053,12 @@
 F32 getTotalMeasuredUFVolumeInMl( void )
 {
     F32 result = totalMeasuredUFVolumeInMl.data;
+
     if ( OVERRIDE_KEY == totalMeasuredUFVolumeInMl.override )
     {
         result = totalMeasuredUFVolumeInMl.ovData;
     }
+
     return result;
 }
 
@@ -1068,10 +1074,12 @@
 F32 getMeasuredDialOutPumpRotorSpeed( void )
 {
     F32 result = dialOutPumpRotorSpeedRPM.data;
+
     if ( OVERRIDE_KEY == dialOutPumpRotorSpeedRPM.override )
     {
         result = dialOutPumpRotorSpeedRPM.ovData;
     }
+
     return result;
 }
 
@@ -1087,10 +1095,12 @@
 F32 getMeasuredDialOutPumpSpeed( void )
 {
     F32 result = dialOutPumpSpeedRPM.data;
+
     if ( OVERRIDE_KEY == dialOutPumpSpeedRPM.override )
     {
         result = dialOutPumpSpeedRPM.ovData;
     }
+
     return result;
 }
 
@@ -1106,10 +1116,12 @@
 F32 getMeasuredDialOutPumpMCSpeed( void )
 {
     F32 result = dialOutPumpMCSpeedRPM.data;
+
     if ( OVERRIDE_KEY == dialOutPumpMCSpeedRPM.override )
     {
         result = dialOutPumpMCSpeedRPM.ovData;
     }
+
     return result;
 }
 
@@ -1125,10 +1137,12 @@
 F32 getMeasuredDialOutPumpMCCurrent( void )
 {
     F32 result = dialOutPumpMCCurrentmA.data;
+
     if ( OVERRIDE_KEY == dialOutPumpMCCurrentmA.override )
     {
         result = dialOutPumpMCCurrentmA.ovData;
     }
+
     return result;
 }
 
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r2112e3143003eaf9584d4be068f7ca89b33c941a -r38e9e1791f490f7a95b7a7040973a6761f7603ff
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 2112e3143003eaf9584d4be068f7ca89b33c941a)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 38e9e1791f490f7a95b7a7040973a6761f7603ff)
@@ -29,11 +29,12 @@
 // ********** build switches **********
 
 #define UF_TEST_ENABLED                     1
+#define UF_TEST_WITH_DG                     1
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
 //    #define RM46_EVAL_BOARD_TARGET          1
 //    #define BREADBOARD_TARGET               1
-    #define SIMULATE_UI                     1
+//    #define SIMULATE_UI                     1
     #define SKIP_POST                       1
     #define DISABLE_CRC_ERROR               1
     #define DISABLE_ACK_ERRORS              1
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r2112e3143003eaf9584d4be068f7ca89b33c941a -r38e9e1791f490f7a95b7a7040973a6761f7603ff
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 2112e3143003eaf9584d4be068f7ca89b33c941a)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 38e9e1791f490f7a95b7a7040973a6761f7603ff)
@@ -103,7 +103,8 @@
     DG_OP_MODE_T dgOpMode = getDGOpMode();  // TODO - the DG mode & sub-mode come as a pair at interval - they MUST be kept together.
     U32 dgSubMode = getDGSubMode();
 
-    // treatment mode state machine
+#ifdef UF_TEST_WITH_DG
+    // state machine to get DG to prep a reservoir so we can start a treatment
     switch ( currentStandbyState )
     {
         case STANDBY_START_STATE:
@@ -192,7 +193,33 @@
             currentStandbyState = STANDBY_START_STATE;
             break;
     }
+#else
+    // state machine to get DG to prep a reservoir so we can start a treatment
+    switch ( currentStandbyState )
+    {
+        case STANDBY_START_STATE:
+            // temporary test code - TODO - remove later
+            homeBloodPump();
+            homeDialInPump();
+            homeDialOutPump();
+            currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
+            break;
 
+        case STANDBY_WAIT_FOR_TREATMENT_STATE:
+            // TODO - test code
+            if ( TRUE == stop )
+            {
+                requestNewOperationMode( MODE_PRES );
+            }
+            break;
+
+        default:
+            // TODO - s/w fault
+            currentStandbyState = STANDBY_START_STATE;
+            break;
+    }
+#endif
+
 #ifdef RM46_EVAL_BOARD_TARGET
     if ( TRUE == didTimeout( start, 5000U ) )
     {