diff --git a/.idea/cmake.xml b/.idea/cmake.xml
new file mode 100644
index 00000000..b0a4921a
--- /dev/null
+++ b/.idea/cmake.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeSharedSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug Test" ENABLED="true" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DFSFW_BUILD_TESTS=ON -DFSFW_OSAL=host" />
+    </configurations>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp b/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp
index da3b6b8d..ec34330a 100644
--- a/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp
+++ b/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp
@@ -34,4 +34,6 @@ void PeriodicHousekeepingHelper::changeCollectionInterval(float newIntervalSecon
   }
   collectionInterval = newIntervalSeconds;
   hkGenerationCd.setTimeout(intervalMs);
+  // We want an immediate HK packet at the start, so time out the generation CD immediately.
+  hkGenerationCd.timeOut();
 }
diff --git a/unittests/CatchFactory.cpp b/unittests/CatchFactory.cpp
index 37c62f94..589e6887 100644
--- a/unittests/CatchFactory.cpp
+++ b/unittests/CatchFactory.cpp
@@ -32,7 +32,7 @@ void Factory::produceFrameworkObjects(void* args) {
   setStaticFrameworkObjectIds();
   new EventManager(objects::EVENT_MANAGER, 120);
   new HealthTable(objects::HEALTH_TABLE);
-  new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
+  new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER, 20, false, 1.0);
 
   {
     PoolManager::LocalPoolConfig poolCfg = {{100, 16}, {50, 32}, {25, 64}, {15, 128}, {5, 1024}};