diff --git a/firmware/config/boards/arro_board.h b/firmware/config/boards/arro_board.h
index b2eeaa39b5..ad0e745640 100644
--- a/firmware/config/boards/arro_board.h
+++ b/firmware/config/boards/arro_board.h
@@ -216,10 +216,6 @@
 #define LED_COMMUNICATION_PORT GPIOD
 #define LED_COMMUNICATION_PIN GPIOD_LED6
 
-#define EFI_SIGNAL_EXECUTOR_SLEEP FALSE
-#define EFI_SIGNAL_EXECUTOR_ONE_TIMER TRUE
-#define EFI_SIGNAL_EXECUTOR_HW_TIMER FALSE
-
 // USART1 -> check defined STM32_SERIAL_USE_USART1
 // For GPS we have USART1. We can start with PB7 USART1_RX and PB6 USART1_TX
 #define GPS_SERIAL_DEVICE &SD1
diff --git a/firmware/config/efifeatures.h b/firmware/config/efifeatures.h
index 4521af82b1..feabaa84cf 100644
--- a/firmware/config/efifeatures.h
+++ b/firmware/config/efifeatures.h
@@ -42,6 +42,10 @@
  */
 #define EFI_CLI_SUPPORT TRUE
 
+#define EFI_SIGNAL_EXECUTOR_SLEEP FALSE
+#define EFI_SIGNAL_EXECUTOR_ONE_TIMER TRUE
+#define EFI_SIGNAL_EXECUTOR_HW_TIMER FALSE
+
 #define EFI_INTERNAL_FLASH TRUE
 
 /**
diff --git a/firmware/controllers/system/SingleTimerExecutor.cpp b/firmware/controllers/system/SingleTimerExecutor.cpp
index 685d47f839..b02113f8a7 100644
--- a/firmware/controllers/system/SingleTimerExecutor.cpp
+++ b/firmware/controllers/system/SingleTimerExecutor.cpp
@@ -15,13 +15,13 @@
 
 #include "SingleTimerExecutor.h"
 #include "efitime.h"
-#include "rfiutil.h"
 
 #if EFI_PROD_CODE
 #include "microsecond_timer.h"
 #endif
 
-#if EFI_SIGNAL_EXECUTOR_ONE_TIMER || defined(__DOXYGEN__)
+#if (EFI_SIGNAL_EXECUTOR_ONE_TIMER && EFI_PROD_CODE )|| defined(__DOXYGEN__)
+#include "rfiutil.h"
 
 static Executor instance;
 
diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index d3ef9eff8f..2cbb06e040 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -102,10 +102,10 @@ CPPSRC = $(UTILSRC_CPP) \
 	$(CONTROLLERS_MATH_SRC_CPP) \
 	$(CONTROLLERS_SENSORS_SRC_CPP) \
 	$(TEST_SRC_CPP) \
+	$(SYSTEMSRC_CPP) \
 	$(PROJECT_DIR)/controllers/trigger/trigger_central.cpp \
 	$(PROJECT_DIR)/controllers/trigger/rpm_calculator.cpp \
 	$(PROJECT_DIR)/controllers/trigger/main_trigger_callback.cpp \
-	$(PROJECT_DIR)/controllers/system/event_queue.cpp \
 	main.cpp
 
 # C sources to be compiled in ARM mode regardless of the global setting.