Index: shared/scripts/configuration/config.py
===================================================================
diff -u -r2aff4bbf5a1749195064cfc9b8acc9f55aab601d -rc0794178d98672bdfbaf2b7315e7f007b6b79295
--- shared/scripts/configuration/config.py	(.../config.py)	(revision 2aff4bbf5a1749195064cfc9b8acc9f55aab601d)
+++ shared/scripts/configuration/config.py	(.../config.py)	(revision c0794178d98672bdfbaf2b7315e7f007b6b79295)
@@ -35,7 +35,7 @@
 #testing options for main treatment saline
 SALINE_BOLUS_TARGET = [0, 1, 150, 155, 299, 300]   #Boundary Value Analysis
 
-NUM_OF_REQUEST_REJECT_REASONS = 43
+NUM_OF_REQUEST_REJECT_REASONS = 34
 #dictionary contains saline cumulative and saline delivered value
 #key : saline cumulative value.
 #value: saline delivered value
Index: shared/scripts/configuration/strings.py
===================================================================
diff -u -r2aff4bbf5a1749195064cfc9b8acc9f55aab601d -rc0794178d98672bdfbaf2b7315e7f007b6b79295
--- shared/scripts/configuration/strings.py	(.../strings.py)	(revision 2aff4bbf5a1749195064cfc9b8acc9f55aab601d)
+++ shared/scripts/configuration/strings.py	(.../strings.py)	(revision c0794178d98672bdfbaf2b7315e7f007b6b79295)
@@ -24,7 +24,7 @@
 # dictionary of rejection reason from application source code.
 # message location -> denali-> Headers-> common-> MsgDefs.h
 REJECTION_REASON = {
-    0: "No Active Alarm List",                                   
+    0: "No Active Alarm List",                                  
     1: "REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE",              # Request is not allowed in the current operating mode
     2: "REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM",         # Validated request was not confirmed by user in reasonable time
     3: "REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE",                    # Request is not allowed if not in treatment mode
@@ -58,18 +58,7 @@
     31: "REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED",                      # Heparin cannot be resumed if not paused
     32: "REQUEST_REJECT_REASON_DG_COMM_LOST",                            # Treatment cannot initiate if DG comm is lost
     33: "REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE",                      # Post-treatment reservoirs drain not complete
-    34: "REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE",            # Treatment cannot initiate if DG is not in standby idle state
-    35: "REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT",                  # Request message not formatted properly
-    36: "REQUEST_REJECT_REASON_INVALID_DATE_OR_TIME",                    # Given date/time is invalid
-    37: "REQUEST_REJECT_REASON____AVAILABLE_1",                          # Not used - available for use
-    38: "REQUEST_REJECT_REASON_BATTERY_IS_NOT_CHARGED",                  # Battery does not have enough charge to start treatment
-    39: "REQUEST_REJECT_REASON_RINSEBACK_NOT_COMPLETED",                 # Cannot move on to recirculate without completing full rinseback.
-    40: "REQUEST_REJECT_REASON_RESERVOIR_ONE_IS_NOT_READY",              # Reservoir one fill is not complete
-    41: "REQUEST_REJECT_REASON_PUMP_TRACK_NOT_CLOSED",                   # Pump track is not ready / closed
-    42: "REQUEST_REJECT_REASON_DOOR_NOT_CLOSED",                         # Door is not closed
-    43: "REQUEST_REJECT_REASON_SYRINGE_NOT_PRESENT",                     # Syringe is not present
-    }
+}
    
    
-   
                          
\ No newline at end of file
Index: tst_treatment_saline_data/test.py
===================================================================
diff -u -r2aff4bbf5a1749195064cfc9b8acc9f55aab601d -rc0794178d98672bdfbaf2b7315e7f007b6b79295
--- tst_treatment_saline_data/test.py	(.../test.py)	(revision 2aff4bbf5a1749195064cfc9b8acc9f55aab601d)
+++ tst_treatment_saline_data/test.py	(.../test.py)	(revision c0794178d98672bdfbaf2b7315e7f007b6b79295)
@@ -99,7 +99,7 @@
     if (not accept_status): test.compare(waitForObjectExists(utility.rejection_msg(config.REJECTION_REASON[rejection_reason])).text, config.REJECTION_REASON[rejection_reason], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[rejection_reason]))
 
     #set saline transition state.
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=saline_states, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=saline_states, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value)  
 
@@ -213,15 +213,15 @@
     
     test.startSection("verification of saline parameter states on main treatment screen")
 
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE  .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) 
     
     mouseClick(waitForObject(names.o_treatmentHome_startFluidButton_TouchRect))
     test.compare((waitForObjectExists(names.o_treatmentHome_startFluidButton_TouchRect).enabled), True, "START BOLUS button is enable")
     test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), True, "Start Bolus text is enable")
     
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE  .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) 
     
@@ -231,7 +231,7 @@
     test.compare((waitForObjectExists(names.o_treatmentHome_image_Image).visible), True, "Pause Image is Visible")
     test.compare(str(waitForObjectExists(names.o_treatmentHome_Treatment_Paused_Text).text), "Treatment Paused", "Treatment Paused text is visible")
 
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE  .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) 
     
@@ -240,7 +240,7 @@
     test.compare((waitForObjectExists(names.o_treatmentHome_image_Image).visible), True, "Pause Image is Visible")
     test.compare(str(waitForObjectExists(names.o_treatmentHome_Treatment_Paused_Text).text), "Treatment Paused", "Treatment Paused text is visible")
 
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_STOP_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_STOP_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) 
     
@@ -257,7 +257,7 @@
     utils.waitForGUI(1)
 
     #navigate to dialysis state
-    hd_simulator.cmd_set_treatment_states_data(sub_mode= HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode= HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value)