diff --git a/code/client/tests/README.md b/code/client/tests/README.md
index 07190fad..99cabd7c 100644
--- a/code/client/tests/README.md
+++ b/code/client/tests/README.md
@@ -30,14 +30,15 @@ For instance, here is the directory structure for all of the tests:
     └── code
         └── client
             └── munkilib
-                ├── appleupdates_test.py
-                └── munkicommon
-                    ├── munkicommon_data_scaffolds.py
-                    ├── test_munkicommon_isapprunning.py
-                    └── test_munkicommon_unicode.py
+                ├── data_scaffolds.py
+                ├── display
+                      └── test_munkicommon_unicode.py
+                ├── processes    
+                      └─── test_munkicommon_isapprunning.py
+                
 
 
-If you want to add tests for the `blockingApplicationsRunning` function, you would name it `test_blockingapplicationsrunning.py` and place it in `tests/code/client/munkilib/munkicommon`. The resulting file structure would look like this:
+If you want to add tests for the `blockingApplicationsRunning` function, you would name it `test_blockingapplicationsrunning.py` and place it in `tests/code/client/munkilib`. The resulting file structure would look like this:
 
     tests
     ├── README.md
diff --git a/code/client/tests/munkilib/munkicommon/data_scaffolds.py b/code/client/tests/munkilib/data_scaffolds.py
similarity index 100%
rename from code/client/tests/munkilib/munkicommon/data_scaffolds.py
rename to code/client/tests/munkilib/data_scaffolds.py
diff --git a/code/client/tests/munkilib/munkicommon/__init__.py b/code/client/tests/munkilib/display/__init__.py
similarity index 100%
rename from code/client/tests/munkilib/munkicommon/__init__.py
rename to code/client/tests/munkilib/display/__init__.py
diff --git a/code/client/tests/munkilib/munkicommon/test_display_unicode.py b/code/client/tests/munkilib/display/test_display_unicode.py
similarity index 98%
rename from code/client/tests/munkilib/munkicommon/test_display_unicode.py
rename to code/client/tests/munkilib/display/test_display_unicode.py
index 3d06ae5e..860b4095 100755
--- a/code/client/tests/munkilib/munkicommon/test_display_unicode.py
+++ b/code/client/tests/munkilib/display/test_display_unicode.py
@@ -20,10 +20,10 @@ Unit tests for display.display_* functions.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-import munkilib.display as display
 import unittest
 
+from munkilib import display
+
 
 MSG_UNI = u'Günther\'s favorite thing is %s'
 MSG_STR = 'Günther\'s favorite thing is %s'
diff --git a/code/client/tests/munkilib/processes/__init__.py b/code/client/tests/munkilib/processes/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/code/client/tests/munkilib/munkicommon/test_isapprunning.py b/code/client/tests/munkilib/processes/test_isapprunning.py
similarity index 98%
rename from code/client/tests/munkilib/munkicommon/test_isapprunning.py
rename to code/client/tests/munkilib/processes/test_isapprunning.py
index 181d301c..2ae4b102 100755
--- a/code/client/tests/munkilib/munkicommon/test_isapprunning.py
+++ b/code/client/tests/munkilib/processes/test_isapprunning.py
@@ -20,10 +20,11 @@ Unit tests for processes.isAppRunning.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-from munkilib import processes
 import unittest
-from data_scaffolds import getRunningProcessesMock
+
+from ..data_scaffolds import getRunningProcessesMock
+from munkilib import processes
+
 
 try:
     from mock import patch