Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r99011bfb443632a788f3afe395c9c63a797bde9d -re66245baae86e539e8470aa9739a99a2146d5f17
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 99011bfb443632a788f3afe395c9c63a797bde9d)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision e66245baae86e539e8470aa9739a99a2146d5f17)
@@ -30,6 +30,12 @@
 #include "TaskPriority.h"
 #include "Timers.h"
 #include "ROPump.h"
+#ifdef EMC_TEST_BUILD
+#include "Heaters.h"
+#endif
+#ifdef ENABLE_DIP_SWITCHES
+#include "Valves.h"
+#endif
 
 /**
  *  @addtogroup ROPump
@@ -272,7 +278,21 @@
     // 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_RECIRC_C_TO_NC );
+        setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
         setROPumpTargetPressure( 120, PUMP_CONTROL_MODE_CLOSED_LOOP );
+#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
@@ -330,6 +350,11 @@
     {
         signalROPumpHardStop();
         result = RO_PUMP_OFF_STATE;
+#ifdef EMC_TEST_BUILD
+        etpwmSetCmpA( etpwmREG6, 0 );
+        etpwmSetCmpB( etpwmREG6, 0 );
+        stopPrimaryHeater();
+#endif
     }
 #endif
 #endif