diff --git a/Changelog.md b/Changelog.md
index d204cd92d..57b50343c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ __New Features__
 - **Breaking change**: Each `VentilationFan` must have one (and only one) `UsedFor...` element set to true.
 
 __Bugfixes__
+- Fixes incorrect Reference Home mechanical ventilation flowrate for attached units (when Aext is not 1).
 - Fixes possible 301ruleset.rb error due to floating point arithmetic.
 
 ## OpenStudio-ERI v1.7.0
diff --git a/rulesets/resources/301ruleset.rb b/rulesets/resources/301ruleset.rb
index 1805dff95..6dda397d6 100644
--- a/rulesets/resources/301ruleset.rb
+++ b/rulesets/resources/301ruleset.rb
@@ -73,7 +73,7 @@ def self.apply_reference_home_ruleset(orig_hpxml, iecc_version: nil, is_all_elec
     set_enclosure_windows_reference(orig_bldg, new_bldg)
     set_enclosure_skylights_reference(orig_bldg, new_bldg)
     set_enclosure_doors_reference(orig_bldg, new_bldg)
-    set_enclosure_air_infiltration_reference(new_bldg)
+    set_enclosure_air_infiltration_reference(orig_bldg, new_bldg)
 
     # Systems
     set_systems_hvac_reference(orig_bldg, new_bldg, is_all_electric: is_all_electric)
@@ -276,7 +276,6 @@ def self.set_summary_reference(orig_bldg, new_bldg)
     @nbeds = orig_bldg.building_construction.number_of_bedrooms
     @ncfl = orig_bldg.building_construction.number_of_conditioned_floors
     @ncfl_ag = orig_bldg.building_construction.number_of_conditioned_floors_above_grade
-    _sla, _ach50, _nach, @infil_volume, @infil_height = Airflow.get_values_from_air_infiltration_measurements(orig_bldg, @cfa, @weather)
 
     new_bldg.site.fuels = orig_bldg.site.fuels
     new_bldg.site.site_type = HPXML::SiteTypeSuburban
@@ -296,7 +295,6 @@ def self.set_summary_rated(orig_bldg, new_bldg)
     @nbeds = orig_bldg.building_construction.number_of_bedrooms
     @ncfl = orig_bldg.building_construction.number_of_conditioned_floors
     @ncfl_ag = orig_bldg.building_construction.number_of_conditioned_floors_above_grade
-    _sla, _ach50, _nach, @infil_volume, @infil_height = Airflow.get_values_from_air_infiltration_measurements(orig_bldg, @cfa, @weather)
 
     new_bldg.site.fuels = orig_bldg.site.fuels
     new_bldg.site.site_type = HPXML::SiteTypeSuburban
@@ -316,7 +314,6 @@ def self.set_summary_iad(orig_bldg, new_bldg)
     @nbeds = 3
     @ncfl = 2.0
     @ncfl_ag = 2.0
-    @infil_volume = 20400.0
 
     new_bldg.site.fuels = orig_bldg.site.fuels
     new_bldg.site.site_type = HPXML::SiteTypeSuburban
@@ -341,38 +338,38 @@ def self.set_climate(orig_bldg, new_bldg)
     @is_southern_hemisphere = (@weather.header.Latitude < 0)
   end
 
-  def self.set_enclosure_air_infiltration_reference(new_bldg)
-    @infil_a_ext = calc_mech_vent_Aext_ratio(new_bldg)
+  def self.set_enclosure_air_infiltration_reference(orig_bldg, new_bldg)
+    _, _, _, infil_volume, infil_height, _ = Airflow.get_values_from_air_infiltration_measurements(orig_bldg, @cfa, @weather)
 
     sla = 0.00036
-    ach50 = Airflow.get_infiltration_ACH50_from_SLA(sla, 0.65, @cfa, @infil_volume)
+    ach50 = Airflow.get_infiltration_ACH50_from_SLA(sla, 0.65, @cfa, infil_volume)
     new_bldg.air_infiltration_measurements.add(id: 'Infiltration_ACH50',
                                                house_pressure: 50,
                                                unit_of_measure: HPXML::UnitsACH,
                                                air_leakage: ach50.round(2),
-                                               infiltration_volume: @infil_volume,
-                                               infiltration_height: @infil_height,
+                                               infiltration_volume: infil_volume,
+                                               infiltration_height: infil_height,
                                                infiltration_type: HPXML::InfiltrationTypeUnitExterior,
-                                               a_ext: @infil_a_ext.round(3))
+                                               a_ext: 1.0)
   end
 
   def self.set_enclosure_air_infiltration_rated(orig_bldg, new_bldg)
-    @infil_a_ext = calc_mech_vent_Aext_ratio(new_bldg)
+    _, _, _, infil_volume, infil_height, _ = Airflow.get_values_from_air_infiltration_measurements(orig_bldg, @cfa, @weather)
+    ach50, a_ext = calc_rated_home_infiltration_ach50(orig_bldg)
 
-    ach50 = calc_rated_home_infiltration_ach50(orig_bldg)
     new_bldg.air_infiltration_measurements.add(id: 'AirInfiltrationMeasurement',
                                                house_pressure: 50,
                                                unit_of_measure: HPXML::UnitsACH,
                                                air_leakage: ach50.round(2),
-                                               infiltration_volume: @infil_volume,
-                                               infiltration_height: @infil_height,
+                                               infiltration_volume: infil_volume,
+                                               infiltration_height: infil_height,
                                                infiltration_type: HPXML::InfiltrationTypeUnitExterior,
-                                               a_ext: @infil_a_ext.round(3))
+                                               a_ext: a_ext.round(3))
   end
 
   def self.set_enclosure_air_infiltration_iad(new_bldg)
-    @infil_height = new_bldg.inferred_infiltration_height(@infil_volume)
-    @infil_a_ext = calc_mech_vent_Aext_ratio(new_bldg)
+    infil_volume = 20400
+    infil_height = new_bldg.inferred_infiltration_height(infil_volume)
 
     if ['1A', '1B', '1C', '2A', '2B', '2C'].include? @iecc_zone
       ach50 = 5.0
@@ -383,10 +380,10 @@ def self.set_enclosure_air_infiltration_iad(new_bldg)
                                                house_pressure: 50,
                                                unit_of_measure: HPXML::UnitsACH,
                                                air_leakage: ach50,
-                                               infiltration_volume: @infil_volume,
-                                               infiltration_height: @infil_height,
+                                               infiltration_volume: infil_volume,
+                                               infiltration_height: infil_height,
                                                infiltration_type: HPXML::InfiltrationTypeUnitExterior,
-                                               a_ext: @infil_a_ext.round(3))
+                                               a_ext: 1.0)
   end
 
   def self.set_enclosure_attics_reference(orig_bldg, new_bldg)
@@ -1460,7 +1457,8 @@ def self.set_systems_mechanical_ventilation_reference(orig_bldg, new_bldg, iecc_
       q_fan_airflow = (0.01 * @cfa) + (7.5 * (@nbeds + 1))
     else
       q_tot = Airflow.get_mech_vent_qtot_cfm(@nbeds, @cfa)
-      q_fan_airflow = calc_mech_vent_q_fan(q_tot, ref_sla, 0.0) # cfm for airflow
+      infil_height = new_bldg.air_infiltration_measurements[0].infiltration_height
+      q_fan_airflow = calc_mech_vent_qfan(q_tot, ref_sla, true, infil_height) # cfm for airflow
     end
 
     mech_vent_fans = orig_bldg.ventilation_fans.select { |f| f.used_for_whole_building_ventilation }
@@ -1627,15 +1625,9 @@ def self.set_systems_mechanical_ventilation_iad(new_bldg)
     q_tot = Airflow.get_mech_vent_qtot_cfm(@nbeds, @cfa)
 
     # Calculate fan cfm
-    sla = nil
-    new_bldg.air_infiltration_measurements.each do |new_infil_measurement|
-      next unless (new_infil_measurement.unit_of_measure == HPXML::UnitsACH) && (new_infil_measurement.house_pressure == 50)
-
-      ach50 = new_infil_measurement.air_leakage
-      sla = Airflow.get_infiltration_SLA_from_ACH50(ach50, 0.65, @cfa, @infil_volume)
-      break
-    end
-    q_fan = calc_mech_vent_q_fan(q_tot, sla, 0.0)
+    _, ach50, _, infil_volume, infil_height, _ = Airflow.get_values_from_air_infiltration_measurements(new_bldg, @cfa, @weather)
+    sla = Airflow.get_infiltration_SLA_from_ACH50(ach50, 0.65, @cfa, infil_volume)
+    q_fan = calc_mech_vent_qfan(q_tot, sla, true, infil_height)
     fan_power_w = 0.70 * q_fan
 
     new_bldg.ventilation_fans.add(id: 'MechanicalVentilation',
@@ -2443,18 +2435,31 @@ def self.calc_rated_home_q_fans_by_system(orig_bldg, all_mech_vent_fans)
   end
 
   def self.calc_rated_home_infiltration_ach50(orig_bldg)
-    _sla, ach50, _nach, _volume, _height = Airflow.get_values_from_air_infiltration_measurements(orig_bldg, @cfa, @weather)
+    # Note: The infiltration rate returned will *include* the Aext term.
+    # We separately report out the Aext in the HPXML file for inspection, but the
+    # AirInfiltrationMeasurement element will use infiltration_type: 'unit exterior'
+    # so as not to double-count the Aext term.
+    _, ach50, _, infil_volume, infil_height, _ = Airflow.get_values_from_air_infiltration_measurements(orig_bldg, @cfa, @weather)
 
-    if [HPXML::ResidentialTypeApartment, HPXML::ResidentialTypeSFA].include? @bldg_type
-      if (Constants.ERIVersions.index(@eri_version) >= Constants.ERIVersions.index('2019'))
-        cfm50 = ach50 * @infil_volume / 60.0
-        tot_cb_area, _ext_cb_area = orig_bldg.compartmentalization_boundary_areas()
-        if cfm50 / tot_cb_area <= 0.30
-          ach50 *= @infil_a_ext
+    if @bldg_type == HPXML::ResidentialTypeSFD
+      a_ext = 1.0
+    else
+      tot_cb_area, ext_cb_area = orig_bldg.compartmentalization_boundary_areas()
+      a_ext = ext_cb_area / tot_cb_area
+
+      if Constants.ERIVersions.index(@eri_version) >= Constants.ERIVersions.index('2019')
+        if [HPXML::ResidentialTypeApartment, HPXML::ResidentialTypeSFA].include? @bldg_type
+          cfm50 = ach50 * infil_volume / 60.0
+          tot_cb_area, _ext_cb_area = orig_bldg.compartmentalization_boundary_areas()
+          if cfm50 / tot_cb_area > 0.30
+            a_ext = 1.0
+          end
         end
       end
     end
 
+    ach50 *= a_ext
+
     # Apply min Natural ACH?
     min_nach = nil
     mech_vent_fans = orig_bldg.ventilation_fans.select { |f| f.used_for_whole_building_ventilation }
@@ -2463,21 +2468,21 @@ def self.calc_rated_home_infiltration_ach50(orig_bldg)
     elsif Constants.ERIVersions.index(@eri_version) >= Constants.ERIVersions.index('2019')
       has_non_exhaust_systems = (mech_vent_fans.select { |f| f.fan_type != HPXML::MechVentTypeExhaust }.size > 0)
       mech_vent_fans.each do |orig_vent_fan|
-        if orig_vent_fan.flow_rate_not_tested || ((@infil_a_ext < 0.5) && !has_non_exhaust_systems)
+        if orig_vent_fan.flow_rate_not_tested || ((a_ext < 0.5) && !has_non_exhaust_systems)
           min_nach = 0.30
         end
       end
     end
 
     if not min_nach.nil?
-      min_sla = Airflow.get_infiltration_SLA_from_ACH(min_nach, @infil_height, @weather)
-      min_ach50 = Airflow.get_infiltration_ACH50_from_SLA(min_sla, 0.65, @cfa, @infil_volume)
+      min_sla = Airflow.get_infiltration_SLA_from_ACH(min_nach, infil_height, @weather)
+      min_ach50 = Airflow.get_infiltration_ACH50_from_SLA(min_sla, 0.65, @cfa, infil_volume)
       if ach50 < min_ach50
         ach50 = min_ach50
       end
     end
 
-    return ach50
+    return ach50, a_ext
   end
 
   def self.calc_mech_vent_supply_exhaust_cfms(ventilation_fans, total_or_oa)
@@ -2524,23 +2529,25 @@ def self.calc_mech_vent_is_balanced(ventilation_fans)
   end
 
   def self.calc_rated_home_qfan(orig_bldg, is_balanced)
-    ach50 = calc_rated_home_infiltration_ach50(orig_bldg)
-    sla = Airflow.get_infiltration_SLA_from_ACH50(ach50, 0.65, @cfa, @infil_volume)
+    _, _, _, infil_volume, infil_height, _ = Airflow.get_values_from_air_infiltration_measurements(orig_bldg, @cfa, @weather)
+    ach50, _ = calc_rated_home_infiltration_ach50(orig_bldg)
+    sla = Airflow.get_infiltration_SLA_from_ACH50(ach50, 0.65, @cfa, infil_volume)
     q_tot = Airflow.get_mech_vent_qtot_cfm(@nbeds, @cfa)
-    q_fan_power = calc_mech_vent_q_fan(q_tot, sla, is_balanced)
-    return q_fan_power
+    q_fan = calc_mech_vent_qfan(q_tot, sla, is_balanced, infil_height)
+    return q_fan
   end
 
-  def self.calc_mech_vent_q_fan(q_tot, sla, is_balanced)
-    nl = Airflow.get_infiltration_NL_from_SLA(sla, @infil_height)
+  def self.calc_mech_vent_qfan(q_tot, sla, is_balanced, infil_height)
+    nl = Airflow.get_infiltration_NL_from_SLA(sla, infil_height)
     q_inf = nl * @weather.data.WSF * @cfa / 7.3 # Effective annual average infiltration rate, cfm, eq. 4.5a
+    a_ext = 1.0 # Use Aext=1.0 because sla reflects 'unit exterior' infiltration so it already incorporates Aext
     if Constants.ERIVersions.index(@eri_version) >= Constants.ERIVersions.index('2019')
       if is_balanced
         phi = 1.0
       else
         phi = q_inf / q_tot
       end
-      q_fan = q_tot - phi * (q_inf * @infil_a_ext)
+      q_fan = q_tot - phi * (q_inf * a_ext)
     else
       if [HPXML::ResidentialTypeApartment, HPXML::ResidentialTypeSFA].include? @bldg_type
         # No infiltration credit for attached/multifamily
@@ -2557,15 +2564,6 @@ def self.calc_mech_vent_q_fan(q_tot, sla, is_balanced)
     return [q_fan, 0].max
   end
 
-  def self.calc_mech_vent_Aext_ratio(hpxml)
-    tot_cb_area, ext_cb_area = hpxml.compartmentalization_boundary_areas()
-    if @bldg_type == HPXML::ResidentialTypeSFD
-      return 1.0
-    end
-
-    return ext_cb_area / tot_cb_area
-  end
-
   def self.get_new_distribution_id(orig_bldg, new_bldg)
     i = 0
     while true
diff --git a/rulesets/tests/test_ventilation.rb b/rulesets/tests/test_ventilation.rb
index 4f8e01155..df724583e 100644
--- a/rulesets/tests/test_ventilation.rb
+++ b/rulesets/tests/test_ventilation.rb
@@ -59,13 +59,13 @@ def test_mech_vent_attached_or_multifamily
     _all_calc_types.each do |calc_type|
       _hpxml, hpxml_bldg = _test_ruleset(hpxml_name, calc_type)
       if [Constants.CalcTypeERIReferenceHome, Constants.CalcTypeCO2eReferenceHome].include? calc_type
-        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 50.6, hours: 24, power: 0.0 }]) # Should have airflow but not fan energy
+        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 31.1, hours: 24, power: 0.0 }]) # Should have airflow but not fan energy
       elsif [Constants.CalcTypeERIRatedHome].include? calc_type
         _check_mech_vent(hpxml_bldg)
       elsif [Constants.CalcTypeERIIndexAdjustmentDesign].include? calc_type
-        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 70.6, hours: 24, power: 49.4 }])
+        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 60.0, hours: 24, power: 42.0 }])
       elsif [Constants.CalcTypeERIIndexAdjustmentReferenceHome].include? calc_type
-        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 32.1, hours: 24, power: 55.0 }])
+        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 8.5, hours: 24, power: 49.4 }])
       end
     end
 
@@ -885,14 +885,14 @@ def test_mech_vent_shared
     _all_calc_types.each do |calc_type|
       _hpxml, hpxml_bldg = _test_ruleset(hpxml_name, calc_type)
       if [Constants.CalcTypeERIReferenceHome, Constants.CalcTypeCO2eReferenceHome].include? calc_type
-        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 50.6, hours: 24, power: 19.7 }])
+        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 31.1, hours: 24, power: 19.0 }])
       elsif [Constants.CalcTypeERIRatedHome].include? calc_type
         _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeSupply, flowrate: 800.0, hours: 24, power: 240.0, in_unit_flowrate: 80.0, frac_recirc: 0.5, has_preheat: true, has_precool: true },
                                       { fantype: HPXML::MechVentTypeExhaust, flowrate: 72.0, hours: 24, power: 26.0 }])
       elsif [Constants.CalcTypeERIIndexAdjustmentDesign].include? calc_type
-        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 70.6, hours: 24, power: 49.4 }])
+        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 60.0, hours: 24, power: 42.0 }])
       elsif [Constants.CalcTypeERIIndexAdjustmentReferenceHome].include? calc_type
-        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 32.1, hours: 24, power: 54.9 }])
+        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 8.5, hours: 24, power: 49.4 }])
       end
     end
   end
@@ -914,7 +914,7 @@ def test_mech_vent_shared_defaulted_fan_power
     calc_types.each do |calc_type|
       _hpxml, hpxml_bldg = _test_ruleset(hpxml_name, calc_type)
       if [Constants.CalcTypeERIReferenceHome, Constants.CalcTypeCO2eReferenceHome].include? calc_type
-        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 50.6, hours: 24, power: 19.7 }])
+        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 31.1, hours: 24, power: 19.0 }])
       elsif [Constants.CalcTypeERIRatedHome].include? calc_type
         _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeSupply, flowrate: 800.0, hours: 24, power: 800.0, in_unit_flowrate: 80.0, frac_recirc: 0.5, has_preheat: true, has_precool: true },
                                       { fantype: HPXML::MechVentTypeExhaust, flowrate: 72.0, hours: 24, power: 26.0 }])
@@ -939,7 +939,7 @@ def test_mech_vent_shared_unmeasured_airflow_rate
     calc_types.each do |calc_type|
       _hpxml, hpxml_bldg = _test_ruleset(hpxml_name, calc_type)
       if [Constants.CalcTypeERIReferenceHome, Constants.CalcTypeCO2eReferenceHome].include? calc_type
-        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 50.6, hours: 24, power: 17.9 }])
+        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 31.1, hours: 24, power: 11.6 }])
       elsif [Constants.CalcTypeERIRatedHome].include? calc_type
         _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeSupply, flowrate: 800.0, hours: 24, power: 240.0, in_unit_flowrate: 30.0, frac_recirc: 0.5, has_preheat: true, has_precool: true },
                                       { fantype: HPXML::MechVentTypeExhaust, flowrate: 72.0, hours: 24, power: 26.0 }])
@@ -966,7 +966,7 @@ def test_mech_vent_shared_unmeasured_airflow_rate_and_defaulted_fan_power
     calc_types.each do |calc_type|
       _hpxml, hpxml_bldg = _test_ruleset(hpxml_name, calc_type)
       if [Constants.CalcTypeERIReferenceHome, Constants.CalcTypeCO2eReferenceHome].include? calc_type
-        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 50.6, hours: 24, power: 17.9 }])
+        _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeBalanced, flowrate: 31.1, hours: 24, power: 11.6 }])
       elsif [Constants.CalcTypeERIRatedHome].include? calc_type
         _check_mech_vent(hpxml_bldg, [{ fantype: HPXML::MechVentTypeSupply, flowrate: 800.0, hours: 24, power: 800.0, in_unit_flowrate: 30.0, frac_recirc: 0.5, has_preheat: true, has_precool: true },
                                       { fantype: HPXML::MechVentTypeExhaust, flowrate: 72.0, hours: 24, power: 26.0 }])
diff --git a/workflow/tests/base_results/EPA_Tests.csv b/workflow/tests/base_results/EPA_Tests.csv
index b4067ee57..13d16d4bf 100644
--- a/workflow/tests/base_results/EPA_Tests.csv
+++ b/workflow/tests/base_results/EPA_Tests.csv
@@ -1,13 +1,13 @@
 [Version] XML,Reference Home ERI,Rated Home ERI
-[MF_National_1.0] MFNCv1_CZ2_FL_gas_ground_corner_slab.xml,66.62,66.62
-[MF_National_1.0] MFNCv1_CZ4_MO_gas_top_corner.xml,72.15,72.15
-[MF_National_1.0] MFNCv1_CZ6_VT_elec_middle_interior.xml,67.71,67.71
-[MF_National_1.1] MFNCv11_CZ2_FL_elec_top_corner.xml,61.71,61.71
-[MF_National_1.1] MFNCv11_CZ4_MO_elec_ground_corner_vented_crawl.xml,61.97,61.97
-[MF_National_1.1] MFNCv11_CZ6_VT_gas_ground_corner_cond_bsmt.xml,58.53,58.53
-[MF_National_1.2] MFNCv12_CZ2_FL_gas_ground_corner_slab.xml,51.12,51.12
-[MF_National_1.2] MFNCv12_CZ4_MO_gas_top_corner.xml,47.78,47.78
-[MF_National_1.2] MFNCv12_CZ6_VT_elec_middle_interior.xml,55.72,55.72
+[MF_National_1.0] MFNCv1_CZ2_FL_gas_ground_corner_slab.xml,66.99,66.99
+[MF_National_1.0] MFNCv1_CZ4_MO_gas_top_corner.xml,74.15,74.15
+[MF_National_1.0] MFNCv1_CZ6_VT_elec_middle_interior.xml,73.52,73.52
+[MF_National_1.1] MFNCv11_CZ2_FL_elec_top_corner.xml,62.2,62.2
+[MF_National_1.1] MFNCv11_CZ4_MO_elec_ground_corner_vented_crawl.xml,63.87,63.87
+[MF_National_1.1] MFNCv11_CZ6_VT_gas_ground_corner_cond_bsmt.xml,62.19,62.19
+[MF_National_1.2] MFNCv12_CZ2_FL_gas_ground_corner_slab.xml,51.4,51.4
+[MF_National_1.2] MFNCv12_CZ4_MO_gas_top_corner.xml,49.03,49.03
+[MF_National_1.2] MFNCv12_CZ6_VT_elec_middle_interior.xml,59.95,59.95
 [SF_National_3.0] SFNHv3_CZ2_FL_gas_slab.xml,72.77,72.77
 [SF_National_3.0] SFNHv3_CZ4_MO_gas_vented_crawl.xml,80.3,80.3
 [SF_National_3.0] SFNHv3_CZ6_VT_elec_cond_bsmt.xml,70.0,70.0
diff --git a/workflow/tests/base_results/real_homes.csv b/workflow/tests/base_results/real_homes.csv
index 28ff3e108..321d23b37 100644
--- a/workflow/tests/base_results/real_homes.csv
+++ b/workflow/tests/base_results/real_homes.csv
@@ -1,15 +1,15 @@
 XML,ERI,REUL Heating (MBtu),REUL Cooling (MBtu),REUL Hot Water (MBtu),EC_r Heating (MBtu),EC_r Cooling (MBtu),EC_r Hot Water (MBtu),EC_x Heating (MBtu),EC_x Cooling (MBtu),EC_x Hot Water (MBtu),EC_x L&A (MBtu),EC_x Vent (MBtu),EC_x Dehumid (MBtu),IAD_Save (%),CO2e Rating Index,ACO2 (lb CO2e),ARCO2 (lb CO2e),IAF RH,ES Reference Home ERI,ES SAF (Size Adjustment Factor),ES SAF Adjusted ERI Target,ES Rated Home ERI,ES Rated Home ERI w/o OPP,ES ENERGY STAR Certification,ZERH Reference Home ERI,ZERH SAF (Size Adjustment Factor),ZERH SAF Adjusted ERI Target,ZERH Rated Home ERI,ZERH Rated Home ERI w/o OPP,ZERH Zero Energy Ready Home Certification,IECC ERI,IECC REUL Heating (MBtu),IECC REUL Cooling (MBtu),IECC REUL Hot Water (MBtu),IECC EC_r Heating (MBtu),IECC EC_r Cooling (MBtu),IECC EC_r Hot Water (MBtu),IECC EC_x Heating (MBtu),IECC EC_x Cooling (MBtu),IECC EC_x Hot Water (MBtu),IECC EC_x L&A (MBtu),IECC EC_x Vent (MBtu),IECC EC_x Dehumid (MBtu),IECC IAD_Save (%)
-house001.xml,57.89,11.6,2.12,6.49,18.53,2.25,12.49,9.32,1.25,9.82,10.06,0.79,0.0,0.23255,66.64,5796.64,8110.43,1.0725,52.37,1.0,52.37,57.89,57.89,0.0,43.73,1.0,43.73,57.89,57.89,0.0,59.71,10.52,2.21,6.49,16.8,2.28,12.48,9.32,1.25,9.82,10.06,0.79,0.0,0.23255
+house001.xml,62.7,9.07,2.35,6.49,14.48,2.32,12.47,9.32,1.25,9.82,10.06,0.79,0.0,0.21294,71.22,5796.64,7633.62,1.0662,55.68,1.0,55.68,62.7,62.7,0.0,46.43,1.0,46.43,62.7,62.7,0.0,60.07,10.52,2.21,6.49,16.8,2.28,12.48,9.32,1.25,9.82,10.06,0.79,0.0,0.21294
 house002.xml,69.72,51.19,21.95,9.54,41.36,12.54,10.56,26.66,6.48,9.45,24.05,1.79,0.0,0.18418,70.68,12424.53,17873.93,0.9834,50.21,1.0,50.21,69.72,69.72,0.0,48.0,1.0,48.0,69.72,69.72,0.0,64.73,59.52,21.93,9.54,47.96,13.04,10.56,26.66,6.48,9.45,24.05,1.79,0.0,0.18418
-house003.xml,62.33,27.66,22.44,8.83,30.96,12.83,16.03,18.689999999999998,7.18,7.24,22.14,1.14,0.0,0.24266,73.31,9373.09,12880.66,0.9926,48.41,1.0,48.41,62.33,62.33,0.0,46.49,1.0,46.49,62.33,62.33,0.0,59.79,30.97,22.16,8.83,34.18,13.19,16.04,18.689999999999998,7.18,7.24,22.14,1.14,0.0,0.24266
+house003.xml,62.62,27.25,22.48,8.83,30.57,12.78,16.02,18.67,7.18,7.24,22.14,1.13,0.0,0.24266,73.66,9367.49,12812.34,0.9926,48.58,1.0,48.58,62.62,62.62,0.0,46.65,1.0,46.65,62.62,62.62,0.0,59.76,30.979999999999997,22.16,8.83,34.18,13.19,16.04,18.67,7.18,7.24,22.14,1.13,0.0,0.24266
 house004.xml,60.6,49.66,3.34,13.08,46.19,1.7,14.35,29.98,0.37,5.38,16.12,3.1,0.0,0.31911,66.17,4907.2,7101.88,1.0442,55.69,1.0,55.69,60.6,60.6,0.0,48.51,1.0,48.51,60.6,60.6,0.0,55.24,59.55,2.75,13.08,54.8,1.45,14.34,29.98,0.37,5.38,16.12,3.1,0.0,0.31911
-house005.xml,57.37,6.16,4.15,5.79,5.16,2.43,12.13,1.26,1.73,4.06,8.94,1.79,0.0,0.20495,79.59,2697.3,3142.0,1.0786,48.7,1.0,48.7,57.37,57.37,0.0,43.53,1.0,43.53,57.37,57.37,0.0,58.5,5.53,4.23,5.79,4.72,2.44,12.12,1.26,1.73,4.06,8.94,1.79,0.0,0.20495
+house005.xml,60.52,4.66,4.33,5.79,4.1,2.44,12.1,1.26,1.73,4.06,8.94,1.79,0.0,0.20495,83.49,2697.3,2995.22,1.0786,50.05,1.0,50.05,60.52,60.52,0.0,45.05,1.0,45.05,60.52,60.52,0.0,58.81,5.57,4.2,5.79,4.74,2.43,12.12,1.26,1.73,4.06,8.94,1.79,0.0,0.20495
 house006.xml,71.58,31.54,21.2,10.54,23.689999999999998,12.23,11.82,16.060000000000002,7.67,10.52,21.3,1.46,0.0,0.23813,72.92,10123.82,13629.7,1.0187,45.7,1.0,45.7,71.58,71.58,0.0,43.87,1.0,43.87,71.58,71.58,0.0,69.59,33.68,21.02,10.54,25.42,12.46,11.82,16.060000000000002,7.67,10.52,21.3,1.46,0.0,0.23813
-house007.xml,74.6,18.97,4.84,8.85,16.02,2.79,9.87,12.28,0.68,8.48,14.96,1.35,0.0,0.23246,76.88,9224.48,11360.06,1.0563,55.47,1.0,55.47,74.6,74.6,0.0,45.58,1.0,45.58,74.6,74.6,0.0,76.44,17.58,4.96,8.85,14.92,2.82,9.87,12.28,0.68,8.48,14.96,1.35,0.0,0.23246
+house007.xml,76.53,15.31,5.17,8.85,13.15,2.87,9.87,10.98,0.67,8.47,14.96,1.35,0.0,0.23246,79.09,8900.46,10654.91,1.0563,55.98,1.0,55.98,76.53,76.53,0.0,47.85,1.0,47.85,76.53,76.53,0.0,73.54,17.6,4.95,8.85,14.93,2.82,9.87,10.98,0.67,8.47,14.96,1.35,0.0,0.23246
 house008.xml,62.76,96.26,11.39,13.22,153.38,7.31,22.23,81.81,3.85,14.8,37.43,0.33,0.0,0.20128,73.45,24331.64,34071.09,0.9723,50.63,1.0,50.63,62.76,62.76,0.0,46.5,1.0,46.5,62.76,62.76,0.0,57.46,111.21,10.81,13.22,177.21,7.22,22.25,81.81,3.85,14.8,37.43,0.33,0.0,0.20128
 house009.xml,61.89,19.28,42.5,8.99,30.89,25.37,16.38,16.34,13.63,12.35,23.29,0.59,0.0,0.2851,84.28,9913.87,11483.44,1.0244,48.4,1.0,48.4,61.89,61.89,0.0,45.45,1.0,45.45,61.89,61.89,0.0,59.5,21.81,42.86,8.99,34.95,26.36,16.38,16.34,13.63,12.35,23.29,0.59,0.0,0.2851
 house010.xml,62.81,51.870000000000005,137.72,7.12,82.98,76.4,13.58,41.58,41.24,6.14,43.24,2.39,0.0,0.28199,94.93,17056.84,19835.31,0.9059,53.79,1.0,53.79,62.82,62.82,0.0,48.61,1.0,48.61,62.82,62.82,0.0,60.45,58.45,140.94,7.12,93.49000000000001,78.31,13.58,41.58,41.24,6.14,43.24,2.39,0.0,0.28199
-house011.xml,60.9,11.87,6.54,7.89,18.99,4.67,8.9,10.57,1.74,8.21,12.64,0.17,0.0,0.27502,84.47,4032.94,4459.97,1.0706,51.93,1.0,51.93,60.9,60.9,0.0,48.65,1.0,48.65,60.9,60.9,0.0,63.93,9.68,6.77,7.89,15.49,4.7,8.9,10.57,1.74,8.21,12.64,0.17,0.0,0.27502
+house011.xml,66.71,8.35,6.89,7.89,13.36,4.69,8.89,10.57,1.74,8.21,12.64,0.17,0.0,0.26148,91.83,4032.94,4116.07,1.067,56.26,1.0,56.26,66.71,66.71,0.0,52.74,1.0,52.74,66.71,66.71,0.0,64.61,9.75,6.71,7.89,15.6,4.67,8.9,10.57,1.74,8.21,12.64,0.17,0.0,0.26148
 house012.xml,50.22,34.25,3.25,11.63,29.18,1.8,12.67,8.47,0.71,10.72,14.75,1.29,0.0,0.31581,51.42,5445.53,10123.68,1.0462,51.13,1.0,51.13,50.22,50.22,1.0,43.89,1.0,43.89,50.22,50.22,0.0,46.43,40.32,2.94,11.63,34.14,1.71,12.68,8.47,0.71,10.72,14.75,1.29,0.0,0.31581
 house013.xml,58.59,12.02,2.05,10.35,8.84,0.97,11.96,6.54,0.23,3.38,13.97,0.64,0.0,0.16963,57.28,1697.87,2810.31,1.0548,52.6,1.0,52.6,58.59,58.59,0.0,47.65,1.0,47.65,58.59,58.59,0.0,57.64,13.02,1.93,10.35,9.47,0.92,11.96,6.54,0.23,3.38,13.97,0.64,0.0,0.16963
 house014.xml,55.02,87.75,29.01,15.51,64.89,15.76,17.2,31.1,7.1899999999999995,3.68,36.46,4.19,0.0,0.25589,55.75,9453.2,17186.16,0.9867,47.49,1.0,47.49,55.02,55.02,0.0,45.42,1.0,45.42,55.02,55.02,0.0,50.67,103.17999999999999,28.400000000000002,15.51,75.95,16.22,17.2,31.1,7.1899999999999995,3.68,36.46,4.19,0.0,0.25589
@@ -38,19 +38,19 @@ house036.xml,67.69,60.56,9.44,8.66,96.61,6.3,15.94,66.06,3.42,9.12,27.96,2.31,0.
 house037.xml,66.06,63.78,7.38,13.22,101.79,5.22,14.55,67.39,3.14,10.98,21.25,0.36,0.0,0.19434,77.03,18820.1,24169.45,1.0108,52.24,1.0,52.24,66.06,66.06,0.0,47.74,1.0,47.74,66.06,66.06,0.0,60.92,73.45,7.01,13.22,117.03,5.17,14.55,67.39,3.14,10.98,21.25,0.36,0.0,0.19434
 house038.xml,64.18,38.46,40.47,9.93,34.55,22.75,17.58,23.310000000000002,12.120000000000001,12.25,27.65,0.82,0.0,0.26678,72.46,13719.89,19469.51,0.9725,47.0,1.0,47.0,64.18,64.18,0.0,45.07,1.0,45.07,64.18,64.18,0.0,62.02,42.25,40.31,9.93,37.58,23.27,17.58,23.310000000000002,12.120000000000001,12.25,27.65,0.82,0.0,0.26678
 house039.xml,49.93,71.77,20.9,16.51,114.5,13.6,29.7,124.66,6.53,24.88,36.28,0.0,0.0,0.09489,204.77,22628.24,11079.09,0.9974,53.07,1.0,53.07,88.17,88.17,0.0,49.48,1.0,49.48,88.17,88.17,0.0,73.26,86.03,20.770000000000003,16.51,137.2,13.549999999999999,29.7,124.66,6.53,24.88,36.28,0.0,0.0,0.09489
-house040.xml,64.06,123.56,13.48,11.07,196.95,8.56,19.44,110.39,9.75,15.31,32.38,2.19,0.0,0.18526,74.98,29199.22,40707.39,0.9567,52.27,1.0,52.27,64.06,64.06,0.0,49.78,1.0,49.78,64.06,64.06,0.0,59.42,139.43,12.9,11.07,222.18,8.19,19.46,110.39,9.75,15.31,32.38,2.19,0.0,0.18526
+house040.xml,64.03,123.63,13.46,11.07,197.06,8.55,19.44,110.22,9.75,15.31,32.38,2.11,0.0,0.18526,74.95,29151.88,40653.82,0.9567,52.1,1.0,52.1,64.03,64.03,0.0,49.57,1.0,49.57,64.03,64.03,0.0,59.38,139.5,12.88,11.07,222.29,8.18,19.46,110.22,9.75,15.31,32.38,2.11,0.0,0.18526
 house041.xml,77.81,24.72,8.54,12.54,39.43,5.38,20.93,27.22,4.1,20.38,23.5,0.0,0.0,0.13091,170.48,9258.28,5305.37,1.0236,52.57,1.0,52.57,77.81,77.81,0.0,46.67,1.0,46.67,77.81,77.81,0.0,75.07,27.45,8.41,12.54,43.77,5.32,20.94,27.22,4.1,20.38,23.5,0.0,0.0,0.13091
 house042.xml,87.26,49.05,21.56,11.39,78.34,13.23,19.74,76.42,10.2,15.57,27.23,0.0,0.0,0.21918,112.93,20313.63,18032.2,0.9976,49.39,1.0,49.39,87.26,87.26,0.0,46.56,1.0,46.56,87.26,87.26,0.0,81.33,56.81,21.46,11.39,90.72,13.63,19.75,76.42,10.2,15.57,27.23,0.0,0.0,0.21918
-house043.xml,-7.48,16.16,5.51,10.49,12.6,2.9,11.8,0.66,1.74,2.58,14.94,0.79,0.0,0.29935,0.68,29.61,4234.61,1.0348,49.87,1.0,49.87,38.68,38.68,1.0,45.13,1.0,45.13,38.68,38.68,1.0,36.64,16.32,5.5,10.49,12.7,2.9,11.8,0.66,1.74,2.58,14.94,0.79,0.0,0.29935
-house044.xml,68.26,19.16,3.66,6.35,30.59,2.96,7.66,25.08,1.92,5.34,9.53,0.52,0.0,0.16723,76.1,7606.65,9477.96,1.0546,51.58,1.0,51.58,68.26,68.26,0.0,48.07,1.0,48.07,68.26,68.26,0.0,66.91,20.05,3.6,6.35,31.99,2.96,7.67,25.08,1.92,5.34,9.53,0.52,0.0,0.16723
+house043.xml,-8.04,12.13,5.7,10.49,9.78,2.98,11.8,0.66,1.74,2.58,14.94,0.79,0.0,0.29935,0.72,29.61,3983.27,1.0348,53.05,1.0,53.05,41.58,41.58,1.0,47.69,1.0,47.69,41.58,41.58,1.0,36.67,16.33,5.5,10.49,12.71,2.89,11.8,0.66,1.74,2.58,14.94,0.79,0.0,0.29935
+house044.xml,68.99,18.69,3.69,6.35,29.85,2.97,7.66,25.08,1.92,5.34,9.53,0.52,0.0,0.16723,76.93,7606.65,9375.03,1.0546,52.06,1.0,52.06,68.99,68.99,0.0,48.45,1.0,48.45,68.99,68.99,0.0,66.92,20.05,3.6,6.35,32.0,2.96,7.67,25.08,1.92,5.34,9.53,0.52,0.0,0.16723
 house045.xml,88.96,73.42,44.14,12.22,55.0,25.31,21.3,47.38,18.52,33.34,39.95,4.48,0.0,0.21962,100.19,25364.48,26369.62,0.9601,49.55,1.0,49.55,88.96,88.96,0.0,45.1,1.0,45.1,88.96,88.96,0.0,83.52,84.13,43.39,12.22,62.87,26.15,21.3,47.38,18.52,33.34,39.95,4.48,0.0,0.21962
 house046.xml,-4.53,74.24,13.11,12.94,61.77,7.3,13.97,12.97,1.61,10.55,17.63,3.05,0.0,0.27832,9.46,2658.16,28227.53,0.9951,49.23,1.0,49.23,37.02,37.02,1.0,43.93,1.0,43.93,37.02,37.02,1.0,32.33,86.17,12.53,12.94,71.53,7.33,13.97,12.97,1.61,10.55,17.63,3.05,0.0,0.27832
 house047.xml,63.15,31.54,9.37,10.49,50.23,5.75,11.81,43.68,2.37,2.71,21.15,0.36,0.0,0.20995,166.81,10235.45,6109.72,1.0043,57.8,1.0,57.8,63.15,63.15,0.0,52.96,1.0,52.96,63.15,63.15,0.0,58.61,38.09,9.24,10.49,60.67,5.7,11.81,43.68,2.37,2.71,21.15,0.36,0.0,0.20995
 house048.xml,65.6,1.75,66.21,5.61,2.8,37.97,10.95,0.55,25.15,7.59,19.73,0.66,0.0,0.33343,82.18,6663.88,7668.54,1.0575,50.54,1.0,50.54,65.6,65.6,0.0,45.99,1.0,45.99,65.6,65.6,0.0,65.33,1.85,66.43,5.61,2.96,38.15,10.95,0.55,25.15,7.59,19.73,0.66,0.0,0.33343
 house049.xml,52.55,13.24,3.8,7.98,9.75,1.92,16.63,3.29,0.76,8.66,13.12,2.15,0.0,0.22576,89.88,2588.21,2737.64,1.0518,48.82,1.0,48.82,52.55,52.55,0.0,44.39,1.0,44.39,52.55,52.55,0.0,51.61,14.22,3.66,7.98,10.39,1.86,16.63,3.29,0.76,8.66,13.12,2.15,0.0,0.22576
 house050.xml,88.02,20.2,6.03,11.92,32.2,3.76,21.36,14.58,3.69,15.6,22.99,13.97,0.0,0.16922,176.06,7382.05,4125.48,1.0163,55.46,1.0,55.46,88.02,88.02,0.0,51.01,1.0,51.01,88.02,88.02,0.0,83.79,23.87,5.55,11.92,38.05,3.55,21.36,14.58,3.69,15.6,22.99,13.97,0.0,0.16922
-house051.xml,52.34,13.22,3.29,9.98,9.82,1.7,18.47,3.91,0.33,8.31,16.7,1.14,0.0,0.17964,87.55,2722.59,3035.69,1.0245,49.12,1.0,49.12,52.34,52.34,0.0,44.81,1.0,44.81,52.34,52.34,0.0,52.54,12.96,3.32,9.98,9.67,1.72,18.47,3.91,0.33,8.31,16.7,1.14,0.0,0.17964
-house052.xml,58.27,12.99,1.8,10.35,9.46,0.86,11.96,4.11,0.14,8.08,13.11,1.26,0.0,0.19375,58.98,1786.93,2861.93,1.0585,52.53,1.0,52.53,58.27,58.27,0.0,47.82,1.0,47.82,58.27,58.27,0.0,57.45,13.74,1.72,10.35,9.96,0.83,11.96,4.11,0.14,8.08,13.11,1.26,0.0,0.19375
+house051.xml,54.7,10.48,3.72,9.98,8.01,1.89,18.47,3.91,0.33,8.31,16.7,1.14,0.0,0.17964,91.53,2722.59,2903.53,1.0245,51.19,1.0,51.19,54.7,54.7,0.0,46.53,1.0,46.53,54.7,54.7,0.0,52.55,12.96,3.32,9.98,9.67,1.72,18.47,3.91,0.33,8.31,16.7,1.14,0.0,0.17964
+house052.xml,59.01,12.3,1.88,10.35,9.01,0.9,11.96,4.11,0.14,8.08,13.11,1.26,0.0,0.19375,59.66,1786.93,2829.56,1.0585,53.13,1.0,53.13,59.01,59.01,0.0,48.28,1.0,48.28,59.01,59.01,0.0,57.46,13.74,1.72,10.35,9.96,0.83,11.96,4.11,0.14,8.08,13.11,1.26,0.0,0.19375
 house053.xml,70.63,20.35,5.84,11.92,32.45,3.67,21.31,20.59,2.5,14.94,22.57,0.9,0.0,0.16976,172.52,7183.73,4091.75,1.0176,55.24,1.0,55.24,70.63,70.63,0.0,50.82,1.0,50.82,70.63,70.63,0.0,67.1,24.16,5.37,11.92,38.51,3.46,21.31,20.59,2.5,14.94,22.57,0.9,0.0,0.16976
 house054.xml,62.02,3.2199999999999998,120.74,7.76,5.17,69.6,13.56,1.6,43.53,6.47,28.18,1.46,0.0,0.33448,71.09,9711.12,13359.7,1.0226,49.59,1.0,49.59,62.02,62.02,0.0,44.94,1.0,44.94,62.02,62.02,0.0,61.66,3.4699999999999998,121.3,7.76,5.5600000000000005,70.03,13.56,1.6,43.53,6.47,28.18,1.46,0.0,0.33448
 house055.xml,63.3,1.76,65.56,5.61,2.82,37.5,10.68,1.18,24.26,5.91,18.6,1.01,0.0,0.33858,75.6,6117.37,7633.95,1.06,48.74,1.0,48.74,63.3,63.3,0.0,44.3,1.0,44.3,63.3,63.3,0.0,63.12,1.83,65.72,5.61,2.93,37.63,10.68,1.18,24.26,5.91,18.6,1.01,0.0,0.33858
@@ -59,8 +59,8 @@ house057.xml,82.11,17.85,5.06,9.98,28.46,3.27,11.54,16.06,3.52,3.24,19.13,11.34,
 house058.xml,64.2,3.14,82.85,6.7,5.03,47.92,12.51,1.48,29.18,10.89,21.41,0.9,0.0,0.33346,78.96,7753.54,9699.18,1.0124,50.4,1.0,50.4,64.2,64.2,0.0,45.79,1.0,45.79,64.2,64.2,0.0,63.23,3.67,83.91,6.7,5.87,48.71,12.51,1.48,29.18,10.89,21.41,0.9,0.0,0.33346
 house059.xml,55.13,7.23,3.65,7.98,5.69,1.81,15.01,2.68,0.58,6.95,14.27,0.12,0.0,0.19288,104.47,2432.37,2166.77,1.0745,50.19,1.0,50.19,55.13,55.13,0.0,46.43,1.0,46.43,55.13,55.13,0.0,54.44,7.9,3.5,7.98,6.12,1.75,15.02,2.68,0.58,6.95,14.27,0.12,0.0,0.19288
 house060.xml,69.84,30.92,34.3,11.51,49.46,20.56,19.93,38.769999999999996,12.129999999999999,13.8,27.47,0.0,0.0,0.22989,87.15,15174.41,17227.68,1.0107,49.57,1.0,49.57,69.84,69.84,0.0,46.09,1.0,46.09,69.84,69.84,0.0,67.83,33.78,34.08,11.51,54.04,20.93,19.93,38.769999999999996,12.129999999999999,13.8,27.47,0.0,0.0,0.22989
-house061.xml,61.97,6.27,3.1,5.79,9.99,1.86,6.81,9.3,0.45,4.66,9.07,0.18,0.0,0.22161,87.96,2933.6,3113.96,1.0711,56.86,1.0,56.86,61.97,61.97,0.0,48.4,1.0,48.4,61.97,61.97,0.0,63.47,5.54,3.16,5.79,8.84,1.86,6.8,9.3,0.45,4.66,9.07,0.18,0.0,0.22161
-house062.xml,72.85,10.03,9.1,5.19,7.73,5.29,6.19,7.85,3.62,4.75,9.72,0.0,0.0,0.24685,73.43,4578.78,5860.5,1.064,48.54,1.0,48.54,72.85,72.85,0.0,45.13,1.0,45.13,72.85,72.85,0.0,74.01,9.48,9.15,5.19,7.32,5.23,6.19,7.85,3.62,4.75,9.72,0.0,0.0,0.24685
+house061.xml,66.34,4.56,3.23,5.79,7.26,1.86,6.8,9.3,0.45,4.66,9.07,0.18,0.0,0.2053,93.39,2933.6,2947.41,1.0657,59.69,1.0,59.69,66.34,66.34,0.0,50.63,1.0,50.63,66.34,66.34,0.0,64.11,5.57,3.13,5.79,8.89,1.85,6.8,9.3,0.45,4.66,9.07,0.18,0.0,0.2053
+house062.xml,74.38,9.3,9.17,5.19,7.19,5.21,6.19,7.85,3.62,4.75,9.72,0.0,0.0,0.24685,74.99,4578.78,5739.02,1.064,49.34,1.0,49.34,74.38,74.38,0.0,45.89,1.0,45.89,74.38,74.38,0.0,74.01,9.48,9.15,5.19,7.32,5.23,6.19,7.85,3.62,4.75,9.72,0.0,0.0,0.24685
 house063.xml,76.94,16.02,40.47,6.02,25.65,23.79,12.48,21.25,15.82,9.48,20.91,3.96,0.0,0.25312,103.2,10655.25,10267.68,1.0056,48.81,1.0,48.81,76.94,76.94,0.0,46.11,1.0,46.11,76.94,76.94,0.0,75.43,17.11,40.62,6.02,27.4,24.25,12.48,21.25,15.82,9.48,20.91,3.96,0.0,0.25312
 house064.xml,69.21,14.03,32.64,6.02,22.47,19.26,12.18,16.43,12.23,8.4,16.88,2.03,0.0,0.27414,94.01,8354.38,8544.04,1.0401,53.37,1.0,53.37,69.21,69.21,0.0,50.18,1.0,50.18,69.21,69.21,0.0,67.81,14.96,32.77,6.02,23.97,19.65,12.18,16.43,12.23,8.4,16.88,2.03,0.0,0.27414
 house065.xml,75.39,15.83,42.47,8.99,25.37,25.52,16.33,22.57,16.26,12.28,24.39,4.55,0.0,0.25212,101.1,11919.81,11388.15,1.0353,47.59,1.0,47.59,75.39,75.39,0.0,44.96,1.0,44.96,75.39,75.39,0.0,74.01,16.99,42.63,8.99,27.22,25.99,16.33,22.57,16.26,12.28,24.39,4.55,0.0,0.25212
@@ -74,16 +74,16 @@ house072.xml,60.56,87.33,1.38,10.46,136.83,1.82,18.74,86.41,0.94,11.49,21.11,0.5
 house073.xml,32.01,116.82,27.15,11.78,96.15,15.19,26.8,23.1,14.059999999999999,32.45,44.5,3.05,0.0,0.16487,67.99,13466.09,20772.93,0.9535,49.1,1.0,49.1,53.68,53.68,0.0,46.66,1.0,46.66,53.68,53.68,0.0,46.17,133.46,26.689999999999998,11.78,110.01,15.71,26.83,23.1,14.059999999999999,32.45,44.5,3.05,0.0,0.16487
 house074.xml,72.15,14.0,33.83,7.53,10.23,19.71,8.68,6.19,13.48,6.54,21.4,0.8,0.0,0.24366,73.89,7235.51,9300.07,1.0529,43.65,1.0,43.65,72.15,72.15,0.0,42.07,1.0,42.07,72.15,72.15,0.0,70.59,15.12,33.94,7.53,10.98,20.15,8.68,6.19,13.48,6.54,21.4,0.8,0.0,0.24366
 house075.xml,64.56,31.54,16.04,11.39,50.4,10.13,19.4,31.43,5.36,18.5,17.85,0.0,0.0,0.21661,85.65,11429.22,12866.93,1.0371,46.19,1.0,46.19,64.56,64.56,0.0,43.55,1.0,43.55,64.56,64.56,0.0,61.41,35.45,15.99,11.39,56.64,10.35,19.42,31.43,5.36,18.5,17.85,0.0,0.0,0.21661
-house076.xml,61.83,8.19,5.02,5.79,13.06,3.62,12.14,9.05,2.16,7.23,10.13,0.71,0.0,0.19932,104.08,3891.26,3513.96,1.0639,51.37,1.0,51.37,61.83,61.83,0.0,44.9,1.0,44.9,61.83,61.83,0.0,63.27,7.43,5.11,5.79,11.84,3.62,12.13,9.05,2.16,7.23,10.13,0.71,0.0,0.19932
-house077.xml,70.45,12.23,5.16,8.66,19.53,3.8,9.54,9.08,2.02,7.33,9.98,7.89,0.0,0.22588,75.07,7485.39,9260.8,1.0768,53.84,1.0,53.84,70.45,70.45,0.0,42.79,1.0,42.79,70.45,70.45,0.0,73.79,10.17,5.41,8.66,16.24,3.85,9.53,9.08,2.02,7.33,9.98,7.89,0.0,0.22588
+house076.xml,65.54,6.62,5.19,5.79,10.55,3.62,12.12,9.05,2.16,7.23,10.13,0.71,0.0,0.18166,109.5,3891.26,3358.43,1.0581,51.7,1.0,51.7,65.54,65.54,0.0,46.77,1.0,46.77,65.54,65.54,0.0,63.88,7.46,5.08,5.79,11.89,3.61,12.13,9.05,2.16,7.23,10.13,0.71,0.0,0.18166
+house077.xml,76.92,8.57,5.66,8.66,13.7,3.91,9.53,9.08,2.02,7.33,9.98,7.89,0.0,0.20964,81.91,7485.39,8532.45,1.0711,55.22,1.0,55.22,76.92,76.92,0.0,46.41,1.0,46.41,76.92,76.92,0.0,74.19,10.17,5.41,8.66,16.24,3.85,9.53,9.08,2.02,7.33,9.98,7.89,0.0,0.20964
 house078.xml,57.33,29.39,57.78,8.99,47.09,33.07,16.27,23.25,17.58,9.48,27.77,0.59,0.0,0.26667,78.95,11856.05,15211.15,0.9872,53.16,1.0,53.16,57.33,57.33,0.0,50.05,1.0,50.05,57.33,57.33,0.0,54.73,33.43,58.3,8.99,53.56,34.47,16.27,23.25,17.58,9.48,27.77,0.59,0.0,0.26667
 house079.xml,49.31,44.94,3.09,10.35,31.57,1.54,12.36,12.94,0.13,3.25,22.67,0.0,0.0,0.21701,49.37,2724.11,5681.42,0.9713,54.87,1.0,54.87,49.31,49.31,1.0,50.49,1.0,50.49,49.31,49.31,1.0,45.51,53.519999999999996,2.66,10.35,37.19,1.35,12.36,12.94,0.13,3.25,22.67,0.0,0.0,0.21701
 house080.xml,41.24,31.14,63.93,8.99,22.71,37.48,10.83,6.7,12.77,1.82,23.91,1.35,0.0,0.27821,43.05,7048.71,16827.05,0.9731,45.88,1.0,45.88,41.24,41.24,1.0,44.33,1.0,44.33,41.24,41.24,1.0,39.09,36.2,64.73,8.99,26.14,39.54,10.84,6.7,12.77,1.82,23.91,1.35,0.0,0.27821
 house081.xml,65.24,5.0,4.43,5.6,4.46,2.58,6.34,2.82,1.1,5.53,8.87,0.3,0.0,0.16808,67.28,3201.54,4182.91,1.1376,42.0,1.0,42.0,65.24,65.24,0.0,40.62,1.0,40.62,65.24,65.24,0.0,64.94,5.14,4.42,5.6,4.56,2.58,6.34,2.82,1.1,5.53,8.87,0.3,0.0,0.16808
 house082.xml,60.48,34.44,69.22,10.42,55.16,40.19,18.41,38.48,20.950000000000003,9.12,30.37,3.22,0.0,0.26379,86.55,15320.33,17970.45,0.9851,54.17,1.0,54.17,60.48,60.48,0.0,50.91,1.0,50.91,60.48,60.48,0.0,57.4,39.98,69.94,10.42,64.04,42.1,18.41,38.48,20.950000000000003,9.12,30.37,3.22,0.0,0.26379
-house083.xml,53.38,3.38,12.47,4.43,2.77,7.35,5.4,1.27,3.75,3.87,8.79,0.22,0.0,0.32017,55.55,2651.27,4240.13,1.1256,49.76,1.0,49.76,53.38,53.38,0.0,44.73,1.0,44.73,53.38,53.38,0.0,53.79,3.19,12.45,4.43,2.65,7.29,5.4,1.27,3.75,3.87,8.79,0.22,0.0,0.32017
+house083.xml,54.34,2.95,12.44,4.43,2.48,7.2,5.4,1.26,3.75,3.87,8.79,0.22,0.0,0.31793,56.49,2648.98,4169.2,1.1247,50.14,1.0,50.14,54.34,54.34,0.0,45.42,1.0,45.42,54.34,54.34,0.0,53.78,3.19,12.45,4.43,2.65,7.29,5.4,1.26,3.75,3.87,8.79,0.22,0.0,0.31793
 house084.xml,12.28,69.99,16.54,10.5,114.79,10.85,18.32,77.33,5.64,14.66,29.28,1.64,0.0,0.16381,128.33,12605.81,10013.55,0.981,54.58,1.0,54.58,64.58,64.58,0.0,50.96,1.0,50.96,64.58,64.58,0.0,55.66,78.34,16.369999999999997,10.5,128.13,10.81,18.34,77.33,5.64,14.66,29.28,1.64,0.0,0.16381
 house085.xml,-25.97,51.040000000000006,14.44,14.54,38.78,7.3100000000000005,16.3,30.41,0.83,2.81,24.8,0.0,0.0,0.22629,-7.59,-643.88,8532.35,0.9941,51.37,1.0,51.37,58.96,58.96,0.0,47.13,1.0,47.13,58.96,58.96,0.0,51.44,62.78,14.3,14.54,46.97,7.27,16.31,30.41,0.83,2.81,24.8,0.0,0.0,0.22629
 house086.xml,52.65,20.92,19.85,8.83,15.73,11.27,10.27,10.32,5.11,1.67,15.34,0.87,0.21,0.30165,53.37,6039.53,10858.12,1.0422,49.82,1.0,49.82,52.65,52.65,0.0,48.52,1.0,48.52,52.65,52.65,0.0,52.29,21.3,19.76,8.83,16.06,11.32,10.27,10.32,5.11,1.67,15.34,0.87,0.21,0.30165
-house087.xml,47.12,7.17,4.55,5.79,5.93,2.63,12.14,3.02,1.62,6.83,8.05,0.16,0.0,0.22972,75.48,2636.27,3199.25,1.0917,45.82,1.0,45.82,47.12,47.12,0.0,41.93,1.0,41.93,47.12,47.12,0.0,47.33,7.03,4.57,5.79,5.82,2.63,12.14,3.02,1.62,6.83,8.05,0.16,0.0,0.22972
+house087.xml,48.62,6.23,4.65,5.79,5.24,2.62,12.12,2.97,1.62,6.83,8.05,0.16,0.0,0.21379,77.86,2630.52,3113.53,1.0852,47.04,1.0,47.04,48.62,48.62,0.0,42.93,1.0,42.93,48.62,48.62,0.0,47.46,7.03,4.57,5.79,5.82,2.63,12.14,2.97,1.62,6.83,8.05,0.16,0.0,0.21379
 house088.xml,55.33,54.44,23.81,11.39,86.92,14.48,19.76,47.34,6.19,15.73,22.03,0.52,0.0,0.27174,97.6,12885.53,13302.17,0.9925,50.71,1.0,50.71,55.33,55.33,0.0,47.84,1.0,47.84,55.33,55.33,0.0,51.68,62.6,23.78,11.39,99.94,14.97,19.77,47.34,6.19,15.73,22.03,0.52,0.0,0.27174
diff --git a/workflow/tests/base_results/sample_files1.csv b/workflow/tests/base_results/sample_files1.csv
index 573090d0f..55dda06fa 100644
--- a/workflow/tests/base_results/sample_files1.csv
+++ b/workflow/tests/base_results/sample_files1.csv
@@ -15,28 +15,28 @@ base-atticroof-flat.xml,71.51,29.26,8.96,10.49,46.59,5.43,11.52,32.07,4.1,9.02,2
 base-atticroof-radiant-barrier.xml,73.19,9.38,26.9,7.53,15.03,15.95,8.51,6.94,14.15,6.72,15.13,0.0,0.0,0.22599,78.9,6322.81,7559.66,1.0601,46.94,1.0,46.94,73.19,73.19,0.0,44.11,1.0,44.11,73.19,73.19,0.0,72.2,9.9,26.96,7.53,15.86,16.14,8.51,6.94,14.15,6.72,15.13,0.0,0.0,0.22599
 base-atticroof-unvented-insulated-roof.xml,74.22,29.48,8.66,10.49,46.97,5.34,11.52,35.06,4.33,9.02,21.28,0.0,0.0,0.18668,142.67,7923.44,5504.73,1.0089,56.2,1.0,56.2,74.22,74.22,0.0,50.79,1.0,50.79,74.22,74.22,0.0,70.48,33.58,8.55,10.49,53.5,5.29,11.53,35.06,4.33,9.02,21.28,0.0,0.0,0.18668
 base-atticroof-vented.xml,76.64,30.01,8.45,10.49,47.81,5.23,11.83,38.37,4.56,9.19,21.28,0.0,0.0,0.22134,150.08,8426.84,5556.17,1.0105,57.02,1.0,57.02,76.64,76.64,0.0,51.76,1.0,51.76,76.64,76.64,0.0,72.77,34.13,8.34,10.49,54.37,5.19,11.83,38.37,4.56,9.19,21.28,0.0,0.0,0.22134
-base-bldgtype-mf-unit-adjacent-to-multiple.xml,68.24,10.29,5.21,10.49,16.46,3.56,11.52,10.92,2.45,9.57,13.08,0.0,0.0,0.22934,102.72,3628.76,3236.99,1.0914,65.23,1.0,65.23,68.24,68.24,0.0,55.41,1.0,55.41,68.24,68.24,0.0,70.67,8.77,5.3,10.49,14.02,3.6,11.51,10.92,2.45,9.57,13.08,0.0,0.0,0.22934
-base-bldgtype-mf-unit-location-portland-or.xml,68.82,5.03,3.6,9.98,8.05,2.5,10.99,1.72,2.62,9.1,13.08,0.0,0.0,0.19618,75.59,2257.5,2771.36,1.0777,61.06,1.0,61.06,68.82,68.82,0.0,49.51,1.0,49.51,68.82,68.82,0.0,70.85,3.82,4.0,9.98,6.12,2.68,10.99,1.72,2.62,9.1,13.08,0.0,0.0,0.19618
-base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml,66.16,7.65,5.92,10.49,12.52,3.9,11.51,3.07,3.93,9.54,13.08,0.0,0.0,0.23763,73.9,2583.11,3192.67,1.0949,57.93,1.0,57.93,66.16,66.16,0.0,48.74,1.0,48.74,66.16,66.16,0.0,68.38,6.25,6.09,10.49,10.25,3.97,11.5,3.07,3.93,9.54,13.08,0.0,0.0,0.23763
-base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml,66.43,7.65,5.92,10.49,12.52,3.9,11.51,3.29,3.93,9.54,13.08,0.0,0.0,0.23763,74.66,2609.69,3192.67,1.0949,58.07,1.0,58.07,66.43,66.43,0.0,48.82,1.0,48.82,66.43,66.43,0.0,68.65,6.25,6.09,10.49,10.25,3.97,11.5,3.29,3.93,9.54,13.08,0.0,0.0,0.23763
-base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml,66.2,7.65,5.92,10.49,12.52,3.9,11.51,3.1,3.93,9.54,13.08,0.0,0.0,0.23763,73.82,2580.46,3192.67,1.0949,58.07,1.0,58.07,66.2,66.2,0.0,48.82,1.0,48.82,66.2,66.2,0.0,68.42,6.25,6.09,10.49,10.25,3.97,11.5,3.1,3.93,9.54,13.08,0.0,0.0,0.23763
-base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml,65.75,7.65,5.92,10.49,11.69,3.9,11.51,2.57,3.93,9.54,13.08,0.0,0.0,0.23342,71.66,2501.0,3192.67,1.0931,57.14,1.0,57.14,65.75,67.9,0.0,48.41,1.0,48.41,65.75,67.9,0.0,67.93,6.25,6.09,10.49,9.73,3.97,11.5,2.57,3.93,9.54,13.08,0.0,0.0,0.23342
-base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml,65.33,7.65,5.92,10.49,12.19,3.9,11.51,4.21,3.01,9.54,13.08,0.0,0.0,0.22973,76.91,2680.25,3192.67,1.0916,62.44,1.0,62.44,65.33,65.33,0.0,49.52,1.0,49.52,65.33,65.33,0.0,67.49,6.25,6.09,10.49,9.96,3.97,11.5,4.21,3.01,9.54,13.08,0.0,0.0,0.22973
-base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml,67.2,7.65,5.92,10.49,12.19,3.9,11.51,4.21,3.55,9.54,13.08,0.0,0.0,0.22973,78.07,2720.69,3192.67,1.0916,62.92,1.0,62.92,67.2,67.2,0.0,49.98,1.0,49.98,67.2,67.2,0.0,69.44,6.25,6.09,10.49,9.96,3.97,11.5,4.21,3.55,9.54,13.08,0.0,0.0,0.22973
-base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml,65.89,7.65,5.92,10.49,12.19,3.9,11.51,4.21,3.17,9.54,13.08,0.0,0.0,0.22973,77.25,2692.23,3192.67,1.0916,62.92,1.0,62.92,65.89,65.89,0.0,49.98,1.0,49.98,65.89,65.89,0.0,68.08,6.25,6.09,10.49,9.96,3.97,11.5,4.21,3.17,9.54,13.08,0.0,0.0,0.22973
-base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml,76.35,7.65,5.92,10.49,12.19,3.9,11.51,4.21,6.23,9.54,13.08,0.0,0.0,0.22973,83.64,2915.0,3192.67,1.0916,66.15,1.0,66.15,76.35,76.35,0.0,53.06,1.0,53.06,76.35,76.35,0.0,78.98,6.25,6.09,10.49,9.96,3.97,11.5,4.21,6.23,9.54,13.08,0.0,0.0,0.22973
-base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml,66.79,7.65,5.92,10.49,12.19,3.9,11.51,4.21,3.44,9.54,13.08,0.0,0.0,0.22973,77.82,2712.12,3192.67,1.0916,62.57,1.0,62.57,66.79,66.79,0.0,49.64,1.0,49.64,66.79,66.79,0.0,69.02,6.25,6.09,10.49,9.96,3.97,11.5,4.21,3.44,9.54,13.08,0.0,0.0,0.22973
-base-bldgtype-mf-unit-shared-generator.xml,61.42,7.65,5.92,10.49,12.23,3.88,11.51,2.87,3.15,9.54,13.08,0.0,0.0,0.22934,131.69,4446.32,3093.61,1.0914,56.26,1.0,56.26,63.68,63.68,0.0,47.01,1.0,47.01,63.68,63.68,0.0,63.46,6.25,6.09,10.49,10.0,3.95,11.5,2.87,3.15,9.54,13.08,0.0,0.0,0.22934
-base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml,72.33,7.65,5.93,10.49,6.44,3.03,11.51,1.79,4.17,9.54,13.08,0.0,0.0,0.22668,68.44,2308.47,3093.61,1.0903,63.57,1.0,63.57,72.33,72.33,0.0,54.55,1.0,54.55,72.33,72.33,0.0,74.53,6.25,6.1,10.49,5.46,3.1,11.5,1.79,4.17,9.54,13.08,0.0,0.0,0.22668
-base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml,63.29,7.27,6.12,10.5,11.63,3.97,18.22,2.69,3.21,14.5,13.08,0.0,0.0,0.229,113.66,3844.73,3099.89,1.0913,50.11,1.0,50.11,63.29,63.29,0.0,42.5,1.0,42.5,63.29,63.29,0.0,65.36,5.9,6.3,10.5,9.43,4.04,18.18,2.69,3.21,14.5,13.08,0.0,0.0,0.229
-base-bldgtype-mf-unit-shared-laundry-room.xml,60.37,7.27,6.12,10.49,11.63,3.97,18.21,3.05,3.05,12.34,13.08,0.0,0.0,0.229,105.45,3567.07,3099.86,1.0913,50.11,1.0,50.11,60.37,60.37,0.0,42.5,1.0,42.5,60.37,60.37,0.0,62.34,5.9,6.3,10.49,9.43,4.04,18.19,3.05,3.05,12.34,13.08,0.0,0.0,0.229
-base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml,70.12,7.53,6.02,10.49,12.04,3.92,11.5,0.69,3.53,9.53,13.08,1.5,0.0,0.22934,85.28,2920.94,3138.38,1.0914,56.26,1.0,56.26,70.12,70.12,0.0,47.01,1.0,47.01,70.12,70.12,0.0,72.39,6.14,6.19,10.49,9.81,3.99,11.5,0.69,3.53,9.53,13.08,1.5,0.0,0.22934
-base-bldgtype-mf-unit-shared-mechvent.xml,65.92,7.53,6.02,10.49,12.04,3.92,11.5,2.65,3.15,9.54,13.08,1.5,0.0,0.22934,75.57,2588.41,3138.38,1.0914,56.26,1.0,56.26,65.92,65.92,0.0,47.01,1.0,47.01,65.92,65.92,0.0,68.05,6.14,6.19,10.49,9.81,3.99,11.5,2.65,3.15,9.54,13.08,1.5,0.0,0.22934
-base-bldgtype-mf-unit-shared-pv.xml,5.88,7.65,5.92,10.49,12.23,3.88,11.51,2.87,3.15,9.54,13.08,0.0,0.0,0.22934,24.35,822.1,3093.61,1.0914,56.26,1.0,56.26,63.68,63.68,0.0,47.01,1.0,47.01,63.68,63.68,0.0,62.3,6.25,6.09,10.49,10.0,3.95,11.5,2.87,3.15,9.54,13.08,0.0,0.0,0.22934
-base-bldgtype-mf-unit-shared-water-heater-recirc.xml,62.0,7.06,6.32,10.49,11.29,4.06,18.21,2.94,3.12,13.43,13.08,0.0,0.0,0.229,107.92,3643.35,3093.61,1.0913,50.93,1.0,50.93,62.0,62.0,0.0,43.28,1.0,43.28,62.0,62.0,0.0,63.99,5.7,6.51,10.49,9.12,4.14,18.18,2.94,3.12,13.43,13.08,0.0,0.0,0.229
-base-bldgtype-mf-unit-shared-water-heater.xml,60.57,7.06,6.32,10.49,11.29,4.06,18.21,2.94,3.12,12.33,13.08,0.0,0.0,0.229,105.31,3555.12,3093.61,1.0913,50.09,1.0,50.09,60.57,60.57,0.0,42.58,1.0,42.58,60.57,60.57,0.0,62.52,5.7,6.51,10.49,9.12,4.14,18.18,2.94,3.12,12.33,13.08,0.0,0.0,0.229
-base-bldgtype-mf-unit.xml,63.68,7.65,5.92,10.49,12.23,3.88,11.51,2.87,3.15,9.54,13.08,0.0,0.0,0.22934,73.97,2497.48,3093.61,1.0914,56.26,1.0,56.26,63.68,63.68,0.0,47.01,1.0,47.01,63.68,63.68,0.0,65.79,6.25,6.09,10.49,10.0,3.95,11.5,2.87,3.15,9.54,13.08,0.0,0.0,0.22934
-base-bldgtype-sfa-unit.xml,74.72,18.94,5.96,10.49,30.2,3.96,11.52,23.74,3.38,9.29,17.18,0.0,0.0,0.22097,133.18,5900.41,4266.59,1.0384,55.03,1.0,55.03,74.72,74.72,0.0,49.83,1.0,49.83,74.72,74.72,0.0,72.85,20.45,5.9,10.49,32.61,3.94,11.52,23.74,3.38,9.29,17.18,0.0,0.0,0.22097
+base-bldgtype-mf-unit-adjacent-to-multiple.xml,72.81,7.77,5.37,10.49,12.42,3.63,11.51,10.92,2.45,9.57,13.08,0.0,0.0,0.21277,108.62,3628.76,3080.4,1.0845,67.52,1.0,67.52,72.81,72.81,0.0,58.51,1.0,58.51,72.81,72.81,0.0,71.12,8.77,5.3,10.49,14.02,3.6,11.51,10.92,2.45,9.57,13.08,0.0,0.0,0.21277
+base-bldgtype-mf-unit-location-portland-or.xml,71.96,3.38,4.18,9.98,5.41,2.76,10.98,1.72,2.62,9.1,13.08,0.0,0.0,0.18165,78.4,2257.5,2686.72,1.0717,61.49,1.0,61.49,71.96,71.96,0.0,51.11,1.0,51.11,71.96,71.96,0.0,71.25,3.82,4.0,9.98,6.12,2.68,10.99,1.72,2.62,9.1,13.08,0.0,0.0,0.18165
+base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml,70.32,5.33,6.23,10.49,8.75,4.03,11.5,3.07,3.93,9.54,13.08,0.0,0.0,0.22099,77.99,2583.11,3044.46,1.0879,59.69,1.0,59.69,70.32,70.32,0.0,51.21,1.0,51.21,70.32,70.32,0.0,68.81,6.25,6.09,10.49,10.25,3.97,11.5,3.07,3.93,9.54,13.08,0.0,0.0,0.22099
+base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml,70.6,5.33,6.23,10.49,8.75,4.03,11.5,3.29,3.93,9.54,13.08,0.0,0.0,0.22099,78.79,2609.69,3044.46,1.0879,59.82,1.0,59.82,70.6,70.6,0.0,51.3,1.0,51.3,70.6,70.6,0.0,69.09,6.25,6.09,10.49,10.25,3.97,11.5,3.29,3.93,9.54,13.08,0.0,0.0,0.22099
+base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml,70.36,5.33,6.23,10.49,8.75,4.03,11.5,3.1,3.93,9.54,13.08,0.0,0.0,0.22099,77.91,2580.46,3044.46,1.0879,59.82,1.0,59.82,70.36,70.36,0.0,51.3,1.0,51.3,70.36,70.36,0.0,68.85,6.25,6.09,10.49,10.25,3.97,11.5,3.1,3.93,9.54,13.08,0.0,0.0,0.22099
+base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml,69.83,5.33,6.23,10.49,8.44,4.03,11.5,2.57,3.93,9.54,13.08,0.0,0.0,0.21721,75.62,2501.0,3044.46,1.0864,58.87,1.0,58.87,69.83,71.28,0.0,50.82,1.0,50.82,69.83,71.28,0.0,68.35,6.25,6.09,10.49,9.73,3.97,11.5,2.57,3.93,9.54,13.08,0.0,0.0,0.21721
+base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml,69.39,5.33,6.23,10.49,8.49,4.03,11.5,4.21,3.01,9.54,13.08,0.0,0.0,0.21313,81.16,2680.25,3044.46,1.0847,63.26,1.0,63.26,69.39,69.39,0.0,51.84,1.0,51.84,69.39,69.39,0.0,67.92,6.25,6.09,10.49,9.96,3.97,11.5,4.21,3.01,9.54,13.08,0.0,0.0,0.21313
+base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml,71.41,5.33,6.23,10.49,8.49,4.03,11.5,4.21,3.55,9.54,13.08,0.0,0.0,0.21313,82.39,2720.69,3044.46,1.0847,63.79,1.0,63.79,71.41,71.41,0.0,52.35,1.0,52.35,71.41,71.41,0.0,69.88,6.25,6.09,10.49,9.96,3.97,11.5,4.21,3.55,9.54,13.08,0.0,0.0,0.21313
+base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml,70.0,5.33,6.23,10.49,8.49,4.03,11.5,4.21,3.17,9.54,13.08,0.0,0.0,0.21313,81.53,2692.23,3044.46,1.0847,63.79,1.0,63.79,70.0,70.0,0.0,52.35,1.0,52.35,70.0,70.0,0.0,68.51,6.25,6.09,10.49,9.96,3.97,11.5,4.21,3.17,9.54,13.08,0.0,0.0,0.21313
+base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml,81.28,5.33,6.23,10.49,8.49,4.03,11.5,4.21,6.23,9.54,13.08,0.0,0.0,0.21313,88.27,2915.0,3044.46,1.0847,67.33,1.0,67.33,81.28,81.28,0.0,55.67,1.0,55.67,81.28,81.28,0.0,79.48,6.25,6.09,10.49,9.96,3.97,11.5,4.21,6.23,9.54,13.08,0.0,0.0,0.21313
+base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml,70.97,5.33,6.23,10.49,8.49,4.03,11.5,4.21,3.44,9.54,13.08,0.0,0.0,0.21313,82.13,2712.12,3044.46,1.0847,63.4,1.0,63.4,70.97,70.97,0.0,51.97,1.0,51.97,70.97,70.97,0.0,69.46,6.25,6.09,10.49,9.96,3.97,11.5,4.21,3.44,9.54,13.08,0.0,0.0,0.21313
+base-bldgtype-mf-unit-shared-generator.xml,65.25,5.33,6.23,10.49,8.53,4.0,11.5,2.87,3.15,9.54,13.08,0.0,0.0,0.21277,138.87,4446.32,2952.32,1.0845,57.85,1.0,57.85,67.65,67.65,0.0,49.35,1.0,49.35,67.65,67.65,0.0,63.86,6.25,6.09,10.49,10.0,3.95,11.5,2.87,3.15,9.54,13.08,0.0,0.0,0.21277
+base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml,76.45,5.33,6.24,10.49,4.81,3.15,11.5,1.79,4.17,9.54,13.08,0.0,0.0,0.21106,72.14,2308.47,2952.32,1.0838,64.83,1.0,64.83,76.45,76.45,0.0,56.67,1.0,56.67,76.45,76.45,0.0,74.98,6.25,6.1,10.49,5.46,3.1,11.5,1.79,4.17,9.54,13.08,0.0,0.0,0.21106
+base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml,67.18,5.0,6.45,10.5,8.0,4.1,18.18,2.69,3.21,14.5,13.08,0.0,0.0,0.21245,119.9,3844.73,2957.16,1.0844,51.43,1.0,51.43,67.18,67.18,0.0,44.63,1.0,44.63,67.18,67.18,0.0,65.78,5.9,6.3,10.5,9.43,4.04,18.18,2.69,3.21,14.5,13.08,0.0,0.0,0.21245
+base-bldgtype-mf-unit-shared-laundry-room.xml,64.07,5.0,6.45,10.49,8.0,4.1,18.17,3.05,3.05,12.34,13.08,0.0,0.0,0.21245,111.24,3567.07,2957.07,1.0844,51.43,1.0,51.43,64.07,64.07,0.0,44.63,1.0,44.63,64.07,64.07,0.0,62.74,5.9,6.3,10.49,9.43,4.04,18.19,3.05,3.05,12.34,13.08,0.0,0.0,0.21245
+base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml,74.43,5.23,6.33,10.49,8.36,4.05,11.5,0.69,3.53,9.53,13.08,1.5,0.0,0.21277,89.88,2920.94,2996.42,1.0845,57.85,1.0,57.85,74.43,74.43,0.0,49.35,1.0,49.35,74.43,74.43,0.0,72.89,6.14,6.19,10.49,9.82,3.99,11.5,0.69,3.53,9.53,13.08,1.5,0.0,0.21277
+base-bldgtype-mf-unit-shared-mechvent.xml,69.96,5.23,6.33,10.49,8.36,4.05,11.5,2.65,3.15,9.54,13.08,1.5,0.0,0.21277,79.65,2588.41,2996.42,1.0845,57.85,1.0,57.85,69.96,69.96,0.0,49.35,1.0,49.35,69.96,69.96,0.0,68.51,6.14,6.19,10.49,9.82,3.99,11.5,2.65,3.15,9.54,13.08,1.5,0.0,0.21277
+base-bldgtype-mf-unit-shared-pv.xml,6.25,5.33,6.23,10.49,8.53,4.0,11.5,2.87,3.15,9.54,13.08,0.0,0.0,0.21277,25.68,822.1,2952.32,1.0845,57.85,1.0,57.85,67.65,67.65,0.0,49.35,1.0,49.35,67.65,67.65,0.0,62.69,6.25,6.09,10.49,10.0,3.95,11.5,2.87,3.15,9.54,13.08,0.0,0.0,0.21277
+base-bldgtype-mf-unit-shared-water-heater-recirc.xml,65.72,4.82,6.67,10.49,7.71,4.2,18.16,2.94,3.12,13.43,13.08,0.0,0.0,0.21245,113.8,3643.35,2952.32,1.0844,52.26,1.0,52.26,65.72,65.72,0.0,45.41,1.0,45.41,65.72,65.72,0.0,64.4,5.7,6.51,10.49,9.12,4.14,18.18,2.94,3.12,13.43,13.08,0.0,0.0,0.21245
+base-bldgtype-mf-unit-shared-water-heater.xml,64.21,4.82,6.67,10.49,7.71,4.2,18.16,2.94,3.12,12.33,13.08,0.0,0.0,0.21245,111.05,3555.12,2952.32,1.0844,51.38,1.0,51.38,64.21,64.21,0.0,44.67,1.0,44.67,64.21,64.21,0.0,62.91,5.7,6.51,10.49,9.12,4.14,18.18,2.94,3.12,12.33,13.08,0.0,0.0,0.21245
+base-bldgtype-mf-unit.xml,67.65,5.33,6.23,10.49,8.53,4.0,11.5,2.87,3.15,9.54,13.08,0.0,0.0,0.21277,78.0,2497.48,2952.32,1.0845,57.85,1.0,57.85,67.65,67.65,0.0,49.35,1.0,49.35,67.65,67.65,0.0,66.21,6.25,6.09,10.49,10.0,3.95,11.5,2.87,3.15,9.54,13.08,0.0,0.0,0.21277
+base-bldgtype-sfa-unit.xml,76.28,17.74,6.01,10.49,28.29,3.98,11.52,23.74,3.38,9.29,17.18,0.0,0.0,0.22097,135.6,5900.41,4190.42,1.0384,56.03,1.0,56.03,76.28,76.28,0.0,50.6,1.0,50.6,76.28,76.28,0.0,72.85,20.45,5.9,10.49,32.61,3.94,11.52,23.74,3.38,9.29,17.18,0.0,0.0,0.22097
 base-dhw-combi-tankless.xml,64.79,28.75,8.95,10.49,47.1,5.51,18.3,32.15,4.88,10.29,21.28,0.0,0.0,0.22957,146.04,8353.92,5658.28,1.0109,54.92,1.0,54.92,64.79,64.79,0.0,49.71,1.0,49.71,64.79,64.79,0.0,61.58,32.84,8.82,10.49,53.63,5.46,18.31,32.15,4.88,10.29,21.28,0.0,0.0,0.22957
 base-dhw-desuperheater.xml,83.37,29.48,8.66,10.49,46.95,5.37,11.52,44.18,5.42,6.9,21.28,0.0,0.0,0.22132,160.12,9155.77,5658.28,1.0105,70.98,1.0,70.98,83.37,83.37,0.0,61.92,1.0,61.92,83.37,83.37,0.0,79.16,33.58,8.55,10.49,53.48,5.32,11.53,44.18,5.42,6.9,21.28,0.0,0.0,0.22132
 base-dhw-dwhr.xml,75.77,29.48,8.66,10.49,46.97,5.34,11.52,38.51,5.16,6.75,21.28,0.0,0.0,0.22097,149.22,8300.55,5504.73,1.0105,56.2,1.0,56.2,75.77,75.77,0.0,50.79,1.0,50.79,75.77,75.77,0.0,71.95,33.58,8.55,10.49,53.5,5.29,11.53,38.51,5.16,6.75,21.28,0.0,0.0,0.22097