diff --git a/speeduino/globals.cpp b/speeduino/globals.cpp
index 5b4e1d60e6..34837048a6 100644
--- a/speeduino/globals.cpp
+++ b/speeduino/globals.cpp
@@ -201,11 +201,11 @@ bool pinIsOutput(byte pin)
   bool isIdlePWM = (configPage6.iacAlgorithm > 0) && ((configPage6.iacAlgorithm <= 3) || (configPage6.iacAlgorithm == 6));
   bool isIdleSteper = (configPage6.iacAlgorithm > 3) && (configPage6.iacAlgorithm != 6);
   //Injector?
-  for (uint8_t index=0U; index<_countof(injectorPins); ++index) {
+  for (uint8_t index=0U; index<_countof(pinInjectors); ++index) {
     used = used || (pin == pinInjectors[index]);
   }
   //Ignition?
-  for (uint8_t index=0U; index<_countof(ignitionPins); ++index) {
+  for (uint8_t index=0U; index<_countof(pinCoils); ++index) {
     used = used || (pin == pinCoils[index]);
   }
 
diff --git a/speeduino/init.cpp b/speeduino/init.cpp
index acd1b54211..d744b6bcd0 100644
--- a/speeduino/init.cpp
+++ b/speeduino/init.cpp
@@ -292,8 +292,8 @@ void initialiseAll(void)
     currentLoopTime = micros_safe();
     mainLoopCount = 0;
     
-    initialiseFuelSchedulers(pinInjectors);
-    initialiseIgnitionSchedulers(pinCoils);
+    initialiseFuelSchedulers();
+    initialiseIgnitionSchedulers();
 
     //Begin priming the fuel pump. This is turned off in the low resolution, 1s interrupt in timers.ino
     //First check that the priming time is not 0
@@ -318,9 +318,11 @@ void initialiseAll(void)
 }
 
 // This saves a couple of bytes of RAM versus using static constexpr statements
-static inline void useDirectChannelControl(void) {
+static inline void useDirectChannelControl(const uint8_t injPins[], const uint8_t ignPins[]) {
   setInjectorControlActions({ openInjector_DIRECT, closeInjector_DIRECT, toggleInjector_DIRECT });
   setIgnitionControlActions({ coilStartCharging_DIRECT, coilStopCharging_DIRECT });    
+  initialiseInjectorPins_DIRECT(injPins);
+  initialiseIgnitionPins_DIRECT(ignPins);
 }
 
 #ifndef SMALL_FLASH_MODE //No support for bluepill here anyway
@@ -354,7 +356,7 @@ static void setPinMappingsV2_0Shield(void) {
   pinFlex = 2; // Flex sensor (Must be external interrupt enabled)
   pinResetControl = 43; //Reset control output
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsV3_0Shield(void) {
@@ -407,7 +409,7 @@ static void setPinMappingsV3_0Shield(void) {
     pinO2 = A22;
   #endif
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsMx5Nb2Shield(void) {
@@ -462,7 +464,7 @@ static void setPinMappingsMx5Nb2Shield(void) {
     pinTachOut = 28; //Done
 #endif
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsMx5Na18Shield(void) {
@@ -514,7 +516,7 @@ static void setPinMappingsMx5Na18Shield(void) {
   pinTachOut = 28; //Done
 #endif
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsMx5Na16Shield(void) {
@@ -568,7 +570,7 @@ static void setPinMappingsMx5Na16Shield(void) {
   pinTachOut = 28; //Done
 #endif
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsTurtanasPcb(void) {
@@ -604,7 +606,7 @@ static void setPinMappingsTurtanasPcb(void) {
   pinFlex = 2; // Flex sensor (Must be external interrupt enabled)
   pinResetControl = 26; //Reset control  
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsDazV6Shield(void) {
@@ -647,7 +649,7 @@ static void setPinMappingsDazV6Shield(void) {
 #endif
   pinFan = 47; //Pin for the fan output
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsNO2CShield(void) {
@@ -694,7 +696,7 @@ static void setPinMappingsNO2CShield(void) {
 #endif
   pinResetControl = 26; //Reset control output
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsUA4CShield(void) {
@@ -742,7 +744,7 @@ static void setPinMappingsUA4CShield(void) {
   pinFan = 24; //Pin for the fan output
   pinResetControl = 46; //Reset control output PLACEHOLDER value for now
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsBlitzboxBL49sp(void) {
@@ -782,7 +784,7 @@ static void setPinMappingsBlitzboxBL49sp(void) {
   pinFan = 12; //Pin for the fan output
   pinResetControl = 46; //Reset control output PLACEHOLDER value for now
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsDiyEfiCore4Shield(void) {
@@ -831,7 +833,7 @@ static void setPinMappingsDiyEfiCore4Shield(void) {
   pinResetControl = 46; //Reset control output PLACEHOLDER value for now
 #endif // CORE_AVR
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsPlazomatV0_1Shield(void) {
@@ -869,7 +871,7 @@ static void setPinMappingsPlazomatV0_1Shield(void) {
   pinResetControl = 26; //Reset control output
 #endif // CORE_AVR
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 #endif // SMALL_FLASH_MODE
@@ -1091,7 +1093,7 @@ static void setPinMappingsV4_0Shield(void) {
   pinTrigger2 = PC15; //The Cam Sensor pin
 #endif
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingBmwPnP(void) {
@@ -1177,7 +1179,7 @@ static void setPinMappingBmwPnP(void) {
   pinCTPS = PA6; //(placeholder)
   #endif
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsTeensyRevA(void) {
@@ -1215,7 +1217,7 @@ static void setPinMappingsTeensyRevA(void) {
 #endif
 #endif
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsTeensyRevB(void) {
@@ -1253,7 +1255,7 @@ static void setPinMappingsTeensyRevB(void) {
 #endif
 #endif
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 
@@ -1292,7 +1294,7 @@ static void setPinMappingsJuiceBox(void) {
 #endif
 #endif
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 static void setPinMappingsDropBear(void) {
@@ -1427,7 +1429,7 @@ static void setPinMappingBearCub(void) {
   pinResetControl = 46; //Reset control output PLACEHOLDER value for now
 #endif
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
  
 static void setPinMappingsSTM32(void) {
@@ -1609,7 +1611,7 @@ static void setPinMappingsSTM32(void) {
   pinTrigger2 = PA13; //The Cam Sensor pin
 #endif
 
-  useDirectChannelControl();
+  useDirectChannelControl(pinInjectors, pinCoils);
 }
 
 /** Set board / microcontroller specific pin mappings / assignments.
diff --git a/speeduino/scheduledIO.cpp b/speeduino/scheduledIO.cpp
index 617746eaaf..725c6df61d 100644
--- a/speeduino/scheduledIO.cpp
+++ b/speeduino/scheduledIO.cpp
@@ -1,5 +1,5 @@
 #include "scheduledIO.h"
-#include "scheduledIO_direct.h"
+
 /** @file
  * Injector and Coil (toggle/open/close) control (under various situations, eg with particular cylinder count, rotary engine type or wasted spark ign, etc.).
  * Also accounts for presence of MC33810 injector/ignition (dwell, etc.) control circuit.
@@ -7,20 +7,6 @@
  * form where they are called (by scheduler.ino).
  */
 
-static inline void registerPins(ioPort toRegister[], uint8_t toRegisterSize, const uint8_t pins[]) {
-    for (uint8_t index=0U; index<toRegisterSize; ++index) {
-        toRegister[index] = pinToOutputPort(pins[index]);
-    }
-}
-
-void initialiseInjectorPins(const uint8_t pins[]) {
-    registerPins(injectorPins, _countof(injectorPins), pins);
-}
-
-void initialiseIgnitionPins(const uint8_t pins[]) {
-    registerPins(ignitionPins, _countof(ignitionPins), pins);
-}
-
 static inline void nullAction(uint8_t index) {
     UNUSED(index);
     // Do nothing
diff --git a/speeduino/scheduledIO.h b/speeduino/scheduledIO.h
index 7d20f83d48..c0d21fdc6f 100644
--- a/speeduino/scheduledIO.h
+++ b/speeduino/scheduledIO.h
@@ -32,19 +32,12 @@ struct injector_control_t {
  */
 void setInjectorControlActions(const injector_control_t &control);
 
-/**
- * @brief Setup the injector (fuel) pins and output control method
- * 
- * @param pins Pin numbers in cylinder order. *Assumption is that the array has at least IGN_CHANNELS elements*
- */
-void initialiseInjectorPins(const uint8_t pins[]);
-
 /**
  * @brief Open an injector
  * 
  * @param channelIndex **One** based index of the injector. I.e. the injector channel number
  */
-static inline void openInjector(uint8_t channelIndex) {
+static CRITICAL_INLINE void openInjector(uint8_t channelIndex) {
     extern injector_control_t injectorControl;
     injectorControl.openInjector(channelIndex);
     if (channelIndex-1U<=BIT_STATUS1_INJ4) { 
@@ -57,7 +50,7 @@ static inline void openInjector(uint8_t channelIndex) {
  * 
  * @param channelIndex **One** based index of the injector. I.e. the injector channel number
  */
-static inline void closeInjector(uint8_t channelIndex) {
+static CRITICAL_INLINE void closeInjector(uint8_t channelIndex) {
     extern injector_control_t injectorControl;
     injectorControl.closeInjector(channelIndex);
     if (channelIndex-1U<=BIT_STATUS1_INJ4) { 
@@ -98,19 +91,12 @@ struct coil_control_t {
  */
 void setIgnitionControlActions(const coil_control_t &control);
 
-/**
- * @brief Setup the ignition (coil) pins and output control method
- * 
- * @param pins Pin numbers in cylinder order. *Assumption is that the array has at least IGN_CHANNELS elements*
- */
-void initialiseIgnitionPins(const uint8_t pins[]);
-
 /**
  * @brief Start charging a coil
  * 
  * @param channelIndex **One** based index of the coil. I.e. the coil channel number
  */
-static inline void beginCoilCharge(uint8_t channelIndex) {
+static CRITICAL_INLINE void beginCoilCharge(uint8_t channelIndex) {
     extern coil_control_t coilControl;
     coilControl.beginCoilCharge(channelIndex);
     if(configPage6.tachoMode) { 
@@ -125,7 +111,7 @@ static inline void beginCoilCharge(uint8_t channelIndex) {
  * 
  * @param channelIndex **One** based index of the coil. I.e. the coil channel number
  */
-static inline void endCoilCharge(uint8_t channelIndex) {
+static CRITICAL_INLINE void endCoilCharge(uint8_t channelIndex) {
     extern coil_control_t coilControl;
     coilControl.endCoilCharge(channelIndex);
     if(configPage6.tachoMode) { 
diff --git a/speeduino/scheduledIO_direct.cpp b/speeduino/scheduledIO_direct.cpp
index d039ab6a6c..23b99d8542 100644
--- a/speeduino/scheduledIO_direct.cpp
+++ b/speeduino/scheduledIO_direct.cpp
@@ -1,6 +1,21 @@
 #include "scheduledIO_direct.h"
 
+static inline void registerPins(ioPort toRegister[], uint8_t toRegisterSize, const uint8_t pins[]) {
+    for (uint8_t index=0U; index<toRegisterSize; ++index) {
+        toRegister[index] = pinToOutputPort(pins[index]);
+    }
+}
+
 // cppcheck-suppress misra-c2012-8.4
 ioPort injectorPins[INJ_CHANNELS];
+
+void initialiseInjectorPins_DIRECT(const uint8_t pins[]) {
+    registerPins(injectorPins, _countof(injectorPins), pins);
+}
+
 // cppcheck-suppress misra-c2012-8.4
-ioPort ignitionPins[IGN_CHANNELS];
\ No newline at end of file
+ioPort ignitionPins[IGN_CHANNELS];
+
+void initialiseIgnitionPins_DIRECT(const uint8_t pins[]) {
+    registerPins(ignitionPins, _countof(ignitionPins), pins);
+}
diff --git a/speeduino/scheduledIO_direct.h b/speeduino/scheduledIO_direct.h
index 232de347a0..4c21eb5e58 100644
--- a/speeduino/scheduledIO_direct.h
+++ b/speeduino/scheduledIO_direct.h
@@ -3,22 +3,33 @@
 #include "globals.h"
 #include "port_pin.h"
 
-//These are for the direct port manipulation of the injectors, coils
-extern ioPort injectorPins[INJ_CHANNELS];
-extern ioPort ignitionPins[IGN_CHANNELS];
-
 //Functions are used to define how each injector control system functions. These are then called by the master openInjectx() function.
 //The DIRECT functions (ie individual pins) are defined below. Others should be defined in their relevant acc_x.h file
+/**
+ * @brief Setup the injector (fuel) pins
+ * 
+ * @param pins Pin numbers in cylinder order. *Assumption is that the array has at least IGN_CHANNELS elements*
+ */
+void initialiseInjectorPins_DIRECT(const uint8_t pins[]);
 
-static inline void openInjector_DIRECT(uint8_t channelIndex) { setPin_High(injectorPins[channelIndex-1U]); }
-static inline void closeInjector_DIRECT(uint8_t channelIndex) { setPin_Low(injectorPins[channelIndex-1U]); }
-static inline void toggleInjector_DIRECT(uint8_t channelIndex) { togglePin(injectorPins[channelIndex-1U]); }
+static inline void openInjector_DIRECT(uint8_t channelIndex) { extern ioPort injectorPins[INJ_CHANNELS]; setPin_High(injectorPins[channelIndex-1U]); }
+static inline void closeInjector_DIRECT(uint8_t channelIndex) { extern ioPort injectorPins[INJ_CHANNELS]; setPin_Low(injectorPins[channelIndex-1U]); }
+static inline void toggleInjector_DIRECT(uint8_t channelIndex) { extern ioPort injectorPins[INJ_CHANNELS]; togglePin(injectorPins[channelIndex-1U]); }
 
 // ======================== Ignition ========================
 
+/**
+ * @brief Setup the ignition (coil) pins
+ * 
+ * @param pins Pin numbers in cylinder order. *Assumption is that the array has at least IGN_CHANNELS elements*
+ */
+void initialiseIgnitionPins_DIRECT(const uint8_t pins[]);
+
 static inline void coilStartCharging_DIRECT(uint8_t channelIndex) {  
+    extern ioPort ignitionPins[IGN_CHANNELS];
     setPinState(ignitionPins[channelIndex-1U], (configPage4.IgInv == GOING_HIGH ? LOW : HIGH));
 }
 static inline void coilStopCharging_DIRECT(uint8_t channelIndex) { 
+    extern ioPort ignitionPins[IGN_CHANNELS];
     setPinState(ignitionPins[channelIndex-1U], (configPage4.IgInv == GOING_HIGH ? HIGH : LOW));
 }
diff --git a/speeduino/scheduler.cpp b/speeduino/scheduler.cpp
index 1397cf7359..33ac9d967f 100644
--- a/speeduino/scheduler.cpp
+++ b/speeduino/scheduler.cpp
@@ -406,12 +406,11 @@ static void initialiseFuelContext(void)
   currentStatus.status3 |= currentStatus.nSquirts << BIT_STATUS3_NSQUIRTS1; //Top 3 bits of the status3 variable are the number of squirts. This must be done after the above section due to nSquirts being forced to 1 for sequential
 }
 
-void initialiseFuelSchedulers(const uint8_t pins[])
+void initialiseFuelSchedulers(void)
 {
   turnOffInjectors();
 
   resetFuelSchedulers();
-  initialiseInjectorPins(pins);
   initialiseFuelContext();
   setFuelChannelAngles();
   initialiseStagedInjection();
@@ -683,12 +682,11 @@ static void initialiseIgnitionContext(void)
   CRANK_ANGLE_MAX_IGN = configPage4.sparkMode == IGN_MODE_SEQUENTIAL ? 720 : 360;
 }
 
-void initialiseIgnitionSchedulers(const uint8_t pins[])
+void initialiseIgnitionSchedulers(void)
 {
   turnOffCoils();
 
   resetIgnitionSchedulers();
-  initialiseIgnitionPins(pins);
   initialiseIgnitionContext();
   setIgnitionChannelAngles();
   setIgnitionScheduleCallbacks(configPage4.sparkMode);  
diff --git a/speeduino/scheduler.h b/speeduino/scheduler.h
index 1886bd9241..5bbe20501d 100644
--- a/speeduino/scheduler.h
+++ b/speeduino/scheduler.h
@@ -81,7 +81,7 @@ extern byte maxIgnOutputs;
  * Assumes that all config pages have been configured - typically by
  * loading the tune from EEPROM
 */
-void initialiseFuelSchedulers(const uint8_t pins[]);
+void initialiseFuelSchedulers(void);
 
 /** @brief Configure all ignition schedulers based on the current tune
  * parameters
@@ -89,7 +89,7 @@ void initialiseFuelSchedulers(const uint8_t pins[]);
  * Assumes that all config pages have been configured - typically by
  * loading the tune from EEPROM
 */
-void initialiseIgnitionSchedulers(const uint8_t pins[]);
+void initialiseIgnitionSchedulers(void);
 
 /** @brief Start fuel system  priming the fuel */
 void beginInjectorPriming(void);
diff --git a/test/test_fuel/test_staging.cpp b/test/test_fuel/test_staging.cpp
index e21a5b6adb..983310c5a4 100644
--- a/test/test_fuel/test_staging.cpp
+++ b/test/test_fuel/test_staging.cpp
@@ -1,6 +1,6 @@
-#include <globals.h>
-#include <speeduino.h>
 #include <unity.h>
+#include "globals.h"
+#include "speeduino.h"
 #include "test_staging.h"
 #include "../test_utils.h"
 #include "scheduler.h"
@@ -21,8 +21,6 @@ void test_Staging_setCommon()
 {
   // initialiseAll();
   
-  maxInjPrimaryOutputs = 2;
-  maxInjSecondaryOutputs = 2;
   configPage2.nCylinders = 4;
   currentStatus.RPM = 3000;
   currentStatus.fuelLoad = 50;
@@ -48,7 +46,8 @@ void test_Staging_setCommon()
   staged_req_fuel_mult_sec = (100 * totalInjector) / configPage10.stagedInjSizeSec;
 }
 
-extern void calculateStaging(uint16_t pwLimit, uint16_t pwPrimary);
+extern pulseWidths computePulseWidths(uint16_t pwLimit, uint16_t pwPrimary);
+extern void applyPWToSchedules(uint16_t primaryPW, uint16_t secondaryPW);
 
 void test_Staging_Off(void)
 {
@@ -57,8 +56,8 @@ void test_Staging_Off(void)
   BIT_SET(currentStatus.status4, BIT_STATUS4_STAGING_ACTIVE);
   configPage10.stagingEnabled = false;
 
-  calculateStaging(9000U, 0U); //90% duty cycle at 6000rpm
-  TEST_ASSERT_BIT_LOW(BIT_STATUS4_STAGING_ACTIVE, currentStatus.status4);
+  auto pw = computePulseWidths(9000U, 0U); //90% duty cycle at 6000rpm
+  TEST_ASSERT_EQUAL(0U, pw.secondary);
 }
 
 void test_Staging_4cyl_Auto_Inactive(void)
@@ -70,14 +69,15 @@ void test_Staging_4cyl_Auto_Inactive(void)
   configPage10.stagingEnabled = true;
   configPage10.stagingMode = STAGING_MODE_AUTO;
 
-  calculateStaging(9000U, 3000U); //90% duty cycle at 6000rpm
+  auto pw = computePulseWidths(9000U, 3000U); //90% duty cycle at 6000rpm
+  applyPWToSchedules(pw.primary, pw.secondary);
   //PW 1 and 2 should be normal, 3 and 4 should be 0 as that testPW is below the pwLimit
   //PW1/2 should be ((PW - openTime) * staged_req_fuel_mult_pri) + openTime = ((3000 - 1000) * 3.0) + 1000 = 7000
   TEST_ASSERT_EQUAL(7000, fuelSchedules[0].pw);
   TEST_ASSERT_EQUAL(7000, fuelSchedules[1].pw);
   TEST_ASSERT_EQUAL(0, fuelSchedules[2].pw);
   TEST_ASSERT_EQUAL(0, fuelSchedules[3].pw);
-  TEST_ASSERT_BIT_LOW(BIT_STATUS4_STAGING_ACTIVE, currentStatus.status4);
+  TEST_ASSERT_EQUAL(0U, pw.secondary);
 }
 
 void test_Staging_4cyl_Table_Inactive(void)
@@ -94,14 +94,15 @@ void test_Staging_4cyl_Table_Inactive(void)
   for(byte x=0; x<64; x++) { stagingTable.values.values[x] = 0; }
 
 
-  calculateStaging(9000U, 3000U); //90% duty cycle at 6000rpm
+  auto pw = computePulseWidths(9000U, 3000U); //90% duty cycle at 6000rpm
+  applyPWToSchedules(pw.primary, pw.secondary);
   //PW 1 and 2 should be normal, 3 and 4 should be 0 as that testPW is below the pwLimit
   //PW1/2 should be (PW - openTime) * staged_req_fuel_mult_pri = (3000 - 1000) * 3.0 = 6000
   TEST_ASSERT_EQUAL(7000, fuelSchedules[0].pw);
   TEST_ASSERT_EQUAL(7000, fuelSchedules[1].pw);
   TEST_ASSERT_EQUAL(0, fuelSchedules[2].pw);
   TEST_ASSERT_EQUAL(0, fuelSchedules[3].pw);
-  TEST_ASSERT_BIT_LOW(BIT_STATUS4_STAGING_ACTIVE, currentStatus.status4);
+  TEST_ASSERT_EQUAL(0U, pw.secondary);
 }
 
 void test_Staging_4cyl_Auto_50pct(void)
@@ -115,13 +116,14 @@ void test_Staging_4cyl_Auto_50pct(void)
 
 
   uint32_t pwLimit = 9000; //90% duty cycle at 6000rpm
-  calculateStaging(pwLimit, 9000U); //90% duty cycle at 6000rpm
+  auto pw = computePulseWidths(pwLimit, 9000U); //90% duty cycle at 6000rpm
+  applyPWToSchedules(pw.primary, pw.secondary);
   //PW 1 and 2 should be maxed out at the pwLimit, 3 and 4 should be based on their relative size
   TEST_ASSERT_EQUAL(pwLimit, fuelSchedules[0].pw); //PW1/2 run at maximum available limit
   TEST_ASSERT_EQUAL(pwLimit, fuelSchedules[1].pw);
   TEST_ASSERT_EQUAL(9000, fuelSchedules[2].pw);
   TEST_ASSERT_EQUAL(9000, fuelSchedules[3].pw);
-  TEST_ASSERT_BIT_HIGH(BIT_STATUS4_STAGING_ACTIVE, currentStatus.status4);
+  TEST_ASSERT_NOT_EQUAL(0U, pw.secondary);
 }
 
 void test_Staging_4cyl_Auto_33pct(void)
@@ -134,13 +136,14 @@ void test_Staging_4cyl_Auto_33pct(void)
   configPage10.stagingMode = STAGING_MODE_AUTO;
 
   uint32_t pwLimit = 9000; //90% duty cycle at 6000rpm
-  calculateStaging(9000U, 7000U); //90% duty cycle at 6000rpm
+  auto pw = computePulseWidths(9000U, 7000U); //90% duty cycle at 6000rpm
+  applyPWToSchedules(pw.primary, pw.secondary);
   //PW 1 and 2 should be maxed out at the pwLimit, 3 and 4 should be based on their relative size
   TEST_ASSERT_EQUAL(pwLimit, fuelSchedules[0].pw); //PW1/2 run at maximum available limit
   TEST_ASSERT_EQUAL(pwLimit, fuelSchedules[1].pw);
   TEST_ASSERT_EQUAL(6000, fuelSchedules[2].pw);
   TEST_ASSERT_EQUAL(6000, fuelSchedules[3].pw);
-  TEST_ASSERT_BIT_HIGH(BIT_STATUS4_STAGING_ACTIVE, currentStatus.status4);
+  TEST_ASSERT_NOT_EQUAL(0U, pw.secondary);
 }
 
 void test_Staging_4cyl_Table_50pct(void)
@@ -159,11 +162,12 @@ void test_Staging_4cyl_Table_50pct(void)
   currentStatus.RPM += 1;
   currentStatus.fuelLoad += 1;
 
-  calculateStaging(9000U, 3000U); //90% duty cycle at 6000rpm
+  auto pw = computePulseWidths(9000U, 3000U); //90% duty cycle at 6000rpm
+  applyPWToSchedules(pw.primary, pw.secondary);
 
   TEST_ASSERT_EQUAL(4000, fuelSchedules[0].pw);
   TEST_ASSERT_EQUAL(4000, fuelSchedules[1].pw);
   TEST_ASSERT_EQUAL(2500, fuelSchedules[2].pw);
   TEST_ASSERT_EQUAL(2500, fuelSchedules[3].pw);
-  TEST_ASSERT_BIT_HIGH(BIT_STATUS4_STAGING_ACTIVE, currentStatus.status4);
+  TEST_ASSERT_NOT_EQUAL(0U, pw.secondary);
 }
\ No newline at end of file
diff --git a/test/test_init/tests_init.cpp b/test/test_init/tests_init.cpp
index 363a7f89fb..881a605bff 100644
--- a/test/test_init/tests_init.cpp
+++ b/test/test_init/tests_init.cpp
@@ -46,6 +46,9 @@ void test_initialisation_complete(void)
   TEST_ASSERT_EQUAL(true, currentStatus.initialisationComplete);
 }
 
+extern ioPort injectorPins[INJ_CHANNELS];
+extern ioPort ignitionPins[INJ_CHANNELS];
+
 void test_initialisation_ports(void)
 {
 #if defined(CORE_AVR) || defined(ARDUINO_ARCH_AVR)
diff --git a/test/test_schedules/test_status_initial_off.cpp b/test/test_schedules/test_status_initial_off.cpp
index ff0105c387..72c13ae57e 100644
--- a/test/test_schedules/test_status_initial_off.cpp
+++ b/test/test_schedules/test_status_initial_off.cpp
@@ -6,7 +6,7 @@
 
 void test_status_initial_off(FuelSchedule &schedule)
 {
-    initialiseFuelSchedulers(pinInjectors);
+    initialiseFuelSchedulers();
     TEST_ASSERT_EQUAL(OFF, schedule._status);
 }
 
@@ -20,7 +20,7 @@ void test_status_initial_off_inj(void)
 
 void test_status_initial_off(IgnitionSchedule &schedule)
 {
-    initialiseFuelSchedulers(pinInjectors);
+    initialiseFuelSchedulers();
     TEST_ASSERT_EQUAL(OFF, schedule._status);
 }
 
diff --git a/test/test_schedules/test_status_off_to_pending.cpp b/test/test_schedules/test_status_off_to_pending.cpp
index 77cf20aaba..0a944ebd1c 100644
--- a/test/test_schedules/test_status_off_to_pending.cpp
+++ b/test/test_schedules/test_status_off_to_pending.cpp
@@ -12,7 +12,7 @@ static void emptyCallback(void) {  }
 
 void test_status_off_to_pending(FuelSchedule &schedule)
 {
-    initialiseFuelSchedulers(pinInjectors);
+    initialiseFuelSchedulers();
     _setSchedule(schedule, TIMEOUT, DURATION);
     TEST_ASSERT_EQUAL(PENDING, schedule._status);
 }
@@ -29,7 +29,7 @@ extern void setCallbacks(Schedule &schedule, voidVoidCallback pStartCallback, vo
 
 void test_status_off_to_pending_ign(IgnitionSchedule &schedule)
 {
-    initialiseIgnitionSchedulers(pinCoils);
+    initialiseIgnitionSchedulers();
     setCallbacks(schedule, emptyCallback, emptyCallback);
     _setSchedule(schedule, TIMEOUT, DURATION);
     TEST_ASSERT_EQUAL(PENDING, schedule._status);