diff --git a/firmware/console/console.mk b/firmware/console/console.mk
index ce8212eb07..2fbf09077e 100644
--- a/firmware/console/console.mk
+++ b/firmware/console/console.mk
@@ -1,10 +1,12 @@
+CONSOLE_COMMON_SRC_CPP = 	$(PROJECT_DIR)/console/binary/tooth_logger.cpp \
+                         	$(PROJECT_DIR)/console/binary_log/log_field.cpp \
+                         	$(PROJECT_DIR)/console/status_loop.cpp \
 
-CONSOLE_SRC_CPP = $(PROJECT_DIR)/console/status_loop.cpp \
+
+CONSOLE_SRC_CPP = $(CONSOLE_COMMON_SRC_CPP) \
 	$(PROJECT_DIR)/console/console_io.cpp \
 	$(PROJECT_DIR)/console/eficonsole.cpp \
 	$(PROJECT_DIR)/console/connector_uart_dma.cpp \
-	$(PROJECT_DIR)/console/binary/tooth_logger.cpp \
-	$(PROJECT_DIR)/console/binary_log/log_field.cpp \
 	$(PROJECT_DIR)/console/binary_log/binary_logging.cpp \
 	$(PROJECT_DIR)/console/binary_log/usb_console.cpp \
 	$(PROJECT_DIR)/console/binary_log/ethernet_console.cpp \
diff --git a/firmware/controllers/actuators/idle_thread_io.cpp b/firmware/controllers/actuators/idle_thread_io.cpp
index 0c2d9896ec..49c45140b4 100644
--- a/firmware/controllers/actuators/idle_thread_io.cpp
+++ b/firmware/controllers/actuators/idle_thread_io.cpp
@@ -81,10 +81,6 @@ void setIdleMode(idle_mode_e value) {
 	showIdleInfo();
 }
 
-percent_t getIdlePosition() {
-	return engine->module<IdleController>().unmock().currentIdlePosition;
-}
-
 void setManualIdleValvePosition(int positionPercent) {
 	if (positionPercent < 1 || positionPercent > 99)
 		return;
@@ -96,6 +92,10 @@ void setManualIdleValvePosition(int positionPercent) {
 
 #endif /* EFI_UNIT_TEST */
 
+percent_t getIdlePosition() {
+	return engine->module<IdleController>().unmock().currentIdlePosition;
+}
+
 void startPedalPins() {
 #if EFI_PROD_CODE
 	// this is neutral/no gear switch input. on Miata it's wired both to clutch pedal and neutral in gearbox
diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index bfbac568fe..f53be66e41 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -27,8 +27,7 @@ CPPSRC += $(ALLCPPSRC) \
 	$(FRAMEWORK_SRC_CPP) \
 	$(TESTS_SRC_CPP) \
 	$(DEVELOPMENT_DIR)/engine_sniffer.cpp \
-	$(PROJECT_DIR)/console/binary/tooth_logger.cpp \
-	$(PROJECT_DIR)/console/binary_log/log_field.cpp \
+	$(CONSOLE_COMMON_SRC_CPP) \
 	$(PROJECT_DIR)/config/boards/hellen/hellen_board_id.cpp \
 	$(PROJECT_DIR)/../unit_tests/logicdata.cpp \
 	$(PROJECT_DIR)/../unit_tests/native/native_impl.cpp \
diff --git a/unit_tests/global.h b/unit_tests/global.h
index f760c19bd3..b4ef20c22e 100644
--- a/unit_tests/global.h
+++ b/unit_tests/global.h
@@ -19,6 +19,7 @@ typedef uint32_t ioportid_t;
 typedef uint32_t ioportmask_t;
 
 #define DL_OUTPUT_BUFFER 200
+#define FIRMWARE_ID "UNIT_TEST"
 
 // just a stub implementation for unit tests
 #define EXPECTED_REMAINING_STACK 1