diff --git a/HPXMLtoOpenStudio/resources/hvac.rb b/HPXMLtoOpenStudio/resources/hvac.rb
index 99a0ec86f1..9cf441648b 100644
--- a/HPXMLtoOpenStudio/resources/hvac.rb
+++ b/HPXMLtoOpenStudio/resources/hvac.rb
@@ -3401,7 +3401,7 @@ def self.add_supplemental_coil_ems_program(model, htg_supp_coil, control_zone, h
     htg_sch = control_zone.thermostatSetpointDualSetpoint.get.heatingSetpointTemperatureSchedule.get
     htg_sp_ss = Model.add_ems_sensor(
       model,
-      name: 'htg_setpoint',
+      name: "#{control_zone.name} htg setpoint",
       output_var_or_meter_name: 'Schedule Value',
       key_name: htg_sch.name
     )
@@ -3831,18 +3831,19 @@ def self.add_variable_speed_power_ems_program(runner, model, air_loop_unitary, c
       key_name: control_zone.name
     )
 
+    htg_sch = control_zone.thermostatSetpointDualSetpoint.get.heatingSetpointTemperatureSchedule.get
+    clg_sch = control_zone.thermostatSetpointDualSetpoint.get.coolingSetpointTemperatureSchedule.get
     htg_spt_sensor = Model.add_ems_sensor(
       model,
-      name: "#{control_zone.name} htg_spt_temp",
-      output_var_or_meter_name: 'Zone Thermostat Heating Setpoint Temperature',
-      key_name: control_zone.name
+      name: "#{control_zone.name} htg setpoint",
+      output_var_or_meter_name: 'Schedule Value',
+      key_name: htg_sch.name
     )
-
     clg_spt_sensor = Model.add_ems_sensor(
       model,
-      name: "#{control_zone.name} clg_spt_temp",
-      output_var_or_meter_name: 'Zone Thermostat Cooling Setpoint Temperature',
-      key_name: control_zone.name
+      name: "#{control_zone.name} clg setpoint",
+      output_var_or_meter_name: 'Schedule Value',
+      key_name: clg_sch.name
     )
 
     load_sensor = Model.add_ems_sensor(
@@ -4136,11 +4137,18 @@ def self.add_backup_staging_ems_program(model, unitary_system, htg_supp_coil, co
       key_name: control_zone.name
     )
 
-    htg_sp_ss = Model.add_ems_sensor(
+    htg_sch = control_zone.thermostatSetpointDualSetpoint.get.heatingSetpointTemperatureSchedule.get
+    htg_sp_sch_ss = Model.add_ems_sensor(
       model,
-      name: 'htg_setpoint',
-      output_var_or_meter_name: 'Zone Thermostat Heating Setpoint Temperature',
-      key_name: control_zone.name
+      name: "#{control_zone.name} htg setpoint",
+      output_var_or_meter_name: 'Schedule Value',
+      key_name: htg_sch.name
+    )
+    htg_coil_ss = Model.add_ems_sensor(
+      model,
+      name: 'htg_coil_rate',
+      output_var_or_meter_name: 'Heating Coil Heating Rate',
+      key_name: htg_coil.name
     )
 
     backup_coil_htg_rate = Model.add_ems_sensor(
@@ -4160,9 +4168,9 @@ def self.add_backup_staging_ems_program(model, unitary_system, htg_supp_coil, co
       num_timesteps_logged: number_of_timestep_logged
     )
 
-    setpoint_temp_trend = Model.add_ems_trend_var(
+    htg_coil_trend = Model.add_ems_trend_var(
       model,
-      ems_object: htg_sp_ss,
+      ems_object: htg_coil_ss,
       num_timesteps_logged: number_of_timestep_logged
     )
 
@@ -4201,12 +4209,19 @@ def self.add_backup_staging_ems_program(model, unitary_system, htg_supp_coil, co
     )
 
     # Check values within min/max limits
+    supp_staging_program.addLine("Set htg_sp_high = #{htg_sp_sch_ss.name} + #{ddb}")
+    supp_staging_program.addLine("Set htg_sp_low = #{htg_sp_sch_ss.name}")
 
     s_trend = []
     (1..number_of_timestep_logged).each do |t_i|
       supp_staging_program.addLine("Set zone_temp_#{t_i}_ago = @TrendValue #{zone_temp_trend.name} #{t_i}")
-      supp_staging_program.addLine("Set htg_spt_temp_#{t_i}_ago = @TrendValue #{setpoint_temp_trend.name} #{t_i}")
+      supp_staging_program.addLine("Set htg_coil_rate_#{t_i}_ago = @TrendValue #{htg_coil_trend.name} #{t_i}")
       supp_staging_program.addLine("Set supp_htg_rate_#{t_i}_ago = @TrendValue #{backup_coil_htg_rate_trend.name} #{t_i}")
+      supp_staging_program.addLine("If htg_coil_rate_#{t_i}_ago > 0.0")
+      supp_staging_program.addLine("  Set htg_spt_temp_#{t_i}_ago = htg_sp_high")
+      supp_staging_program.addLine('Else')
+      supp_staging_program.addLine("  Set htg_spt_temp_#{t_i}_ago = htg_sp_low")
+      supp_staging_program.addLine('EndIf')
       if max_htg_coil_stage > 1
         supp_staging_program.addLine("Set unitary_var_#{t_i}_ago = @TrendValue #{unitary_speed_var_trend.name} #{t_i}")
         s_trend << "((htg_spt_temp_#{t_i}_ago - zone_temp_#{t_i}_ago > 0.01) && (unitary_var_#{t_i}_ago == #{max_htg_coil_stage}))"
@@ -4218,16 +4233,14 @@ def self.add_backup_staging_ems_program(model, unitary_system, htg_supp_coil, co
     supp_staging_program.addLine("If #{global_var_supp_avail.name} == 0") # Other EMS set it to be 0.0, keep the logic
     supp_staging_program.addLine("  Set #{supp_coil_avail_act.name} = 0")
     supp_staging_program.addLine('Else') # global variable = 1
-    supp_staging_program.addLine("  Set #{supp_coil_avail_act.name} = 1")
-    supp_staging_program.addLine("  If (supp_htg_rate_1_ago > 0) && (#{htg_sp_ss.name} + #{living_temp_ss.name} > 0.01)")
-    supp_staging_program.addLine("    Set #{supp_coil_avail_act.name} = 1") # Keep backup coil on until reaching setpoint
+    supp_staging_program.addLine("  If (supp_htg_rate_1_ago > 0) && (htg_sp_high - #{living_temp_ss.name} > 0.01)")
+    supp_staging_program.addLine("    Set #{supp_coil_avail_act.name} = 1") # Keep backup coil on until reaching cut-out temperature
     supp_staging_program.addLine("  ElseIf (#{s_trend.join(' && ')})")
-    if ddb > 0.0
-      supp_staging_program.addLine("    If (#{living_temp_ss.name} >= #{htg_sp_ss.name} - #{ddb})")
-      supp_staging_program.addLine("      Set #{global_var_supp_avail.name} = 0")
-      supp_staging_program.addLine("      Set #{supp_coil_avail_act.name} = 0")
-      supp_staging_program.addLine('    EndIf')
-    end
+    supp_staging_program.addLine("    Set #{supp_coil_avail_act.name} = 1")
+    supp_staging_program.addLine("    If (#{living_temp_ss.name} >= htg_sp_low)")
+    supp_staging_program.addLine("      Set #{global_var_supp_avail.name} = 0")
+    supp_staging_program.addLine("      Set #{supp_coil_avail_act.name} = 0")
+    supp_staging_program.addLine('    EndIf')
     supp_staging_program.addLine('  Else')
     supp_staging_program.addLine("    Set #{global_var_supp_avail.name} = 0")
     supp_staging_program.addLine("    Set #{supp_coil_avail_act.name} = 0")
diff --git a/workflow/tests/base_results/results_simulations_bills.csv b/workflow/tests/base_results/results_simulations_bills.csv
index 3147c089a2..d7a29012e8 100644
--- a/workflow/tests/base_results/results_simulations_bills.csv
+++ b/workflow/tests/base_results/results_simulations_bills.csv
@@ -215,7 +215,7 @@ base-hvac-air-to-air-heat-pump-1-speed-detailed-performance.xml,2237.76,144.0,20
 base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml,2150.57,144.0,2006.57,0.0,2150.57,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml,1938.73,144.0,1794.73,0.0,1938.73,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,2154.85,144.0,2010.85,0.0,2154.85,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,4099.63,144.0,3955.63,0.0,4099.63,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,4101.94,144.0,3957.94,0.0,4101.94,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-hvac-air-to-air-heat-pump-1-speed-seer-hspf.xml,2214.19,144.0,2070.19,0.0,2214.19,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-hvac-air-to-air-heat-pump-1-speed.xml,2151.36,144.0,2007.36,0.0,2151.36,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-hvac-air-to-air-heat-pump-2-speed-detailed-performance.xml,2067.77,144.0,1923.77,0.0,2067.77,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/workflow/tests/base_results/results_simulations_energy.csv b/workflow/tests/base_results/results_simulations_energy.csv
index 6164884ead..e72590a09f 100644
--- a/workflow/tests/base_results/results_simulations_energy.csv
+++ b/workflow/tests/base_results/results_simulations_energy.csv
@@ -215,7 +215,7 @@ base-hvac-air-to-air-heat-pump-1-speed-detailed-performance.xml,57.017,57.017,57
 base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml,54.643,54.643,54.643,54.643,0.0,0.0,0.0,0.0,0.0,0.0,11.798,2.167,3.297,0.097,4.397,1.105,10.77,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.074,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml,48.874,48.874,48.874,48.874,0.0,0.0,0.0,0.0,0.0,0.0,11.892,2.024,3.048,0.08,0.0,0.0,10.735,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.158,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,54.759,54.759,54.759,54.759,0.0,0.0,0.0,0.0,0.0,0.0,11.342,1.836,4.265,0.173,4.287,1.075,10.768,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.078,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,101.789,101.789,101.789,101.789,0.0,0.0,0.0,0.0,0.0,0.0,20.142,3.106,41.801,1.773,0.586,0.154,13.285,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.006,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,101.848,101.848,101.848,101.848,0.0,0.0,0.0,0.0,0.0,0.0,20.089,3.089,41.924,1.777,0.586,0.154,13.285,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.007,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-hvac-air-to-air-heat-pump-1-speed-seer-hspf.xml,56.375,56.375,56.375,56.375,0.0,0.0,0.0,0.0,0.0,0.0,13.325,2.138,3.079,0.081,4.867,1.105,10.77,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.074,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-hvac-air-to-air-heat-pump-1-speed.xml,54.664,54.664,54.664,54.664,0.0,0.0,0.0,0.0,0.0,0.0,12.084,2.138,3.079,0.081,4.397,1.105,10.77,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.074,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-hvac-air-to-air-heat-pump-2-speed-detailed-performance.xml,52.388,52.388,52.388,52.388,0.0,0.0,0.0,0.0,0.0,0.0,11.156,1.162,3.483,0.075,4.322,0.409,10.77,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.074,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/workflow/tests/base_results/results_simulations_loads.csv b/workflow/tests/base_results/results_simulations_loads.csv
index 580288427e..dcfe5ab667 100644
--- a/workflow/tests/base_results/results_simulations_loads.csv
+++ b/workflow/tests/base_results/results_simulations_loads.csv
@@ -215,7 +215,7 @@ base-hvac-air-to-air-heat-pump-1-speed-detailed-performance.xml,30.28,0.953,17.6
 base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml,30.497,1.254,17.692,9.917,0.849,0.0,0.0,0.0,3.273,3.875,0.882,7.07,0.676,11.54,-12.828,0.0,0.0,0.0,8.305,-0.111,5.695,0.0,0.509,0.0,12.695,-9.514,-2.634,0.0,0.05,-0.244,-0.021,2.452,0.019,-0.374,12.67,0.0,0.0,0.0,-6.419,-0.107,-0.941,-4.166,-0.084,0.0,5.666,7.311,1.873
 base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml,29.747,1.044,0.0,9.917,0.814,0.0,0.0,0.0,3.262,3.839,0.873,7.055,0.669,11.442,-12.717,0.0,0.0,0.0,8.161,-0.101,5.633,0.0,0.504,0.0,12.111,-9.386,-2.613,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,30.612,3.009,17.163,9.917,0.847,0.0,0.0,0.0,3.446,3.961,0.89,7.413,0.669,11.468,-13.28,0.0,0.0,0.0,9.376,0.113,5.674,0.0,0.54,0.0,11.175,-9.172,-2.678,0.0,0.127,-0.191,-0.02,2.567,0.006,-0.535,12.217,0.0,0.0,0.0,-6.265,0.104,-0.953,-4.684,-0.075,0.0,5.543,7.261,1.829
-base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,87.668,1.773,2.396,12.403,0.877,0.0,0.0,0.0,5.486,7.037,1.592,14.335,1.474,20.77,-14.023,0.0,0.0,0.0,17.611,0.303,14.513,0.0,1.119,0.0,31.135,-12.663,-3.29,0.0,-0.193,-0.547,-0.117,0.237,-0.134,-1.791,7.607,0.0,0.0,0.0,-7.031,0.285,-1.146,-1.929,-0.129,0.0,0.691,5.001,1.218
+base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,87.655,1.777,2.396,12.403,0.876,0.0,0.0,0.0,5.49,7.04,1.593,14.339,1.474,20.777,-14.022,0.0,0.0,0.0,17.616,0.302,14.515,0.0,1.119,0.0,31.107,-12.657,-3.29,0.0,-0.193,-0.546,-0.117,0.238,-0.134,-1.788,7.607,0.0,0.0,0.0,-7.031,0.284,-1.144,-1.929,-0.129,0.0,0.695,5.0,1.217
 base-hvac-air-to-air-heat-pump-1-speed-seer-hspf.xml,30.351,1.046,17.692,9.917,0.849,0.0,0.0,0.0,3.279,3.875,0.882,7.07,0.676,11.539,-12.828,0.0,0.0,0.0,8.305,-0.111,5.68,0.0,0.509,0.0,12.559,-9.475,-2.634,0.0,0.05,-0.244,-0.021,2.452,0.019,-0.374,12.67,0.0,0.0,0.0,-6.419,-0.107,-0.941,-4.166,-0.084,0.0,5.666,7.311,1.873
 base-hvac-air-to-air-heat-pump-1-speed.xml,30.351,1.046,17.692,9.917,0.849,0.0,0.0,0.0,3.279,3.875,0.882,7.07,0.676,11.539,-12.828,0.0,0.0,0.0,8.305,-0.111,5.68,0.0,0.509,0.0,12.559,-9.475,-2.634,0.0,0.05,-0.244,-0.021,2.452,0.019,-0.374,12.67,0.0,0.0,0.0,-6.419,-0.107,-0.941,-4.166,-0.084,0.0,5.666,7.311,1.873
 base-hvac-air-to-air-heat-pump-2-speed-detailed-performance.xml,33.502,1.273,19.528,9.917,0.849,0.0,0.0,0.0,3.148,3.876,0.882,7.073,0.676,11.542,-12.828,0.0,0.0,0.0,8.311,-0.111,5.767,0.0,0.509,0.0,15.737,-9.499,-2.634,0.0,-0.02,-0.244,-0.021,2.453,0.019,-0.373,12.67,0.0,0.0,0.0,-6.417,-0.107,-0.937,-4.172,-0.084,0.0,7.566,7.311,1.873
diff --git a/workflow/tests/base_results/results_simulations_misc.csv b/workflow/tests/base_results/results_simulations_misc.csv
index 3526934def..ed0041daf4 100644
--- a/workflow/tests/base_results/results_simulations_misc.csv
+++ b/workflow/tests/base_results/results_simulations_misc.csv
@@ -215,7 +215,7 @@ base-hvac-air-to-air-heat-pump-1-speed-detailed-performance.xml,0.0,0.0,0.0,1286
 base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9035.1,4233.1,9035.1,9035.1,4233.1,9035.1,31072.0,24785.0,0.0
 base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,9046.3,1887.6,9046.3,9046.3,1887.6,9046.3,31055.0,0.0,0.0
 base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,148.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,15409.2,4217.6,15409.2,15409.2,4217.6,15409.2,51750.0,24621.0,0.0
-base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,412.433,0.0,0.0,1286.4,890.5,12241.8,4208.1,20808.8,9769.5,20808.8,20808.8,9769.5,20808.8,63178.0,33162.0,0.0
+base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,405.117,0.0,0.0,1286.4,890.5,12241.8,4208.1,20788.0,9769.6,20788.0,20788.0,9769.6,20788.0,63206.0,33162.0,0.0
 base-hvac-air-to-air-heat-pump-1-speed-seer-hspf.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9099.4,4416.8,9099.4,9099.4,4416.8,9099.4,31054.0,24785.0,0.0
 base-hvac-air-to-air-heat-pump-1-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9063.9,4233.1,9063.9,9063.9,4233.1,9063.9,31054.0,24785.0,0.0
 base-hvac-air-to-air-heat-pump-2-speed-detailed-performance.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,8970.5,4139.6,8970.5,8970.5,4139.6,8970.5,31065.0,26551.0,0.0