diff --git a/lbrynet/conf.py b/lbrynet/conf.py
index ca6447478..25d1edb74 100644
--- a/lbrynet/conf.py
+++ b/lbrynet/conf.py
@@ -482,7 +482,7 @@ class Config(object):
             self._data[data_type][name] = value
 
     def update(self, updated_settings, data_types=(TYPE_RUNTIME,)):
-        for k, v in updated_settings.iteritems():
+        for k, v in updated_settings.items():
             try:
                 self.set(k, v, data_types=data_types)
             except (KeyError, AssertionError):
diff --git a/tests/functional/test_misc.py b/tests/functional/test_misc.py
index a86a38f69..f8542a2cd 100644
--- a/tests/functional/test_misc.py
+++ b/tests/functional/test_misc.py
@@ -16,8 +16,9 @@ from lbrynet.database.storage import SQLiteStorage
 from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file
 from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager
 from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
-from lbrynet.tests import mocks
-from lbrynet.tests.util import mk_db_and_blob_dir, rm_db_and_blob_dir
+
+from tests import mocks
+from tests.util import mk_db_and_blob_dir, rm_db_and_blob_dir
 
 FakeNode = mocks.Node
 FakeWallet = mocks.Wallet
diff --git a/tests/functional/test_reflector.py b/tests/functional/test_reflector.py
index efa5b4f8a..1f6eef584 100644
--- a/tests/functional/test_reflector.py
+++ b/tests/functional/test_reflector.py
@@ -10,8 +10,8 @@ from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager
 from lbrynet.core.RateLimiter import DummyRateLimiter
 from lbrynet.database.storage import SQLiteStorage
 from lbrynet.core.PaymentRateManager import OnlyFreePaymentsManager
-from lbrynet.tests import mocks
-from lbrynet.tests.util import mk_db_and_blob_dir, rm_db_and_blob_dir
+from tests import mocks
+from tests.util import mk_db_and_blob_dir, rm_db_and_blob_dir
 
 
 class TestReflector(unittest.TestCase):
diff --git a/tests/functional/test_streamify.py b/tests/functional/test_streamify.py
index ddea87547..ce6952f72 100644
--- a/tests/functional/test_streamify.py
+++ b/tests/functional/test_streamify.py
@@ -13,7 +13,7 @@ from lbrynet.database.storage import SQLiteStorage
 from lbrynet.core.PaymentRateManager import OnlyFreePaymentsManager
 from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file
 from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager
-from lbrynet.tests import mocks
+from tests import mocks
 
 
 FakeNode = mocks.Node
diff --git a/tests/integration/wallet/__init__.py b/tests/integration/wallet/__init__.py
new file mode 100644
index 000000000..e69de29bb