Index: NVDataMgmtHDRecords.h
===================================================================
diff -u -re48883cbb19f2f978a46cd726e4bfefc96bd8061 -r5b0a75e836a3f30e2ab6a627920a36c9e0f1d914
--- NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision e48883cbb19f2f978a46cd726e4bfefc96bd8061)
+++ NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 5b0a75e836a3f30e2ab6a627920a36c9e0f1d914)
@@ -67,7 +67,7 @@
     SW_CONFIG_DISABLE_DRY_SELF_TESTS,                         // TODO remove                                                 ///< Software configuration disable dry self tests.
     SW_CONFIG_DISABLE_PRIMING,                                                                                 ///< Software configuration disable priming.
     SW_CONFIG_DISABLE_WET_SELF_TEST,                                                                           ///< Software configuration disable wet self test.
-    SW_CONFIG_ENABLE_WET_SELF_TEST_WIDER_VOLUME_TOL,                                                           ///< Software configuration enable wet self test wider volume tolerance.
+    SW_CONFIG_ENABLE_WET_SELF_TEST_WIDER_VOLUME_TOL,         // TODO remove                                                  ///< Software configuration enable wet self test wider volume tolerance.
     SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS,                                                                  ///< Software configuration disable ultrafiltration alarms.
     SW_CONFIG_DISABLE_BUBBLE_ALARMS,                                                                           ///< Software configuration disable bubble alarms.
     SW_CONFIG_DISABLE_ACCELEROMETERS,                                                                          ///< Software configuration disable accelerometers.
@@ -81,7 +81,7 @@
     SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP,                                                           ///< Software configuration enable dialysate inlet pump open loop.
     SW_CONFIG_DISABLE_SWITCHES_MONITOR,                                                                        ///< Software configuration disable switches monitor.
     SW_CONFIG_ENABLE_VBA_SPECIAL_POSITION_C,                                                                   ///< Software configuration enable VBA special position C.
-    SW_CONFIG_DISABLE_SERVICE_AND_DISINFECT_CHECK,                                                             ///< Software configuration disable service and disinfect checks.
+    SW_CONFIG_DISABLE_SERVICE_AND_DISINFECT_CHECK,           // TODO remove                                                  ///< Software configuration disable service and disinfect checks.
     SW_CONFIG_DISABLE_AIR_PUMP,                              // TODO remove                                                  ///< Software configuration disable air pump.
     NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
 } SOFTWARE_CONFIG_T;
Index: TestSupport.h
===================================================================
diff -u -r70d4f14eda44c2d2ca2a087d525b144ca86faaef -r5b0a75e836a3f30e2ab6a627920a36c9e0f1d914
--- TestSupport.h	(.../TestSupport.h)	(revision 70d4f14eda44c2d2ca2a087d525b144ca86faaef)
+++ TestSupport.h	(.../TestSupport.h)	(revision 5b0a75e836a3f30e2ab6a627920a36c9e0f1d914)
@@ -49,6 +49,8 @@
     TEST_CONFIG_USE_WORN_CARTRIDGE,                            ///< Test configuration use worn cartridge.
     TEST_CONFIG_EXPEDITE_PRE_TREATMENT,                        ///< Test configuration expedite pre-treatment.
     TEST_CONFIG_SKIP_BLOOD_PRIME,                              ///< Test configuration skip blood prime.
+    TEST_CONFIG_SKIP_DISINFECT_AND_SERVICE_TX_BLOCKERS,        ///< Test configuration skip disinfect and service treatment blockers.
+    TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_CHECK,       ///< Test configuration disable wet self test displacement check.
     NUM_OF_TEST_CONFIGS                                        ///< Number of test configuration.
 } TEST_CONFIG_T;
 #endif