diff --git a/resources/hpxml-measures/BuildResidentialScheduleFile/measure.xml b/resources/hpxml-measures/BuildResidentialScheduleFile/measure.xml
index 45494d5ec8..a50e1fe292 100644
--- a/resources/hpxml-measures/BuildResidentialScheduleFile/measure.xml
+++ b/resources/hpxml-measures/BuildResidentialScheduleFile/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>build_residential_schedule_file</name>
   <uid>f770b2db-1a9f-4e99-99a7-7f3161a594b1</uid>
-  <version_id>1872e0df-889e-46ae-8cb9-849eadb97fda</version_id>
-  <version_modified>2024-09-13T21:54:22Z</version_modified>
+  <version_id>1fc75fd9-df4c-4ba6-8eff-2366ba375060</version_id>
+  <version_modified>2024-09-26T04:58:59Z</version_modified>
   <xml_checksum>03F02484</xml_checksum>
   <class_name>BuildResidentialScheduleFile</class_name>
   <display_name>Schedule File Builder</display_name>
@@ -229,7 +229,7 @@
       <filename>schedules.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>1E6EB1B1</checksum>
+      <checksum>85B9A7B9</checksum>
     </file>
     <file>
       <filename>shower_cluster_size_probability.csv</filename>
diff --git a/resources/hpxml-measures/BuildResidentialScheduleFile/resources/schedules.rb b/resources/hpxml-measures/BuildResidentialScheduleFile/resources/schedules.rb
index 747dbc0de2..8e1a8682e9 100644
--- a/resources/hpxml-measures/BuildResidentialScheduleFile/resources/schedules.rb
+++ b/resources/hpxml-measures/BuildResidentialScheduleFile/resources/schedules.rb
@@ -853,12 +853,15 @@ def export(schedules_path:)
       schedule_keys = table[0] + schedule_keys
       schedule_rows = schedule_rows.map.with_index { |row, i| table[i + 1] + row }
     end
-    CSV.open(schedules_path, 'w') do |csv|
-      csv << schedule_keys
+
+    # Note: We don't use the CSV library here because it's slow for large files
+    File.open(schedules_path, 'w') do |csv|
+      csv << "#{schedule_keys.join(',')}\n"
       schedule_rows.each do |row|
-        csv << row
+        csv << "#{row.join(',')}\n"
       end
     end
+
     return true
   end
 
diff --git a/resources/hpxml-measures/HPXMLtoOpenStudio/measure.xml b/resources/hpxml-measures/HPXMLtoOpenStudio/measure.xml
index 3b5e3387c7..770afc4840 100644
--- a/resources/hpxml-measures/HPXMLtoOpenStudio/measure.xml
+++ b/resources/hpxml-measures/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>e5f1c576-9881-4a74-b9c0-d9a96ec4c6be</version_id>
-  <version_modified>2024-09-24T18:24:04Z</version_modified>
+  <version_id>871ee4d0-efe2-4846-80e1-cdc147901ebd</version_id>
+  <version_modified>2024-09-26T05:18:34Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -351,13 +351,13 @@
       <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>C8198E51</checksum>
+      <checksum>278B0E8F</checksum>
     </file>
     <file>
       <filename>hpxml_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>331D7C8E</checksum>
+      <checksum>AE852A11</checksum>
     </file>
     <file>
       <filename>hpxml_schema/HPXML.xsd</filename>
@@ -591,7 +591,7 @@
       <filename>schedules.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>14BD47A8</checksum>
+      <checksum>7BE6BB34</checksum>
     </file>
     <file>
       <filename>simcontrols.rb</filename>
@@ -663,7 +663,7 @@
       <filename>test_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>FA4AF769</checksum>
+      <checksum>1821AF01</checksum>
     </file>
     <file>
       <filename>test_enclosure.rb</filename>
@@ -681,7 +681,7 @@
       <filename>test_hotwater_appliance.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>9FD5D93B</checksum>
+      <checksum>A1E1E023</checksum>
     </file>
     <file>
       <filename>test_hvac.rb</filename>
@@ -711,7 +711,7 @@
       <filename>test_miscloads.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>C3D97554</checksum>
+      <checksum>974B3838</checksum>
     </file>
     <file>
       <filename>test_pv.rb</filename>
@@ -735,7 +735,7 @@
       <filename>test_validation.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>57009C9A</checksum>
+      <checksum>9310E9E6</checksum>
     </file>
     <file>
       <filename>test_water_heater.rb</filename>
diff --git a/resources/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb b/resources/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb
index 15a025a297..6af816d59b 100644
--- a/resources/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb
+++ b/resources/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb
@@ -2549,7 +2549,7 @@ class BuildingHeader < BaseElement
              :manualj_humidity_difference,          # [Double] HVACSizingControl/ManualJInputs/HumidityDifference (grains)
              :manualj_internal_loads_sensible,      # [Double] HVACSizingControl/ManualJInputs/InternalLoadsSensible (Btu/hr)
              :manualj_internal_loads_latent,        # [Double] HVACSizingControl/ManualJInputs/InternalLoadsLatent (Btu/hr)
-             :manualj_num_occupants,                # [Integer] HVACSizingControl/ManualJInputs/NumberofOccupants
+             :manualj_num_occupants,                # [Double] HVACSizingControl/ManualJInputs/NumberofOccupants
              :manualj_infiltration_shielding_class, # [Integer] HVACSizingControl/ManualJInputs/InfiltrationShieldingClass (1-5)
              :manualj_infiltration_method,          # [String] HVACSizingControl/ManualJInputs/InfiltrationMethod (HPXML::ManualJInfiltrationMethodXXX)
              :natvent_days_per_week,                # [Integer] NaturalVentilationAvailabilityDaysperWeek
@@ -2595,7 +2595,7 @@ def to_doc(building)
         XMLHelper.add_element(manualj_sizing_inputs, 'HumidityDifference', @manualj_humidity_difference, :float, @manualj_humidity_difference_isdefaulted) unless @manualj_humidity_difference.nil?
         XMLHelper.add_element(manualj_sizing_inputs, 'InternalLoadsSensible', @manualj_internal_loads_sensible, :float, @manualj_internal_loads_sensible_isdefaulted) unless @manualj_internal_loads_sensible.nil?
         XMLHelper.add_element(manualj_sizing_inputs, 'InternalLoadsLatent', @manualj_internal_loads_latent, :float, @manualj_internal_loads_latent_isdefaulted) unless @manualj_internal_loads_latent.nil?
-        XMLHelper.add_element(manualj_sizing_inputs, 'NumberofOccupants', @manualj_num_occupants, :integer, @manualj_num_occupants_isdefaulted) unless @manualj_num_occupants.nil?
+        XMLHelper.add_element(manualj_sizing_inputs, 'NumberofOccupants', @manualj_num_occupants, :float, @manualj_num_occupants_isdefaulted) unless @manualj_num_occupants.nil?
         XMLHelper.add_element(manualj_sizing_inputs, 'InfiltrationShieldingClass', @manualj_infiltration_shielding_class, :integer, @manualj_infiltration_shielding_class_isdefaulted) unless @manualj_infiltration_shielding_class.nil?
         XMLHelper.add_element(manualj_sizing_inputs, 'InfiltrationMethod', @manualj_infiltration_method, :string, @manualj_infiltration_method_isdefaulted) unless @manualj_infiltration_method.nil?
       end
@@ -2648,7 +2648,7 @@ def from_doc(building)
       @manualj_humidity_difference = XMLHelper.get_value(building_summary, 'extension/HVACSizingControl/ManualJInputs/HumidityDifference', :float)
       @manualj_internal_loads_sensible = XMLHelper.get_value(building_summary, 'extension/HVACSizingControl/ManualJInputs/InternalLoadsSensible', :float)
       @manualj_internal_loads_latent = XMLHelper.get_value(building_summary, 'extension/HVACSizingControl/ManualJInputs/InternalLoadsLatent', :float)
-      @manualj_num_occupants = XMLHelper.get_value(building_summary, 'extension/HVACSizingControl/ManualJInputs/NumberofOccupants', :integer)
+      @manualj_num_occupants = XMLHelper.get_value(building_summary, 'extension/HVACSizingControl/ManualJInputs/NumberofOccupants', :float)
       @manualj_infiltration_shielding_class = XMLHelper.get_value(building_summary, 'extension/HVACSizingControl/ManualJInputs/InfiltrationShieldingClass', :integer)
       @manualj_infiltration_method = XMLHelper.get_value(building_summary, 'extension/HVACSizingControl/ManualJInputs/InfiltrationMethod', :string)
       @extension_properties = {}
diff --git a/resources/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_defaults.rb b/resources/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
index 7ba5e61969..ab10004106 100644
--- a/resources/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
+++ b/resources/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
@@ -329,7 +329,7 @@ def self.apply_building_header_sizing(runner, hpxml_bldg, weather)
       runner.registerWarning("ManualJInputs/InternalLoadsLatent (#{hpxml_bldg.header.manualj_internal_loads_latent}) does not match sum of conditioned spaces (#{sum_space_manualj_internal_loads_latent}).")
     end
 
-    sum_space_manualj_num_occupants = hpxml_bldg.conditioned_spaces.map { |space| space.manualj_num_occupants.to_f }.sum.round
+    sum_space_manualj_num_occupants = hpxml_bldg.conditioned_spaces.map { |space| space.manualj_num_occupants.to_f }.sum
     if hpxml_bldg.header.manualj_num_occupants.nil?
       if sum_space_manualj_num_occupants > 0
         hpxml_bldg.header.manualj_num_occupants = sum_space_manualj_num_occupants
@@ -348,7 +348,7 @@ def self.apply_building_header_sizing(runner, hpxml_bldg, weather)
         space.manualj_num_occupants = (hpxml_bldg.header.manualj_num_occupants * space.floor_area / total_floor_area).round(2)
         space.manualj_num_occupants_isdefaulted = true
       end
-    elsif (hpxml_bldg.header.manualj_num_occupants - sum_space_manualj_num_occupants).abs >= 1 # Tolerance for rounding
+    elsif (hpxml_bldg.header.manualj_num_occupants - sum_space_manualj_num_occupants).abs >= 0.1
       runner.registerWarning("ManualJInputs/NumberofOccupants (#{hpxml_bldg.header.manualj_num_occupants}) does not match sum of conditioned spaces (#{sum_space_manualj_num_occupants}).")
     end
 
@@ -4292,7 +4292,7 @@ def self.get_weather_station_csv_data
     zipcode_csv_filepath = File.join(File.dirname(__FILE__), 'data', 'zipcode_weather_stations.csv')
 
     if $zip_csv_data.nil?
-      # Don't use the CSV library because it's much slower
+      # Note: We don't use the CSV library here because it's slow for large files
       $zip_csv_data = File.readlines(zipcode_csv_filepath).map(&:strip)
     end
 
diff --git a/resources/hpxml-measures/HPXMLtoOpenStudio/resources/schedules.rb b/resources/hpxml-measures/HPXMLtoOpenStudio/resources/schedules.rb
index 1bc35dff94..348e4b0215 100644
--- a/resources/hpxml-measures/HPXMLtoOpenStudio/resources/schedules.rb
+++ b/resources/hpxml-measures/HPXMLtoOpenStudio/resources/schedules.rb
@@ -1287,7 +1287,8 @@ def import(schedules_paths)
     num_hrs_in_year = Calendar.num_hours_in_year(@year)
     @schedules = {}
     schedules_paths.each do |schedules_path|
-      columns = CSV.read(schedules_path).transpose
+      # Note: We don't use the CSV library here because it's slow for large files
+      columns = File.readlines(schedules_path).map(&:strip).map { |r| r.split(',') }.transpose
       columns.each do |col|
         col_name = col[0]
         column = Columns.values.find { |c| c.name == col_name }
@@ -1348,11 +1349,11 @@ def import(schedules_paths)
   def export()
     return false if @output_schedules_path.nil?
 
-    CSV.open(@output_schedules_path, 'wb') do |csv|
-      csv << @tmp_schedules.keys
-      rows = @tmp_schedules.values.transpose
-      rows.each do |row|
-        csv << row
+    # Note: We don't use the CSV library here because it's slow for large files
+    File.open(@output_schedules_path, 'w') do |csv|
+      csv << "#{@tmp_schedules.keys.join(',')}\n"
+      @tmp_schedules.values.transpose.each do |row|
+        csv << "#{row.join(',')}\n"
       end
     end
 
diff --git a/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb b/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb
index bfb998f23c..a0a8b11b0c 100644
--- a/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb
+++ b/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb
@@ -325,10 +325,10 @@ def test_building
     assert_equal(4, default_hpxml_bldg.header.manualj_num_occupants)
 
     # Test defaults w/ NumberOfResidents provided and greater than Nbr+1
-    hpxml_bldg.building_occupancy.number_of_residents = 6
+    hpxml_bldg.building_occupancy.number_of_residents = 5.5
     XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
     _default_hpxml, default_hpxml_bldg = _test_measure()
-    assert_equal(6, default_hpxml_bldg.header.manualj_num_occupants)
+    assert_equal(5.5, default_hpxml_bldg.header.manualj_num_occupants)
 
     # Test defaults - DST in weather file
     hpxml, hpxml_bldg = _create_hpxml('base-location-AMY-2012.xml')
diff --git a/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_hotwater_appliance.rb b/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_hotwater_appliance.rb
index 6a2a833bfd..20baadd275 100644
--- a/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_hotwater_appliance.rb
+++ b/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_hotwater_appliance.rb
@@ -111,7 +111,7 @@ def test_base
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     fixture_gpd = 43.71
     dist_gpd = 10.030
     cw_gpd = 3.7116
@@ -176,7 +176,7 @@ def test_dhw_multiple
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-multiple.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     fixture_gpd = 15.30
     dist_gpd = 3.510
     cw_gpd = 1.2991
@@ -237,7 +237,7 @@ def test_dhw_shared_water_heater_recirc
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-mf-unit-shared-water-heater-recirc.xml'))
     model, _hpxml, hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     fixture_gpd = 43.71
     dist_gpd = 12.103
     cw_gpd = 3.7116
@@ -313,7 +313,7 @@ def test_dhw_shared_laundry
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-mf-unit-shared-laundry-room.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     fixture_gpd = 43.71
     dist_gpd = 12.103
     cw_gpd = 3.7116
@@ -374,7 +374,7 @@ def test_dhw_low_flow_fixtures
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-low-flow-fixtures.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     fixture_gpd = 42.39
     dist_gpd = 9.7261
     assert_in_epsilon(fixture_gpd, get_wu_gpd(model, Constants::ObjectTypeFixtures), 0.001)
@@ -386,7 +386,7 @@ def test_dhw_dwhr
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-dwhr.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     fixture_gpd = 43.71
     dist_gpd = 10.030
     assert_in_epsilon(fixture_gpd, get_wu_gpd(model, Constants::ObjectTypeFixtures), 0.001)
@@ -457,7 +457,7 @@ def test_appliances_none
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-appliances-none.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     assert_nil(get_wu_gpd(model, Constants::ObjectTypeClothesWasher))
     assert_nil(get_wu_gpd(model, Constants::ObjectTypeDishwasher))
 
@@ -494,7 +494,7 @@ def test_appliances_modified
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-appliances-modified.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     cw_gpd = 3.7116
     dw_gpd = 5.475
     assert_in_epsilon(cw_gpd, get_wu_gpd(model, Constants::ObjectTypeClothesWasher), 0.001)
@@ -551,7 +551,7 @@ def test_appliances_oil
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-appliances-oil.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     cw_gpd = 3.7116
     dw_gpd = 2.7342
     assert_in_epsilon(cw_gpd, get_wu_gpd(model, Constants::ObjectTypeClothesWasher), 0.001)
@@ -620,7 +620,7 @@ def test_appliances_gas
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-appliances-gas.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     cw_gpd = 3.7116
     dw_gpd = 2.7342
     assert_in_epsilon(cw_gpd, get_wu_gpd(model, Constants::ObjectTypeClothesWasher), 0.001)
@@ -689,7 +689,7 @@ def test_appliances_propane
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-appliances-propane.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     cw_gpd = 3.7116
     dw_gpd = 2.7342
     assert_in_epsilon(cw_gpd, get_wu_gpd(model, Constants::ObjectTypeClothesWasher), 0.001)
@@ -758,7 +758,7 @@ def test_appliances_wood
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-appliances-wood.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     cw_gpd = 3.7116
     dw_gpd = 2.7342
     assert_in_epsilon(cw_gpd, get_wu_gpd(model, Constants::ObjectTypeClothesWasher), 0.001)
@@ -827,7 +827,7 @@ def test_appliances_coal
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-appliances-coal.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     cw_gpd = 3.7116
     dw_gpd = 2.7342
     assert_in_epsilon(cw_gpd, get_wu_gpd(model, Constants::ObjectTypeClothesWasher), 0.001)
@@ -896,7 +896,7 @@ def test_usage_multiplier
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-misc-usage-multiplier.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     fixture_gpd = 43.71 * 0.9
     dist_gpd = 10.030 * 0.9
     cw_gpd = 3.7116 * 0.9
@@ -957,7 +957,7 @@ def test_operational_1_occupant
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-residents-1.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
+    # water use equipment hot water gal/day
     fixture_gpd = 13.485
     dist_gpd = 4.569
     cw_gpd = 2.25
@@ -1013,37 +1013,37 @@ def test_operational_1_occupant
     assert_in_epsilon(1.0, get_oe_fractions(model, Constants::ObjectTypeGeneralWaterUseLatent)[1], 0.001)
   end
 
-  def test_operational_5_occupants
+  def test_operational_5_5_occupants
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-residents-5.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-residents-5-5.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
-    # water use equipment peak flows
-    fixture_gpd = 86.397
-    dist_gpd = 21.648
-    cw_gpd = 6.224
-    dw_gpd = 5.387
+    # water use equipment hot water gal/day
+    fixture_gpd = 95.511
+    dist_gpd = 23.142
+    cw_gpd = 6.667
+    dw_gpd = 5.722
     assert_in_epsilon(cw_gpd, get_wu_gpd(model, Constants::ObjectTypeClothesWasher), 0.001)
     assert_in_epsilon(dw_gpd, get_wu_gpd(model, Constants::ObjectTypeDishwasher), 0.001)
     assert_in_epsilon(fixture_gpd, get_wu_gpd(model, Constants::ObjectTypeFixtures), 0.001)
     assert_in_epsilon(dist_gpd, get_wu_gpd(model, Constants::ObjectTypeDistributionWaste), 0.001)
 
     # electric equipment
-    cw_ee_kwh_yr = 139.688
+    cw_ee_kwh_yr = 149.642
     cw_sens_frac = 0.27
     cw_lat_frac = 0.03
     assert_in_epsilon(cw_ee_kwh_yr, get_ee_kwh_per_year(model, Constants::ObjectTypeClothesWasher), 0.001)
     assert_in_epsilon(cw_sens_frac, get_ee_fractions(model, Constants::ObjectTypeClothesWasher)[0], 0.001)
     assert_in_epsilon(cw_lat_frac, get_ee_fractions(model, Constants::ObjectTypeClothesWasher)[1], 0.001)
 
-    dw_ee_kwh_yr = 163.593
+    dw_ee_kwh_yr = 173.775
     dw_sens_frac = 0.3
     dw_lat_frac = 0.300
     assert_in_epsilon(dw_ee_kwh_yr, get_ee_kwh_per_year(model, Constants::ObjectTypeDishwasher), 0.001)
     assert_in_epsilon(dw_sens_frac, get_ee_fractions(model, Constants::ObjectTypeDishwasher)[0], 0.001)
     assert_in_epsilon(dw_lat_frac, get_ee_fractions(model, Constants::ObjectTypeDishwasher)[1], 0.001)
 
-    cd_ee_kwh_yr = 1038.961
+    cd_ee_kwh_yr = 1113.0
     cd_sens_frac = 0.135
     cd_lat_frac = 0.015
     assert_in_epsilon(cd_ee_kwh_yr, get_ee_kwh_per_year(model, Constants::ObjectTypeClothesDryer), 0.001)
@@ -1055,7 +1055,7 @@ def test_operational_5_occupants
     assert_in_epsilon(rf_sens_frac, get_ee_fractions(model, Constants::ObjectTypeRefrigerator)[0], 0.001)
     assert_in_epsilon(rf_lat_frac, get_ee_fractions(model, Constants::ObjectTypeRefrigerator)[1], 0.001)
 
-    cook_ee_kwh_yr = 651.2
+    cook_ee_kwh_yr = 691.75
     cook_sens_frac = 0.72
     cook_lat_frac = 0.080
     assert_in_epsilon(cook_ee_kwh_yr, get_ee_kwh_per_year(model, Constants::ObjectTypeCookingRange), 0.001)
@@ -1063,8 +1063,8 @@ def test_operational_5_occupants
     assert_in_epsilon(cook_lat_frac, get_ee_fractions(model, Constants::ObjectTypeCookingRange)[1], 0.001)
 
     # other equipment
-    water_sens = -490.4
-    water_lat = 497.6
+    water_sens = -536.0
+    water_lat = 543.8
     assert_in_epsilon(water_sens, get_oe_kwh(model, Constants::ObjectTypeGeneralWaterUseSensible), 0.001)
     assert_in_epsilon(1.0, get_oe_fractions(model, Constants::ObjectTypeGeneralWaterUseSensible)[0], 0.001)
     assert_in_epsilon(0.0, get_oe_fractions(model, Constants::ObjectTypeGeneralWaterUseSensible)[1], 0.001)
diff --git a/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_miscloads.rb b/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_miscloads.rb
index f31070719a..b8e0121688 100644
--- a/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_miscloads.rb
+++ b/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_miscloads.rb
@@ -197,17 +197,17 @@ def test_large_uncommon_loads2
 
   def test_operational_defaults
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-residents-5.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-residents-5-5.xml'))
     model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     # Check misc plug loads
     kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants::ObjectTypeMiscPlugLoads)
-    assert_in_delta(2887, kwh_yr, 1.0)
+    assert_in_delta(3008, kwh_yr, 1.0)
     assert_equal(0, therm_yr)
 
     # Check television
     kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants::ObjectTypeMiscTelevision)
-    assert_in_delta(957, kwh_yr, 1.0)
+    assert_in_delta(1003, kwh_yr, 1.0)
     assert_equal(0, therm_yr)
 
     # Check vehicle
diff --git a/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb b/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb
index 772228764b..2468c148a8 100644
--- a/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb
+++ b/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb
@@ -1716,7 +1716,7 @@ def test_ruby_warning_messages
                               'hvac-setpoint-adjustments-daily-schedules' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
                               'multistage-backup-more-than-4-stages' => ['EnergyPlus only supports 4 stages for multi-stage electric backup coil. Combined the remaining capacities in the last stage.',
                                                                          'Calculated multi-stage backup coil capacity increment for last stage is not equal to user input, actual capacity increment is'],
-                              'manualj-sum-space-num-occupants' => ['ManualJInputs/NumberofOccupants (4) does not match sum of conditioned spaces (5).'],
+                              'manualj-sum-space-num-occupants' => ['ManualJInputs/NumberofOccupants (4.8) does not match sum of conditioned spaces (5.0).'],
                               'manualj-sum-space-internal-loads-sensible' => ['ManualJInputs/InternalLoadsSensible (1000.0) does not match sum of conditioned spaces (1200.0).'],
                               'manualj-sum-space-internal-loads-latent' => ['ManualJInputs/InternalLoadsLatent (200.0) does not match sum of conditioned spaces (100.0).'],
                               'multiple-conditioned-zone' => ['While multiple conditioned zones are specified, the EnergyPlus model will only include a single conditioned thermal zone.'],
@@ -1888,9 +1888,9 @@ def test_ruby_warning_messages
         hpxml_bldg.hvac_controls[0].weekday_heating_setpoints = '64, 64, 64, 64, 64, 64, 64, 76, 70, 66, 66, 66, 66, 66, 66, 66, 66, 68, 68, 68, 68, 68, 64, 64'
       elsif ['manualj-sum-space-num-occupants'].include? warning_case
         hpxml, hpxml_bldg = _create_hpxml('base-zones-spaces.xml')
-        hpxml_bldg.header.manualj_num_occupants = 4
+        hpxml_bldg.header.manualj_num_occupants = 4.8
         hpxml_bldg.conditioned_spaces.each_with_index do |space, i|
-          space.manualj_num_occupants = (i == 0 ? hpxml_bldg.header.manualj_num_occupants + 1 : 0)
+          space.manualj_num_occupants = (i == 0 ? hpxml_bldg.header.manualj_num_occupants.round : 0)
         end
       elsif ['manualj-sum-space-internal-loads-sensible'].include? warning_case
         hpxml, hpxml_bldg = _create_hpxml('base-zones-spaces.xml')
diff --git a/resources/hpxml-measures/ReportSimulationOutput/measure.rb b/resources/hpxml-measures/ReportSimulationOutput/measure.rb
index 6b00253802..03cf08c0c9 100644
--- a/resources/hpxml-measures/ReportSimulationOutput/measure.rb
+++ b/resources/hpxml-measures/ReportSimulationOutput/measure.rb
@@ -1869,7 +1869,8 @@ def report_timeseries_output_results(runner, outputs, timeseries_output_path, ar
       end
 
       # Write file
-      CSV.open(timeseries_output_path, 'wb') { |csv| data.to_a.each { |elem| csv << elem } }
+      # Note: We don't use the CSV library here because it's slow for large files
+      File.open(timeseries_output_path, 'wb') { |csv| data.to_a.each { |elem| csv << "#{elem.join(',')}\n" } }
     elsif ['json', 'msgpack'].include? args[:output_format]
       # Assemble data
       h = {}
diff --git a/resources/hpxml-measures/ReportSimulationOutput/measure.xml b/resources/hpxml-measures/ReportSimulationOutput/measure.xml
index 5b595ae85c..1a9c7d902d 100644
--- a/resources/hpxml-measures/ReportSimulationOutput/measure.xml
+++ b/resources/hpxml-measures/ReportSimulationOutput/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>report_simulation_output</name>
   <uid>df9d170c-c21a-4130-866d-0d46b06073fd</uid>
-  <version_id>22b3e453-eba9-432d-8e44-e0afdb46bb9e</version_id>
-  <version_modified>2024-08-21T16:00:15Z</version_modified>
+  <version_id>29a26cd3-0ea4-4c33-9d29-e80f2f58b8f5</version_id>
+  <version_modified>2024-09-26T04:59:04Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>ReportSimulationOutput</class_name>
   <display_name>HPXML Simulation Output Report</display_name>
@@ -1929,7 +1929,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>C4D35B1C</checksum>
+      <checksum>877A9DB3</checksum>
     </file>
     <file>
       <filename>test_report_sim_output.rb</filename>
diff --git a/resources/hpxml-measures/ReportUtilityBills/measure.rb b/resources/hpxml-measures/ReportUtilityBills/measure.rb
index c564a418a6..b1baf8317e 100644
--- a/resources/hpxml-measures/ReportUtilityBills/measure.rb
+++ b/resources/hpxml-measures/ReportUtilityBills/measure.rb
@@ -488,7 +488,8 @@ def report_monthly_output_results(runner, args, timestamps, monthly_data, monthl
         data = data.zip(*monthly_data)
 
         # Write file
-        CSV.open(monthly_output_path, 'wb') { |csv| data.to_a.each { |elem| csv << elem } }
+        # Note: We don't use the CSV library here because it's slow for large files
+        File.open(monthly_output_path, 'wb') { |csv| data.to_a.each { |elem| csv << "#{elem.join(',')}\n" } }
       elsif ['json', 'msgpack'].include? args[:output_format]
         h = {}
         h['Time'] = data[2..-1]
diff --git a/resources/hpxml-measures/ReportUtilityBills/measure.xml b/resources/hpxml-measures/ReportUtilityBills/measure.xml
index 8fe6f47907..1ac13ef931 100644
--- a/resources/hpxml-measures/ReportUtilityBills/measure.xml
+++ b/resources/hpxml-measures/ReportUtilityBills/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>report_utility_bills</name>
   <uid>ca88a425-e59a-4bc4-af51-c7e7d1e960fe</uid>
-  <version_id>057900e7-7e6b-4ea7-976a-3818a92bdde4</version_id>
-  <version_modified>2024-09-20T18:14:01Z</version_modified>
+  <version_id>dd47ff13-28e8-414a-abb6-940ee40e7c55</version_id>
+  <version_modified>2024-09-26T05:04:27Z</version_modified>
   <xml_checksum>15BF4E57</xml_checksum>
   <class_name>ReportUtilityBills</class_name>
   <display_name>Utility Bills Report</display_name>
@@ -180,7 +180,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>93B04330</checksum>
+      <checksum>CC656203</checksum>
     </file>
     <file>
       <filename>detailed_rates/Adams Electric Cooperative Inc - Rate Schedule T1 TOD (Effective 2013-02-01).json</filename>
diff --git a/resources/hpxml-measures/docs/source/workflow_inputs.rst b/resources/hpxml-measures/docs/source/workflow_inputs.rst
index 4e20770322..d1f1f07789 100644
--- a/resources/hpxml-measures/docs/source/workflow_inputs.rst
+++ b/resources/hpxml-measures/docs/source/workflow_inputs.rst
@@ -819,7 +819,7 @@ Additional inputs for ACCA Manual J design loads, used for sizing HVAC equipment
   ``HumidityDifference``             double    grains               No        See [#]_      Difference between absolute humidity of the outdoor/indoor air during the summer
   ``InternalLoadsSensible``          double    Btu/hr  >= 0         No        See [#]_      Sensible internal loads for cooling design load
   ``InternalLoadsLatent``            double    Btu/hr  >= 0         No        0             Latent internal loads for cooling design load
-  ``NumberofOccupants``              integer           >= 0         No        See [#]_      Number of occupants for cooling design load
+  ``NumberofOccupants``              double            >= 0         No        See [#]_      Number of occupants for cooling design load
   ``InfiltrationShieldingClass``     integer           >= 1, <= 5   No        See [#]_      Wind shielding class for infiltration design loads
   ``InfiltrationMethod``             string            See [#]_     No        See [#]_      Method to calculate infiltration design loads
   =================================  ========  ======  ===========  ========  ============  ============================================
@@ -900,7 +900,7 @@ Each space within a conditioned zone can be entered as a ``/HPXML/Building/Build
   ``FloorArea``                                          double   ft2      > 0          Yes                 Space floor area
   ``extension/ManualJInputs/InternalLoadsSensible``      double   Btu/hr   >= 0         No [#]_   See [#]_  Conditioned space sensible internal loads for cooling design load
   ``extension/ManualJInputs/InternalLoadsLatent``        double   Btu/hr   >= 0         No [#]_   See [#]_  Conditioned space latent internal loads for cooling design load
-  ``extension/ManualJInputs/NumberofOccupants``          integer           >= 0         No [#]_   See [#]_  Conditioned space number of occupants for cooling design load
+  ``extension/ManualJInputs/NumberofOccupants``          double            >= 0         No [#]_   See [#]_  Conditioned space number of occupants for cooling design load
   ``extension/ManualJInputs/FenestrationLoadProcedure``  string            See [#]_     No        standard  Conditioned space fenestration load procedure [#]_
   =====================================================  =======  =======  ===========  ========  ========  ==============================================
 
diff --git a/resources/hpxml-measures/workflow/hpxml_inputs.json b/resources/hpxml-measures/workflow/hpxml_inputs.json
index bc1fa56a95..1d2ad28866 100644
--- a/resources/hpxml-measures/workflow/hpxml_inputs.json
+++ b/resources/hpxml-measures/workflow/hpxml_inputs.json
@@ -3667,9 +3667,9 @@
     "permanent_spa_pump_annual_kwh": null,
     "permanent_spa_heater_annual_kwh": null
   },
-  "sample_files/base-residents-5.xml": {
+  "sample_files/base-residents-5-5.xml": {
     "parent_hpxml": "sample_files/base-misc-defaults.xml",
-    "geometry_unit_num_occupants": 5
+    "geometry_unit_num_occupants": 5.5
   },
   "sample_files/base-schedules-simple.xml": {
     "parent_hpxml": "sample_files/base.xml",
diff --git a/resources/hpxml-measures/workflow/sample_files/base-hvac-autosize-sizing-controls.xml b/resources/hpxml-measures/workflow/sample_files/base-hvac-autosize-sizing-controls.xml
index 6cdd5c7b9a..b3fc533d93 100644
--- a/resources/hpxml-measures/workflow/sample_files/base-hvac-autosize-sizing-controls.xml
+++ b/resources/hpxml-measures/workflow/sample_files/base-hvac-autosize-sizing-controls.xml
@@ -66,7 +66,7 @@
               <HumidityDifference>30.0</HumidityDifference>
               <InternalLoadsSensible>4000.0</InternalLoadsSensible>
               <InternalLoadsLatent>200.0</InternalLoadsLatent>
-              <NumberofOccupants>5</NumberofOccupants>
+              <NumberofOccupants>5.0</NumberofOccupants>
             </ManualJInputs>
           </HVACSizingControl>
         </extension>
diff --git a/resources/hpxml-measures/workflow/sample_files/base-residents-5.xml b/resources/hpxml-measures/workflow/sample_files/base-residents-5-5.xml
similarity index 99%
rename from resources/hpxml-measures/workflow/sample_files/base-residents-5.xml
rename to resources/hpxml-measures/workflow/sample_files/base-residents-5-5.xml
index 748aea7f73..1cc84862e4 100644
--- a/resources/hpxml-measures/workflow/sample_files/base-residents-5.xml
+++ b/resources/hpxml-measures/workflow/sample_files/base-residents-5-5.xml
@@ -32,7 +32,7 @@
           </FuelTypesAvailable>
         </Site>
         <BuildingOccupancy>
-          <NumberofResidents>5.0</NumberofResidents>
+          <NumberofResidents>5.5</NumberofResidents>
         </BuildingOccupancy>
         <BuildingConstruction>
           <ResidentialFacilityType>single-family detached</ResidentialFacilityType>
diff --git a/resources/hpxml-measures/workflow/tests/ACCA_Examples/Long_Residence.xml b/resources/hpxml-measures/workflow/tests/ACCA_Examples/Long_Residence.xml
index 663911ecac..0f0853a79e 100644
--- a/resources/hpxml-measures/workflow/tests/ACCA_Examples/Long_Residence.xml
+++ b/resources/hpxml-measures/workflow/tests/ACCA_Examples/Long_Residence.xml
@@ -46,7 +46,7 @@
               <HumidityDifference>40.0</HumidityDifference>
               <InternalLoadsSensible>2400.0</InternalLoadsSensible>
               <InternalLoadsLatent>0.0</InternalLoadsLatent>
-              <NumberofOccupants>4</NumberofOccupants>
+              <NumberofOccupants>4.0</NumberofOccupants>
             </ManualJInputs>
           </HVACSizingControl>
         </extension>
diff --git a/resources/hpxml-measures/workflow/tests/ACCA_Examples/Vatilo_Residence.xml b/resources/hpxml-measures/workflow/tests/ACCA_Examples/Vatilo_Residence.xml
index 9a51c3e9f2..04e23c6e9f 100644
--- a/resources/hpxml-measures/workflow/tests/ACCA_Examples/Vatilo_Residence.xml
+++ b/resources/hpxml-measures/workflow/tests/ACCA_Examples/Vatilo_Residence.xml
@@ -50,7 +50,7 @@
               <HumidityDifference>51.0</HumidityDifference>
               <InternalLoadsSensible>1200.0</InternalLoadsSensible>
               <InternalLoadsLatent>0.0</InternalLoadsLatent>
-              <NumberofOccupants>3</NumberofOccupants>
+              <NumberofOccupants>3.0</NumberofOccupants>
             </ManualJInputs>
           </HVACSizingControl>
         </extension>
diff --git a/resources/hpxml-measures/workflow/tests/ACCA_Examples/Victor_Residence.xml b/resources/hpxml-measures/workflow/tests/ACCA_Examples/Victor_Residence.xml
index af08c37567..0ebe1d7cd2 100644
--- a/resources/hpxml-measures/workflow/tests/ACCA_Examples/Victor_Residence.xml
+++ b/resources/hpxml-measures/workflow/tests/ACCA_Examples/Victor_Residence.xml
@@ -46,7 +46,7 @@
               <HumidityDifference>45.0</HumidityDifference>
               <InternalLoadsSensible>2400.0</InternalLoadsSensible>
               <InternalLoadsLatent>0.0</InternalLoadsLatent>
-              <NumberofOccupants>4</NumberofOccupants>
+              <NumberofOccupants>4.0</NumberofOccupants>
             </ManualJInputs>
           </HVACSizingControl>
         </extension>
diff --git a/resources/hpxml-measures/workflow/tests/base_results/results_simulations_bills.csv b/resources/hpxml-measures/workflow/tests/base_results/results_simulations_bills.csv
index 63ac2b2436..1d51651d2f 100644
--- a/resources/hpxml-measures/workflow/tests/base_results/results_simulations_bills.csv
+++ b/resources/hpxml-measures/workflow/tests/base_results/results_simulations_bills.csv
@@ -405,7 +405,7 @@ base-residents-0.xml,915.08,144.0,268.02,0.0,412.02,144.0,359.06,503.06,0.0,0.0,
 base-residents-1-misc-loads-large-uncommon.xml,2674.4,144.0,1817.12,0.0,1961.12,144.0,443.44,587.44,0.0,0.0,0.0,0.0,67.32,67.32,0.0,58.52,58.52,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-residents-1-misc-loads-large-uncommon2.xml,2404.08,144.0,1731.61,0.0,1875.61,144.0,254.61,398.61,0.0,71.34,71.34,0.0,0.0,0.0,0.0,0.0,0.0,0.0,58.52,58.52,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-residents-1.xml,1541.45,144.0,980.64,0.0,1124.64,144.0,272.81,416.81,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-residents-5.xml,1394.06,144.0,1501.62,-737.14,908.49,144.0,341.57,485.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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-residents-5-5.xml,1474.44,144.0,1588.0,-737.14,994.86,144.0,335.58,479.58,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-schedules-detailed-all-10-mins.xml,1847.64,144.0,1312.81,0.0,1456.81,144.0,246.83,390.83,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-schedules-detailed-mixed-timesteps-power-outage.xml,1368.69,144.0,1028.77,0.0,1172.77,144.0,51.92,195.92,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-schedules-detailed-mixed-timesteps.xml,1608.5,144.0,1235.16,0.0,1379.16,144.0,85.34,229.34,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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/resources/hpxml-measures/workflow/tests/base_results/results_simulations_energy.csv b/resources/hpxml-measures/workflow/tests/base_results/results_simulations_energy.csv
index bde0bd8889..31adeac04f 100644
--- a/resources/hpxml-measures/workflow/tests/base_results/results_simulations_energy.csv
+++ b/resources/hpxml-measures/workflow/tests/base_results/results_simulations_energy.csv
@@ -405,7 +405,7 @@ base-residents-0.xml,41.664,41.664,7.363,7.363,34.301,0.0,0.0,0.0,0.0,0.0,0.0,0.
 base-residents-1-misc-loads-large-uncommon.xml,99.944,99.944,49.922,49.922,42.362,0.0,2.527,5.133,0.0,0.0,0.0,0.565,0.0,0.0,4.562,0.695,3.75,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,4.293,1.024,0.0,0.2,0.221,0.917,1.115,0.0,2.007,6.55,5.687,1.15,0.0,6.508,2.937,2.899,0.0,0.0,0.0,22.778,0.0,0.0,0.0,0.0,0.0,18.039,0.0,0.0,1.544,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2.527,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.133,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-residents-1-misc-loads-large-uncommon2.xml,79.555,79.555,47.572,47.572,24.322,2.527,0.0,0.0,5.133,0.0,0.0,0.565,0.0,0.0,4.562,0.695,3.75,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,4.293,1.024,0.0,0.2,0.221,0.917,1.115,0.0,2.007,6.55,5.687,1.15,0.0,6.508,0.587,2.899,0.0,0.0,0.0,22.778,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.544,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2.527,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.133,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-residents-1.xml,53.002,53.002,26.941,26.941,26.061,0.0,0.0,0.0,0.0,0.0,0.0,0.647,0.0,0.0,4.03,0.593,3.753,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.067,0.0,0.0,0.2,0.221,0.917,1.115,0.0,2.007,6.55,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,26.061,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-residents-5.xml,73.884,53.632,41.254,21.003,32.63,0.0,0.0,0.0,0.0,0.0,0.0,0.81,0.0,0.0,2.637,0.326,6.787,0.0,0.326,4.507,0.0,0.334,1.139,0.0,0.0,1.173,2.163,0.0,0.0,0.558,0.477,3.545,2.222,0.745,3.265,9.851,0.0,0.0,0.0,0.0,0.0,0.0,-20.251,0.0,0.39,32.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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-residents-5-5.xml,75.685,55.433,43.627,23.376,32.058,0.0,0.0,0.0,0.0,0.0,0.0,0.795,0.0,0.0,2.681,0.334,8.12,0.0,0.328,4.507,0.0,0.334,1.139,0.0,0.0,1.182,2.164,0.0,0.0,0.593,0.511,3.798,2.36,0.745,3.423,10.263,0.0,0.0,0.0,0.0,0.0,0.0,-20.251,0.0,0.351,32.058,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-schedules-detailed-all-10-mins.xml,59.646,59.646,36.067,36.067,23.579,0.0,0.0,0.0,0.0,0.0,0.0,0.585,0.0,0.0,4.619,0.698,9.023,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.073,0.0,0.0,0.319,0.365,1.513,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,23.579,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-schedules-detailed-mixed-timesteps-power-outage.xml,33.223,33.223,28.263,28.263,4.96,0.0,0.0,0.0,0.0,0.0,0.0,0.123,0.0,0.0,3.201,0.431,7.327,0.0,0.0,3.619,0.0,0.267,0.0,0.0,0.0,0.0,1.687,0.0,0.0,0.267,0.304,1.259,1.258,0.0,1.714,6.807,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.96,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-schedules-detailed-mixed-timesteps.xml,42.086,42.086,33.933,33.933,8.153,0.0,0.0,0.0,0.0,0.0,0.0,0.202,0.0,0.0,3.214,0.433,9.054,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,1.962,0.0,0.0,0.319,0.365,1.513,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,8.153,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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/resources/hpxml-measures/workflow/tests/base_results/results_simulations_hvac.csv b/resources/hpxml-measures/workflow/tests/base_results/results_simulations_hvac.csv
index fc2c207e3b..b06ca22d42 100644
--- a/resources/hpxml-measures/workflow/tests/base_results/results_simulations_hvac.csv
+++ b/resources/hpxml-measures/workflow/tests/base_results/results_simulations_hvac.csv
@@ -405,7 +405,7 @@ base-residents-0.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575
 base-residents-1-misc-loads-large-uncommon.xml,6.8,91.76,36000.0,24000.0,0.0,33431.0,8742.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,5779.0,0.0,0.0,21277.0,6150.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,4520.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-residents-1-misc-loads-large-uncommon2.xml,6.8,91.76,36000.0,24000.0,0.0,33431.0,8742.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,5779.0,0.0,0.0,21277.0,6150.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,4520.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-residents-1.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
-base-residents-5.xml,6.8,91.76,36000.0,24000.0,0.0,32173.0,4674.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,8590.0,0.0,0.0,17176.0,1061.0,7758.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,1860.0,0.0,3550.0,0.0,0.0,-975.0,0.0,-1975.0,0.0,1000.0
+base-residents-5-5.xml,6.8,91.76,36000.0,24000.0,0.0,32173.0,4674.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,8590.0,0.0,0.0,17298.0,1068.0,7758.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,1860.0,0.0,3665.0,0.0,0.0,-875.0,0.0,-1975.0,0.0,1100.0
 base-schedules-detailed-all-10-mins.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-schedules-detailed-mixed-timesteps-power-outage.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-schedules-detailed-mixed-timesteps.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
diff --git a/resources/hpxml-measures/workflow/tests/base_results/results_simulations_loads.csv b/resources/hpxml-measures/workflow/tests/base_results/results_simulations_loads.csv
index 9c810d0e16..245f07deba 100644
--- a/resources/hpxml-measures/workflow/tests/base_results/results_simulations_loads.csv
+++ b/resources/hpxml-measures/workflow/tests/base_results/results_simulations_loads.csv
@@ -405,7 +405,7 @@ base-residents-0.xml,32.415,0.0,10.561,0.0,0.62,0.0,0.0,0.0,3.761,3.912,0.547,7.
 base-residents-1-misc-loads-large-uncommon.xml,21.521,0.0,14.588,3.416,0.614,0.0,0.0,0.0,3.822,3.877,0.545,7.617,0.681,10.741,-13.465,0.0,0.0,0.0,8.416,-0.111,5.233,0.0,0.766,0.0,5.114,-9.432,-2.643,0.0,-0.024,-0.232,-0.02,2.761,0.024,-0.764,10.948,0.0,0.0,0.0,-6.251,-0.107,-0.887,-4.03,-0.122,0.0,3.256,8.291,1.864
 base-residents-1-misc-loads-large-uncommon2.xml,21.521,0.0,14.588,3.416,0.614,0.0,0.0,0.0,3.822,3.877,0.545,7.617,0.681,10.741,-13.465,0.0,0.0,0.0,8.416,-0.111,5.233,0.0,0.766,0.0,5.114,-9.432,-2.643,0.0,-0.024,-0.232,-0.02,2.761,0.024,-0.764,10.948,0.0,0.0,0.0,-6.251,-0.107,-0.887,-4.03,-0.122,0.0,3.256,8.291,1.864
 base-residents-1.xml,24.625,0.0,12.438,3.416,0.617,0.0,0.0,0.0,3.829,3.91,0.549,7.497,0.689,10.866,-13.807,0.0,0.0,0.0,8.308,-0.14,5.324,0.0,0.776,0.0,5.779,-6.597,-2.713,0.0,0.121,-0.11,-0.003,2.905,0.054,-0.377,10.606,0.0,0.0,0.0,-5.981,-0.136,-0.759,-3.634,-0.102,0.0,2.868,5.311,1.794
-base-residents-5.xml,30.814,0.0,6.482,18.008,0.645,0.0,11.874,0.0,4.271,4.01,0.562,7.385,0.723,11.374,-14.146,0.0,0.0,0.0,8.358,-0.266,2.392,0.0,16.811,0.0,3.539,-11.749,-2.82,0.0,0.503,0.15,0.033,3.257,0.128,1.307,12.031,0.0,0.0,0.0,-5.319,-0.263,-0.059,0.0,-2.054,-14.688,0.657,9.204,1.687
+base-residents-5-5.xml,30.273,0.0,6.634,19.692,0.642,0.0,12.223,0.0,4.268,4.009,0.562,7.405,0.724,11.371,-14.071,0.0,0.0,0.0,8.358,-0.265,2.379,0.0,16.785,0.0,3.479,-12.287,-2.81,0.0,0.492,0.139,0.032,3.247,0.126,1.273,12.107,0.0,0.0,0.0,-5.362,-0.261,-0.062,0.0,-2.103,-14.936,0.672,9.674,1.698
 base-schedules-detailed-all-10-mins.xml,22.277,0.0,14.405,9.053,0.639,0.0,0.0,0.0,3.853,3.926,0.552,7.665,0.697,10.89,-13.527,0.0,0.0,0.0,8.387,-0.096,5.738,0.0,0.813,0.0,5.316,-9.591,-2.673,0.0,0.046,-0.205,-0.017,2.835,0.029,-0.654,10.826,0.0,0.0,0.0,-6.168,-0.091,-0.911,-3.756,-0.146,0.0,3.366,7.54,1.836
 base-schedules-detailed-mixed-timesteps-power-outage.xml,4.688,0.0,8.963,7.3,0.563,0.0,0.0,0.0,2.703,2.543,0.355,4.288,0.355,6.718,-13.045,0.0,0.0,0.0,3.932,-0.083,3.532,0.0,0.427,0.0,1.074,-6.689,-1.691,0.0,-0.15,-0.439,-0.05,2.559,-0.026,-1.348,11.313,0.0,0.0,0.0,-7.072,-0.038,-1.168,-6.399,-0.172,0.0,2.194,7.967,1.928
 base-schedules-detailed-mixed-timesteps.xml,7.702,0.0,9.01,9.053,0.673,0.0,0.0,0.0,3.005,2.897,0.405,5.414,0.442,7.764,-13.035,0.0,0.0,0.0,5.769,-0.039,4.019,0.0,0.626,0.0,1.815,-9.083,-2.581,0.0,-0.153,-0.441,-0.05,2.563,-0.027,-1.356,11.319,0.0,0.0,0.0,-7.016,-0.037,-1.171,-6.417,-0.172,0.0,2.203,7.971,1.929
diff --git a/resources/hpxml-measures/workflow/tests/base_results/results_simulations_misc.csv b/resources/hpxml-measures/workflow/tests/base_results/results_simulations_misc.csv
index bf3f2988c7..f3d136db0d 100644
--- a/resources/hpxml-measures/workflow/tests/base_results/results_simulations_misc.csv
+++ b/resources/hpxml-measures/workflow/tests/base_results/results_simulations_misc.csv
@@ -405,7 +405,7 @@ base-residents-0.xml,0.0,0.0,0.0,0.0,0.0,0.0,609.5,1840.9,1840.9,25.712,14.806,0
 base-residents-1-misc-loads-large-uncommon.xml,0.0,0.0,821.3,625.4,3446.7,1167.8,2380.2,4185.6,4185.6,23.647,19.133,0.0
 base-residents-1-misc-loads-large-uncommon2.xml,0.0,0.0,821.3,625.4,3446.7,1167.8,2242.4,4045.5,4045.5,23.647,19.133,0.0
 base-residents-1.xml,0.0,0.0,821.3,625.4,3446.7,1167.8,1598.5,3242.6,3242.6,24.263,17.862,0.0
-base-residents-5.xml,0.0,0.0,2270.6,1965.3,21614.0,5415.7,3020.1,3655.9,3655.9,27.775,17.624,1.745
+base-residents-5-5.xml,0.0,0.0,2432.5,2087.7,23981.6,5810.6,3127.7,3738.2,3738.2,27.637,17.835,1.509
 base-schedules-detailed-all-10-mins.xml,0.333,0.833,1354.7,998.0,11252.4,2582.1,9419.9,11054.3,11054.3,37.577,21.976,0.0
 base-schedules-detailed-mixed-timesteps-power-outage.xml,1.667,0.0,1141.2,883.5,9207.2,2112.8,9366.2,10786.7,10786.7,47.12,21.538,0.0
 base-schedules-detailed-mixed-timesteps.xml,0.0,0.0,1354.7,998.0,11253.7,2582.4,9360.3,10789.8,10789.8,34.057,21.541,0.0