Index: firmware/App/HDCommon.h
===================================================================
diff -u -rc14a0220256e92a6339a444a3e1bc85e159ccce3 -r5d13922ee2e8c851bc5db67ef4d0120b47de6f07
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision c14a0220256e92a6339a444a3e1bc85e159ccce3)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 5d13922ee2e8c851bc5db67ef4d0120b47de6f07)
@@ -32,7 +32,7 @@
 // TODO - remove build switches before release
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
-    #define BOARD_WITH_NO_HARDWARE          1
+//    #define BOARD_WITH_NO_HARDWARE          1
 //    #define RUN_WITHOUT_DG                  1           // Run HD w/o DG
 //    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
@@ -53,17 +53,22 @@
     #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_VALVE_ALARMS            1           // Do not error on HD valve position
-//    #define DISABLE_CAL_CHECK               1
+    #define DISABLE_CAL_CHECK               1
 //    #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
 //    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART
-    #define SKIP_SELF_TESTS                 1           // Skip Pre-treatment Self-tests
     #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
-    #define SKIP_CALIBRATION_TESTS          1           // Skip calibration tests
+    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
 //    #define V1_5_SYSTEM                     1           // Build for v1.5 system
-    #define SKIP_UI_INTERACTION             1           // Skip UI interaction
+    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
+    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
+    #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
+    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
+//    #define DISABLE_BATT_COMM               1           // Disable battery communication.
+    #define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.
+    #define DISABLE_OCCLUSION_SELF_TEST     1           // Skip occlusion sensor self-test.
     #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check
 
     #include <stdio.h>