Index: README.md
===================================================================
diff -u -rb0c5cfc6618b44d337ad6560f2cb4252e68c8d8c -r28c6de16995eccda5170c5385752da0cc4277183
--- README.md	(.../README.md)	(revision b0c5cfc6618b44d337ad6560f2cb4252e68c8d8c)
+++ README.md	(.../README.md)	(revision 28c6de16995eccda5170c5385752da0cc4277183)
@@ -64,22 +64,19 @@
 - See the tests directory for examples of how to use this API
 - Also consult the Dialin API documentation which can be generated using the `tools/document.sh` script.
 
-```batch
-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
 
 
 from dialin.dg.dialysate_generator import DG
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -r42feb8ffe3a0d7ab3a4de04ad0d58456afe2333b -r28c6de16995eccda5170c5385752da0cc4277183
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 42feb8ffe3a0d7ab3a4de04ad0d58456afe2333b)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 28c6de16995eccda5170c5385752da0cc4277183)
@@ -163,12 +163,3 @@
             print("Timeout!!!!")
             return False
 
-if __name__ == "__main__":
-    # create an DG object called dg
-    dg = DG()
-
-    # wait 2 seconds and then login to DG as a tester
-    sleep(2)
-    dg.cmd_log_in_to_dg()
-
-    # add test code below
Index: dialin/dg/load_cells.py
===================================================================
diff -u -r7b2d65304d1cc925e5000d9621fa195ce6a08cf1 -r28c6de16995eccda5170c5385752da0cc4277183
--- dialin/dg/load_cells.py	(.../load_cells.py)	(revision 7b2d65304d1cc925e5000d9621fa195ce6a08cf1)
+++ dialin/dg/load_cells.py	(.../load_cells.py)	(revision 28c6de16995eccda5170c5385752da0cc4277183)
@@ -132,11 +132,11 @@
 
     def cmd_load_cell_data_broadcast_interval_override(self, ms, reset=NO_RESET):
         """
-            Constructs and sends the load cell data broadcast interval override command
+        Constructs and sends the load cell data broadcast interval override command
 
-            \param ms:  integer - interval (in ms) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+        \param ms:  integer - interval (in ms) to override with
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \returns 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
Index: tests/dg_test_script.py
===================================================================
diff -u -r4cb37e8ec3d57576aea76c8aae84130d3adb3ab1 -r28c6de16995eccda5170c5385752da0cc4277183
--- tests/dg_test_script.py	(.../dg_test_script.py)	(revision 4cb37e8ec3d57576aea76c8aae84130d3adb3ab1)
+++ tests/dg_test_script.py	(.../dg_test_script.py)	(revision 28c6de16995eccda5170c5385752da0cc4277183)
@@ -40,6 +40,19 @@
         success = dg.fill('stop')
         self.assertTrue(success)
 
+    @unittest.skip("Skipping test_dg_login")
+    def test_dg_login(self):
+        raise NotImplementedError
+        """
+        # create an DG object called dg
+        dg = DG()
+
+        # wait 2 seconds and then login to DG as a tester
+        sleep(2)
+        dg.cmd_log_in_to_dg()
+        """
+
+
     @unittest.skip("Skipping test_dg_3")
     def test_dg_3(self):
         raise NotImplementedError
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):