Index: tests/test_uf.py
===================================================================
diff -u -r69fc37ca34f89229ceb18cf691dd4717d29032c8 -r32e628abcbbd3fd70866505d9f2836a6f732ef06
--- tests/test_uf.py	(.../test_uf.py)	(revision 69fc37ca34f89229ceb18cf691dd4717d29032c8)
+++ tests/test_uf.py	(.../test_uf.py)	(revision 32e628abcbbd3fd70866505d9f2836a6f732ef06)
@@ -1,14 +1,14 @@
 ###########################################################################
 #
-# Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+# Copyright (c) 2020-2024 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
 #
 # @author  (last)      Sean Nash
-# @date    (last)      12-Nov-2021
+# @date    (last)      24-Sep-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  14-Jul-2020
 #
@@ -64,7 +64,7 @@
                 ", VBV, " + hd.valves.valves_status[ValvesEnum.VBV.name]["PosID"] + \
                 ", VDi, " + hd.valves.valves_status[ValvesEnum.VDI.name]["PosID"] + \
                 ", VDo, " + hd.valves.valves_status[ValvesEnum.VDO.name]["PosID"] + \
-                ", VBT, " + hd.valves.hd_air_trap_status
+                ", VBT, " + '{:1d}'.format(hd.valves.hd_air_trap_status)
             air = ", ADV, " + '{:1d}'.format(hd.air_bubbles.air_bubbles_status[0]) + \
                 ", ULBl, " + '{:1d}'.format(hd.air_trap.lower_level) + \
                 ", ULBu, " + '{:1d}'.format(hd.air_trap.upper_level)
@@ -101,7 +101,7 @@
                 ", TPo, " + '{:9.2f}'.format(dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name]) + \
                 ", TRo, " + '{:9.2f}'.format(dg.temperatures.temperatures[DGTemperaturesNames.INLET_DIALYSATE.name]) + \
                 ", TDi, " + '{:9.2f}'.format(dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name]) + ","
-            alarms = ", AL.s, " + hd.alarms.get_current_alarms_state() + \
+            alarms = ", AL.s, " + '{:1d}'.format(hd.alarms.get_current_alarms_state()) + \
                 ", AL.t, " + '{:4d}'.format(hd.alarms.alarm_top)
             accels = ", AC.x, " + '{:9.4f}'.format(hd.accel.get_accel_vector().x) + \
                 ", AC.y, " + '{:9.4f}'.format(hd.accel.get_accel_vector().y) + \
@@ -112,7 +112,7 @@
                 ", ACt.x, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().x) + \
                 ", ACt.y, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().y) + \
                 ", ACt.z, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().z)
-            htrs = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Trimmer_DC, {:5.3f}, '
+            htrs = (', Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Trimmer_DC, {:5.3f}, '
                     'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '.
                     format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle,
                            dg.heaters.trimmer_heater_duty_cycle,