Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r5c967dc311b485769e50e5e4f122be21079b5ae9 -rfba89d67dd2bef913e85a13563e2aa49f0e2e2f5
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 5c967dc311b485769e50e5e4f122be21079b5ae9)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision fba89d67dd2bef913e85a13563e2aa49f0e2e2f5)
@@ -268,20 +268,20 @@
         // Check if RPM is out of range. Using fabs since the read RPM can be above or below the target.
         BOOL isRPMOutOfRange = fabs( targetRPM - currentDrainPumpRPM ) > threshold;
 
-        //checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, isRPMOutOfRange, currentDrainPumpRPM, threshold );
+        checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, isRPMOutOfRange, currentDrainPumpRPM, threshold );
     }
 
     // Check if the pump is in off state and the RPM is greater than the minimum RPM
     if ( drainPumpState == DRAIN_PUMP_OFF_STATE )
     {
         BOOL isRPMTooHigh = currentDrainPumpRPM > MIN_DRAIN_PUMP_RPM;
 
-        //checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, isRPMTooHigh, currentDrainPumpRPM, MIN_DRAIN_PUMP_RPM );
+        checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, isRPMTooHigh, currentDrainPumpRPM, MIN_DRAIN_PUMP_RPM );
 
         // If the off fault alarm has become active, trigger the safety shutdown
         if ( isAlarmActive( ALARM_ID_DRAIN_PUMP_OFF_FAULT ) )
         {
-            //activateSafetyShutdown();
+            activateSafetyShutdown();
             BOOL test = FALSE;
         }
     }
@@ -589,7 +589,7 @@
 
     if ( TRUE == isTestingActivated() )
     {
-        if ( value >= MIN_DRAIN_PUMP_RPM && value <= MAX_DRAIN_PUMP_RPM )
+        if ( ( 0 == value ) || ( value >= MIN_DRAIN_PUMP_RPM ) && ( value <= MAX_DRAIN_PUMP_RPM ) )
         {
             result = setDrainPumpTargetRPM( value );
         }