Index: DialityCoreCanProtocol.py
===================================================================
diff -u -rf2b88894a458d9e03a9cb005af02ef16fd5e6f32 -reeded10f89bd0722474d326a6423c755a11cc988
--- DialityCoreCanProtocol.py	(.../DialityCoreCanProtocol.py)	(revision f2b88894a458d9e03a9cb005af02ef16fd5e6f32)
+++ DialityCoreCanProtocol.py	(.../DialityCoreCanProtocol.py)	(revision eeded10f89bd0722474d326a6423c755a11cc988)
@@ -461,7 +461,7 @@
 
 if __name__ == "__main__":
     test_messenger = DialinCanMessenger()
-    test_channel_id = DialinMessage.ui_to_hd_ch_id
+    test_channel_id = DialinChannels.ui_to_hd_ch_id
 
     test_received_channel_id = DialinMessage.hd_to_ui_ch_id
     test_received_message_id = 0x100
Index: DialysateGenerator.py
===================================================================
diff -u -rf2b88894a458d9e03a9cb005af02ef16fd5e6f32 -reeded10f89bd0722474d326a6423c755a11cc988
--- DialysateGenerator.py	(.../DialysateGenerator.py)	(revision f2b88894a458d9e03a9cb005af02ef16fd5e6f32)
+++ DialysateGenerator.py	(.../DialysateGenerator.py)	(revision eeded10f89bd0722474d326a6423c755a11cc988)
@@ -68,8 +68,8 @@
 
         payload = [1] if start_or_stop == 'start' else [0]
 
-        msg = DialinMessage.buildMessage(channel_id=DialinChannels.hd_to_dg_ch_id,
-                                         message_id=0x7000,
+        msg = DialinMessage.buildMessage(channel_id=DialinChannels.ui_to_hd_ch_id,
+                                         message_id=1000,
                                          payload=payload)
 
         # Send message
@@ -96,7 +96,7 @@
     test_packet = test_dg.fill('start')
     test_fill_print(test_packet)
 
-    sleep(2)
+    sleep(10)
     test_packet = test_dg.fill('stop')
     test_fill_print(test_packet)
 
Index: Miscellaneous/DG_Firmware_Simulator.py
===================================================================
diff -u -rf2b88894a458d9e03a9cb005af02ef16fd5e6f32 -reeded10f89bd0722474d326a6423c755a11cc988
--- Miscellaneous/DG_Firmware_Simulator.py	(.../DG_Firmware_Simulator.py)	(revision f2b88894a458d9e03a9cb005af02ef16fd5e6f32)
+++ Miscellaneous/DG_Firmware_Simulator.py	(.../DG_Firmware_Simulator.py)	(revision eeded10f89bd0722474d326a6423c755a11cc988)
@@ -6,7 +6,7 @@
 # Building response message
 
 response_msg = DialinMessage.buildMessage(channel_id=DialinChannels.dg_to_hd_ch_id,
-                                          message_id=0x7000,
+                                          message_id=1000,
                                           payload=[1])
 
 # Building Publication message
@@ -26,8 +26,8 @@
 
 
 # Register response command for the DG
-dialin_messenger.registerReceivingPublicationFunction(channel_id=DialinChannels.hd_to_dg_ch_id,
-                                                      message_id=0x7000,
+dialin_messenger.registerReceivingPublicationFunction(channel_id=DialinChannels.ui_to_hd_ch_id,
+                                                      message_id=1000,
                                                       function=respondToCommand)
 
 dialin_messenger.start()