Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -r2dbe3df84ab5f68cea1ac6bce9a3727ac1dbe72a -r3dc6f8a5072178c107f7f273aae5f34ca1d06e4d
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 2dbe3df84ab5f68cea1ac6bce9a3727ac1dbe72a)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 3dc6f8a5072178c107f7f273aae5f34ca1d06e4d)
@@ -25,7 +25,7 @@
 from .constants import RESET, NO_RESET
 from .drain_pump import DGDrainPump
 from .fans import Fans
-from .flow_rate import DialysateFlowSensor
+from .dialysate_flow_sensor import DialysateFlowSensor
 from .fluid_leak import DGFluidLeak
 from .flush import FlushMode
 from .hd_proxy import DGHDProxy
Index: tests/test_dialysate_flow_sensor.py
===================================================================
diff -u -r69aa5e13a175a24174b6d6776209a6166b595c0f -r3dc6f8a5072178c107f7f273aae5f34ca1d06e4d
--- tests/test_dialysate_flow_sensor.py	(.../test_dialysate_flow_sensor.py)	(revision 69aa5e13a175a24174b6d6776209a6166b595c0f)
+++ tests/test_dialysate_flow_sensor.py	(.../test_dialysate_flow_sensor.py)	(revision 3dc6f8a5072178c107f7f273aae5f34ca1d06e4d)
@@ -16,42 +16,29 @@
 
 import sys
 sys.path.append("..")
-from dialin.dg.hemodialysis_device import DG
-from dialin.dg.dialysate_flow_sensor import DialysateFlowSensor
+from dialin.hd.hemodialysis_device import HD
+from dialin.dg.dialysate_generator import DG
 from time import sleep
 
 if __name__ == "__main__":
 
     # Create a dialysate flow object called df_object
-    df_object = DialysateFlowSensor()
+    dg_object = DG()
+    hd_object = HD()
 
-    sleep(2)
+    #dg.cmd_log_in_to_dg()
+    #dg_object.dialysate_flow_sensor.cmd_flow_sensor_data_broadcast_interval_override(500.0)
+    #sleep(2)
 
     while True:
-        sleep(0.5)
-        print("Measured Dialysate Flow = {} mL/min".format(df_object.get_flow_rate()))
-        sleep(10)
+        print("Measured Dialysate Flow =, {} ,mL/min".format(dg_object.dialysate_flow_sensor.get_flow_rate())+
+              ", UF Rate =, {} ,mL/min".format(hd_object.dialysate_outlet_flow.get_measured_dialysate_outlet_pump_speed()))
+        sleep(1)
 
-        df_object.cmd_flow_sensor_value_override(1.0)
-        sleep(10)
-        print("Measured Dialysate Flow = {} mL/min".format(df_object.get_flow_rate()))
 
-        df_object.cmd_flow_sensor_value_override(1.5)
-        sleep(10)
-        print("Measured Dialysate Flow = {} mL/min".format(df_object.get_flow_rate()))
 
-        df_object.cmd_flow_sensor_data_broadcast_interval_override(500.0)
-        sleep(10)
 
-        df_object.cmd_flow_sensor_data_broadcast_interval_override(800.0)
-        sleep(10)
 
-        df_object.cmd_flow_sensor_data_broadcast_interval_override(900.0)
-        sleep(10)
 
 
 
-
-
-
-