Index: firmware/App/HDCommon.h
===================================================================
diff -u -rac6532c81f2a6d4ad1c67420c22d59f6aeeaae13 -rad9ce5693365b5fb6cdeea1b1b7846e6ce4c8d25
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision ac6532c81f2a6d4ad1c67420c22d59f6aeeaae13)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision ad9ce5693365b5fb6cdeea1b1b7846e6ce4c8d25)
@@ -58,10 +58,15 @@
 //    #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_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
+    #define SKIP_CALIBRATION_TESTS          1           // Skip pre-treatment self-tests involving calibration
+    #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
+    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
 
     #include <stdio.h>
     #include <strings.h>