Index: tests/data_capture_helpers/fp_helpers.py
===================================================================
diff -u -r549db6a2f9c36fa5f714a92146b19ca81d6d1900 -r20c66b3bb8286d87559830a84621489645c5249c
--- tests/data_capture_helpers/fp_helpers.py	(.../fp_helpers.py)	(revision 549db6a2f9c36fa5f714a92146b19ca81d6d1900)
+++ tests/data_capture_helpers/fp_helpers.py	(.../fp_helpers.py)	(revision 20c66b3bb8286d87559830a84621489645c5249c)
@@ -8,9 +8,12 @@
 
 
 from leahi_dialin import FP
-from leahi_dialin.common.fp_defs import *
-from leahi_dialin import DD
-from leahi_dialin.dd.modules.valves import DDValves, DDValveNames
+from leahi_dialin.fp.modules.conductivity_sensors import FPConductivitySensorNames
+from leahi_dialin.fp.modules.flow_sensors import FPFlowSensorNames
+from leahi_dialin.fp.modules.pressure_sensors import FPPressureSensorNames
+from leahi_dialin.fp.modules.levels import FPFloaterLevels
+from leahi_dialin.fp.modules.valves import FPValveNames, FPValveStates
+from leahi_dialin.fp.modules.temperatures import FPTemperaturesNames
 
 excel.ExcelFormatter.header_style = None
 write_mutex = Lock()
@@ -150,8 +153,8 @@
         write_mutex.acquire()
         with open(log_path, "a") as f:
             # collect data and log it
-            cond = "{}, ".format(FPConductivitySensorsEnum.P9_COND.name) + '{}'.format(fp.conductivity.fp_conductivity['P9_COND']) + \
-                    ", {}, ".format(FPConductivitySensorsEnum.P18_COND.name) + '{}'.format(fp.conductivity.fp_conductivity['P18_COND']) + \
+            cond = "{}, ".format(FPConductivitySensorNames.P9_COND.name) + '{}'.format(fp.conductivity.p9_cond) + \
+                    ", {}, ".format(FPConductivitySensorNames.P18_COND.name) + '{}'.format(fp.conductivity.p18_cond) + \
                     ", {}\n".format(fp.conductivity.fp_conductivity_timestamp)
 
             f.write(cond)