Index: tests/test_imports.py
===================================================================
diff -u -r4cb37e8ec3d57576aea76c8aae84130d3adb3ab1 -r28c6de16995eccda5170c5385752da0cc4277183
--- tests/test_imports.py	(.../test_imports.py)	(revision 4cb37e8ec3d57576aea76c8aae84130d3adb3ab1)
+++ tests/test_imports.py	(.../test_imports.py)	(revision 28c6de16995eccda5170c5385752da0cc4277183)
@@ -7,27 +7,30 @@
 
     # @unittest.skip("Skipping test_imports")
     def test_hd_imports(self):
-        from dialin.hd.basics import HDBasics
         from dialin.hd.alarms import HDAlarms
-        from dialin.hd.constants import RESET, NO_RESET
-        from dialin.hd.buttons import HDButtons
         from dialin.hd.blood_flow import HDBloodFlow
-        from dialin.hd.hemodialysis_device import HD
-        from dialin.hd.dialysate_outlet_flow import HDDialysateOutletFlow
+        from dialin.hd.buttons import HDButtons
+        from dialin.hd.constants import RESET, NO_RESET
         from dialin.hd.dialysate_inlet_flow import HDDialysateInletFlow
-        from dialin.hd.dialout_flow import DialOutStates, HDDialOut
-        from dialin.hd.ui import HDUI
-        from dialin.hd.treatment import HDTreatment
+        from dialin.hd.dialysate_outlet_flow import HDDialysateOutletFlow
+        from dialin.hd.hemodialysis_device import HD
+        from dialin.hd.pressure_occlusion import HDPressureOcclusion
         from dialin.hd.rtc import HDRTC
+        from dialin.hd.treatment import HDTreatment
+        from dialin.hd.ui_proxy import HDUIProxy
         from dialin.hd.watchdog import HDWatchdog
-        from dialin.hd.basics import HDBasics
-        from dialin.hd.pressure_occlusion import HDPressureOcclusion
 
     # @unittest.skip("Skipping test_imports")
     def test_dg_imports(self):
 
         from dialin.dg.dialysate_generator import DG
+        from dialin.dg.drain_pump import DGDrainPump
+        from dialin.dg.hd_proxy import DGHDProxy
+        from dialin.dg.load_cells import DGLoadCells
+        from dialin.dg.pressures import DGPressures
+        from dialin.dg.reservoirs import DGReservoirs
 
+
     # @unittest.skip("Skipping test_imports")
     def test_protocols_imports(self):