Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -r979a84608c047c3bb83f2b419f925e424304f75a -rb30ee890f17656546ff5103f0c5d181cca51e45c
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 979a84608c047c3bb83f2b419f925e424304f75a)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision b30ee890f17656546ff5103f0c5d181cca51e45c)
@@ -688,7 +688,7 @@
                 rsp_payload += integer_to_bytearray(PreTreatmentSubModes.HD_PRE_TREATMENT_WATER_SAMPLE_STATE.value)
                 self.demoSelection = 5  # <TBD next is Water Sample
                 self.demoCount = 2 * 60  # TBD const
-                self.demoCountdownId = MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS
+                self.demoCountdownId = MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS_DATA
                 self.demoCountdownChannel = DenaliChannels.dg_to_ui_ch_id  # flush is a DG action
 
             elif self.demoSelection == 5:  # <TBD Water Sample
@@ -771,6 +771,8 @@
                 self.demoSelection = 0  # TBD! setup event to change to // Wait for user
 
             elif self.demoSelection == 9:  # Dry Self Tests; init by MSG_ID_UI_INSTALLATION_CONFIRM
+                if self.demoTimedIncValue == PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_STOPPED_STATE.value: # Skip Stop state
+                    self.demoTimedIncValue = PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_COMPLETE_STATE.value # And move to Complete state
                 rsp_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE_DATA
                 rsp_payload = struct.pack(
                     "<" + str(PreTreatmentSubModes.NUM_OF_HD_PRE_TREATMENT_STATES.value + 1) + "i",