Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r8b5b59032b8edc0db91041b35dabc0a81f96ea04 -r04f8c319026c94e3846464775fc8920a0306d751
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 8b5b59032b8edc0db91041b35dabc0a81f96ea04)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 04f8c319026c94e3846464775fc8920a0306d751)
@@ -1108,7 +1108,7 @@
                 clearAlarmCondition( ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED );
             }
             // If no syringe detected and detection is required, trigger alarm condition
-            else if ( ( FALSE == isSyringeDetected() ) && ( TRUE == requireSyringeDetection ) )
+            else if ( FALSE == isSyringeDetected() )
             {
                 activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED );
             }
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rd9e5244f8f1da1f42e87f9c5ab8bdad728805a7e -r04f8c319026c94e3846464775fc8920a0306d751
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d9e5244f8f1da1f42e87f9c5ab8bdad728805a7e)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 04f8c319026c94e3846464775fc8920a0306d751)
@@ -1220,7 +1220,7 @@
     }
 
     // Handle any test messages if tester has logged in successfully
-    if ( ( msgID > MSG_ID_FIRST_TESTER_MESSAGE ) && ( msgID <= END_OF_MSG_IDS ) && ( TRUE == isTestingActivated() ) )
+    if ( ( msgID > MSG_ID_FIRST_TESTER_MESSAGE ) && ( TRUE == isTestingActivated() ) )
     {
         switch ( msgID )
         {