Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r4fa0828e455e7701dc485b00391486bdfc8d7775 -r31900229872819144c2d0a05f90e5794649bf80f
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4fa0828e455e7701dc485b00391486bdfc8d7775)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 31900229872819144c2d0a05f90e5794649bf80f)
@@ -7,8 +7,8 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      08-Mar-2023
+* @author  (last)      James Walter Taylor
+* @date    (last)      24-Mar-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -222,6 +222,7 @@
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
+    cmdStopDGTrimmerHeater();
 
     if ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM ) )
     {
@@ -1506,6 +1507,15 @@
     }
     else
     {
+#ifndef _RELEASE_
+        if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) ) ||         // if no air pump, now we can allow fills to start
+             ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) ) )    // OR if Dry tests disabled
+        {
+            signalAllowDGFlushFills();
+            signalAllowDGFillRes1();
+            signalAllowDGFillRes2();
+        }
+#endif
         state = DRY_SELF_TESTS_COMPLETE_STATE;
     }
 
@@ -1811,6 +1821,7 @@
         if ( DG_CMD_REQUEST_REJECT_REASON_NONE == cmdResp.rejectCode )
         {
             setDialInPumpTargetFlowRate( DIP_FLOW_RATE_FIRST_DISPLACEMENT_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+            cmdStartDGTrimmerHeater();
             settleStartTime = getMSTimerCount();
             state           = WET_SELF_TESTS_FIRST_DISPLACEMENT_STATE;
         }
@@ -1845,6 +1856,7 @@
         if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
+            cmdStopDGTrimmerHeater();
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE;
         }
@@ -1954,6 +1966,7 @@
         if ( DG_CMD_REQUEST_REJECT_REASON_NONE == cmdResp.rejectCode )
         {
             setDialInPumpTargetFlowRate( DIP_FLOW_RATE_SECOND_DISPLACEMENT_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+            cmdStartDGTrimmerHeater();
             settleStartTime = getMSTimerCount();
             state           = WET_SELF_TESTS_SECOND_DISPLACEMENT_STATE;
         }
@@ -1996,6 +2009,7 @@
         if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
+            cmdStopDGTrimmerHeater();
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE;
         }