Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r3a480399e9fd87f51a12a469cc56242ebeb93539 -r74be223d47ea7bb0ac7d814e74d3627d830a5fac
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3a480399e9fd87f51a12a469cc56242ebeb93539)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 74be223d47ea7bb0ac7d814e74d3627d830a5fac)
@@ -1417,14 +1417,6 @@
                 handleTestBloodPumpOcclusionOverrideRequest( message );
                 break;
 
-            //case MSG_ID_OCCLUSION_DIAL_IN_PUMP_OVERRIDE:
-            //    handleTestDialysateInletPumpOcclusionOverrideRequest( message );
-            //    break;
-
-            //case MSG_ID_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE:
-            //    handleTestDialysateOutletPumpOcclusionOverrideRequest( message );
-            //    break;
-
             case MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE:
                 handleTestPresOcclBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1523,14 +1515,16 @@
                 handleHDSoftwareResetRequest( message );
                 break;
 
+#ifdef USE_FMB_FLOW_SENSOR
             case MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE:
                 handleTestBloodFlowSignalStrengthOverrideRequest( message );
                 break;
-
+#endif
+#ifdef USE_FMD_FLOW_SENSOR
             case MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE:
                 handleTestDialInFlowSignalStrengthOverrideRequest( message );
                 break;
-
+#endif
             case MSG_ID_BLOOD_PUMP_HOME_CMD:
                 handleTestBloodPumpHomeRequest( message );
                 break;
@@ -1779,6 +1773,14 @@
                 handleTestPostTreatmentModeSendIntervalOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_BLOCK_MESSAGE_TRANSMISSION:
+                handleTestBlockMessagesRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_FORCE_SENSOR_DAC_CALIBRATE:
+                handleTestSyringePumpForceSensorCalibrateRequest( message );
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;