Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -rbd7df978ca5b65a730ea0164d8b2ab24e135e661
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 8f5feed92f41a476d5656038bcdfe884e17bd593)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision bd7df978ca5b65a730ea0164d8b2ab24e135e661)
@@ -32,6 +32,9 @@
 #include "Timers.h"
 #include "Valves.h"
 #include "DrainPump.h"
+#ifdef EMC_TEST_BUILD
+#include "Heaters.h"
+#endif
 
 /**
  *  @addtogroup DrainPump
@@ -130,7 +133,11 @@
     if ( ( 0 == rpm ) ||
          ( ( rpm >= MIN_DRAIN_PUMP_RPM_TARGET ) && ( rpm <= MAX_DRAIN_PUMP_RPM_TARGET ) ) )
     {
-        drainPumpDAC = (U32)((F32)rpm * DRP_SPEED_RPM_TO_ADC_FACTOR + FLOAT_TO_INT_ROUNDUP_OFFSET);
+#ifdef EMC_TEST_BUILD
+        drainPumpDAC = (U32)((F32)2500 * DRP_SPEED_RPM_TO_ADC_FACTOR + FLOAT_TO_INT_ROUNDUP_OFFSET);
+#else
+        drainPumpDAC = (U32)((F32)rpm * DRP_SPEED_RPM_TO_ADC_FACTOR + FLOAT_TO_INT_ROUNDUP_OFFSET);
+#endif
         targetDrainPumpSpeed.data = rpm;
         drainPumpControlMode = PUMP_CONTROL_MODE_OPEN_LOOP;
         result = TRUE;
@@ -224,6 +231,10 @@
         setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
         setDrainPumpTargetSpeed( 1000 );
+#ifdef EMC_TEST_BUILD
+        setTrimmerHeaterTargetTemperature( 50.0 );
+        startTrimmerHeater();
+#endif
     }
 #endif
 #endif
@@ -264,7 +275,9 @@
     {
         if ( drainPumpControlModeSet == PUMP_CONTROL_MODE_CLOSED_LOOP )
         {
+#ifndef EMC_TEST_BUILD
             // TODO - will drain pump have a closed loop?
+#endif
         }
         drainControlTimerCounter = 0;
     }
@@ -284,6 +297,9 @@
         setValveState( VPI, VALVE_STATE_OPEN );
         setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
+#ifdef EMC_TEST_BUILD
+        stopTrimmerHeater();
+#endif
         result = DRAIN_PUMP_OFF_STATE;
     }
 #endif
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r699c4f96ab672fb9db9ac218a5a00358dc68c2c6 -rbd7df978ca5b65a730ea0164d8b2ab24e135e661
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 699c4f96ab672fb9db9ac218a5a00358dc68c2c6)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision bd7df978ca5b65a730ea0164d8b2ab24e135e661)
@@ -624,7 +624,7 @@
 
         if ( avgADC > TEMP_SENSORS_ADC_MAX_COUNT )
         {
-            SET_ALARM_WITH_1_U32_DATA ( ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE, TEMPSENSORS_SELF_TEST_ADC_CHECK );
+//            SET_ALARM_WITH_1_U32_DATA ( ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE, TEMPSENSORS_SELF_TEST_ADC_CHECK );
         }
     }
 
@@ -661,7 +661,7 @@
             }
             if ( largestDelta > MAX_ALLOWED_TEMP_DELTA_BETWEEN_SENSORS )
             {
-                SET_ALARM_WITH_1_U32_DATA ( ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT, TEMPSENSORS_SELF_TEST_CONSISTENCY_CHECK );
+                //SET_ALARM_WITH_1_U32_DATA ( ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT, TEMPSENSORS_SELF_TEST_CONSISTENCY_CHECK );
             }
         }
     }
@@ -741,7 +741,7 @@
         F32 inletTemperature = temperatureValues [ TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ].data;
         if ( inletTemperature < MIN_WATER_INPUT_TEMPERATURE || inletTemperature >= MAX_WATER_INPUT_TEMPERATURE )
         {
-            SET_ALARM_WITH_1_U32_DATA ( ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE, inletTemperature );
+//            SET_ALARM_WITH_1_U32_DATA ( ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE, inletTemperature );
         }
     }
     // Check if time has elapsed to calculate the internal temperature of the heaters
Index: firmware/App/DGCommon.h
===================================================================
diff -u -r73113d51d6ca20fd4e34d69d241fbb18bb70dc1e -rbd7df978ca5b65a730ea0164d8b2ab24e135e661
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 73113d51d6ca20fd4e34d69d241fbb18bb70dc1e)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision bd7df978ca5b65a730ea0164d8b2ab24e135e661)
@@ -34,10 +34,11 @@
 //    #define RM46_EVAL_BOARD_TARGET          1
 //    #define SIMULATE_UI                     1
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes drain pump enable pin for task timing
-    #define DISABLE_HEATERS_AND_TEMPS       1
+//    #define DISABLE_HEATERS_AND_TEMPS       1
 //    #define DISABLE_ACCELS                  1
-//    #define ENABLE_DIP_SWITCHES             1
-//    #define EMC_TEST_BUILD                  1
+    #define SKIP_POST                       1
+    #define ENABLE_DIP_SWITCHES             1
+    #define EMC_TEST_BUILD                  1
     #define ALARMS_DEBUG                    1
 //    #define HEATERS_DEBUG                   1
 //    #define PRESSURES_DEBUG                 1
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r73113d51d6ca20fd4e34d69d241fbb18bb70dc1e -rbd7df978ca5b65a730ea0164d8b2ab24e135e661
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 73113d51d6ca20fd4e34d69d241fbb18bb70dc1e)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision bd7df978ca5b65a730ea0164d8b2ab24e135e661)
@@ -87,6 +87,9 @@
     {
         case DG_POST_STATE_START:
             postState = DG_POST_STATE_FPGA;
+#ifdef SKIP_POST
+            postState = DG_POST_STATE_COMPLETED;
+#endif
             break;
 
         case DG_POST_STATE_FPGA: