Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r388a6f1cf7661a973b0b08c2eeb4de30522c1e88 -re66245baae86e539e8470aa9739a99a2146d5f17
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 388a6f1cf7661a973b0b08c2eeb4de30522c1e88)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e66245baae86e539e8470aa9739a99a2146d5f17)
@@ -16,10 +16,10 @@
 
 #include "etpwm.h"
 
-// TODO for testing only remove
+#ifdef ENABLE_DIP_SWITCHES
 #include "mibspi.h"
 #include "FPGA.h"
-// TODO for testing only remove
+#endif
 
 #include "AlarmMgmt.h"
 #include "Common.h"
@@ -314,8 +314,10 @@
     // If the RO pump is not on, turn off the heaters
     if ( ! isReverseOsmosisPumpOn() )
     {
-        stopPrimaryHeater();
+#ifndef EMC_TEST_BUILD
+        stopPrimaryHeater();  // TODO - this is so immediate - if other module requests RO pump on and start heater, this monitor may stop the heater request before RO pump has a chance to start
         stopTrimmerHeater();
+#endif
     }
 }
 
@@ -618,6 +620,7 @@
     // TODO remove this code
 #ifdef DEBUG_ENABLED
 #ifdef ENABLE_DIP_SWITCHES
+#ifndef EMC_TEST_BUILD
     if ( !TOGGLEPRIMAYHEATER() )
     {
         stopPrimaryHeater();
@@ -629,6 +632,7 @@
     }
 #endif
 #endif
+#endif
     // TODO Remove this code
 
     if ( ! isPrimaryHeaterOn )
@@ -656,6 +660,7 @@
     // TODO for testing only. remove
 #ifdef DEBUG_ENABLED
 #ifdef ENABLE_DIP_SWITCHES
+#ifndef EMC_TEST_BUILD
     if ( TOGGLEPRIMAYHEATER() )
     {
         setTrimmerHeaterTargetTemperature ( 38 );
@@ -672,6 +677,7 @@
     }
 #endif
 #endif
+#endif
     // TODO remove this code for testing
 
     if ( hasStartTrimmerHeaterRequested )
@@ -717,6 +723,7 @@
     // TODO remove this code
 #ifdef DEBUG_ENABLED
 #ifdef ENABLE_DIP_SWITCHES
+#ifndef EMC_TEST_BUILD
     if ( !TOGGLEPRIMAYHEATER() )
     {
         stopTrimmerHeater();
@@ -732,6 +739,7 @@
     }
 #endif
 #endif
+#endif
     // TODO Remove this code
 
     if ( ! isTrimmerHeaterOn )