Index: firmware/App/HDCommon.h
===================================================================
diff -u -rba7a576375ad7bbfa0d5a879d82b8783e5182899 -r565ed0856be2fcf1443e3ec4cb8fe023b2c14db4
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision ba7a576375ad7bbfa0d5a879d82b8783e5182899)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 565ed0856be2fcf1443e3ec4cb8fe023b2c14db4)
@@ -42,15 +42,15 @@
 //    #define DISABLE_3WAY_VALVES             1           // Disable 3-way valves
 //    #define TST_3WAY_VALVES_ALWAYS_OPEN     1           // After POST and homing, open all 4 valves
     #define DISABLE_ACCELS                  1           // Disable accelerometer POST and monitoring
-    #define DISABLE_CRC_ERROR               1           // Do not error on bad CRC for CAN messages
-    #define DISABLE_ACK_ERRORS              1           // Do not error on failure of other node(s) to ACK a message
+//    #define DISABLE_CRC_ERROR               1           // Do not error on bad CRC for CAN messages
+//    #define DISABLE_ACK_ERRORS              1           // Do not error on failure of other node(s) to ACK a message
     #define DISABLE_MOTOR_CURRENT_CHECKS    1           // Do not error on HD pump current checks
     #define DISABLE_PUMP_FLOW_CHECKS        1           // Do not error on HD pump flow checks
     #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks
     #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
-    #define DISABLE_SALINE_BOLUS_CHECKS     1           // Do not error on HD saline bolus checks
+    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
     #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
-    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
+//    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
     #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
 //    #define RUN_PUMPS_OPEN_LOOP             1           // BP and DPi pumps will be run open loop (no flow sensor feedback)
 //    #define RAW_FLOW_SENSOR_DATA            1           // Test build will not filter flow sensor data
@@ -59,6 +59,7 @@
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART
     #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
     #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
+    #define SKIP_CALIBRATION_TESTS          1           // Skip calibration tests
 //    #define V1_5_SYSTEM                     1           // Build for v1.5 system
     #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
     #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests