Index: tests/peter/test_blood_flow.py
===================================================================
diff -u -r46ebf93d3666db40f25ad1e9170426853aa845d4 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_blood_flow.py	(.../test_blood_flow.py)	(revision 46ebf93d3666db40f25ad1e9170426853aa845d4)
+++ tests/peter/test_blood_flow.py	(.../test_blood_flow.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -16,7 +16,7 @@
 import numpy as np
 import sys
 from time import sleep
-sys.path.append("..")
+sys.path.append("../../")
 from dialin import HDSimulator
 from dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from dialin.common import MsgIds
Index: tests/peter/test_calibration.py
===================================================================
diff -u -r46ebf93d3666db40f25ad1e9170426853aa845d4 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_calibration.py	(.../test_calibration.py)	(revision 46ebf93d3666db40f25ad1e9170426853aa845d4)
+++ tests/peter/test_calibration.py	(.../test_calibration.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -6,7 +6,7 @@
 
 from dialin import HD, AbstractObserver
 
-sys.path.append("../")
+sys.path.append("../../")
 from dialin.dg.dialysate_generator import DG
 from dialin.utils.nv_ops_utils import NVOpsUtils
 from time import sleep
Index: tests/peter/test_can.py
===================================================================
diff -u -r46ebf93d3666db40f25ad1e9170426853aa845d4 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_can.py	(.../test_can.py)	(revision 46ebf93d3666db40f25ad1e9170426853aa845d4)
+++ tests/peter/test_can.py	(.../test_can.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -14,7 +14,7 @@
 #
 ############################################################################
 import sys
-sys.path.append("..")
+sys.path.append("../../")
 from dialin.utils import setup_virtual_can_interface, setup_real_can_interface
 
 resp = input("Setup virtual can interface? (y/n): ")
Index: tests/peter/test_data_logger.py
===================================================================
diff -u -r71a841a276af8c3d4a53ad1a0c90727b63a8f5d3 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_data_logger.py	(.../test_data_logger.py)	(revision 71a841a276af8c3d4a53ad1a0c90727b63a8f5d3)
+++ tests/peter/test_data_logger.py	(.../test_data_logger.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -16,7 +16,7 @@
 import sys
 from time import sleep
 
-sys.path.append("..")
+sys.path.append("../../")
 from dialin import HD, AbstractObserver
 from dialin.utils import DataLogger
 
Index: tests/peter/test_debug_text.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_debug_text.py	(.../test_debug_text.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_debug_text.py	(.../test_debug_text.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -14,7 +14,7 @@
 #
 ############################################################################
 import sys
-sys.path.append("..")
+sys.path.append("../../")
 
 from dialin.ui.hd_simulator import HDSimulator
 from dialin.ui.messageBuilder import textToByte
Index: tests/peter/test_demo.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_demo.py	(.../test_demo.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_demo.py	(.../test_demo.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -14,7 +14,7 @@
 #
 ############################################################################
 import sys
-sys.path.append("..")
+sys.path.append("../../")
 from dialin.dg.dialysate_generator import DG
 from dialin.hd.hemodialysis_device import HD
 from dialin.hd.constants import RESET, NO_RESET, BUTTON_PRESSED, BUTTON_RELEASED
Index: tests/peter/test_dg_thermistors.py
===================================================================
diff -u -rb20262631dc86edf5c3550762bc888089fa2626d -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_dg_thermistors.py	(.../test_dg_thermistors.py)	(revision b20262631dc86edf5c3550762bc888089fa2626d)
+++ tests/peter/test_dg_thermistors.py	(.../test_dg_thermistors.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -16,7 +16,7 @@
 import numpy as np
 import sys
 from time import sleep
-sys.path.append("..")
+sys.path.append("../../")
 from dialin import DGSimulator
 from dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from dialin.common import MsgIds
Index: tests/peter/test_dg_valves.py
===================================================================
diff -u -rb20262631dc86edf5c3550762bc888089fa2626d -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_dg_valves.py	(.../test_dg_valves.py)	(revision b20262631dc86edf5c3550762bc888089fa2626d)
+++ tests/peter/test_dg_valves.py	(.../test_dg_valves.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -16,7 +16,7 @@
 import numpy as np
 import sys
 from time import sleep
-sys.path.append("..")
+sys.path.append("../../")
 from dialin import DGSimulator
 from dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from dialin.common import MsgIds
Index: tests/peter/test_dg_valves_observer.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_dg_valves_observer.py	(.../test_dg_valves_observer.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_dg_valves_observer.py	(.../test_dg_valves_observer.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -15,7 +15,7 @@
 ############################################################################
 
 import sys
-sys.path.append("..")
+sys.path.append("../../")
 from dialin.dg.dialysate_generator import DG
 from datetime import datetime, timedelta
 from dialin.utils.base import AbstractObserver
Index: tests/peter/test_fw_controller.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_fw_controller.py	(.../test_fw_controller.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_fw_controller.py	(.../test_fw_controller.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -14,7 +14,7 @@
 #
 ############################################################################
 import sys
-sys.path.append("..")
+sys.path.append("../../")
 from dialin.ui.hd_simulator import HDSimulator
 from time import sleep
 
Index: tests/peter/test_gen_requirements.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_gen_requirements.py	(.../test_gen_requirements.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_gen_requirements.py	(.../test_gen_requirements.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -14,7 +14,7 @@
 #
 ############################################################################
 import sys
-sys.path.append("..")
+sys.path.append("../../")
 from dialin.dg.dialysate_generator import DG
 from dialin.hd.hemodialysis_device import HD
 from dialin.hd.constants import RESET, NO_RESET, BUTTON_PRESSED, BUTTON_RELEASED
Index: tests/peter/test_hd_dg_simulators.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_hd_dg_simulators.py	(.../test_hd_dg_simulators.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_hd_dg_simulators.py	(.../test_hd_dg_simulators.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -16,7 +16,7 @@
 import sys
 from time import sleep
 
-sys.path.append("..")
+sys.path.append("../../")
 from dialin import HDSimulator, DGSimulator, AbstractObserver
 
 
Index: tests/peter/test_hd_fluid_leak.py
===================================================================
diff -u -r33e3f9f462c34f5ac8f8319dc3fada668b829190 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_hd_fluid_leak.py	(.../test_hd_fluid_leak.py)	(revision 33e3f9f462c34f5ac8f8319dc3fada668b829190)
+++ tests/peter/test_hd_fluid_leak.py	(.../test_hd_fluid_leak.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -16,7 +16,7 @@
 import numpy as np
 import sys
 from time import sleep
-sys.path.append("..")
+sys.path.append("../../")
 from dialin import HDSimulator
 from dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from dialin.common import MsgIds
Index: tests/peter/test_hd_reset.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_hd_reset.py	(.../test_hd_reset.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_hd_reset.py	(.../test_hd_reset.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -14,7 +14,7 @@
 #
 ############################################################################
 import sys
-sys.path.append("..")
+sys.path.append("../../")
 from dialin.hd.hemodialysis_device import HD
 
 def test_reset():
Index: tests/peter/test_hd_simulator.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_hd_simulator.py	(.../test_hd_simulator.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_hd_simulator.py	(.../test_hd_simulator.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -14,7 +14,7 @@
 #
 ############################################################################
 import sys
-sys.path.append("..")
+sys.path.append("../../")
 
 from dialin.ui.hd_simulator import HDSimulator, RequestRejectReasons
 from dialin.hd.hemodialysis_device import HD
Index: tests/peter/test_hd_valves.py
===================================================================
diff -u -rb20262631dc86edf5c3550762bc888089fa2626d -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_hd_valves.py	(.../test_hd_valves.py)	(revision b20262631dc86edf5c3550762bc888089fa2626d)
+++ tests/peter/test_hd_valves.py	(.../test_hd_valves.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -16,7 +16,7 @@
 import numpy as np
 import sys
 from time import sleep
-sys.path.append("..")
+sys.path.append("../../")
 from dialin import HDSimulator
 from dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from dialin.common import MsgIds
Index: tests/peter/test_listener.py
===================================================================
diff -u -r46ebf93d3666db40f25ad1e9170426853aa845d4 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_listener.py	(.../test_listener.py)	(revision 46ebf93d3666db40f25ad1e9170426853aa845d4)
+++ tests/peter/test_listener.py	(.../test_listener.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -1,6 +1,6 @@
 import sys
 import time
-sys.path.append("..")
+sys.path.append("../../")
 from dialin import HD, AbstractObserver
 
 
Index: tests/peter/test_logging.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_logging.py	(.../test_logging.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_logging.py	(.../test_logging.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -15,10 +15,10 @@
 ############################################################################
 import sys
 import subprocess
-sys.path.append("..")
+sys.path.append("../../")
 from dialin.dg.dialysate_generator import DG
 from dialin.hd.hemodialysis_device import HD
-from dialin.utils.base import create_logger
+from dialin.utils import create_logger
 import time
 import logging
 from logging import Logger
Index: tests/peter/test_print_version.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_print_version.py	(.../test_print_version.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_print_version.py	(.../test_print_version.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -14,7 +14,7 @@
 #
 ############################################################################
 import sys
-sys.path.append("..")
+sys.path.append("../../")
 
 import dialin
 print(dialin.__version__)
\ No newline at end of file
Index: tests/peter/test_single_alarm.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_single_alarm.py	(.../test_single_alarm.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_single_alarm.py	(.../test_single_alarm.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -14,7 +14,7 @@
 #
 ############################################################################
 import sys
-sys.path.append("..")
+sys.path.append("../../")
 from dialin.ui.hd_simulator import HDSimulator
 from dialin.ui.hd_simulator_alarms import Alarms
 from time import sleep
Index: tests/peter/test_temperature_sensors.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_temperature_sensors.py	(.../test_temperature_sensors.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_temperature_sensors.py	(.../test_temperature_sensors.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -16,7 +16,7 @@
 import numpy as np
 import sys
 from time import sleep
-sys.path.append("..")
+sys.path.append("../../")
 from dialin import HDSimulator
 from dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from dialin.common import MsgIds
Index: tests/peter/test_ui_proxy.py
===================================================================
diff -u -rbfb0c47181dc8a73d09825ab697a7799dd520417 -r1508298c28026c5a1df24fb8e614cb8ab65b2e09
--- tests/peter/test_ui_proxy.py	(.../test_ui_proxy.py)	(revision bfb0c47181dc8a73d09825ab697a7799dd520417)
+++ tests/peter/test_ui_proxy.py	(.../test_ui_proxy.py)	(revision 1508298c28026c5a1df24fb8e614cb8ab65b2e09)
@@ -14,7 +14,7 @@
 #
 ############################################################################
 import sys
-sys.path.append("../..")
+sys.path.append("../../")
 from dialin.hd.hemodialysis_device import HD
 from time import sleep
 from dialin.utils.base import AbstractObserver