diff --git a/firmware/controllers/injector_central.cpp b/firmware/controllers/injector_central.cpp
index d20305f869..4327776d5a 100644
--- a/firmware/controllers/injector_central.cpp
+++ b/firmware/controllers/injector_central.cpp
@@ -175,7 +175,6 @@ static void fuelbench(const char * onTimeStr, const char *offTimeStr, const char
 	fuelbench2("0", "1", onTimeStr, offTimeStr, countStr);
 }
 
-
 static void doRunSpark(int humanIndex, const char *delayStr, const char * onTimeStr, const char *offTimeStr,
 		const char *countStr) {
 	if (humanIndex < 1 || humanIndex > engineConfiguration->specs.cylindersCount) {
@@ -279,9 +278,15 @@ void runIoTest(int subsystem, int index) {
 	if (subsystem == 0x12) {
 		doRunSpark(index, "300", "4", "400", "3");
 	} else if (subsystem == 0x13) {
-
+		doRunFuel(index, "300", "4", "400", "3");
+	} else if (subsystem == 0x14) {
+		fuelPumpBench();
+	} else if (subsystem == 0x15) {
+		fanBench();
+	} else if (subsystem == 0x16) {
+		milBench();
+	} else if (subsystem == 0x17) {
 	}
-
 }
 
 void initInjectorCentral(Logging *sharedLogger) {
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index 8e4f7a76fe..45f5320cff 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -1270,6 +1270,11 @@ cmd_test_inj14 = "w\x00\x13\x00\x0e"
 cmd_test_inj15 = "w\x00\x13\x00\x0f"
 cmd_test_inj16 = "w\x00\x13\x00\x10"
 		
+cmd_test_fuel_pump           = "w\x00\x14\x00\x01"
+cmd_test_radiator_fan        = "w\x00\x15\x00\x01"
+cmd_test_check_engine_light  = "w\x00\x16\x00\x01"
+cmd_test_idle_valve          = "w\x00\x17\x00\x01"
+		
 		
 [UserDefined]
 
@@ -1740,16 +1745,37 @@ cmd_test_inj16 = "w\x00\x13\x00\x10"
 		panel = fsioSetting,	East
 		
 		
-	dialog = ioTest, "I-O Test"
+	dialog = testSpark, "Spark"
 		commandButton = "Spark #1", cmd_test_spk1
 		commandButton = "Spark #2", cmd_test_spk2
 		commandButton = "Spark #3", cmd_test_spk3
 		commandButton = "Spark #4", cmd_test_spk4
+		commandButton = "Spark #5", cmd_test_spk5
+		commandButton = "Spark #6", cmd_test_spk6
+		commandButton = "Spark #7", cmd_test_spk7
+		commandButton = "Spark #8", cmd_test_spk8
 		
+	dialog = testInjectors, "Fuel"
 		commandButton = "Injector #1", cmd_test_inj1
 		commandButton = "Injector #2", cmd_test_inj2
 		commandButton = "Injector #3", cmd_test_inj3
 		commandButton = "Injector #4", cmd_test_inj4
+		commandButton = "Injector #5", cmd_test_inj5
+		commandButton = "Injector #6", cmd_test_inj6
+		commandButton = "Injector #7", cmd_test_inj7
+		commandButton = "Injector #8", cmd_test_inj8
+		
+	dialog = testMisc, "Misc"
+		commandButton = "Fuel Pump", cmd_test_fuel_pump
+		commandButton = "Radiator Fan", cmd_test_radiator_fan
+		commandButton = "Check Engine", cmd_test_check_engine_light
+		commandButton = "Idle Air Valve", cmd_test_idle_valve          
+		
+	dialog = ioTest, "I-O Test", border
+		panel = testSpark,		West
+		panel = testInjectors,	Center
+		panel = testMisc,		East
+
 
 ;			Board->ECU stimulator
 	dialog = ecuStimulator, "ECU stimulator"