Index: dialin/dg/events.py
===================================================================
diff -u -rb5ebd4c79b40e896e806e3495c7548466731bcd1 -r840ed25b933e32a993cadfe0d0c44343573c84cb
--- dialin/dg/events.py	(.../events.py)	(revision b5ebd4c79b40e896e806e3495c7548466731bcd1)
+++ dialin/dg/events.py	(.../events.py)	(revision 840ed25b933e32a993cadfe0d0c44343573c84cb)
@@ -101,12 +101,14 @@
         else:
             # Get the all the events
             complete_list = self._dg_event_dictionary[DGEventList(event_id).name]
-
             # Since the last <number_of_message> are located at the end of the list, iterate backwards for the defined
             # event messages
-            for i in range(len(complete_list) - 1, number_of_events + 1, -1):
+            for i in range(len(complete_list) - 1, len(complete_list) - number_of_events - 1, -1):
                 list_of_events.append(complete_list[i])
 
+        if number_of_events == 0:
+            list_of_events = self._dg_event_dictionary[DGEventList(event_id).name]
+
         return list_of_events
 
     @publish(['_dg_event_dictionary'])
Index: dialin/dg/ro_pump.py
===================================================================
diff -u -rb5ebd4c79b40e896e806e3495c7548466731bcd1 -r840ed25b933e32a993cadfe0d0c44343573c84cb
--- dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision b5ebd4c79b40e896e806e3495c7548466731bcd1)
+++ dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision 840ed25b933e32a993cadfe0d0c44343573c84cb)
@@ -119,6 +119,7 @@
         self.measured_flow_rate_lpm = flow
         self.pwm_duty_cycle_pct = pwm
         self.ro_pump_state = ROPumpStates(ro_state).name if ROPumpStates.has_value(ro_state) else 'State Unknown'
+        self.target_flow_lpm = tgt_flow
 
     def cmd_ro_pump_duty_cycle_pct(self, duty: float) -> int:
         """
Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -rb5ebd4c79b40e896e806e3495c7548466731bcd1 -r840ed25b933e32a993cadfe0d0c44343573c84cb
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision b5ebd4c79b40e896e806e3495c7548466731bcd1)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 840ed25b933e32a993cadfe0d0c44343573c84cb)
@@ -549,11 +549,11 @@
     hd.cmd_log_in_to_hd()
     sleep(1)
 
-    #run_heat_disinfect()
+    # run_heat_disinfect()
 
     # run_chemical_disinfect()
 
-    #run_dg()
+    # run_dg()
 
     # run_ro_pump_duty_cycles()
 
Index: tests/test_flush.py
===================================================================
diff -u -rb5ebd4c79b40e896e806e3495c7548466731bcd1 -r840ed25b933e32a993cadfe0d0c44343573c84cb
--- tests/test_flush.py	(.../test_flush.py)	(revision b5ebd4c79b40e896e806e3495c7548466731bcd1)
+++ tests/test_flush.py	(.../test_flush.py)	(revision 840ed25b933e32a993cadfe0d0c44343573c84cb)
@@ -27,7 +27,7 @@
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, Op, {}, '
             'Sub, {}, History, {}, '
             .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time,
-                    dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top, dg.events.get_dg_nth_event(1),
+                    dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top, dg.events.get_dg_events(1, 0),
                     dg.events.get_dg_nth_event(2), dg.events.get_dg_events(2, 70)))
 
     return info