Index: dialin/common/msg_defs.py
===================================================================
diff -u -r20061fe2205912140dbb711d3b64a3864472c0be -rbd1071fffc619bebb9b5a3b533e151cb9c02a7d4
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 20061fe2205912140dbb711d3b64a3864472c0be)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision bd1071fffc619bebb9b5a3b533e151cb9c02a7d4)
@@ -76,8 +76,8 @@
     MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37                        # DG heat disinfection publish data
     MSG_ID_UI_START_TREATMENT = 0x38                            # UI user request to initiate a treatment
     MSG_ID_HD_START_TREATMENT_RESPONSE = 0x39                   # HD response to user request to initiate a treatment
-    MSG_ID_HD_VALVES_DATA = 0x3B                                # HD broadcast of valves data
-    MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3A              # UI user confirmation of treatment parameters
+    MSG_ID_HD_VALVES_DATA = 0x3A                                # HD broadcast of valves data
+    MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3B              # UI user confirmation of treatment parameters
     MSG_ID_UI_TREATMENT_END_REQUEST = 0x3C                      # UI user treatment end request
     MSG_ID_HD_TREATMENT_END_RESPONSE = 0x3D                     # HD response to user request to end treatment
     MSG_ID_HD_AIR_TRAP_DATA = 0x003E                            # HD broadcast of air trap data
Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -ref9b75f5db31f12a46fe9b509385fbd222cd2bf4 -rbd1071fffc619bebb9b5a3b533e151cb9c02a7d4
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision ef9b75f5db31f12a46fe9b509385fbd222cd2bf4)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision bd1071fffc619bebb9b5a3b533e151cb9c02a7d4)
@@ -91,8 +91,13 @@
 
     # Sub Mode
     # UI only cares about the actual state and _NOT could be any other state
-    TREATMENT_DIALYSIS_STATE_NOT = 0
-    TREATMENT_DIALYSIS_STATE = 1
+    TREATMENT_START_STATE = 0
+    TREATMENT_BLOOD_PRIME_STATE = 1
+    TREATMENT_DIALYSIS_STATE = 2
+    TREATMENT_STOP_STATE = 3
+    TREATMENT_RINSEBACK_STATE = 4
+    TREATMENT_RECIRC_STATE = 5
+    TREATMENT_END_STATE = 6
 
     # Heparin states
     HEPARIN_STATE_OFF = 0  # No heparin delivery is in progress
Index: tests/test_heparin.py
===================================================================
diff -u
--- tests/test_heparin.py	(revision 0)
+++ tests/test_heparin.py	(revision bd1071fffc619bebb9b5a3b533e151cb9c02a7d4)
@@ -0,0 +1,28 @@
+###########################################################################
+#
+# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+#
+# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+#
+# @file test_single_alarm.py
+#
+# @author (last) Peter Lucia
+# @date (last) 22-Feb-2021
+# @author (original) Peter Lucia
+# @date (original) 22-Feb-2021
+#
+############################################################################
+import sys
+sys.path.append("..")
+from dialin.ui import HDSimulator
+from dialin.ui import TXStates
+
+hd_sim = HDSimulator()
+# hd_sim.alarms_simulator.cmd_send_clear_alarms()
+# hd_sim.cmd_set_treatment_states_data()
+# hd_sim.cmd_send_start_treatment_response(1, 0)
+hd_sim.cmd_set_treatment_states_data(TXStates.TREATMENT_DIALYSIS_STATE,
+                                           TXStates.UF_OFF_STATE,
+                                           TXStates.SALINE_BOLUS_STATE_IDLE,
+                                           TXStates.HEPARIN_STATE_OFF)
\ No newline at end of file