Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r428b61f33828c36245ce3c3d8ed86a00797791f3 -r7364468c47160aad7f912f710431345af35d21b7
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 428b61f33828c36245ce3c3d8ed86a00797791f3)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 7364468c47160aad7f912f710431345af35d21b7)
@@ -491,10 +491,9 @@
  *************************************************************************/
 static TRIMMER_HEATER_EXEC_STATES_T handleTrimmerHeaterStateOff ( void )
 {
-    TRIMMER_HEATER_EXEC_STATES_T state = TRIMMER_HEATER_EXEC_STATE_CONTROL_TO_TARGET;
+    TRIMMER_HEATER_EXEC_STATES_T state = TRIMMER_HEATER_EXEC_STATE_OFF;
 
     // TODO for testing only. remove
-    state = TRIMMER_HEATER_EXEC_STATE_OFF;
     if ( TOGGLEPRIMAYHEATER() )
     {
         setTrimmerHeaterTargetTemperature ( 38 );
@@ -621,8 +620,8 @@
     }
     else if ( heater == TRIMMER_HEATER )
     {
-        trimmerHeaterDutyCycle = SMALL_PRIMAY_HEATER_MAX_DUTY_CYCLE;
-        resetPIController ( PI_CONTROLLER_ID_TRIMMER_HEATER, SMALL_PRIMAY_HEATER_MAX_DUTY_CYCLE );
+        trimmerHeaterDutyCycle = TRIMMER_HEATER_MAX_DUTY_CYCLE;
+        resetPIController ( PI_CONTROLLER_ID_TRIMMER_HEATER, TRIMMER_HEATER_MAX_DUTY_CYCLE );
     }
 }
 
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r26c64288f4baab3707eb9555636b61c0e747f965 -r7364468c47160aad7f912f710431345af35d21b7
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 26c64288f4baab3707eb9555636b61c0e747f965)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 7364468c47160aad7f912f710431345af35d21b7)
@@ -175,11 +175,12 @@
 void initTemperatureSensors ( void )
 {
     U08 i;
-    tempSensorsSelfTestResult = SELF_TEST_STATUS_IN_PROGRESS;
-    tempSensorsSelfTestState  = TEMPSENSORS_SELF_TEST_START;
-    tempSensorsExecState      = TEMPSENSORS_EXEC_STATE_START;
-    sampleCount               = 0;
-    elapsedTime               = 0;
+    tempSensorsSelfTestResult      = SELF_TEST_STATUS_IN_PROGRESS;
+    tempSensorsSelfTestState       = TEMPSENSORS_SELF_TEST_START;
+    tempSensorsExecState           = TEMPSENSORS_EXEC_STATE_START;
+    sampleCount                    = 0;
+    elapsedTime                    = 0;
+    internalHeatersConversionTimer = 0;
 
     // Initialize TPi and TPo constants
     for ( i = TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR; i < TEMPSENSORS_CONDUCTIVITY_SENSOR_1_TEMP_SENSOR; i++ )
@@ -556,6 +557,7 @@
  *************************************************************************/
 static TEMPSENSORS_SELF_TEST_STATES_T handleSelfTestStart ( void )
 {
+    tempSensorsSelfTestResult = SELF_TEST_STATUS_IN_PROGRESS;
     return TEMPSENSORS_SELF_TEST_ADC_CHECK;
 }