diff --git a/src/fsfw/objectmanager/ObjectManager.h b/src/fsfw/objectmanager/ObjectManager.h
index 50e4af00..e0e74792 100644
--- a/src/fsfw/objectmanager/ObjectManager.h
+++ b/src/fsfw/objectmanager/ObjectManager.h
@@ -38,7 +38,7 @@ class ObjectManager : public ObjectManagerIF {
   /**
    *  @brief  In the class's destructor, all objects in the list are deleted.
    */
-  virtual ~ObjectManager();
+  ~ObjectManager() override;
   ReturnValue_t insert(object_id_t id, SystemObjectIF* object) override;
   ReturnValue_t remove(object_id_t id) override;
   void initialize() override;
diff --git a/unittests/CatchFactory.cpp b/unittests/CatchFactory.cpp
index fdb5fd08..d5d12935 100644
--- a/unittests/CatchFactory.cpp
+++ b/unittests/CatchFactory.cpp
@@ -33,7 +33,6 @@ void Factory::produceFrameworkObjects(void* args) {
   new EventManager(objects::EVENT_MANAGER);
   new HealthTable(objects::HEALTH_TABLE);
   new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
-  new HkReceiverMock(objects::HK_RECEIVER_MOCK);
 
   {
     PoolManager::LocalPoolConfig poolCfg = {{100, 16}, {50, 32}, {25, 64}, {15, 128}, {5, 1024}};
diff --git a/unittests/CatchRunner.cpp b/unittests/CatchRunner.cpp
index 1377049c..9bdcb676 100644
--- a/unittests/CatchRunner.cpp
+++ b/unittests/CatchRunner.cpp
@@ -13,6 +13,7 @@
 #include <catch2/catch_session.hpp>
 
 extern int customSetup();
+extern int customTeardown();
 
 int main(int argc, char* argv[]) {
   customSetup();
@@ -21,5 +22,6 @@ int main(int argc, char* argv[]) {
   int result = Catch::Session().run(argc, argv);
 
   // global clean-up
+  customTeardown();
   return result;
 }
diff --git a/unittests/CatchSetup.cpp b/unittests/CatchSetup.cpp
index 06f5190a..3b918e05 100644
--- a/unittests/CatchSetup.cpp
+++ b/unittests/CatchSetup.cpp
@@ -29,3 +29,9 @@ int customSetup() {
   objMan->initialize();
   return 0;
 }
+
+int customTeardown() {
+  ObjectManager* objMan = ObjectManager::instance();
+  delete objMan;
+  return 0;
+}