Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r4a20fdc5e32937930ea3793b831b8d4852e453d1 -rfbc0a281b094ff309dcbf83db1878818a9b384f1
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 4a20fdc5e32937930ea3793b831b8d4852e453d1)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision fbc0a281b094ff309dcbf83db1878818a9b384f1)
@@ -461,30 +461,6 @@
 {
     RO_PUMP_STATE_T result = RO_PUMP_OFF_STATE;
 
-#ifdef DEBUG_ENABLED
-#ifdef ENABLE_DIP_SWITCHES
-    // TODO - test code - remove later
-    if ( GET_DIP_SW0_TEST() )
-    {
-        setValveState( VSP, VALVE_STATE_CLOSED );
-        setValveState( VPI, VALVE_STATE_OPEN );
-        setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-        setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
-        setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
-        setROPumpTargetPressure( 120 );
-#ifdef EMC_TEST_BUILD
-        {
-            F32 fanPWM = 0.25;
-            etpwmSetCmpA( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
-            etpwmSetCmpB( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
-            setPrimaryHeaterTargetTemperature( 50.0 );
-            startPrimaryHeater();
-        }
-#endif
-    }
-#endif
-#endif
-
     // If there is a flow, transition to the PI controller to get the corresponding pressure of that flow
     if ( getTargetROPumpFlowRate() > 0 && roPumpControlMode == PUMP_CONTROL_MODE_CLOSED_LOOP )
     {
@@ -651,22 +627,6 @@
         roControlTimerCounter = 0;
     }
 
-#ifdef DEBUG_ENABLED
-#ifdef ENABLE_DIP_SWITCHES
-    // TODO - test code - remove later
-    if ( !GET_DIP_SW0_TEST() )
-    {
-        signalROPumpHardStop();
-        result = RO_PUMP_OFF_STATE;
-#ifdef EMC_TEST_BUILD
-        etpwmSetCmpA( etpwmREG6, 0 );
-        etpwmSetCmpB( etpwmREG6, 0 );
-        stopPrimaryHeater();
-#endif
-    }
-#endif
-#endif
-
     return result;
 }
 
@@ -853,14 +813,13 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetTargetROPumpFlowRateOverride function overrides the target
- * flow rate.
+ * The testSetTargetROPumpFlow function overrides the target flow rate.
  * @details Inputs: none
  * @details Outputs: none
  * @param value which is override target RO flow rate (in L/min)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetTargetROPumpFlowAndPressure( F32 flow, U32 pressure )
+BOOL testSetTargetROPumpFlow( F32 flow )
 {
     BOOL result = FALSE;
 
@@ -869,10 +828,7 @@
         // The flow rate and pressure must be in range
         if ( flow < MAX_RO_FLOWRATE_LPM && flow >= MIN_RO_FLOWRATE_LPM )
         {
-            if ( pressure >= MIN_ALLOWED_PRESSURE_PSI && pressure <= MAX_ALLOWED_PRESSURE_PSI )
-            {
-                result = setROPumpTargetFlowRate( flow, pressure );
-            }
+            result = setROPumpTargetFlowRate( flow, MAX_ALLOWED_PRESSURE_PSI );
         }
     }