diff --git a/Drv/Ip/CMakeLists.txt b/Drv/Ip/CMakeLists.txt
index 2a3574fca5..771728c0c6 100644
--- a/Drv/Ip/CMakeLists.txt
+++ b/Drv/Ip/CMakeLists.txt
@@ -12,7 +12,11 @@ set(SOURCE_FILES
 	"${CMAKE_CURRENT_LIST_DIR}/UdpSocket.cpp"
 	"${CMAKE_CURRENT_LIST_DIR}/SocketReadTask.cpp"
 )
-set(MOD_DEPS Os)
+
+set(MOD_DEPS
+	Os
+	Fw/Buffer
+)
 
 register_fprime_module()
 
diff --git a/Fw/Buffer/CMakeLists.txt b/Fw/Buffer/CMakeLists.txt
index 1877b88ef0..133dc277c8 100644
--- a/Fw/Buffer/CMakeLists.txt
+++ b/Fw/Buffer/CMakeLists.txt
@@ -10,6 +10,11 @@ set(SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/BufferSendPortAi.xml"
   "${CMAKE_CURRENT_LIST_DIR}/Buffer.cpp"
 )
+
+set(MOD_DEPS
+    Fw/Types
+)
+
 register_fprime_module()
 
 set(UT_SOURCE_FILES
diff --git a/Svc/Framer/CMakeLists.txt b/Svc/Framer/CMakeLists.txt
index 7080ed0543..f07a2387f5 100644
--- a/Svc/Framer/CMakeLists.txt
+++ b/Svc/Framer/CMakeLists.txt
@@ -12,10 +12,9 @@ set(SOURCE_FILES
 )
 
 set(MOD_DEPS
-    Svc_FramingProtocol
+    Svc/FramingProtocol
 )
 
-
 register_fprime_module()
 
 #### UTS ###
diff --git a/Svc/FramingProtocol/CMakeLists.txt b/Svc/FramingProtocol/CMakeLists.txt
index 1dd108779b..3182586cde 100644
--- a/Svc/FramingProtocol/CMakeLists.txt
+++ b/Svc/FramingProtocol/CMakeLists.txt
@@ -12,5 +12,12 @@ set(SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/FprimeProtocol.cpp"
 )
 
+set(MOD_DEPS
+    Fw/Buffer
+    Fw/Time
+    Utils/Hash
+    Utils/Types
+)
+
 register_fprime_module()
 
diff --git a/cmake/test/src/cmake.py b/cmake/test/src/cmake.py
index ce7ffa9c04..fd9f252a19 100644
--- a/cmake/test/src/cmake.py
+++ b/cmake/test/src/cmake.py
@@ -19,7 +19,7 @@
 # Constants to supplied to the calls to subprocess
 CMAKE = "cmake"
 MAKE_CALL = "make"
-MAKE_ARGS = ["-j128"]
+MAKE_ARGS = ["-j2"]
 
 
 def register_test(
diff --git a/cmake/test/src/test_basic.py b/cmake/test/src/test_basic.py
index d51e929fc5..36ea440881 100644
--- a/cmake/test/src/test_basic.py
+++ b/cmake/test/src/test_basic.py
@@ -12,7 +12,6 @@
 BUILD_DIR = os.path.join("<FPRIME>", "Ref")
 EXPECTED = [
     os.path.join("bin", platform.system(), "Ref"),
-    os.path.join("<FPRIME_INSTALL>", "dict", "RefTopologyAppDictionary.xml"),
     os.path.join("lib", platform.system(), "libDrv_BlockDriver.a"),
     os.path.join("lib", platform.system(), "libSvc_FileUplink.a"),
     os.path.join("lib", platform.system(), "libSvc_CmdSequencer.a"),
@@ -52,7 +51,6 @@
     os.path.join("lib", platform.system(), "libSvc_AssertFatalAdapter.a"),
     os.path.join("lib", platform.system(), "libSvc_PolyIf.a"),
     os.path.join("lib", platform.system(), "libSvc_FileDownlink.a"),
-    os.path.join("lib", platform.system(), "libFw_ComFile.a"),
     os.path.join("lib", platform.system(), "libRef_RecvBuffApp.a"),
     os.path.join("lib", platform.system(), "libSvc_Time.a"),
     os.path.join("lib", platform.system(), "libFw_Cfg.a"),
@@ -63,5 +61,58 @@
     os.path.join("lib", platform.system(), "libCFDP_Checksum.a"),
     os.path.join("lib", platform.system(), "libSvc_PrmDb.a"),
     os.path.join("lib", platform.system(), "libSvc_PassiveConsoleTextLogger.a"),
+    os.path.join("<FPRIME_INSTALL>", "dict", "RefTopologyAppDictionary.xml"),
+    os.path.join("<FPRIME_INSTALL>", "bin", "Ref"),
+    os.path.join("<FPRIME_INSTALL>", "dict", "RefTopologyAppDictionary.xml"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libDrv_BlockDriver.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FileUplink.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_CmdSequencer.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Time.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FileManager.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_SendBuffApp.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_FilePacket.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Ping.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Types.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libUtils_Hash.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Port.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_RateGroupDriver.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FatalHandler.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_TlmChan.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Obj.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Prm.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_ActiveRateGroup.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Cycle.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Health.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_LinuxTime.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_PingReceiver.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Com.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libDrv_DataTypes.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Buffer.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Comp.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_CmdDispatcher.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Log.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Tlm.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libOs.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_SignalGen.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Sched.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Seq.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_WatchDog.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_AssertFatalAdapter.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FileDownlink.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_RecvBuffApp.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Time.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Cfg.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Fatal.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_ActiveLogger.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_BufferManager.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Cmd.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libCFDP_Checksum.a"),
+    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_PrmDb.a"),
+    os.path.join(
+        "<FPRIME_INSTALL>",
+        "lib",
+        "static",
+        "libSvc_PassiveConsoleTextLogger.a",
+    ),
 ]
 cmake.register_test(__name__, "ref-standard")
diff --git a/cmake/test/src/test_custom_target.py b/cmake/test/src/test_custom_target.py
index bbf29fab84..51dbb88177 100644
--- a/cmake/test/src/test_custom_target.py
+++ b/cmake/test/src/test_custom_target.py
@@ -48,7 +48,6 @@
     os.path.join("awesome", "Svc_AssertFatalAdapter_is_awesome"),
     os.path.join("awesome", "Svc_PolyIf_is_awesome"),
     os.path.join("awesome", "Svc_FileDownlink_is_awesome"),
-    os.path.join("awesome", "Fw_ComFile_is_awesome"),
     os.path.join("awesome", "Svc_Time_is_awesome"),
     os.path.join("awesome", "Fw_Cfg_is_awesome"),
     os.path.join("awesome", "Svc_Fatal_is_awesome"),
diff --git a/cmake/test/src/test_install.py b/cmake/test/src/test_install.py
deleted file mode 100644
index e81a0167f8..0000000000
--- a/cmake/test/src/test_install.py
+++ /dev/null
@@ -1,66 +0,0 @@
-####
-# test_install.py:
-#
-# CMake install test.
-####
-import os
-import cmake
-
-# Test a normal build, with the ref executable and static libraries
-BUILD_DIR = os.path.join("<FPRIME>", "Ref")
-EXPECTED = [
-    os.path.join("<FPRIME_INSTALL>", "bin", "Ref"),
-    os.path.join("<FPRIME_INSTALL>", "dict", "RefTopologyAppDictionary.xml"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libDrv_BlockDriver.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FileUplink.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_CmdSequencer.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Time.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FileManager.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_SendBuffApp.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_FilePacket.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Ping.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Types.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libUtils_Hash.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Port.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_RateGroupDriver.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FatalHandler.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_TlmChan.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Obj.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Prm.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_ActiveRateGroup.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Cycle.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Health.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_LinuxTime.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_PingReceiver.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Com.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libDrv_DataTypes.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Buffer.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Comp.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_CmdDispatcher.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Log.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Tlm.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libOs.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_SignalGen.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Sched.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Seq.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_WatchDog.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_AssertFatalAdapter.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FileDownlink.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_RecvBuffApp.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Time.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Cfg.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Fatal.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_ActiveLogger.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_BufferManager.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Cmd.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libCFDP_Checksum.a"),
-    os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_PrmDb.a"),
-    os.path.join(
-        "<FPRIME_INSTALL>",
-        "lib",
-        "static",
-        "libSvc_PassiveConsoleTextLogger.a",
-    ),
-]
-TARGETS = ["package_gen"]
-cmake.register_test(__name__, "install-test")
diff --git a/cmake/test/src/test_shared.py b/cmake/test/src/test_shared.py
index bdad8779e1..a6d8551b79 100644
--- a/cmake/test/src/test_shared.py
+++ b/cmake/test/src/test_shared.py
@@ -59,7 +59,6 @@
     os.path.join("lib", platform.system(), "libSvc_AssertFatalAdapter." + ext),
     os.path.join("lib", platform.system(), "libSvc_PolyIf." + ext),
     os.path.join("lib", platform.system(), "libSvc_FileDownlink." + ext),
-    os.path.join("lib", platform.system(), "libFw_ComFile." + ext),
     os.path.join("lib", platform.system(), "libRef_RecvBuffApp." + ext),
     os.path.join("lib", platform.system(), "libSvc_Time." + ext),
     os.path.join("lib", platform.system(), "libFw_Cfg." + ext),
diff --git a/cmake/test/src/test_ut.py b/cmake/test/src/test_ut.py
deleted file mode 100644
index a3c605c334..0000000000
--- a/cmake/test/src/test_ut.py
+++ /dev/null
@@ -1,38 +0,0 @@
-####
-# test_basic.py:
-#
-# Basic CMake tests.
-#
-####
-import os
-import platform
-import cmake
-
-# Test a normal build, with the ref executable and static libraries
-BUILD_DIR = os.path.join("<FPRIME>")
-OPTIONS = {"CMAKE_BUILD_TYPE": "TESTING"}
-TARGETS = ["all", "check"]
-EXPECTED = [
-    os.path.join("bin", platform.system(), "CFDP_Checksum_ut_exe"),
-    os.path.join("bin", platform.system(), "Fw_FilePacket_ut_exe"),
-    os.path.join("bin", platform.system(), "Fw_Log_ut_exe"),
-    os.path.join("bin", platform.system(), "Fw_SerializableFile_ut_exe"),
-    os.path.join("bin", platform.system(), "Fw_Time_ut_exe"),
-    os.path.join("bin", platform.system(), "Fw_Tlm_ut_exe"),
-    os.path.join("bin", platform.system(), "Fw_Types_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_ActiveLogger_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_ActiveRateGroup_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_BufferManager_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_CmdDispatcher_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_CmdSequencer_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_ComLogger_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_FileDownlink_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_FileManager_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_FileUplink_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_LinuxTime_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_PolyDb_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_PrmDb_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_RateGroupDriver_ut_exe"),
-    os.path.join("bin", platform.system(), "Svc_TlmChan_ut_exe"),
-]
-cmake.register_test(__name__, "fp-uts")