Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r4e6093159809ef2ddc39d88401390caebe7fa293
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 4e6093159809ef2ddc39d88401390caebe7fa293)
@@ -538,14 +538,14 @@
 void resetBloodPumpRotorCount( void )
 {
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE ) != SW_CONFIG_ENABLE_VALUE )
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE ) )
     {
-        bloodPumpRotorCounter.data = 0;
+        bloodPumpRotorCounter.data = BP_MAX_ROTOR_COUNT_FOR_WEAR;
     }
     else
 #endif
     {
-        bloodPumpRotorCounter.data = BP_MAX_ROTOR_COUNT_FOR_WEAR;
+        bloodPumpRotorCounter.data = 0;
     }
 }
 
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r4e6093159809ef2ddc39d88401390caebe7fa293
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 4e6093159809ef2ddc39d88401390caebe7fa293)
@@ -299,11 +299,11 @@
 
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
         syringePumpControllerMeasuredDirection = MOTOR_DIR_FORWARD;
         syringePumpEncoderMeasuredDirection = MOTOR_DIR_FORWARD;
     }
-#endif
 
     syringePumpDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     syringePumpSpeedCalcTimerCounter = 0;
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rc42203c6f42c89e70b7cd8b93e1fb88b984ca12a -r4e6093159809ef2ddc39d88401390caebe7fa293
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision c42203c6f42c89e70b7cd8b93e1fb88b984ca12a)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4e6093159809ef2ddc39d88401390caebe7fa293)
@@ -1459,14 +1459,14 @@
         selfTestsResumeRequested = FALSE;
         doorClosedRequired( TRUE, TRUE );
 #ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
         {
-            state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+            state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
         }
         else
 #endif
         {
-            state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+            state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
         }
     }
 
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r4e6093159809ef2ddc39d88401390caebe7fa293
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4e6093159809ef2ddc39d88401390caebe7fa293)
@@ -959,23 +959,24 @@
     else
     {
         if ( alarmStatus.alarmsState < NUM_OF_ALARM_PRIORITIES )
-#ifndef _RELEASE_
         {
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
+#ifndef _RELEASE_
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) )
             {
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE, alarmStatus.alarmsState )
+                    setAlarmAudioState( ALARM_PRIORITY_HIGH,
+                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
+                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
+            }
+
+            else
+#endif
+            {
                 setAlarmAudioState( alarmStatus.alarmsState,
                                     ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
                                     ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
             }
         }
-        else
-#endif
-        {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE, alarmStatus.alarmsState )
-            setAlarmAudioState( ALARM_PRIORITY_HIGH,
-                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
-                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
-        }
     }
 }