Index: tests/test_uf.py
===================================================================
diff -u -rd23b6e2d83f29c9eeec1d2f284a00eb312ca6fe5 -r6e5fe18fa126baffc94a09c050312ac00d98c288
--- tests/test_uf.py	(.../test_uf.py)	(revision d23b6e2d83f29c9eeec1d2f284a00eb312ca6fe5)
+++ tests/test_uf.py	(.../test_uf.py)	(revision 6e5fe18fa126baffc94a09c050312ac00d98c288)
@@ -1,16 +1,16 @@
 ###########################################################################
 #
-# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+# Copyright (c) 2019-2021 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_uf.py
+# @file    test_uf.py
 #
-# @author (last) Peter Lucia
-# @date (last) 02-Oct-2020
-# @author (original) Peter Lucia
-# @date (original) 14-Jul-2020
+# @author  (last)      Sean Nash
+# @date    (last)      23-Jul-2021
+# @author  (original)  Peter Lucia
+# @date    (original)  14-Jul-2020
 #
 ############################################################################
 
@@ -71,6 +71,7 @@
                 ", DPi.f, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_flow_rate) + \
                 ", DPo.m, " + '{:7.1f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_speed) + \
                 ", DPo.r, " + '{:6.1f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_rotor_speed) + \
+                ", FMD.f, " + '{:7.4f}'.format(dg.dialysate_flow_sensor.get_flow_rate()) + \
                 ", ROP.f, " + '{:9.3f}'.format(dg.ro_pump.measured_flow_rate_lpm)
             pumpPWMs = ", BP.w, "+'{:6.1f}'.format(hd.bloodflow.pwm_duty_cycle_pct) + \
                 ", DPi.w, " + '{:6.1f}'.format(hd.dialysate_inlet_flow.pwm_duty_cycle_pct) +  \
@@ -83,9 +84,7 @@
                 ", PDr, " + '{:9.2f}'.format(dg.pressures.drain_pump_outlet_pressure)
             hdPress = ", PBA, " + '{:9.2f}'.format(hd.pressure_occlusion.arterial_pressure) + \
                 ", PBV, " + '{:9.2f}'.format(hd.pressure_occlusion.venous_pressure) + \
-                ", OB, " + '{:7d}'.format(hd.pressure_occlusion.blood_pump_occlusion) + \
-                ", ODi, " + '{:7d}'.format(hd.pressure_occlusion.dialysate_inlet_pump_occlusion) + \
-                ", ODo, " + '{:7d}'.format(hd.pressure_occlusion.dialysate_outlet_pump_occlusion)
+                ", OB, " + '{:7d}'.format(hd.pressure_occlusion.blood_pump_occlusion)
             Temps = ", TPi, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INLET_PRIMARY_HEATER.name]) + \
                 ", TPo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.OUTLET_PRIMARY_HEATER.name]) + \
                 ", TRo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INLET_DIALYSATE.name]) + \