diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp
index b022b4b695..d79e286faa 100644
--- a/unit_tests/main.cpp
+++ b/unit_tests/main.cpp
@@ -63,33 +63,47 @@ int main(void) {
 
 	testMisc();
 	testDifferentInjectionModes();
+	/**
+	 * PID
+	 */
 	testPidAuto();
+	testPidController();
+	/**
+	 * Larger-scale engine control
+	 */
 	testMissedSpark299();
 	testSparkReverseOrderBug319();
 	testFuelSchedulerBug299smallAndLarge();
 	testFuelSchedulerBug299smallAndMedium();
 	testLogicExpressions(); // fsio
-	testOverflow64Counter();
-	testInterpolate3d();
-	testFindIndex();
 	testPlainCrankingWithoutAdvancedFeatures();
 	testStartOfCrankingPrimingPulse();
 	testFasterEngineSpinningUp();
-	testInterpolate2d();
 	testGpsParser();
 	testFuelMap();
 	testFuelCut();
 	testEngineMath();
 	testIgnitionPlanning();
 	testSensors();
+	/**
+	 * Data structures and general methods
+	 */
 	testCyclicBuffer();
 	testCrc();
+	testOverflow64Counter();
+	testFindIndex();
+	testInterpolate3d();
+	testInterpolate2d();
+	testSetTableValue();
+	testHistogram();
+	testFLStack();
 
 	testSignalExecutor();
 
-	testHistogram();
-
 
+	/**
+	 * Business logic tests
+	 */
 	testMalfunctionCentral();
 
 	testConsoleLogic();
@@ -97,24 +111,20 @@ int main(void) {
 	testAngleResolver();
 
 	testPinHelper();
-	testSetTableValue();
 
 	testAccelEnrichment();
 
 	testSpeedDensity();
 
-	testFLStack();
-
 	testMenuTree();
 	testMafLookup();
 	testIgnitionMapGenerator();
 	testMafFuelMath();
 
-	testPidController();
 	testTriggerDecoder();
 
 	//	resizeMap();
-	printf("Success 20181120\r\n");
+	printf("Success 20181206\r\n");
 	printAllTriggers();
 //	printConvertedTable();
 	return EXIT_SUCCESS;
diff --git a/unit_tests/test_basic_math/test_find_index.cpp b/unit_tests/test_basic_math/test_find_index.cpp
index 79f9152737..b961324fa6 100644
--- a/unit_tests/test_basic_math/test_find_index.cpp
+++ b/unit_tests/test_basic_math/test_find_index.cpp
@@ -66,10 +66,6 @@ void testFindIndex(void) {
 	}
 }
 
-//static float getValue2(float key, float maf) {
-//
-//}
-
 void testInterpolate2d(void) {
 	printf("*************************************************** testInterpolate2d\r\n");
 
@@ -100,7 +96,6 @@ void testSetTableValue(void) {
 	printf("*************************************************** testSetTableValue\r\n");
 
 	persistent_config_s config;
-//	memset()
 
 	for (int i = 0; i < CLT_CURVE_SIZE; i++) {
 		config.cltFuelCorrBins[i] = -40 + i * 10;