Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -ra0e7107b30e4d6fc631784e249f59038aefeb04f -ra407ca3aee42efe94cf8d2fe41ef2804175b992b
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision a0e7107b30e4d6fc631784e249f59038aefeb04f)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision a407ca3aee42efe94cf8d2fe41ef2804175b992b)
@@ -345,10 +345,10 @@
     D23_VALV                            = 16    # Balancing chamber Valve 1 (D23)
     D19_VALV                            = 17    # Balancing chamber Valve 2 (D19)
     D25_VALV                            = 18    # Balancing chamber Valve 3 (D25)
-    D26_VALV                            = 19    # Balancing chamber Valve 7 (D26)
+    D21_VALV                            = 19    # Balancing chamber Valve 7 (D26)
     D24_VALV                            = 20    # Balancing chamber Valve 5 (D24)
     D20_VALV                            = 21    # Balancing chamber Valve 6 (D20)
-    D21_VALV                            = 22    # Balancing chamber Valve 4 (D21)
+    D26_VALV                            = 22    # Balancing chamber Valve 4 (D21)
     D22_VALV                            = 23    # Balancing chamber Valve 8 (D22)
     NUM_OF_DD_VALVES                    = 24    # Number of Valves for the DD
 
Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r00412d78bda4176d5c45a3778cb90ad907928965 -ra407ca3aee42efe94cf8d2fe41ef2804175b992b
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 00412d78bda4176d5c45a3778cb90ad907928965)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision a407ca3aee42efe94cf8d2fe41ef2804175b992b)
@@ -195,6 +195,7 @@
     MSG_ID_TD_AIR_PUMP_POWER_RAISE_OVERRIDE_REQUEST = 0x803D
     MSG_ID_TD_AIR_PUMP_POWER_LOWER_OVERRIDE_REQUEST = 0x803E
     MSG_ID_TD_HARD_STOP_BLOOD_PUMP = 0x803F
+    MSG_ID_TD_TRAINING_TEST_OVERRIDE_REQUEST = 0x8999
 
     MSG_ID_DD_TESTER_LOGIN_REQUEST = 0xA000
     MSG_ID_DD_SOFTWARE_RESET_REQUEST = 0xA001
Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -ra0e7107b30e4d6fc631784e249f59038aefeb04f -ra407ca3aee42efe94cf8d2fe41ef2804175b992b
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision a0e7107b30e4d6fc631784e249f59038aefeb04f)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision a407ca3aee42efe94cf8d2fe41ef2804175b992b)
@@ -30,6 +30,7 @@
 from .modules.post_gen_dialysate import DDPostGenDialysate
 from .modules.pressure_sensors import DDPressureSensors
 from .modules.pre_gen_dialysate import DDPreGenDialysate
+from .modules.rinse_pump import DDRinsePump
 from .modules.spent_chamber_fill import DDSpentChamberFill
 from .modules.temperature_sensors import DDTemperatureSensors
 from .modules.dd_test_configs import DDTestConfig
@@ -130,6 +131,7 @@
         self.post_gen_dialysate = DDPostGenDialysate(self.can_interface, self.logger)
         self.pressure_sensors = DDPressureSensors(self.can_interface, self.logger)
         self.pre_gen_dialysate = DDPreGenDialysate(self.can_interface, self.logger)
+        self.rinse_pump = DDRinsePump(self.can_interface, self.logger)
         self.spent_chamber_fill = DDSpentChamberFill(self.can_interface, self.logger)
         self.temperature_sensors = DDTemperatureSensors(self.can_interface, self.logger)
         self.test_configs = DDTestConfig(self.can_interface, self.logger)
@@ -348,4 +350,4 @@
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
             self.logger.debug("Timeout!!!!")
-            return False
\ No newline at end of file
+            return False
Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -r4c41400037a9da1afe303601bd960b30de3d79da -ra407ca3aee42efe94cf8d2fe41ef2804175b992b
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 4c41400037a9da1afe303601bd960b30de3d79da)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision a407ca3aee42efe94cf8d2fe41ef2804175b992b)
@@ -132,6 +132,7 @@
         "p37_valv",
         "p39_valv",
         "p43_valv",
+        "p6_valv",
         "valve_states_enum",
         "fp_valves_states_timestamp"
     ])