Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r2468e56fbecd26da713bc78535bd727f4b105fe1 -rbd9f7ebe27d5fbdc893d04c9925f1990e873edfa
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 2468e56fbecd26da713bc78535bd727f4b105fe1)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision bd9f7ebe27d5fbdc893d04c9925f1990e873edfa)
@@ -64,14 +64,9 @@
 #define FLOW_SAMPLES_TO_AVERAGE                        ( 250 / TASK_PRIORITY_INTERVAL )            ///< Averaging flow data over 250 ms intervals.
 #define FLOW_AVERAGE_MULTIPLIER                        ( 1.0 / (F32)FLOW_SAMPLES_TO_AVERAGE )      ///< Optimization - multiplying is faster than dividing.
 
-#ifdef USE_SMALL_FLOW_SENSOR_K_FACTOR
-// TODO new flow sensor k factor for testing only
 #define RO_FLOW_ADC_TO_LPM_FACTOR                      300                                         ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading).
-#else
-#define RO_FLOW_ADC_TO_LPM_FACTOR                      5555                                        ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading).
-#endif
 
-#define RO_FLOW_ADC_TO_LPM_FACTOR_TEMP_REMOVE                      5555
+#define RO_FLOW_ADC_TO_LPM_FACTOR_TEMP_REMOVE          5555 //TODo remove
 
 #define ROP_FLOW_TO_PWM_SLOPE                          0.1                                         ///< Slope of flow to PWM line equation.
 #define ROP_FLOW_TO_PWM_INTERCEPT                      0.0                                         ///< Intercept of flow to PWM line equation.
Index: firmware/App/DGCommon.h
===================================================================
diff -u -r79bf3d1f0df93b3fffd1d0136db9275544b76112 -rbd9f7ebe27d5fbdc893d04c9925f1990e873edfa
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 79bf3d1f0df93b3fffd1d0136db9275544b76112)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision bd9f7ebe27d5fbdc893d04c9925f1990e873edfa)
@@ -56,7 +56,6 @@
     // Turn these flags on to disable dialysate mixing
     #define DISABLE_DIALYSATE_CHECK         1
     #define DISABLE_MIXING                  1
-    #define USE_SMALL_FLOW_SENSOR_K_FACTOR  1
     //#define DISABLE_FLOW_CONTROL_TREATMENT  1
 
     #include <stdio.h>
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r60ec2f1256b02ee0a6d4346877494ce1bda55ab2 -rbd9f7ebe27d5fbdc893d04c9925f1990e873edfa
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 60ec2f1256b02ee0a6d4346877494ce1bda55ab2)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision bd9f7ebe27d5fbdc893d04c9925f1990e873edfa)
@@ -48,13 +48,13 @@
 #define DRAIN_WEIGHT_UNCHANGE_TIMEOUT               ( 6 * MS_PER_SECOND )                             ///< Time period of unchanged weight during draining before timeout.
 
 // Flush drain path state defines
-#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * MS_PER_SECOND )                    ///< Flush Drain path wait time in milliseconds. TODo it was 2 minutes
+#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * MS_PER_SECOND )                             ///< Flush Drain path wait time in milliseconds. TODo it was 2 minutes
 
 // Flush dialysate state defines
 #define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush dialysate wait time in milliseconds.
 
 // Flush concentrate straws state defines
-#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 0.5 * 60 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
+#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
 #define ACID_PUMP_SPEED_ML_PER_MIN                  -30.0                                             ///< Acid pump speed in mL/min.
 // The bicarb pump is 2% faster than the acid pump to create a flow from acid to bicarb line during flush
 #define BICARB_PUMP_SPEED_ML_PER_MIN                30.6                                              ///< Bicarb pump speed in mL/min.
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r60ec2f1256b02ee0a6d4346877494ce1bda55ab2 -rbd9f7ebe27d5fbdc893d04c9925f1990e873edfa
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 60ec2f1256b02ee0a6d4346877494ce1bda55ab2)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision bd9f7ebe27d5fbdc893d04c9925f1990e873edfa)
@@ -201,14 +201,12 @@
             break;
 
         case DG_POST_STATE_WATCHDOG:
-            //testStatus = execWatchdogTest();
-            testStatus = SELF_TEST_STATUS_PASSED; // TODO in unit 4 after resets it may not pass DEBUG_DENALI test
+            testStatus = execWatchdogTest();
             postState = handlePOSTStatus( testStatus );
             break;
 
         case DG_POST_STATE_SAFETY_SHUTDOWN:
-            //testStatus = execSafetyShutdownTest();
-            testStatus = SELF_TEST_STATUS_PASSED;  // TODO in unit 4 after resets it may not pass
+            testStatus = execSafetyShutdownTest();
             postState = handlePOSTStatus( testStatus );
             break;
 
Index: firmware/App/Modes/ModeSolo.c
===================================================================
diff -u -raf0faf02f1bd7bffcce083e9b52988a01c343d8e -rbd9f7ebe27d5fbdc893d04c9925f1990e873edfa
--- firmware/App/Modes/ModeSolo.c	(.../ModeSolo.c)	(revision af0faf02f1bd7bffcce083e9b52988a01c343d8e)
+++ firmware/App/Modes/ModeSolo.c	(.../ModeSolo.c)	(revision bd9f7ebe27d5fbdc893d04c9925f1990e873edfa)
@@ -102,7 +102,7 @@
     DG_SOLO_STANDBY_STATE_T result = DG_SOLO_IDLE_STATE;
 
     // if HD is on, transition to DG standby mode
-    //if ( TRUE == isHDCommunicating() ) TODO uncomment. Tehre was no HD in unit 2
+    if ( TRUE == isHDCommunicating() )
     {
         requestNewOperationMode( DG_MODE_STAN );
     }
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -raf0faf02f1bd7bffcce083e9b52988a01c343d8e -rbd9f7ebe27d5fbdc893d04c9925f1990e873edfa
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision af0faf02f1bd7bffcce083e9b52988a01c343d8e)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision bd9f7ebe27d5fbdc893d04c9925f1990e873edfa)
@@ -157,9 +157,7 @@
     DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_IDLE;
 
     // go to standby solo mode if HD is turned off or stops communicating.
-    //if ( FALSE == isHDCommunicating() )  //TODO uncomment
-    BOOL test = TRUE;
-    if( FALSE == test )
+    if ( FALSE == isHDCommunicating() )
     {   // TODO if HD comm loss, should we wait an hour or so before going to solo standby?
         requestNewOperationMode( DG_MODE_SOLO );
     }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r60ec2f1256b02ee0a6d4346877494ce1bda55ab2 -rbd9f7ebe27d5fbdc893d04c9925f1990e873edfa
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 60ec2f1256b02ee0a6d4346877494ce1bda55ab2)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision bd9f7ebe27d5fbdc893d04c9925f1990e873edfa)
@@ -1562,7 +1562,7 @@
         }
         else if ( ( DG_MODE_GENE == getCurrentOperationMode() ) && ( FALSE == startingTreatment ) )
         {
-            //result = requestDGStop(); TODO uncomment this only for testing If DG by itself is run, a stop request is sent since HD is may not be available
+            result = requestDGStop();
         }
     }