diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp
index 72d0284eb7..f15748f269 100644
--- a/unit_tests/engine_test_helper.cpp
+++ b/unit_tests/engine_test_helper.cpp
@@ -13,6 +13,7 @@
 #include "accel_enrichment.h"
 #include "thermistors.h"
 #include "advance_map.h"
+#include "algo.h"
 
 extern int timeNowUs;
 extern EnginePins enginePins;
@@ -50,12 +51,10 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persiste
 	setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 60, 1.03);
 	setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 70, 1.01);
 
-	prepareFuelMap(PASS_ENGINE_PARAMETER_SIGNATURE);
+	initDataStructures(PASS_ENGINE_PARAMETER_SIGNATURE);
 
 	initAccelEnrichment(NULL PASS_ENGINE_PARAMETER_SUFFIX);
 
-	initSpeedDensity(PASS_ENGINE_PARAMETER_SIGNATURE);
-
 	resetConfigurationExt(NULL, engineType PASS_ENGINE_PARAMETER_SUFFIX);
 	prepareShapes(PASS_ENGINE_PARAMETER_SIGNATURE);
 	engine->engineConfigurationPtr->mafAdcChannel = (adc_channel_e)TEST_MAF_CHANNEL;
@@ -63,7 +62,6 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persiste
 	initThermistors(NULL PASS_ENGINE_PARAMETER_SUFFIX);
 	// this is needed to have valid CLT and IAT.
 	engine->updateSlowSensors(PASS_ENGINE_PARAMETER_SIGNATURE);
-	prepareTimingMap(PASS_ENGINE_PARAMETER_SIGNATURE);
 
 	engine->initializeTriggerShape(NULL PASS_ENGINE_PARAMETER_SUFFIX);
 	engine->triggerCentral.addEventListener(rpmShaftPositionCallback, "rpm reporter", engine);
diff --git a/unit_tests/tests/test_trigger_decoder.cpp b/unit_tests/tests/test_trigger_decoder.cpp
index cc6a19496e..a566483b0f 100644
--- a/unit_tests/tests/test_trigger_decoder.cpp
+++ b/unit_tests/tests/test_trigger_decoder.cpp
@@ -228,8 +228,6 @@ void testTriggerDecoder2(const char *msg, engine_type_e type, int synchPointInde
 	EngineTestHelper eth(type);
 	EXPAND_EngineTestHelper;
 
-	initSpeedDensity(PASS_ENGINE_PARAMETER_SIGNATURE);
-
 	TriggerShape *t = &ENGINE(triggerCentral.triggerShape);
 
 	assertFalseM("isError", t->shapeDefinitionError);
@@ -519,7 +517,6 @@ void testTriggerDecoder(void) {
 		EngineTestHelper eth(MITSU_4G93);
 		EXPAND_EngineTestHelper;
 
-		initSpeedDensity(PASS_ENGINE_PARAMETER_SIGNATURE);
 
 //		TriggerShape *t = &eth.engine.triggerShape;
 //		assertEquals(1, t->eventAngles[1]);