diff --git a/src/apex/__init__.py b/src/apex/__init__.py
index 79da91db8ad25e591535e0cfcb9d0d222cbf890b..2948cd1586d224f21d71557a8282ab0047863168 100644
--- a/src/apex/__init__.py
+++ b/src/apex/__init__.py
@@ -2,7 +2,7 @@
 Main module for APEX refernce implementation application.
 """
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/__main__.py b/src/apex/__main__.py
index d7635460d5daca651bc3052136f81157b88194d8..0a7712f2016ba9944ccead84819ac3ba536246e1 100644
--- a/src/apex/__main__.py
+++ b/src/apex/__main__.py
@@ -12,7 +12,7 @@ Why does this file exist, and why __main__? For more info, read:
 - https://docs.python.org/3/using/cmdline.html#cmdoption-m
 """
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/aprs/__init__.py b/src/apex/aprs/__init__.py
index a8bb121e1cbcdaf9013db04e232b811a581a9293..075caff0b883fa8a6210e7749f28bc87d70ef2fe 100644
--- a/src/apex/aprs/__init__.py
+++ b/src/apex/aprs/__init__.py
@@ -15,7 +15,7 @@ APRS Python Module.
 
 """
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/aprs/aprs_kiss.py b/src/apex/aprs/aprs_kiss.py
index 396602f94ba788274777d4107bd54e4e29fcecbf..86a6d0aed7ade850ffdb0106d610cff88f732c47 100644
--- a/src/apex/aprs/aprs_kiss.py
+++ b/src/apex/aprs/aprs_kiss.py
@@ -3,7 +3,7 @@
 
 """APRS KISS Class Definitions"""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/aprs/constants.py b/src/apex/aprs/constants.py
index a60431010b103093553cdb697a7877d9fc75a463..616ceec1b7e07cd9bfc09be14643f5963e7bac11 100644
--- a/src/apex/aprs/constants.py
+++ b/src/apex/aprs/constants.py
@@ -5,7 +5,7 @@
 Constants for APRS Module.
 """
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/aprs/decimal_degrees.py b/src/apex/aprs/decimal_degrees.py
index 6f9be72904cb4fbf7e6f5293582aa71e8f9abc70..e3b99d89711ea836700df14c043f870bf26444f6 100644
--- a/src/apex/aprs/decimal_degrees.py
+++ b/src/apex/aprs/decimal_degrees.py
@@ -48,7 +48,7 @@ $ python decimal_degrees.py [-v]
 
 """
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/aprs/igate.py b/src/apex/aprs/igate.py
index bb9b94c3da882b99bca2faaa3feadca8d2875037..9b4da00b25696fb24386db721c26f98e25086c85 100644
--- a/src/apex/aprs/igate.py
+++ b/src/apex/aprs/igate.py
@@ -3,7 +3,7 @@
 
 """APRS Internet Service Class Definitions"""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/aprs/util.py b/src/apex/aprs/util.py
index ece5b8a70498b02a2a410dde613a8fe1e06c3f21..445eee6eac8d1b7741c6fd1421b9c0c7353d5a66 100755
--- a/src/apex/aprs/util.py
+++ b/src/apex/aprs/util.py
@@ -3,7 +3,7 @@
 
 """Utilities for the APRS Python Module."""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/kiss/__init__.py b/src/apex/kiss/__init__.py
index 5def26ad48251ceb758beb1546f74ed4846caa37..ed2fa6b45cd252078497aee09ccce83b28f6f4d9 100644
--- a/src/apex/kiss/__init__.py
+++ b/src/apex/kiss/__init__.py
@@ -15,7 +15,7 @@ KISS Python Module.
 
 """
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/kiss/constants.py b/src/apex/kiss/constants.py
index df79ad02cd07af7cfd7a99bb9b6c564e7d968708..17e3fc3a61f84b43dc6a5c502d6c3dfef7ba2423 100644
--- a/src/apex/kiss/constants.py
+++ b/src/apex/kiss/constants.py
@@ -3,7 +3,7 @@
 
 """Constants for KISS Python Module."""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/kiss/kiss.py b/src/apex/kiss/kiss.py
index 619a7a7a6023c8b63ed9306e0288ed1f024f76d9..5d49eeea39c3ba5796e3489adbffa008ef0a9089 100644
--- a/src/apex/kiss/kiss.py
+++ b/src/apex/kiss/kiss.py
@@ -3,7 +3,7 @@
 
 """KISS Core Classes."""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/kiss/kiss_serial.py b/src/apex/kiss/kiss_serial.py
index 77e408974b0e98f326bb2cebaf4742d64e5ed8d8..2ddc2ba562117d034660df71c8df9009c43c7c8a 100644
--- a/src/apex/kiss/kiss_serial.py
+++ b/src/apex/kiss/kiss_serial.py
@@ -3,7 +3,7 @@
 
 """KISS Core Classes."""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/kiss/kiss_tcp.py b/src/apex/kiss/kiss_tcp.py
index 54b3dd3ca1be3e23d83f0fe2ae05589b1b630dde..4f6392f609b6cbd4d8186a9d1c53499f0707ba66 100644
--- a/src/apex/kiss/kiss_tcp.py
+++ b/src/apex/kiss/kiss_tcp.py
@@ -3,7 +3,7 @@
 
 """KISS Core Classes."""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/plugin_loader.py b/src/apex/plugin_loader.py
index e079216386b4ccc77b08ee521e3826fbaf92cd82..869f2ad6612ed76924eb5bc28e1fc19fa17452fb 100644
--- a/src/apex/plugin_loader.py
+++ b/src/apex/plugin_loader.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/plugins/__init__.py b/src/apex/plugins/__init__.py
index d1c192fbe783c8193960758ee1226d3a13dcf827..271dbfba0821254eab8d00c9463900752d7cdc70 100644
--- a/src/apex/plugins/__init__.py
+++ b/src/apex/plugins/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/plugins/apexparadigm/__init__.py b/src/apex/plugins/apexparadigm/__init__.py
index 5cc6a948e20682028e3ddd14bb057ad2ce4da34a..d1eb004d06a9569a56052630e36052ba867f231c 100644
--- a/src/apex/plugins/apexparadigm/__init__.py
+++ b/src/apex/plugins/apexparadigm/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/plugins/beacon/__init__.py b/src/apex/plugins/beacon/__init__.py
index d1eee3e9bc0681d1dfe9a4812b0f0e13013a8a3f..177ad3fad34df95d8f391762e240215560e2685f 100644
--- a/src/apex/plugins/beacon/__init__.py
+++ b/src/apex/plugins/beacon/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/plugins/id/__init__.py b/src/apex/plugins/id/__init__.py
index ef6d03e3a33bdb3d1e83be0062cded8338dc76d9..8382cf4b7cb87c73bc86df808822453f766493a5 100644
--- a/src/apex/plugins/id/__init__.py
+++ b/src/apex/plugins/id/__init__.py
@@ -1,7 +1,7 @@
 ##!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/plugins/status/__init__.py b/src/apex/plugins/status/__init__.py
index 9d8c9c4d5d6c630a3936fc6731b5969dd10163a4..c026c1d083399f9d0215c2c5bf9fca3b4fef566e 100644
--- a/src/apex/plugins/status/__init__.py
+++ b/src/apex/plugins/status/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/routing/__init__.py b/src/apex/routing/__init__.py
index f10884d31b5df72b584be624b8f13a6881d1e7e2..a74e9ad5bbd290f3b11b1ad0bfd8e0c04488e353 100644
--- a/src/apex/routing/__init__.py
+++ b/src/apex/routing/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/src/apex/routing/route.py b/src/apex/routing/route.py
index f7690a19cde0b8829ea4e32e4fc23bde11232846..66456e7087fd405a854fcf89d96bbdd0169e0d71 100644
--- a/src/apex/routing/route.py
+++ b/src/apex/routing/route.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..cc92b55da937a7ce9c6f9a86b2467936ae87f28e
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# These imports are for python3 compatibility inside python2
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from .kiss_mock import KissMock  # noqa: F401
+
+__author__ = 'Jeffrey Phillips Freeman (WI2ARD)'
+__maintainer__ = 'Jeffrey Phillips Freeman (WI2ARD)'
+__email__ = 'jeffrey.freeman@syncleus.com'
+__license__ = 'Apache License, Version 2.0'
+__copyright__ = 'Copyright 2016, Syncleus, Inc. and contributors'
+__credits__ = []
diff --git a/tests/constants.py b/tests/constants.py
index b28aa9fde24b1a5a207f83291165861e35285941..1d0182fffb45f3df3b7e87800fca98b13434dbe6 100644
--- a/tests/constants.py
+++ b/tests/constants.py
@@ -3,7 +3,7 @@
 
 """Constants for APEX Module Tests."""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/tests/context.py b/tests/context.py
index a26a5a86f41f993c1ed341df0b0d0a0bb86925c3..33fd9b444cc1f15510ceb4044b6901109d7b410c 100644
--- a/tests/context.py
+++ b/tests/context.py
@@ -3,7 +3,7 @@
 
 """Context for tests for APRS Python Module."""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/tests/kiss_mock.py b/tests/kiss_mock.py
new file mode 100644
index 0000000000000000000000000000000000000000..42ca532d28e6f31c067c01701790241d9136b721
--- /dev/null
+++ b/tests/kiss_mock.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# These imports are for python3 compatibility inside python2
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import apex.kiss.constants
+
+__author__ = 'Jeffrey Phillips Freeman (WI2ARD)'
+__maintainer__ = 'Jeffrey Phillips Freeman (WI2ARD)'
+__email__ = 'jeffrey.freeman@syncleus.com'
+__license__ = 'Apache License, Version 2.0'
+__copyright__ = 'Copyright 2016, Syncleus, Inc. and contributors'
+__credits__ = []
+
+
+class KissMock(apex.kiss.Kiss):
+
+    def __init__(self,
+                 strip_df_start=True):
+        super(KissMock, self).__init__(strip_df_start)
+        self.read_from_interface = []
+        self.sent_to_interface = []
+
+    def _read_interface(self):
+        if not len(self.read_from_interface):
+            return None
+        raw_frame = self.read_from_interface[0]
+        del self.read_from_interface[0]
+        return raw_frame
+
+    def _write_interface(self, data):
+        self.sent_to_interface.append(data)
+
+    def clear_interface(self):
+        self.read_from_interface = []
+        self.sent_to_interface = []
+
+    def add_read_from_interface(self, raw_frame):
+        self.read_from_interface.append(raw_frame)
+
+    def get_sent_to_interface(self):
+        return self.sent_to_interface
diff --git a/tests/test_apex.py b/tests/test_apex.py
index c0c4266aa506926ef672fb2d82c593aca2b594e7..4f9127f0cc79073ff3e5e7c64521021ae53e3051 100644
--- a/tests/test_apex.py
+++ b/tests/test_apex.py
@@ -1,4 +1,4 @@
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/tests/test_aprs.py b/tests/test_aprs.py
index 86f4d823c51785a30ed7400fc90d4dad97e092fa..5928a5cef2b1ee7e3ef0e3ba655801f78718b953 100644
--- a/tests/test_aprs.py
+++ b/tests/test_aprs.py
@@ -3,7 +3,7 @@
 
 """Tests for Python APRS-IS Bindings."""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/tests/test_kiss.py b/tests/test_kiss.py
index 433f932050798757840b8781560ed07a19c4a89a..df5bf2abe4b44703e2e6ef6d2f90066a68da4f17 100644
--- a/tests/test_kiss.py
+++ b/tests/test_kiss.py
@@ -3,7 +3,7 @@
 
 """Tests for KISS Util Module."""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
@@ -13,6 +13,8 @@ import unittest
 import apex.kiss
 import apex.kiss.constants
 
+from .kiss_mock import KissMock
+
 __author__ = 'Jeffrey Phillips Freeman (WI2ARD)'
 __maintainer__ = 'Jeffrey Phillips Freeman (WI2ARD)'
 __email__ = 'jeffrey.freeman@syncleus.com'
@@ -71,35 +73,5 @@ class KissUtilTestCase(unittest.TestCase):
         self.assertEqual(ENCODED_FRAME, all_raw_frames[0])
 
 
-
-class KissMock(apex.kiss.Kiss):
-
-    def __init__(self,
-                 strip_df_start=True):
-        super(KissMock, self).__init__(strip_df_start)
-        self.read_from_interface = []
-        self.sent_to_interface = []
-
-    def _read_interface(self):
-        if not len(self.read_from_interface):
-            return None
-        raw_frame = self.read_from_interface[0]
-        del self.read_from_interface[0]
-        return raw_frame
-
-    def _write_interface(self, data):
-        self.sent_to_interface.append(data)
-
-    def clear_interface(self):
-        self.read_from_interface = []
-        self.sent_to_interface = []
-
-    def add_read_from_interface(self, raw_frame):
-        self.read_from_interface.append(raw_frame)
-
-    def get_sent_to_interface(self):
-        return self.sent_to_interface
-
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/test_util.py b/tests/test_util.py
index 0423c29ed8ec39158457915c318b2ebfd666d38c..e8dead8a45e7464cc0d542f6e9f9852c5a9a4099 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -3,7 +3,7 @@
 
 """Tests for Python APRS util methods."""
 
-# These imports are for python3 compatability inside python2
+# These imports are for python3 compatibility inside python2
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function