diff --git a/tests/shared/mocks/MockRegEdit/CMakeLists.txt b/tests/shared/mocks/MockRegEdit/CMakeLists.txt
deleted file mode 100644
index f781498..0000000
--- a/tests/shared/mocks/MockRegEdit/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-add_library(MockRegEdit STATIC
-    MockRegEdit.c
-)
-
-target_include_directories(MockRegEdit PUBLIC
-    ${CMAKE_CURRENT_LIST_DIR}
-    ${CMAKE_SOURCE_DIR}/src/RegEdit/
-)
-
-target_link_libraries(MockRegEdit
-    ${CPPUTEST_LIBRARIES}
-)
diff --git a/tests/shared/mocks/MockRegEdit/MockRegEdit.c b/tests/shared/mocks/MockRegEdit/MockRegEdit.c
deleted file mode 100644
index ca8dfc1..0000000
--- a/tests/shared/mocks/MockRegEdit/MockRegEdit.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Author: username
- * Date: 2024
- * filename: MockRegEdit.c
- * description: module_purpose
- */
-
-#include "MockRegEdit.h"
-#include "CppUTestExt/MockSupport_c.h"
-
-// For 64-Bit systems and register access.
-
-void RegEdit_u64_SetRegister(void *reg)
-{
-    mock_c()->actualCall("RegEdit_u64_SetRegister")->withPointerParameters("reg", reg);
-}
-
-void RegEdit_u64_ClearRegister(void *reg)
-{
-    mock_c()->actualCall("RegEdit_u64_ClearRegister")->withPointerParameters("reg", reg);
-}
-
-void RegEdit_u64_SetBit(void *reg, uint8_t bit_num)
-{
-    mock_c()->actualCall("RegEdit_u64_SetBit")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num);
-}
-
-void RegEdit_u64_ClearBit(void *reg, uint8_t bit_num)
-{
-    mock_c()->actualCall("RegEdit_u64_ClearBit")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num);
-}
-
-bool RegEdit_u64_IsBitSet(void *reg, uint8_t bit_num)
-{
-    return mock_c()->actualCall("RegEdit_u64_IsBitSet")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num)->returnBoolValueOrDefault(true);
-    // return mock_c()->returnBoolValueOrDefault(true);
-}
-
-void RegEdit_u64_OR_Num(void *reg, uint64_t num)
-{
-    mock_c()->actualCall("RegEdit_u64_OR_Num")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-void RegEdit_u64_AND_Num(void *reg, uint64_t num)
-{
-    mock_c()->actualCall("RegEdit_u64_AND_Num")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-void RegEdit_u64_SetNum(void *reg, uint64_t num)
-{
-    mock_c()->actualCall("RegEdit_u64_SetNum")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-uint64_t RegEdit_u64_ReadReg(void *reg)
-{
-    uint64_t value = *(uint64_t *)reg;
-
-    mock_c()->actualCall("RegEdit_u64_ReadReg")->withPointerParameters("reg", reg)->returnUnsignedIntValueOrDefault(value);
-
-    return value;
-}
-
-// For 32-Bit systems and register access.
-
-void RegEdit_u32_SetRegister(void *reg)
-{
-    mock_c()->actualCall("RegEdit_u32_SetRegister")->withPointerParameters("reg", reg);
-}
-
-void RegEdit_u32_ClearRegister(void *reg)
-{
-    mock_c()->actualCall("RegEdit_u32_ClearRegister")->withPointerParameters("reg", reg);
-}
-
-void RegEdit_u32_SetBit(void *reg, uint8_t bit_num)
-{
-    mock_c()->actualCall("RegEdit_u32_SetBit")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num);
-}
-
-void RegEdit_u32_ClearBit(void *reg, uint8_t bit_num)
-{
-    mock_c()->actualCall("RegEdit_u32_ClearBit")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num);
-}
-
-bool RegEdit_u32_IsBitSet(void *reg, uint8_t bit_num)
-{
-    return mock_c()->actualCall("RegEdit_u32_IsBitSet")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num)->returnBoolValueOrDefault(true);
-    // return mock_c()->returnBoolValueOrDefault(true);
-}
-
-void RegEdit_u32_OR_Num(void *reg, uint32_t num)
-{
-    mock_c()->actualCall("RegEdit_u32_OR_Num")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-void RegEdit_u32_AND_Num(void *reg, uint32_t num)
-{
-    mock_c()->actualCall("RegEdit_u32_AND_Num")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-void RegEdit_u32_SetNum(void *reg, uint32_t num)
-{
-    mock_c()->actualCall("RegEdit_u32_SetNum")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-uint32_t RegEdit_u32_ReadReg(void *reg)
-{
-    uint32_t value = *(uint32_t *)reg;
-
-    mock_c()->actualCall("RegEdit_u32_ReadReg")->withPointerParameters("reg", reg)->returnUnsignedIntValueOrDefault(value);
-
-    return value;
-}
-
-// For 16-Bit systems and register access.
-
-void RegEdit_u16_SetRegister(void *reg)
-{
-    mock_c()->actualCall("RegEdit_u16_SetRegister")->withPointerParameters("reg", reg);
-}
-
-void RegEdit_u16_ClearRegister(void *reg)
-{
-    mock_c()->actualCall("RegEdit_u16_ClearRegister")->withPointerParameters("reg", reg);
-}
-
-void RegEdit_u16_SetBit(void *reg, uint8_t bit_num)
-{
-    mock_c()->actualCall("RegEdit_u16_SetBit")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num);
-}
-
-void RegEdit_u16_ClearBit(void *reg, uint8_t bit_num)
-{
-    mock_c()->actualCall("RegEdit_u16_ClearBit")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num);
-}
-
-bool RegEdit_u16_IsBitSet(void *reg, uint8_t bit_num)
-{
-    return mock_c()->actualCall("RegEdit_u16_IsBitSet")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num)->returnBoolValueOrDefault(true);
-    // return mock_c()->returnBoolValueOrDefault(true);
-}
-
-void RegEdit_u16_OR_Num(void *reg, uint16_t num)
-{
-    mock_c()->actualCall("RegEdit_u16_OR_Num")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-void RegEdit_u16_AND_Num(void *reg, uint16_t num)
-{
-    mock_c()->actualCall("RegEdit_u16_AND_Num")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-void RegEdit_u16_SetNum(void *reg, uint16_t num)
-{
-    mock_c()->actualCall("RegEdit_u16_SetNum")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-uint16_t RegEdit_u16_ReadReg(void *reg)
-{
-    uint16_t value = *(uint16_t *)reg;
-
-    mock_c()->actualCall("RegEdit_u16_ReadReg")->withPointerParameters("reg", reg)->returnUnsignedIntValueOrDefault(value);
-
-    return value;
-}
-
-// For 8-Bit systems and register access.
-
-void RegEdit_u8_SetRegister(void *reg)
-{
-    mock_c()->actualCall("RegEdit_u8_SetRegister")->withPointerParameters("reg", reg);
-}
-
-void RegEdit_u8_ClearRegister(void *reg)
-{
-    mock_c()->actualCall("RegEdit_u8_ClearRegister")->withPointerParameters("reg", reg);
-}
-
-void RegEdit_u8_SetBit(void *reg, uint8_t bit_num)
-{
-    mock_c()->actualCall("RegEdit_u8_SetBit")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num);
-}
-
-void RegEdit_u8_ClearBit(void *reg, uint8_t bit_num)
-{
-    mock_c()->actualCall("RegEdit_u8_ClearBit")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num);
-}
-
-bool RegEdit_u8_IsBitSet(void *reg, uint8_t bit_num)
-{
-    return mock_c()->actualCall("RegEdit_u8_IsBitSet")->withPointerParameters("reg", reg)->withUnsignedIntParameters("bit_num", bit_num)->returnBoolValueOrDefault(true);
-    // return mock_c()->returnBoolValueOrDefault(true);
-}
-
-void RegEdit_u8_OR_Num(void *reg, uint8_t num)
-{
-    mock_c()->actualCall("RegEdit_u8_OR_Num")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-void RegEdit_u8_AND_Num(void *reg, uint8_t num)
-{
-    mock_c()->actualCall("RegEdit_u8_AND_Num")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-void RegEdit_u8_SetNum(void *reg, uint8_t num)
-{
-    mock_c()->actualCall("RegEdit_u8_SetNum")->withPointerParameters("reg", reg)->withUnsignedIntParameters("num", num);
-}
-
-uint8_t RegEdit_u8_ReadReg(void *reg)
-{
-    uint8_t value = *(uint8_t *)reg;
-
-    mock_c()->actualCall("RegEdit_u8_ReadReg")->withPointerParameters("reg", reg)->returnUnsignedIntValueOrDefault(value);
-
-    return value;
-}
diff --git a/tests/shared/mocks/MockRegEdit/MockRegEdit.h b/tests/shared/mocks/MockRegEdit/MockRegEdit.h
deleted file mode 100644
index 49c48f7..0000000
--- a/tests/shared/mocks/MockRegEdit/MockRegEdit.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @brief Mock of the RegEdit module.
- * @details This file is just re-exports the RegEdit functions plus extras.
- * @author Jake G
- * @date 2025-12-21
- * @copyright None
- * @file MockRegEdit.h
- */
-
-#ifndef MOCKREGEDIT_H
-#define MOCKREGEDIT_H
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#include "RegEdit.h"
-
-#endif // MOCKREGEDIT_H
diff --git a/tests/shared/mocks/MockRegEdit/u8_comparator.cpp b/tests/shared/mocks/MockRegEdit/u8_comparator.cpp
deleted file mode 100644
index 76876dc..0000000
--- a/tests/shared/mocks/MockRegEdit/u8_comparator.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "u8_comparator.hpp"
-#include "CppUTest/SimpleString.h"
-
-/*
-class MyTypeComparator : public MockNamedValueComparator
-{
-public:
-    virtual bool isEqual(const void* object1, const void* object2)
-    {
-        return object1 == object2;
-    }
-    virtual SimpleString valueToString(const void* object)
-    {
-        return StringFrom(object);
-    }
-};
-*/
-
-bool UInt8PointerComparator::isEqual(const void *object1, const void *object2)
-{
-    const uint8_t *ptr1 = reinterpret_cast<const uint8_t *>(object1);
-    const uint8_t *ptr2 = reinterpret_cast<const uint8_t *>(object2);
-    return std::memcmp(ptr1, ptr2, sizeof(uint8_t)) == 0;
-}
-
-SimpleString UInt8PointerComparator::valueToString(const void *object)
-{
-    const uint8_t *ptr = reinterpret_cast<const uint8_t *>(object);
-    return StringFromFormat("0x%02x", *ptr);
-}
-
-/*
-bool UInt8PointerComparator::isEqual(const void* object1, const void* object2) const {
-    const uint8_t* ptr1 = static_cast<const uint8_t*>(object1);
-    const uint8_t* ptr2 = static_cast<const uint8_t*>(object2);
-    return std::memcmp(ptr1, ptr2, sizeof(uint8_t)) == 0;
-}
-
-SimpleString UInt8PointerComparator::valueToString(const void* object) const {
-    const uint8_t* ptr = static_cast<const uint8_t*>(object);
-    return StringFromFormat("0x%02x", *ptr);
-}
-*/
-
-bool UInt8Comparator::isEqual(const void *object1, const void *object2)
-{
-    return (uint8_t *)object1 == (uint8_t *)object2;
-}
-
-SimpleString UInt8Comparator::valueToString(const void *object)
-{
-    // uint8_t value = reinterpret_cast<uint8_t>(object);
-    const uint8_t *ptr = reinterpret_cast<const uint8_t *>(object);
-    return StringFromFormat("0x%02x", *ptr);
-}
diff --git a/tests/shared/mocks/MockRegEdit/u8_comparator.hpp b/tests/shared/mocks/MockRegEdit/u8_comparator.hpp
deleted file mode 100644
index 0c934d8..0000000
--- a/tests/shared/mocks/MockRegEdit/u8_comparator.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef U8_COMPARATOR_H
-#define U8_COMPARATOR_H
-
-#include <cstdint>
-#include <cstring>
-#include <CppUTestExt/MockSupport.h>
-
-class UInt8PointerComparator : public MockNamedValueComparator {
-public:
-    virtual bool isEqual(const void* object1, const void* object2) override;
-    SimpleString valueToString(const void* object) override;
-};
-
-class UInt8Comparator : public MockNamedValueComparator {
-    public:
-        virtual bool isEqual(const void* object1, const void* object2) override;
-        SimpleString valueToString(const void* object) override;
-};
-
-#endif //U8_COMPARATOR_H