diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 4f1ff4c32..2d3d6733d 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -68,7 +68,7 @@ Sherlock.  This invocation hides the progress text that Sherlock normally
 outputs, and instead shows the verbose output of the tests.
 
 ```console
-$ cd sherlock/sherlock
+# Assumes pwd is respository root
 $ python3 -m unittest tests.all --verbose
 ```
 
diff --git a/sherlock/tests/__init__.py b/tests/__init__.py
similarity index 100%
rename from sherlock/tests/__init__.py
rename to tests/__init__.py
diff --git a/sherlock/tests/all.py b/tests/all.py
similarity index 100%
rename from sherlock/tests/all.py
rename to tests/all.py
diff --git a/sherlock/tests/base.py b/tests/base.py
similarity index 98%
rename from sherlock/tests/base.py
rename to tests/base.py
index 204c19c0a..2146b88b2 100644
--- a/sherlock/tests/base.py
+++ b/tests/base.py
@@ -5,7 +5,7 @@
 import os
 import os.path
 import unittest
-import sherlock
+from sherlock import sherlock
 from sherlock.result import QueryStatus
 from sherlock.notify import QueryNotify
 from sherlock.sites import SitesInformation
@@ -30,7 +30,7 @@ def setUp(self):
         warnings.simplefilter("ignore", ResourceWarning)
 
         # Create object with all information about sites we are aware of.
-        sites = SitesInformation(data_file_path=os.path.join(os.path.dirname(__file__), "../resources/data.json"))
+        sites = SitesInformation(data_file_path=os.path.join(os.path.dirname(__file__), "../sherlock/resources/data.json"))
 
         # Create original dictionary from SitesInformation() object.
         # Eventually, the rest of the code will be updated to use the new object
diff --git a/sherlock/tests/test_multiple_usernames.py b/tests/test_multiple_usernames.py
similarity index 90%
rename from sherlock/tests/test_multiple_usernames.py
rename to tests/test_multiple_usernames.py
index 3be803330..3e8a307ee 100644
--- a/sherlock/tests/test_multiple_usernames.py
+++ b/tests/test_multiple_usernames.py
@@ -1,7 +1,7 @@
 import unittest
 import sys
 sys.path.append('../')
-import sherlock as sh
+from sherlock import sherlock as sh
 
 checksymbols = []
 checksymbols = ["_", "-", "."]