diff --git a/tests/JFJochStateMachineTest.cpp b/tests/JFJochStateMachineTest.cpp
index 013a5b9a..411e8d37 100644
--- a/tests/JFJochStateMachineTest.cpp
+++ b/tests/JFJochStateMachineTest.cpp
@@ -59,7 +59,7 @@ TEST_CASE("JFJochStateMachine_State_Pedestal") {
     REQUIRE_THROWS(state_machine.Pedestal());
     REQUIRE_THROWS(state_machine.Initialize());
 
-    DetectorSettings settings;
+    DetectorSettings settings{};
     settings.frame_time_us = 500;
     settings.storage_cell_count = 16;
     REQUIRE_THROWS(state_machine.SetDetectorSettings(settings));
@@ -89,7 +89,7 @@ TEST_CASE("JFJochStateMachine_State_Measure") {
     REQUIRE_THROWS(state_machine.Pedestal());
     REQUIRE_THROWS(state_machine.Initialize());
 
-    DetectorSettings settings;
+    DetectorSettings settings{};
     settings.frame_time_us = 500;
     settings.storage_cell_count = 16;
     REQUIRE_THROWS(state_machine.SetDetectorSettings(settings));
@@ -118,7 +118,7 @@ TEST_CASE("JFJochStateMachine_State_Error") {
     REQUIRE_THROWS(state_machine.Start(setup));
     REQUIRE_THROWS(state_machine.Pedestal());
 
-    DetectorSettings settings;
+    DetectorSettings settings{};
     settings.frame_time_us = 500;
     settings.storage_cell_count = 16;
     REQUIRE_NOTHROW(state_machine.SetDetectorSettings(settings));
@@ -134,7 +134,7 @@ TEST_CASE("JFJochStateMachine_Setup") {
     JFJochServices services(logger);
     JFJochStateMachine state_machine(services, logger);
 
-    DetectorSettings settings, settings_save;
+    DetectorSettings settings{}, settings_save{};
     settings.pedestal_g1_frames = -15;
     settings.pedestal_g0_frames = 2378;
     REQUIRE_THROWS(state_machine.SetDetectorSettings(settings));
@@ -194,7 +194,7 @@ TEST_CASE("JFJochStateMachine_StorageCells") {
     JFJochStateMachine state_machine(services, logger);
     state_machine.AddDetectorSetup(DetectorGeometry(4));
 
-    DetectorSettings settings;
+    DetectorSettings settings{};
     settings.frame_time_us = 500;
     settings.storage_cell_count = 16;
     REQUIRE_NOTHROW(state_machine.SetDetectorSettings(settings));
@@ -235,7 +235,7 @@ TEST_CASE("JFJochStateMachine_AddDetectorSetup_Multiple") {
 TEST_CASE("JFJochStateMachine_LoadDatasetSettings", "[DiffractionExperiment]") {
     DiffractionExperiment x;
     x.ImagesPerTrigger(567).BeamY_pxl(324).Compression(CompressionAlgorithm::BSHUF_ZSTD);
-    DatasetSettings settings;
+    DatasetSettings settings{};
     settings.images_per_trigger = 234;
     settings.ntrigger = 56;
     settings.beam_x_pxl = 23.4;
@@ -265,7 +265,7 @@ TEST_CASE("JFJochStateMachine_LoadDatasetSettings", "[DiffractionExperiment]") {
 TEST_CASE("JFJochStateMachine_LoadDatasetSettings_Invalid", "[DiffractionExperiment]") {
     DiffractionExperiment x;
     x.ImagesPerTrigger(567).BeamY_pxl(324).Compression(CompressionAlgorithm::BSHUF_ZSTD);
-    DatasetSettings settings;
+    DatasetSettings settings{};
     settings.images_per_trigger = -1;
     settings.ntrigger = 56;
     settings.beam_x_pxl = 23.4;
@@ -290,7 +290,7 @@ TEST_CASE("JFJochStateMachine_SetDetectorSettings", "[DiffractionExperiment]") {
 
     state_machine.NotThreadSafe_Experiment().PedestalG0Frames(456).PedestalG1Frames(1234).PedestalG2Frames(123).StorageCellDelay(2500ns);
 
-    DetectorSettings settings;
+    DetectorSettings settings{};
     settings.frame_time_us = 600;
     settings.count_time_us = 400;
     settings.storage_cell_count = 8;
@@ -320,7 +320,7 @@ TEST_CASE("JFJochStateMachine_SetDetectorSettings_StorageCellDelay", "[Diffracti
 
     state_machine.NotThreadSafe_Experiment().PedestalG0Frames(456).PedestalG1Frames(1234).PedestalG2Frames(123).StorageCellDelay(5000ns);
 
-    DetectorSettings settings;
+    DetectorSettings settings{};
     settings.frame_time_us = 600;
     settings.count_time_us = 400;
     settings.storage_cell_count = 8;
@@ -339,7 +339,7 @@ TEST_CASE("JFJochStateMachine_SetDetectorSettings_invalid", "[DiffractionExperim
     state_machine.NotThreadSafe_Experiment().PedestalG0Frames(456).PedestalG1Frames(1234).PedestalG2Frames(123)
             .FrameTime(525us).Mode(DetectorMode::Conversion);
 
-    DetectorSettings settings;
+    DetectorSettings settings{};
     settings.frame_time_us = 600;
     settings.count_time_us = 800;
     settings.storage_cell_count = 16;
@@ -367,7 +367,7 @@ TEST_CASE("JFJochStateMachine_SetDetectorSettings_inferred", "[DiffractionExperi
 
     state_machine.NotThreadSafe_Experiment().PedestalG0Frames(456).PedestalG1Frames(1234).PedestalG2Frames(123);
 
-    DetectorSettings settings;
+    DetectorSettings settings{};
     settings.frame_time_us = 600;
     settings.storage_cell_count = 1;
     REQUIRE_NOTHROW(state_machine.SetDetectorSettings(settings));