diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp
index afeb130f68..df35beed5c 100644
--- a/unit_tests/main.cpp
+++ b/unit_tests/main.cpp
@@ -95,10 +95,6 @@ GTEST_API_ int main(int argc, char **argv) {
 
 	testPinHelper();
 
-	testAccelEnrichment();
-
-	testSpeedDensity();
-
 	testMenuTree();
 	testMafLookup();
 	testIgnitionMapGenerator();
@@ -107,7 +103,6 @@ GTEST_API_ int main(int argc, char **argv) {
 	testTriggerDecoder();
 
 
-
 	//	resizeMap();
 	printf("Success 20190103\r\n");
 	printAllTriggers();
diff --git a/unit_tests/tests/test_accel_enrichment.cpp b/unit_tests/tests/test_accel_enrichment.cpp
index acb1904efb..2d819b7f01 100644
--- a/unit_tests/tests/test_accel_enrichment.cpp
+++ b/unit_tests/tests/test_accel_enrichment.cpp
@@ -8,11 +8,10 @@
 
 #include "global.h"
 #include "accel_enrichment.h"
-#include "test_accel_enrichment.h"
 #include "engine_configuration.h"
 #include "engine_test_helper.h"
 
-void testAccelEnrichment(void) {
+TEST(big, testAccelEnrichment) {
 	printf("====================================================================================== testAccelEnrichment\r\n");
 
 	EngineTestHelper eth(FORD_ASPIRE_1996);
diff --git a/unit_tests/tests/test_accel_enrichment.h b/unit_tests/tests/test_accel_enrichment.h
index c9db10c982..777b927b83 100644
--- a/unit_tests/tests/test_accel_enrichment.h
+++ b/unit_tests/tests/test_accel_enrichment.h
@@ -9,6 +9,4 @@
 #ifndef TEST_ACCEL_ENRICHMENT_H_
 #define TEST_ACCEL_ENRICHMENT_H_
 
-void testAccelEnrichment(void);
-
 #endif /* TEST_ACCEL_ENRICHMENT_H_ */
diff --git a/unit_tests/tests/test_fasterEngineSpinningUp.cpp b/unit_tests/tests/test_fasterEngineSpinningUp.cpp
index 1a9d6a9fff..c466108e7d 100644
--- a/unit_tests/tests/test_fasterEngineSpinningUp.cpp
+++ b/unit_tests/tests/test_fasterEngineSpinningUp.cpp
@@ -43,7 +43,7 @@ TEST(sensors, testFasterEngineSpinningUp) {
 	// check if the mode is changed
 	assertEquals(SPINNING_UP, engine->rpmCalculator.getState());
 	// due to isFasterEngineSpinUp=true, we should have already detected RPM!
-	assertEqualsM("RPM#1", 300, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
+	assertEqualsM("spinning-RPM#1", 300, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
 	// two simultaneous injections
 	assertEqualsM("plain#1", 4, engine->executor.size());
 	// test if they are simultaneous
diff --git a/unit_tests/tests/test_speed_density.cpp b/unit_tests/tests/test_speed_density.cpp
index 3867fd42a8..0518aa5b3c 100644
--- a/unit_tests/tests/test_speed_density.cpp
+++ b/unit_tests/tests/test_speed_density.cpp
@@ -8,9 +8,8 @@
 #include "global.h"
 #include "engine_test_helper.h"
 #include "speed_density.h"
-#include "test_speed_density.h"
 
-void testSpeedDensity(void) {
+TEST(big, testSpeedDensity) {
 	printf("*************************************************** testSpeedDensity\r\n");
 	EngineTestHelper eth(FORD_INLINE_6_1995);
 	EXPAND_EngineTestHelper;
diff --git a/unit_tests/tests/test_speed_density.h b/unit_tests/tests/test_speed_density.h
index e4dd8cd546..2716d95e1a 100644
--- a/unit_tests/tests/test_speed_density.h
+++ b/unit_tests/tests/test_speed_density.h
@@ -8,6 +8,4 @@
 #ifndef TEST_SPEED_DENSITY_H_
 #define TEST_SPEED_DENSITY_H_
 
-void testSpeedDensity(void);
-
 #endif /* TEST_SPEED_DENSITY_H_ */
diff --git a/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp b/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp
index 7682464657..539cbbda7a 100644
--- a/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp
+++ b/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp
@@ -22,7 +22,7 @@ TEST(engine, testPlainCrankingWithoutAdvancedFeatures) {
 
 	eth.fireTriggerEventsWithDuration(/* durationMs */ 200);
 	// still no RPM since need to cycles measure cycle duration
-	assertEqualsM("RPM#1", 0, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
+	assertEqualsM("start-RPM#1", 0, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
 
 
 	eth.fireRise(/* delayMs */ 200);
diff --git a/unit_tests/tests/test_trigger_decoder.cpp b/unit_tests/tests/test_trigger_decoder.cpp
index a2667b0bd4..451ca827fe 100644
--- a/unit_tests/tests/test_trigger_decoder.cpp
+++ b/unit_tests/tests/test_trigger_decoder.cpp
@@ -466,8 +466,6 @@ void testTriggerDecoder(void) {
 	assertEquals(s->wave.switchTimes[2], 0.75);
 	assertEquals(s->wave.switchTimes[3], 1);
 
-	testNoiselessDecoder();
-
 	printf("====================================================================================== testTriggerDecoder part 2\r\n");
 	testDodgeNeonDecoder();
 	testTriggerDecoder2("Dodge Neon 1995", DODGE_NEON_1995, 8, 0.4931, 0.2070);
diff --git a/unit_tests/tests/test_trigger_decoder.h b/unit_tests/tests/test_trigger_decoder.h
index ce328b29a8..61f9ff60f7 100644
--- a/unit_tests/tests/test_trigger_decoder.h
+++ b/unit_tests/tests/test_trigger_decoder.h
@@ -16,7 +16,6 @@ void testStartupFuelPumping(void);
 void test1995FordInline6TriggerDecoder(void);
 void testTriggerDecoder2(const char *msg, engine_type_e type, int synchPointIndex, float channel1duty, float channel2duty);
 void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injMode = IM_BATCH);
-void testNoiselessDecoder(void);
 
 void assertRpm(const char *msg, int expectedRpm DECLARE_ENGINE_PARAMETER_SUFFIX);
 
diff --git a/unit_tests/tests/test_trigger_noiseless.cpp b/unit_tests/tests/test_trigger_noiseless.cpp
index a62a150842..85c325d106 100644
--- a/unit_tests/tests/test_trigger_noiseless.cpp
+++ b/unit_tests/tests/test_trigger_noiseless.cpp
@@ -167,7 +167,7 @@ static void testNoiselessDecoderProcedure(EngineTestHelper &eth, int errorTolera
 
 }
 
-void testNoiselessDecoder(void) {
+TEST(big, testNoiselessDecoder) {
 	printf("====================================================================================== testNoiselessDecoder\r\n");
 
 	EngineTestHelper eth(TEST_ENGINE);