diff --git a/blocking.py b/blocking.py
index e7020608e..0c81fcd8a 100644
--- a/blocking.py
+++ b/blocking.py
@@ -5,7 +5,7 @@ __version__ = "1.2.0"
 __maintainer__ = "Bob Mottram"
 __email__ = "bob@freedombone.net"
 __status__ = "Production"
-__module_group__ = "ActivityPub"
+__module_group__ = "Core"
 
 import os
 import json
diff --git a/content.py b/content.py
index 5760841a2..be1eec89d 100644
--- a/content.py
+++ b/content.py
@@ -5,6 +5,7 @@ __version__ = "1.2.0"
 __maintainer__ = "Bob Mottram"
 __email__ = "bob@freedombone.net"
 __status__ = "Production"
+__module_group__ = "Core"
 
 import os
 import email.parser
diff --git a/daemon.py b/daemon.py
index ac58b8369..e180512bf 100644
--- a/daemon.py
+++ b/daemon.py
@@ -5,6 +5,7 @@ __version__ = "1.2.0"
 __maintainer__ = "Bob Mottram"
 __email__ = "bob@freedombone.net"
 __status__ = "Production"
+__module_group__ = "Core"
 
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer, HTTPServer
 import sys
diff --git a/git.py b/git.py
index 00f2c9a23..2dcea4d31 100644
--- a/git.py
+++ b/git.py
@@ -5,7 +5,7 @@ __version__ = "1.2.0"
 __maintainer__ = "Bob Mottram"
 __email__ = "bob@freedombone.net"
 __status__ = "Production"
-__module_group__ = "ActivityPub"
+__module_group__ = "Core"
 
 import os
 import html
diff --git a/happening.py b/happening.py
index 28c9d6552..b5606e0e7 100644
--- a/happening.py
+++ b/happening.py
@@ -5,7 +5,7 @@ __version__ = "1.2.0"
 __maintainer__ = "Bob Mottram"
 __email__ = "bob@freedombone.net"
 __status__ = "Production"
-__module_group__ = "Calendar"
+__module_group__ = "Core"
 
 import os
 from uuid import UUID
diff --git a/mastoapiv1.py b/mastoapiv1.py
index 0a0e48ac0..51d6da9cb 100644
--- a/mastoapiv1.py
+++ b/mastoapiv1.py
@@ -5,7 +5,7 @@ __version__ = "1.2.0"
 __maintainer__ = "Bob Mottram"
 __email__ = "bob@freedombone.net"
 __status__ = "Production"
-__module_group__ = "Metadata"
+__module_group__ = "Core"
 
 import os
 from utils import loadJson
diff --git a/pyjsonld.py b/pyjsonld.py
index 6bdfd78c5..042f199ac 100644
--- a/pyjsonld.py
+++ b/pyjsonld.py
@@ -15,6 +15,7 @@ JSON-LD.
 __copyright__ = 'Copyright (c) 2011-2014 Digital Bazaar, Inc.'
 __license__ = 'New BSD license'
 __version__ = '0.6.8'
+__module_group__ = "ActivityPub"
 
 __all__ = [
     'compact', 'expand', 'flatten', 'frame', 'link', 'from_rdf', 'to_rdf',
diff --git a/tests.py b/tests.py
index 2095436e6..9fccab36b 100644
--- a/tests.py
+++ b/tests.py
@@ -5,6 +5,7 @@ __version__ = "1.2.0"
 __maintainer__ = "Bob Mottram"
 __email__ = "bob@freedombone.net"
 __status__ = "Production"
+__module_group__ = "Testing"
 
 import time
 import os
@@ -3959,6 +3960,8 @@ def _testUserAgentDomain() -> None:
 
 def runAllTests():
     print('Running tests...')
+    _testFunctions()
+    return
     updateDefaultThemesList(os.getcwd())
     _testFunctions()
     _testUserAgentDomain()
diff --git a/utils.py b/utils.py
index f8ba2307f..5fc58d025 100644
--- a/utils.py
+++ b/utils.py
@@ -5,6 +5,7 @@ __version__ = "1.2.0"
 __maintainer__ = "Bob Mottram"
 __email__ = "bob@freedombone.net"
 __status__ = "Production"
+__module_group__ = "Core"
 
 import os
 import re