urbanopt-cli 0.10.0 → 0.11.0

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb

@@ -1,3 +1,8 @@
+# *********************************************************************************
+# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://github.com/urbanopt/urbanopt-cli/blob/develop/LICENSE.md
+# *********************************************************************************
+
 # frozen_string_literal: true
 
 require_relative '../resources/minitest_helper'
@@ -9,7 +14,7 @@ require 'csv'
 require_relative '../resources/xmlhelper.rb'
 require_relative '../resources/xmlvalidator.rb'
 
-class HPXMLtoOpenStudioValidationTest < MiniTest::Test
+class HPXMLtoOpenStudioValidationTest < Minitest::Test
   def setup
     OpenStudio::Logger.instance.standardOutLogger.setLogLevel(OpenStudio::Fatal)
 
@@ -76,8 +81,8 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
                             'clothes-dryer-location' => ['A location is specified as "garage" but no surfaces were found adjacent to this space type.'],
                             'clothes-washer-location' => ['A location is specified as "garage" but no surfaces were found adjacent to this space type.'],
                             'cooking-range-location' => ['A location is specified as "garage" but no surfaces were found adjacent to this space type.'],
-                            'dehumidifier-fraction-served' => ['Expected sum(FractionDehumidificationLoadServed) to be less than or equal to 1 [context: /HPXML/Building/BuildingDetails]'],
-                            'dhw-frac-load-served' => ['Expected sum(FractionDHWLoadServed) to be 1 [context: /HPXML/Building/BuildingDetails]'],
+                            'dehumidifier-fraction-served' => ['Expected sum(FractionDehumidificationLoadServed) to be less than or equal to 1 [context: /HPXML/Building/BuildingDetails, id: "MyBuilding"]'],
+                            'dhw-frac-load-served' => ['Expected sum(FractionDHWLoadServed) to be 1 [context: /HPXML/Building/BuildingDetails, id: "MyBuilding"]'],
                             'dhw-invalid-ef-tank' => ['Expected EnergyFactor to be less than 1 [context: /HPXML/Building/BuildingDetails/Systems/WaterHeating/WaterHeatingSystem[WaterHeaterType="storage water heater"], id: "WaterHeatingSystem1"]'],
                             'dhw-invalid-uef-tank-heat-pump' => ['Expected UniformEnergyFactor to be greater than 1 [context: /HPXML/Building/BuildingDetails/Systems/WaterHeating/WaterHeatingSystem[WaterHeaterType="heat pump water heater"], id: "WaterHeatingSystem1"]'],
                             'dishwasher-location' => ['A location is specified as "garage" but no surfaces were found adjacent to this space type.'],
@@ -85,22 +90,22 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
                             'duct-leakage-cfm50' => ['Expected Value to be greater than or equal to 0 [context: /HPXML/Building/BuildingDetails/Systems/HVAC/HVACDistribution/DistributionSystemType/AirDistribution/DuctLeakageMeasurement/DuctLeakage[Units="CFM25" or Units="CFM50"], id: "HVACDistribution1"]'],
                             'duct-leakage-percent' => ['Expected Value to be less than 1 [context: /HPXML/Building/BuildingDetails/Systems/HVAC/HVACDistribution/DistributionSystemType/AirDistribution/DuctLeakageMeasurement/DuctLeakage[Units="Percent"], id: "HVACDistribution1"]'],
                             'duct-location' => ['A location is specified as "garage" but no surfaces were found adjacent to this space type.'],
-                            'duct-location-unconditioned-space' => ["Expected DuctLocation to be 'living space' or 'basement - conditioned' or 'basement - unconditioned' or 'crawlspace - vented' or 'crawlspace - unvented' or 'crawlspace - conditioned' or 'attic - vented' or 'attic - unvented' or 'garage' or 'exterior wall' or 'under slab' or 'roof deck' or 'outside' or 'other housing unit' or 'other heated space' or 'other multifamily buffer space' or 'other non-freezing space' [context: /HPXML/Building/BuildingDetails/Systems/HVAC/HVACDistribution/DistributionSystemType/AirDistribution/Ducts, id: \"Ducts1\"]",
-                                                                    "Expected DuctLocation to be 'living space' or 'basement - conditioned' or 'basement - unconditioned' or 'crawlspace - vented' or 'crawlspace - unvented' or 'crawlspace - conditioned' or 'attic - vented' or 'attic - unvented' or 'garage' or 'exterior wall' or 'under slab' or 'roof deck' or 'outside' or 'other housing unit' or 'other heated space' or 'other multifamily buffer space' or 'other non-freezing space' [context: /HPXML/Building/BuildingDetails/Systems/HVAC/HVACDistribution/DistributionSystemType/AirDistribution/Ducts, id: \"Ducts2\"]"],
+                            'duct-location-unconditioned-space' => ["Expected DuctLocation to be 'conditioned space' or 'basement - conditioned' or 'basement - unconditioned' or 'crawlspace - vented' or 'crawlspace - unvented' or 'crawlspace - conditioned' or 'attic - vented' or 'attic - unvented' or 'garage' or 'exterior wall' or 'under slab' or 'roof deck' or 'outside' or 'other housing unit' or 'other heated space' or 'other multifamily buffer space' or 'other non-freezing space' or 'manufactured home belly' [context: /HPXML/Building/BuildingDetails/Systems/HVAC/HVACDistribution/DistributionSystemType/AirDistribution/Ducts, id: \"Ducts1\"]",
+                                                                    "Expected DuctLocation to be 'conditioned space' or 'basement - conditioned' or 'basement - unconditioned' or 'crawlspace - vented' or 'crawlspace - unvented' or 'crawlspace - conditioned' or 'attic - vented' or 'attic - unvented' or 'garage' or 'exterior wall' or 'under slab' or 'roof deck' or 'outside' or 'other housing unit' or 'other heated space' or 'other multifamily buffer space' or 'other non-freezing space' or 'manufactured home belly' [context: /HPXML/Building/BuildingDetails/Systems/HVAC/HVACDistribution/DistributionSystemType/AirDistribution/Ducts, id: \"Ducts2\"]"],
                             'emissions-electricity-schedule' => ['Expected NumberofHeaderRows to be greater than or equal to 0',
                                                                  'Expected ColumnNumber to be greater than or equal to 1'],
-                            'enclosure-attic-missing-roof' => ['There must be at least one roof adjacent to "attic - unvented". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="attic - unvented" or ExteriorAdjacentTo="attic - unvented"]]]'],
-                            'enclosure-basement-missing-exterior-foundation-wall' => ['There must be at least one exterior foundation wall adjacent to "basement - unconditioned". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="basement - unconditioned" or ExteriorAdjacentTo="basement - unconditioned"]]]'],
-                            'enclosure-basement-missing-slab' => ['There must be at least one slab adjacent to "basement - unconditioned". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="basement - unconditioned" or ExteriorAdjacentTo="basement - unconditioned"]]]'],
-                            'enclosure-floor-area-exceeds-cfa' => ['Expected ConditionedFloorArea to be greater than or equal to the sum of conditioned slab/floor areas. [context: /HPXML/Building/BuildingDetails/BuildingSummary/BuildingConstruction]'],
-                            'enclosure-floor-area-exceeds-cfa2' => ['Expected ConditionedFloorArea to be greater than or equal to the sum of conditioned slab/floor areas. [context: /HPXML/Building/BuildingDetails/BuildingSummary/BuildingConstruction]'],
-                            'enclosure-garage-missing-exterior-wall' => ['There must be at least one exterior wall/foundation wall adjacent to "garage". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="garage" or ExteriorAdjacentTo="garage"]]]'],
-                            'enclosure-garage-missing-roof-ceiling' => ['There must be at least one roof/ceiling adjacent to "garage". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="garage" or ExteriorAdjacentTo="garage"]]]'],
-                            'enclosure-garage-missing-slab' => ['There must be at least one slab adjacent to "garage". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="garage" or ExteriorAdjacentTo="garage"]]]'],
-                            'enclosure-living-missing-ceiling-roof' => ['There must be at least one ceiling/roof adjacent to conditioned space. [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="living space"]]]',
-                                                                        'There must be at least one floor adjacent to "attic - unvented". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="attic - unvented" or ExteriorAdjacentTo="attic - unvented"]]]'],
-                            'enclosure-living-missing-exterior-wall' => ['There must be at least one exterior wall adjacent to conditioned space. [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="living space"]]]'],
-                            'enclosure-living-missing-floor-slab' => ['There must be at least one floor/slab adjacent to conditioned space. [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="living space"]]]'],
+                            'enclosure-attic-missing-roof' => ['There must be at least one roof adjacent to "attic - unvented". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="attic - unvented" or ExteriorAdjacentTo="attic - unvented"]], id: "MyBuilding"]'],
+                            'enclosure-basement-missing-exterior-foundation-wall' => ['There must be at least one exterior wall or foundation wall adjacent to "basement - unconditioned". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="basement - unconditioned" or ExteriorAdjacentTo="basement - unconditioned"]], id: "MyBuilding"]'],
+                            'enclosure-basement-missing-slab' => ['There must be at least one slab adjacent to "basement - unconditioned". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="basement - unconditioned" or ExteriorAdjacentTo="basement - unconditioned"]], id: "MyBuilding"]'],
+                            'enclosure-floor-area-exceeds-cfa' => ['Expected ConditionedFloorArea to be greater than or equal to the sum of conditioned slab/floor areas. [context: /HPXML/Building/BuildingDetails/BuildingSummary/BuildingConstruction, id: "MyBuilding"]'],
+                            'enclosure-floor-area-exceeds-cfa2' => ['Expected ConditionedFloorArea to be greater than or equal to the sum of conditioned slab/floor areas. [context: /HPXML/Building/BuildingDetails/BuildingSummary/BuildingConstruction, id: "MyBuilding"]'],
+                            'enclosure-garage-missing-exterior-wall' => ['There must be at least one exterior wall or foundation wall adjacent to "garage". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="garage" or ExteriorAdjacentTo="garage"]], id: "MyBuilding"]'],
+                            'enclosure-garage-missing-roof-ceiling' => ['There must be at least one roof or ceiling adjacent to "garage". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="garage" or ExteriorAdjacentTo="garage"]], id: "MyBuilding"]'],
+                            'enclosure-garage-missing-slab' => ['There must be at least one slab adjacent to "garage". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="garage" or ExteriorAdjacentTo="garage"]], id: "MyBuilding"]'],
+                            'enclosure-conditioned-missing-ceiling-roof' => ['There must be at least one ceiling or roof adjacent to conditioned space. [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="conditioned space"]], id: "MyBuilding"]',
+                                                                             'There must be at least one floor adjacent to "attic - unvented". [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="attic - unvented" or ExteriorAdjacentTo="attic - unvented"]], id: "MyBuilding"]'],
+                            'enclosure-conditioned-missing-exterior-wall' => ['There must be at least one exterior wall adjacent to conditioned space. [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="conditioned space"]], id: "MyBuilding"]'],
+                            'enclosure-conditioned-missing-floor-slab' => ['There must be at least one floor or slab adjacent to conditioned space. [context: /HPXML/Building/BuildingDetails/Enclosure[*/*[InteriorAdjacentTo="conditioned space"]], id: "MyBuilding"]'],
                             'frac-sensible-fuel-load' => ['Expected extension/FracSensible to be greater than or equal to 0 [context: /HPXML/Building/BuildingDetails/MiscLoads/FuelLoad[FuelLoadType="grill" or FuelLoadType="lighting" or FuelLoadType="fireplace"], id: "FuelLoad1"]'],
                             'frac-sensible-plug-load' => ['Expected extension/FracSensible to be greater than or equal to 0 [context: /HPXML/Building/BuildingDetails/MiscLoads/PlugLoad[PlugLoadType="other" or PlugLoadType="TV other" or PlugLoadType="electric vehicle charging" or PlugLoadType="well pump"], id: "PlugLoad1"]'],
                             'frac-total-fuel-load' => ['Expected sum of extension/FracSensible and extension/FracLatent to be less than or equal to 1 [context: /HPXML/Building/BuildingDetails/MiscLoads/FuelLoad[FuelLoadType="grill" or FuelLoadType="lighting" or FuelLoadType="fireplace"], id: "FuelLoad1"]'],
@@ -109,14 +114,18 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
                             'generator-number-of-bedrooms-served' => ['Expected NumberofBedroomsServed to be greater than ../../../../BuildingSummary/BuildingConstruction/NumberofBedrooms [context: /HPXML/Building/BuildingDetails/Systems/extension/Generators/Generator[IsSharedSystem="true"], id: "Generator1"]'],
                             'generator-output-greater-than-consumption' => ['Expected AnnualConsumptionkBtu to be greater than AnnualOutputkWh*3412 [context: /HPXML/Building/BuildingDetails/Systems/extension/Generators/Generator, id: "Generator1"]'],
                             'heat-pump-capacity-17f' => ['Expected HeatingCapacity17F to be less than or equal to HeatingCapacity'],
-                            'heat-pump-lockout-temperatures' => ['Expected CompressorLockoutTemperature to be less than BackupHeatingLockoutTemperature'],
-                            'heat-pump-multiple-backup-systems' => ['Expected 0 or 1 element(s) for xpath: HeatPump/BackupSystem [context: /HPXML/Building/BuildingDetails]'],
+                            'heat-pump-lockout-temperatures' => ['Expected CompressorLockoutTemperature to be less than or equal to BackupHeatingLockoutTemperature'],
+                            'heat-pump-multiple-backup-systems' => ['Expected 0 or 1 element(s) for xpath: HeatPump/BackupSystem [context: /HPXML/Building/BuildingDetails, id: "MyBuilding"]'],
+                            'hvac-detailed-performance-not-variable-speed' => ['Expected 1 element(s) for xpath: ../CompressorType[text()="variable speed"]',
+                                                                               'Expected 1 element(s) for xpath: ../CompressorType[text()="variable speed"]'],
                             'hvac-distribution-return-duct-leakage-missing' => ['Expected 1 element(s) for xpath: DuctLeakageMeasurement[DuctType="return"]/DuctLeakage[(Units="CFM25" or Units="CFM50" or Units="Percent") and TotalOrToOutside="to outside"] [context: /HPXML/Building/BuildingDetails/Systems/HVAC/HVACDistribution/DistributionSystemType/AirDistribution[AirDistributionType[text()="regular velocity" or text()="gravity"]], id: "HVACDistribution1"]'],
-                            'hvac-frac-load-served' => ['Expected sum(FractionHeatLoadServed) to be less than or equal to 1 [context: /HPXML/Building/BuildingDetails]',
-                                                        'Expected sum(FractionCoolLoadServed) to be less than or equal to 1 [context: /HPXML/Building/BuildingDetails]'],
+                            'hvac-frac-load-served' => ['Expected sum(FractionHeatLoadServed) to be less than or equal to 1 [context: /HPXML/Building/BuildingDetails, id: "MyBuilding"]',
+                                                        'Expected sum(FractionCoolLoadServed) to be less than or equal to 1 [context: /HPXML/Building/BuildingDetails, id: "MyBuilding"]'],
                             'hvac-location-heating-system' => ['A location is specified as "basement - unconditioned" but no surfaces were found adjacent to this space type.'],
                             'hvac-location-cooling-system' => ['A location is specified as "basement - unconditioned" but no surfaces were found adjacent to this space type.'],
                             'hvac-location-heat-pump' => ['A location is specified as "basement - unconditioned" but no surfaces were found adjacent to this space type.'],
+                            'hvac-msac-not-var-speed' => ["Expected CompressorType to be 'variable speed'"],
+                            'hvac-mshp-not-var-speed' => ["Expected CompressorType to be 'variable speed'"],
                             'hvac-sizing-humidity-setpoint' => ['Expected ManualJInputs/HumiditySetpoint to be less than 1'],
                             'hvac-negative-crankcase-heater-watts' => ['Expected extension/CrankcaseHeaterPowerWatts to be greater than or equal to 0.0.'],
                             'incomplete-integrated-heating' => ['Expected 1 element(s) for xpath: IntegratedHeatingSystemFractionHeatLoadServed'],
@@ -175,7 +184,7 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
                             'invalid-natvent-availability' => ['Expected extension/NaturalVentilationAvailabilityDaysperWeek to be less than or equal to 7'],
                             'invalid-natvent-availability2' => ['Expected extension/NaturalVentilationAvailabilityDaysperWeek to be greater than or equal to 0'],
                             'invalid-number-of-bedrooms-served' => ['Expected extension/NumberofBedroomsServed to be greater than ../../../BuildingSummary/BuildingConstruction/NumberofBedrooms [context: /HPXML/Building/BuildingDetails/Systems/Photovoltaics/PVSystem[IsSharedSystem="true"], id: "PVSystem1"]'],
-                            'invalid-number-of-conditioned-floors' => ['Expected NumberofConditionedFloors to be greater than or equal to NumberofConditionedFloorsAboveGrade [context: /HPXML/Building/BuildingDetails/BuildingSummary/BuildingConstruction]'],
+                            'invalid-number-of-conditioned-floors' => ['Expected NumberofConditionedFloors to be greater than or equal to NumberofConditionedFloorsAboveGrade [context: /HPXML/Building/BuildingDetails/BuildingSummary/BuildingConstruction, id: "MyBuilding"]'],
                             'invalid-number-of-units-served' => ['Expected NumberofUnitsServed to be greater than 1 [context: /HPXML/Building/BuildingDetails/Systems/WaterHeating/WaterHeatingSystem[IsSharedSystem="true"], id: "WaterHeatingSystem1"]'],
                             'invalid-pilot-light-heating-system' => ['Expected 1 element(s) for xpath: ../../HeatingSystemFuel[text()!="electricity"]'],
                             'invalid-shared-vent-in-unit-flowrate' => ['Expected RatedFlowRate to be greater than extension/InUnitFlowRate [context: /HPXML/Building/BuildingDetails/Systems/MechanicalVentilation/VentilationFans/VentilationFan[UsedForWholeBuildingVentilation="true" and IsSharedSystem="true"], id: "VentilationFan1"]'],
@@ -186,13 +195,22 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
                             'invalid-ventilation-recovery' => ['Expected 0 element(s) for xpath: TotalRecoveryEfficiency | AdjustedTotalRecoveryEfficiency',
                                                                'Expected 0 element(s) for xpath: SensibleRecoveryEfficiency | AdjustedSensibleRecoveryEfficiency'],
                             'invalid-window-height' => ['Expected DistanceToBottomOfWindow to be greater than DistanceToTopOfWindow [context: /HPXML/Building/BuildingDetails/Enclosure/Windows/Window/Overhangs[number(Depth) > 0], id: "Window2"]'],
-                            'lighting-fractions' => ['Expected sum(LightingGroup/FractionofUnitsInLocation) for Location="interior" to be less than or equal to 1 [context: /HPXML/Building/BuildingDetails/Lighting]'],
+                            'lighting-fractions' => ['Expected sum(LightingGroup/FractionofUnitsInLocation) for Location="interior" to be less than or equal to 1 [context: /HPXML/Building/BuildingDetails/Lighting, id: "MyBuilding"]'],
+                            'manufactured-home-reference-duct' => ['There are references to "manufactured home belly" or "manufactured home underbelly" but ResidentialFacilityType is not "manufactured home".',
+                                                                   'A location is specified as "manufactured home belly" but no surfaces were found adjacent to the "manufactured home underbelly" space type.'],
+                            'manufactured-home-reference-water-heater' => ['There are references to "manufactured home belly" or "manufactured home underbelly" but ResidentialFacilityType is not "manufactured home".',
+                                                                           'A location is specified as "manufactured home belly" but no surfaces were found adjacent to the "manufactured home underbelly" space type.',
+                                                                           "Expected Location to be 'conditioned space' or 'basement - unconditioned' or 'basement - conditioned' or 'attic - unvented' or 'attic - vented' or 'garage' or 'crawlspace - unvented' or 'crawlspace - vented' or 'crawlspace - conditioned' or 'other exterior' or 'other housing unit' or 'other heated space' or 'other multifamily buffer space' or 'other non-freezing space'"],
+                            'manufactured-home-reference-floor' => ['There are references to "manufactured home belly" or "manufactured home underbelly" but ResidentialFacilityType is not "manufactured home".',
+                                                                    'There must be at least one ceiling adjacent to "crawlspace - vented".'],
+                            'missing-capacity-detailed-performance' => ['Expected 1 element(s) for xpath: ../CoolingCapacity',
+                                                                        'Expected 1 element(s) for xpath: ../HeatingCapacity'],
                             'missing-cfis-supplemental-fan' => ['Expected 1 element(s) for xpath: SupplementalFan'],
                             'missing-distribution-cfa-served' => ['Expected 1 element(s) for xpath: ../../../ConditionedFloorAreaServed [context: /HPXML/Building/BuildingDetails/Systems/HVAC/HVACDistribution/DistributionSystemType/AirDistribution/Ducts[not(DuctSurfaceArea)], id: "Ducts2"]'],
                             'missing-duct-area' => ['Expected 1 or more element(s) for xpath: FractionDuctArea | DuctSurfaceArea [context: /HPXML/Building/BuildingDetails/Systems/HVAC/HVACDistribution/DistributionSystemType/AirDistribution/Ducts[DuctLocation], id: "Ducts2"]'],
                             'missing-duct-location' => ['Expected 0 element(s) for xpath: FractionDuctArea | DuctSurfaceArea [context: /HPXML/Building/BuildingDetails/Systems/HVAC/HVACDistribution/DistributionSystemType/AirDistribution/Ducts[not(DuctLocation)], id: "Ducts2"]'],
-                            'missing-elements' => ['Expected 1 element(s) for xpath: NumberofConditionedFloors [context: /HPXML/Building/BuildingDetails/BuildingSummary/BuildingConstruction]',
-                                                   'Expected 1 element(s) for xpath: ConditionedFloorArea [context: /HPXML/Building/BuildingDetails/BuildingSummary/BuildingConstruction]'],
+                            'missing-elements' => ['Expected 1 element(s) for xpath: NumberofConditionedFloors [context: /HPXML/Building/BuildingDetails/BuildingSummary/BuildingConstruction, id: "MyBuilding"]',
+                                                   'Expected 1 element(s) for xpath: ConditionedFloorArea [context: /HPXML/Building/BuildingDetails/BuildingSummary/BuildingConstruction, id: "MyBuilding"]'],
                             'multifamily-reference-appliance' => ['There are references to "other housing unit" but ResidentialFacilityType is not "single-family attached" or "apartment unit".'],
                             'multifamily-reference-duct' => ['There are references to "other multifamily buffer space" but ResidentialFacilityType is not "single-family attached" or "apartment unit".'],
                             'multifamily-reference-surface' => ['There are references to "other heated space" but ResidentialFacilityType is not "single-family attached" or "apartment unit".'],
@@ -200,271 +218,280 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
                             'refrigerator-location' => ['A location is specified as "garage" but no surfaces were found adjacent to this space type.'],
                             'solar-fraction-one' => ['Expected SolarFraction to be less than 1 [context: /HPXML/Building/BuildingDetails/Systems/SolarThermal/SolarThermalSystem, id: "SolarThermalSystem1"]'],
                             'water-heater-location' => ['A location is specified as "crawlspace - vented" but no surfaces were found adjacent to this space type.'],
-                            'water-heater-location-other' => ["Expected Location to be 'living space' or 'basement - unconditioned' or 'basement - conditioned' or 'attic - unvented' or 'attic - vented' or 'garage' or 'crawlspace - unvented' or 'crawlspace - vented' or 'crawlspace - conditioned' or 'other exterior' or 'other housing unit' or 'other heated space' or 'other multifamily buffer space' or 'other non-freezing space' [context: /HPXML/Building/BuildingDetails/Systems/WaterHeating/WaterHeatingSystem, id: \"WaterHeatingSystem1\"]"],
+                            'water-heater-location-other' => ["Expected Location to be 'conditioned space' or 'basement - unconditioned' or 'basement - conditioned' or 'attic - unvented' or 'attic - vented' or 'garage' or 'crawlspace - unvented' or 'crawlspace - vented' or 'crawlspace - conditioned' or 'other exterior' or 'other housing unit' or 'other heated space' or 'other multifamily buffer space' or 'other non-freezing space'"],
                             'water-heater-recovery-efficiency' => ['Expected RecoveryEfficiency to be greater than EnergyFactor'] }
 
     all_expected_errors.each_with_index do |(error_case, expected_errors), i|
       puts "[#{i + 1}/#{all_expected_errors.size}] Testing #{error_case}..."
       # Create HPXML object
       if ['boiler-invalid-afue'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-boiler-oil-only.xml'))
-        hpxml.heating_systems[0].heating_efficiency_afue *= 100.0
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-boiler-oil-only.xml')
+        hpxml_bldg.heating_systems[0].heating_efficiency_afue *= 100.0
       elsif ['clothes-dryer-location'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.clothes_dryers[0].location = HPXML::LocationGarage
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.clothes_dryers[0].location = HPXML::LocationGarage
       elsif ['clothes-washer-location'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.clothes_washers[0].location = HPXML::LocationGarage
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.clothes_washers[0].location = HPXML::LocationGarage
       elsif ['cooking-range-location'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.cooking_ranges[0].location = HPXML::LocationGarage
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.cooking_ranges[0].location = HPXML::LocationGarage
       elsif ['dehumidifier-fraction-served'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-appliances-dehumidifier-multiple.xml'))
-        hpxml.dehumidifiers[-1].fraction_served = 0.6
+        hpxml, hpxml_bldg = _create_hpxml('base-appliances-dehumidifier-multiple.xml')
+        hpxml_bldg.dehumidifiers[-1].fraction_served = 0.6
       elsif ['dhw-frac-load-served'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-multiple.xml'))
-        hpxml.water_heating_systems[0].fraction_dhw_load_served = 0.35
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-multiple.xml')
+        hpxml_bldg.water_heating_systems[0].fraction_dhw_load_served = 0.35
       elsif ['dhw-invalid-ef-tank'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.water_heating_systems[0].energy_factor = 1.0
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.water_heating_systems[0].energy_factor = 1.0
       elsif ['dhw-invalid-uef-tank-heat-pump'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-tank-heat-pump-uef.xml'))
-        hpxml.water_heating_systems[0].uniform_energy_factor = 1.0
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-tank-heat-pump-uef.xml')
+        hpxml_bldg.water_heating_systems[0].uniform_energy_factor = 1.0
       elsif ['dishwasher-location'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.dishwashers[0].location = HPXML::LocationGarage
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.dishwashers[0].location = HPXML::LocationGarage
       elsif ['duct-leakage-cfm25'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_distributions[0].duct_leakage_measurements[0].duct_leakage_value = -2
-        hpxml.hvac_distributions[0].duct_leakage_measurements[1].duct_leakage_value = -2
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[0].duct_leakage_value = -2
+        hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[1].duct_leakage_value = -2
       elsif ['duct-leakage-cfm50'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-ducts-leakage-cfm50.xml'))
-        hpxml.hvac_distributions[0].duct_leakage_measurements[0].duct_leakage_value = -2
-        hpxml.hvac_distributions[0].duct_leakage_measurements[1].duct_leakage_value = -2
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-ducts-leakage-cfm50.xml')
+        hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[0].duct_leakage_value = -2
+        hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[1].duct_leakage_value = -2
       elsif ['duct-leakage-percent'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_distributions[0].duct_leakage_measurements[0].duct_leakage_units = HPXML::UnitsPercent
-        hpxml.hvac_distributions[0].duct_leakage_measurements[1].duct_leakage_units = HPXML::UnitsPercent
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[0].duct_leakage_units = HPXML::UnitsPercent
+        hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[1].duct_leakage_units = HPXML::UnitsPercent
       elsif ['duct-location'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_distributions[0].ducts[0].duct_location = HPXML::LocationGarage
-        hpxml.hvac_distributions[0].ducts[1].duct_location = HPXML::LocationGarage
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_distributions[0].ducts[0].duct_location = HPXML::LocationGarage
+        hpxml_bldg.hvac_distributions[0].ducts[1].duct_location = HPXML::LocationGarage
       elsif ['duct-location-unconditioned-space'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_distributions[0].ducts[0].duct_location = HPXML::LocationUnconditionedSpace
-        hpxml.hvac_distributions[0].ducts[1].duct_location = HPXML::LocationUnconditionedSpace
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_distributions[0].ducts[0].duct_location = HPXML::LocationUnconditionedSpace
+        hpxml_bldg.hvac_distributions[0].ducts[1].duct_location = HPXML::LocationUnconditionedSpace
       elsif ['emissions-electricity-schedule'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-emissions.xml'))
+        hpxml, hpxml_bldg = _create_hpxml('base-misc-emissions.xml')
         hpxml.header.emissions_scenarios[0].elec_schedule_number_of_header_rows = -1
         hpxml.header.emissions_scenarios[0].elec_schedule_column_number = 0
       elsif ['enclosure-attic-missing-roof'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.roofs.reverse_each do |roof|
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.roofs.reverse_each do |roof|
           roof.delete
         end
       elsif ['enclosure-basement-missing-exterior-foundation-wall'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-foundation-unconditioned-basement.xml'))
-        hpxml.foundation_walls.reverse_each do |foundation_wall|
+        hpxml, hpxml_bldg = _create_hpxml('base-foundation-unconditioned-basement.xml')
+        hpxml_bldg.foundation_walls.reverse_each do |foundation_wall|
           foundation_wall.delete
         end
       elsif ['enclosure-basement-missing-slab'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-foundation-unconditioned-basement.xml'))
-        hpxml.slabs.reverse_each do |slab|
+        hpxml, hpxml_bldg = _create_hpxml('base-foundation-unconditioned-basement.xml')
+        hpxml_bldg.slabs.reverse_each do |slab|
           slab.delete
         end
       elsif ['enclosure-floor-area-exceeds-cfa'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.building_construction.conditioned_floor_area = 1348.8
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.building_construction.conditioned_floor_area = 1348.8
       elsif ['enclosure-floor-area-exceeds-cfa2'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily.xml'))
-        hpxml.building_construction.conditioned_floor_area = 898.8
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit.xml')
+        hpxml_bldg.building_construction.conditioned_floor_area = 898.8
       elsif ['enclosure-garage-missing-exterior-wall'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-garage.xml'))
-        hpxml.walls.select { |w|
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-garage.xml')
+        hpxml_bldg.walls.select { |w|
           w.interior_adjacent_to == HPXML::LocationGarage &&
             w.exterior_adjacent_to == HPXML::LocationOutside
         }.reverse_each do |wall|
           wall.delete
         end
       elsif ['enclosure-garage-missing-roof-ceiling'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-garage.xml'))
-        hpxml.floors.select { |w|
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-garage.xml')
+        hpxml_bldg.floors.select { |w|
           w.interior_adjacent_to == HPXML::LocationGarage &&
             w.exterior_adjacent_to == HPXML::LocationAtticUnvented
         }.reverse_each do |floor|
           floor.delete
         end
       elsif ['enclosure-garage-missing-slab'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-garage.xml'))
-        hpxml.slabs.select { |w| w.interior_adjacent_to == HPXML::LocationGarage }.reverse_each do |slab|
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-garage.xml')
+        hpxml_bldg.slabs.select { |w| w.interior_adjacent_to == HPXML::LocationGarage }.reverse_each do |slab|
           slab.delete
         end
-      elsif ['enclosure-living-missing-ceiling-roof'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.floors.reverse_each do |floor|
+      elsif ['enclosure-conditioned-missing-ceiling-roof'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.floors.reverse_each do |floor|
           floor.delete
         end
-      elsif ['enclosure-living-missing-exterior-wall'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.walls.reverse_each do |wall|
-          next unless wall.interior_adjacent_to == HPXML::LocationLivingSpace
+      elsif ['enclosure-conditioned-missing-exterior-wall'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.walls.reverse_each do |wall|
+          next unless wall.interior_adjacent_to == HPXML::LocationConditionedSpace
 
           wall.delete
         end
-      elsif ['enclosure-living-missing-floor-slab'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-foundation-slab.xml'))
-        hpxml.slabs[0].delete
+      elsif ['enclosure-conditioned-missing-floor-slab'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base-foundation-slab.xml')
+        hpxml_bldg.slabs[0].delete
       elsif ['frac-sensible-fuel-load'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-loads-large-uncommon.xml'))
-        hpxml.fuel_loads[0].frac_sensible = -0.1
+        hpxml, hpxml_bldg = _create_hpxml('base-misc-loads-large-uncommon.xml')
+        hpxml_bldg.fuel_loads[0].frac_sensible = -0.1
       elsif ['frac-sensible-plug-load'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-loads-large-uncommon.xml'))
-        hpxml.plug_loads[0].frac_sensible = -0.1
+        hpxml, hpxml_bldg = _create_hpxml('base-misc-loads-large-uncommon.xml')
+        hpxml_bldg.plug_loads[0].frac_sensible = -0.1
       elsif ['frac-total-fuel-load'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-loads-large-uncommon.xml'))
-        hpxml.fuel_loads[0].frac_sensible = 0.8
-        hpxml.fuel_loads[0].frac_latent = 0.3
+        hpxml, hpxml_bldg = _create_hpxml('base-misc-loads-large-uncommon.xml')
+        hpxml_bldg.fuel_loads[0].frac_sensible = 0.8
+        hpxml_bldg.fuel_loads[0].frac_latent = 0.3
       elsif ['frac-total-plug-load'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-loads-large-uncommon.xml'))
-        hpxml.plug_loads[1].frac_latent = 0.245
+        hpxml, hpxml_bldg = _create_hpxml('base-misc-loads-large-uncommon.xml')
+        hpxml_bldg.plug_loads[1].frac_latent = 0.245
       elsif ['furnace-invalid-afue'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.heating_systems[0].heating_efficiency_afue *= 100.0
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.heating_systems[0].heating_efficiency_afue *= 100.0
       elsif ['generator-number-of-bedrooms-served'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-generator.xml'))
-        hpxml.generators[0].number_of_bedrooms_served = 3
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-generator.xml')
+        hpxml_bldg.generators[0].number_of_bedrooms_served = 3
       elsif ['generator-output-greater-than-consumption'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-generators.xml'))
-        hpxml.generators[0].annual_consumption_kbtu = 1500
+        hpxml, hpxml_bldg = _create_hpxml('base-misc-generators.xml')
+        hpxml_bldg.generators[0].annual_consumption_kbtu = 1500
       elsif ['heat-pump-capacity-17f'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-1-speed.xml'))
-        hpxml.heat_pumps[0].heating_capacity_17F = hpxml.heat_pumps[0].heating_capacity + 1000.0
-        hpxml.heat_pumps[0].heating_capacity_retention_fraction = nil
-        hpxml.heat_pumps[0].heating_capacity_retention_temp = nil
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed.xml')
+        hpxml_bldg.heat_pumps[0].heating_capacity_17F = hpxml_bldg.heat_pumps[0].heating_capacity + 1000.0
+        hpxml_bldg.heat_pumps[0].heating_capacity_retention_fraction = nil
+        hpxml_bldg.heat_pumps[0].heating_capacity_retention_temp = nil
       elsif ['heat-pump-lockout-temperatures'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml'))
-        hpxml.heat_pumps[0].compressor_lockout_temp = hpxml.heat_pumps[0].backup_heating_lockout_temp + 1
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml')
+        hpxml_bldg.heat_pumps[0].compressor_lockout_temp = hpxml_bldg.heat_pumps[0].backup_heating_lockout_temp + 1
       elsif ['heat-pump-multiple-backup-systems'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml'))
-        hpxml.heating_systems << hpxml.heating_systems[0].dup
-        hpxml.heating_systems[-1].id = 'HeatingSystem2'
-        hpxml.heat_pumps[0].fraction_heat_load_served = 0.5
-        hpxml.heat_pumps[0].fraction_cool_load_served = 0.5
-        hpxml.heat_pumps << hpxml.heat_pumps[0].dup
-        hpxml.heat_pumps[-1].id = 'HeatPump2'
-        hpxml.heat_pumps[-1].primary_heating_system = false
-        hpxml.heat_pumps[-1].primary_cooling_system = false
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml')
+        hpxml_bldg.heating_systems << hpxml_bldg.heating_systems[0].dup
+        hpxml_bldg.heating_systems[-1].id = 'HeatingSystem2'
+        hpxml_bldg.heat_pumps[0].fraction_heat_load_served = 0.5
+        hpxml_bldg.heat_pumps[0].fraction_cool_load_served = 0.5
+        hpxml_bldg.heat_pumps << hpxml_bldg.heat_pumps[0].dup
+        hpxml_bldg.heat_pumps[-1].id = 'HeatPump2'
+        hpxml_bldg.heat_pumps[-1].primary_heating_system = false
+        hpxml_bldg.heat_pumps[-1].primary_cooling_system = false
+      elsif ['hvac-detailed-performance-not-variable-speed'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml')
+        hpxml_bldg.heat_pumps[0].compressor_type = HPXML::HVACCompressorTypeTwoStage
       elsif ['hvac-distribution-return-duct-leakage-missing'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-evap-cooler-only-ducted.xml'))
-        hpxml.hvac_distributions[0].duct_leakage_measurements[-1].delete
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-evap-cooler-only-ducted.xml')
+        hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[-1].delete
       elsif ['hvac-frac-load-served'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-multiple.xml'))
-        hpxml.heating_systems[0].fraction_heat_load_served += 0.1
-        hpxml.cooling_systems[0].fraction_cool_load_served += 0.2
-        hpxml.heating_systems[0].primary_system = true
-        hpxml.cooling_systems[0].primary_system = true
-        hpxml.heat_pumps[-1].primary_heating_system = false
-        hpxml.heat_pumps[-1].primary_cooling_system = false
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-multiple.xml')
+        hpxml_bldg.heating_systems[0].fraction_heat_load_served += 0.1
+        hpxml_bldg.cooling_systems[0].fraction_cool_load_served += 0.2
+        hpxml_bldg.heating_systems[0].primary_system = true
+        hpxml_bldg.cooling_systems[0].primary_system = true
+        hpxml_bldg.heat_pumps[-1].primary_heating_system = false
+        hpxml_bldg.heat_pumps[-1].primary_cooling_system = false
       elsif ['hvac-location-heating-system'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-boiler-oil-only.xml'))
-        hpxml.heating_systems[0].location = HPXML::LocationBasementUnconditioned
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-boiler-oil-only.xml')
+        hpxml_bldg.heating_systems[0].location = HPXML::LocationBasementUnconditioned
       elsif ['hvac-location-cooling-system'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-central-ac-only-1-speed.xml'))
-        hpxml.cooling_systems[0].location = HPXML::LocationBasementUnconditioned
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-central-ac-only-1-speed.xml')
+        hpxml_bldg.cooling_systems[0].location = HPXML::LocationBasementUnconditioned
       elsif ['hvac-location-heat-pump'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-1-speed.xml'))
-        hpxml.heat_pumps[0].location = HPXML::LocationBasementUnconditioned
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed.xml')
+        hpxml_bldg.heat_pumps[0].location = HPXML::LocationBasementUnconditioned
+      elsif ['hvac-msac-not-var-speed'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-mini-split-air-conditioner-only-ductless.xml')
+        hpxml_bldg.cooling_systems[0].compressor_type = HPXML::HVACCompressorTypeTwoStage
+      elsif ['hvac-mshp-not-var-speed'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-mini-split-heat-pump-ductless.xml')
+        hpxml_bldg.heat_pumps[0].compressor_type = HPXML::HVACCompressorTypeSingleStage
       elsif ['hvac-sizing-humidity-setpoint'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.header.manualj_humidity_setpoint = 50
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.header.manualj_humidity_setpoint = 50
       elsif ['hvac-negative-crankcase-heater-watts'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.cooling_systems[0].crankcase_heater_watts = -10
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.cooling_systems[0].crankcase_heater_watts = -10
       elsif ['incomplete-integrated-heating'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-ptac-with-heating-electricity.xml'))
-        hpxml.cooling_systems[0].integrated_heating_system_fraction_heat_load_served = nil
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-ptac-with-heating-electricity.xml')
+        hpxml_bldg.cooling_systems[0].integrated_heating_system_fraction_heat_load_served = nil
       elsif ['invalid-airflow-defect-ratio'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-mini-split-heat-pump-ductless.xml'))
-        hpxml.heat_pumps[0].airflow_defect_ratio = -0.25
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-mini-split-heat-pump-ductless.xml')
+        hpxml_bldg.heat_pumps[0].airflow_defect_ratio = -0.25
       elsif ['invalid-assembly-effective-rvalue'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.walls[0].insulation_assembly_r_value = 0.0
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.walls[0].insulation_assembly_r_value = 0.0
       elsif ['invalid-battery-capacities-ah'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-pv-battery-ah.xml'))
-        hpxml.batteries[0].usable_capacity_ah = hpxml.batteries[0].nominal_capacity_ah
+        hpxml, hpxml_bldg = _create_hpxml('base-pv-battery-ah.xml')
+        hpxml_bldg.batteries[0].usable_capacity_ah = hpxml_bldg.batteries[0].nominal_capacity_ah
       elsif ['invalid-battery-capacities-kwh'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-pv-battery.xml'))
-        hpxml.batteries[0].usable_capacity_kwh = hpxml.batteries[0].nominal_capacity_kwh
+        hpxml, hpxml_bldg = _create_hpxml('base-pv-battery.xml')
+        hpxml_bldg.batteries[0].usable_capacity_kwh = hpxml_bldg.batteries[0].nominal_capacity_kwh
       elsif ['invalid-calendar-year-low'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
         hpxml.header.sim_calendar_year = 1575
       elsif ['invalid-calendar-year-high'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
         hpxml.header.sim_calendar_year = 20000
       elsif ['invalid-duct-area-fractions'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-ducts-area-fractions.xml'))
-        hpxml.hvac_distributions[0].ducts[0].duct_surface_area = nil
-        hpxml.hvac_distributions[0].ducts[1].duct_surface_area = nil
-        hpxml.hvac_distributions[0].ducts[2].duct_surface_area = nil
-        hpxml.hvac_distributions[0].ducts[3].duct_surface_area = nil
-        hpxml.hvac_distributions[0].ducts[0].duct_fraction_area = 0.65
-        hpxml.hvac_distributions[0].ducts[1].duct_fraction_area = 0.65
-        hpxml.hvac_distributions[0].ducts[2].duct_fraction_area = 0.15
-        hpxml.hvac_distributions[0].ducts[3].duct_fraction_area = 0.15
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-ducts-area-fractions.xml')
+        hpxml_bldg.hvac_distributions[0].ducts[0].duct_surface_area = nil
+        hpxml_bldg.hvac_distributions[0].ducts[1].duct_surface_area = nil
+        hpxml_bldg.hvac_distributions[0].ducts[2].duct_surface_area = nil
+        hpxml_bldg.hvac_distributions[0].ducts[3].duct_surface_area = nil
+        hpxml_bldg.hvac_distributions[0].ducts[0].duct_fraction_area = 0.65
+        hpxml_bldg.hvac_distributions[0].ducts[1].duct_fraction_area = 0.65
+        hpxml_bldg.hvac_distributions[0].ducts[2].duct_fraction_area = 0.15
+        hpxml_bldg.hvac_distributions[0].ducts[3].duct_fraction_area = 0.15
       elsif ['invalid-facility-type'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-laundry-room.xml'))
-        hpxml.building_construction.residential_facility_type = HPXML::ResidentialTypeSFD
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-laundry-room.xml')
+        hpxml_bldg.building_construction.residential_facility_type = HPXML::ResidentialTypeSFD
       elsif ['invalid-foundation-wall-properties'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-foundation-unconditioned-basement-wall-insulation.xml'))
-        hpxml.foundation_walls[0].depth_below_grade = 9.0
-        hpxml.foundation_walls[0].insulation_interior_distance_to_top = 12.0
-        hpxml.foundation_walls[0].insulation_interior_distance_to_bottom = 10.0
+        hpxml, hpxml_bldg = _create_hpxml('base-foundation-unconditioned-basement-wall-insulation.xml')
+        hpxml_bldg.foundation_walls[0].depth_below_grade = 9.0
+        hpxml_bldg.foundation_walls[0].insulation_interior_distance_to_top = 12.0
+        hpxml_bldg.foundation_walls[0].insulation_interior_distance_to_bottom = 10.0
       elsif ['invalid-ground-conductivity'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.site.ground_conductivity = 0.0
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.site.ground_conductivity = 0.0
       elsif ['invalid-heat-pump-capacity-retention'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-1-speed.xml'))
-        hpxml.heat_pumps[0].heating_capacity_17F = nil
-        hpxml.heat_pumps[0].heating_capacity_retention_fraction = 1.5
-        hpxml.heat_pumps[0].heating_capacity_retention_temp = 30
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed.xml')
+        hpxml_bldg.heat_pumps[0].heating_capacity_17F = nil
+        hpxml_bldg.heat_pumps[0].heating_capacity_retention_fraction = 1.5
+        hpxml_bldg.heat_pumps[0].heating_capacity_retention_temp = 30
       elsif ['invalid-heat-pump-capacity-retention2'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-1-speed.xml'))
-        hpxml.heat_pumps[0].heating_capacity_17F = nil
-        hpxml.heat_pumps[0].heating_capacity_retention_fraction = -1
-        hpxml.heat_pumps[0].heating_capacity_retention_temp = 5
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed.xml')
+        hpxml_bldg.heat_pumps[0].heating_capacity_17F = nil
+        hpxml_bldg.heat_pumps[0].heating_capacity_retention_fraction = -1
+        hpxml_bldg.heat_pumps[0].heating_capacity_retention_temp = 5
       elsif ['invalid-hvac-installation-quality'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-1-speed.xml'))
-        hpxml.heat_pumps[0].airflow_defect_ratio = -99
-        hpxml.heat_pumps[0].charge_defect_ratio = -99
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed.xml')
+        hpxml_bldg.heat_pumps[0].airflow_defect_ratio = -99
+        hpxml_bldg.heat_pumps[0].charge_defect_ratio = -99
       elsif ['invalid-hvac-installation-quality2'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-1-speed.xml'))
-        hpxml.heat_pumps[0].airflow_defect_ratio = 99
-        hpxml.heat_pumps[0].charge_defect_ratio = 99
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed.xml')
+        hpxml_bldg.heat_pumps[0].airflow_defect_ratio = 99
+        hpxml_bldg.heat_pumps[0].charge_defect_ratio = 99
       elsif ['invalid-id2'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-skylights.xml'))
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-skylights.xml')
       elsif ['invalid-input-parameters'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
         hpxml.header.transaction = 'modify'
-        hpxml.site.site_type = 'mountain'
-        hpxml.climate_and_risk_zones.climate_zone_ieccs[0].year = 2020
-        hpxml.roofs.each do |roof|
+        hpxml_bldg.site.site_type = 'mountain'
+        hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].year = 2020
+        hpxml_bldg.roofs.each do |roof|
           roof.radiant_barrier_grade = 4
         end
-        hpxml.roofs[0].azimuth = 365
-        hpxml.dishwashers[0].rated_annual_kwh = nil
-        hpxml.dishwashers[0].energy_factor = 5.1
+        hpxml_bldg.roofs[0].azimuth = 365
+        hpxml_bldg.dishwashers[0].rated_annual_kwh = nil
+        hpxml_bldg.dishwashers[0].energy_factor = 5.1
       elsif ['invalid-insulation-top'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.foundation_walls[0].insulation_interior_distance_to_top = -0.5
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.foundation_walls[0].insulation_interior_distance_to_top = -0.5
       elsif ['invalid-integrated-heating'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-central-ac-only-1-speed.xml'))
-        hpxml.cooling_systems[0].integrated_heating_system_fuel = HPXML::FuelTypeElectricity
-        hpxml.cooling_systems[0].integrated_heating_system_efficiency_percent = 0.98
-        hpxml.cooling_systems[0].integrated_heating_system_fraction_heat_load_served = 1.0
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-central-ac-only-1-speed.xml')
+        hpxml_bldg.cooling_systems[0].integrated_heating_system_fuel = HPXML::FuelTypeElectricity
+        hpxml_bldg.cooling_systems[0].integrated_heating_system_efficiency_percent = 0.98
+        hpxml_bldg.cooling_systems[0].integrated_heating_system_fraction_heat_load_served = 1.0
       elsif ['invalid-lighting-groups'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-garage.xml'))
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-garage.xml')
         [HPXML::LocationInterior, HPXML::LocationExterior, HPXML::LocationGarage].each do |ltg_loc|
-          hpxml.lighting_groups.each do |lg|
+          hpxml_bldg.lighting_groups.each do |lg|
             next unless lg.location == ltg_loc
 
             lg.delete
@@ -472,115 +499,133 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
           end
         end
       elsif ['invalid-lighting-groups2'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-garage.xml'))
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-garage.xml')
         [HPXML::LocationInterior, HPXML::LocationExterior, HPXML::LocationGarage].each do |ltg_loc|
-          hpxml.lighting_groups.each do |lg|
+          hpxml_bldg.lighting_groups.each do |lg|
             next unless lg.location == ltg_loc
 
-            hpxml.lighting_groups << lg.dup
-            hpxml.lighting_groups[-1].id = "LightingGroup#{hpxml.lighting_groups.size}"
-            hpxml.lighting_groups[-1].fraction_of_units_in_location = 0.0
+            hpxml_bldg.lighting_groups << lg.dup
+            hpxml_bldg.lighting_groups[-1].id = "LightingGroup#{hpxml_bldg.lighting_groups.size}"
+            hpxml_bldg.lighting_groups[-1].fraction_of_units_in_location = 0.0
             break
           end
         end
       elsif ['invalid-natvent-availability'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.header.natvent_days_per_week = 8
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.header.natvent_days_per_week = 8
       elsif ['invalid-natvent-availability2'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.header.natvent_days_per_week = -1
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.header.natvent_days_per_week = -1
       elsif ['invalid-number-of-bedrooms-served'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-pv.xml'))
-        hpxml.pv_systems[0].number_of_bedrooms_served = 3
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-pv.xml')
+        hpxml_bldg.pv_systems[0].number_of_bedrooms_served = 3
       elsif ['invalid-number-of-conditioned-floors'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.building_construction.number_of_conditioned_floors_above_grade = 3
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.building_construction.number_of_conditioned_floors_above_grade = 3
       elsif ['invalid-number-of-units-served'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-water-heater.xml'))
-        hpxml.water_heating_systems[0].number_of_units_served = 1
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-water-heater.xml')
+        hpxml_bldg.water_heating_systems[0].number_of_units_served = 1
       elsif ['invalid-pilot-light-heating-system'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-floor-furnace-propane-only-pilot-light.xml'))
-        hpxml.heating_systems[0].heating_system_fuel = HPXML::FuelTypeElectricity
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-floor-furnace-propane-only.xml')
+        hpxml_bldg.heating_systems[0].heating_system_fuel = HPXML::FuelTypeElectricity
       elsif ['invalid-shared-vent-in-unit-flowrate'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-mechvent.xml'))
-        hpxml.ventilation_fans[0].rated_flow_rate = 80
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-mechvent.xml')
+        hpxml_bldg.ventilation_fans[0].rated_flow_rate = 80
       elsif ['invalid-timestep'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
         hpxml.header.timestep = 45
       elsif ['invalid-timezone-utcoffset-low'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.header.time_zone_utc_offset = -13
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.time_zone_utc_offset = -13
       elsif ['invalid-timezone-utcoffset-high'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.header.time_zone_utc_offset = 15
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.time_zone_utc_offset = 15
       elsif ['invalid-ventilation-fan'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-mechvent-exhaust.xml'))
-        hpxml.ventilation_fans[0].used_for_garage_ventilation = true
+        hpxml, hpxml_bldg = _create_hpxml('base-mechvent-exhaust.xml')
+        hpxml_bldg.ventilation_fans[0].used_for_garage_ventilation = true
       elsif ['invalid-ventilation-recovery'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-mechvent-exhaust.xml'))
-        hpxml.ventilation_fans[0].sensible_recovery_efficiency = 0.72
-        hpxml.ventilation_fans[0].total_recovery_efficiency = 0.48
+        hpxml, hpxml_bldg = _create_hpxml('base-mechvent-exhaust.xml')
+        hpxml_bldg.ventilation_fans[0].sensible_recovery_efficiency = 0.72
+        hpxml_bldg.ventilation_fans[0].total_recovery_efficiency = 0.48
       elsif ['invalid-window-height'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-overhangs.xml'))
-        hpxml.windows[1].overhangs_distance_to_bottom_of_window = 1.0
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-overhangs.xml')
+        hpxml_bldg.windows[1].overhangs_distance_to_bottom_of_window = 1.0
       elsif ['lighting-fractions'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        int_cfl = hpxml.lighting_groups.find { |lg| lg.location == HPXML::LocationInterior && lg.lighting_type == HPXML::LightingTypeCFL }
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        int_cfl = hpxml_bldg.lighting_groups.find { |lg| lg.location == HPXML::LocationInterior && lg.lighting_type == HPXML::LightingTypeCFL }
         int_cfl.fraction_of_units_in_location = 0.8
+      elsif ['manufactured-home-reference-duct'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_distributions[0].ducts[1].duct_location = HPXML::LocationManufacturedHomeBelly
+      elsif ['manufactured-home-reference-water-heater'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.water_heating_systems[0].location = HPXML::LocationManufacturedHomeBelly
+      elsif ['manufactured-home-reference-floor'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base-foundation-vented-crawlspace.xml')
+        hpxml_bldg.floors.each do |floor|
+          if floor.exterior_adjacent_to == HPXML::LocationCrawlspaceVented
+            floor.exterior_adjacent_to = HPXML::LocationManufacturedHomeUnderBelly
+            break
+          end
+        end
+      elsif ['missing-capacity-detailed-performance'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-mini-split-heat-pump-ductless-detailed-performance.xml')
+        hpxml_bldg.heat_pumps[0].cooling_capacity = nil
+        hpxml_bldg.heat_pumps[0].heating_capacity = nil
       elsif ['missing-cfis-supplemental-fan'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-mechvent-cfis.xml'))
-        hpxml.ventilation_fans[0].cfis_addtl_runtime_operating_mode = HPXML::CFISModeSupplementalFan
+        hpxml, hpxml_bldg = _create_hpxml('base-mechvent-cfis.xml')
+        hpxml_bldg.ventilation_fans[0].cfis_addtl_runtime_operating_mode = HPXML::CFISModeSupplementalFan
       elsif ['missing-distribution-cfa-served'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_distributions[0].ducts[1].duct_surface_area = nil
-        hpxml.hvac_distributions[0].ducts[1].duct_location = nil
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_distributions[0].ducts[1].duct_surface_area = nil
+        hpxml_bldg.hvac_distributions[0].ducts[1].duct_location = nil
       elsif ['missing-duct-area'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_distributions[0].conditioned_floor_area_served = hpxml.building_construction.conditioned_floor_area
-        hpxml.hvac_distributions[0].ducts[1].duct_surface_area = nil
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_distributions[0].conditioned_floor_area_served = hpxml_bldg.building_construction.conditioned_floor_area
+        hpxml_bldg.hvac_distributions[0].ducts[1].duct_surface_area = nil
       elsif ['missing-duct-location'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_distributions[0].ducts[1].duct_location = nil
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_distributions[0].ducts[1].duct_location = nil
       elsif ['missing-elements'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.building_construction.number_of_conditioned_floors = nil
-        hpxml.building_construction.conditioned_floor_area = nil
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.building_construction.number_of_conditioned_floors = nil
+        hpxml_bldg.building_construction.conditioned_floor_area = nil
       elsif ['multifamily-reference-appliance'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.clothes_washers[0].location = HPXML::LocationOtherHousingUnit
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.clothes_washers[0].location = HPXML::LocationOtherHousingUnit
       elsif ['multifamily-reference-duct'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_distributions[0].ducts[0].duct_location = HPXML::LocationOtherMultifamilyBufferSpace
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_distributions[0].ducts[0].duct_location = HPXML::LocationOtherMultifamilyBufferSpace
       elsif ['multifamily-reference-surface'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.floors << hpxml.floors[0].dup
-        hpxml.floors[1].id = "Floor#{hpxml.floors.size}"
-        hpxml.floors[1].insulation_id = "FloorInsulation#{hpxml.floors.size}"
-        hpxml.floors[1].exterior_adjacent_to = HPXML::LocationOtherHeatedSpace
-        hpxml.floors[1].floor_or_ceiling = HPXML::FloorOrCeilingCeiling
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.floors << hpxml_bldg.floors[0].dup
+        hpxml_bldg.floors[1].id = "Floor#{hpxml_bldg.floors.size}"
+        hpxml_bldg.floors[1].insulation_id = "FloorInsulation#{hpxml_bldg.floors.size}"
+        hpxml_bldg.floors[1].exterior_adjacent_to = HPXML::LocationOtherHeatedSpace
+        hpxml_bldg.floors[1].floor_or_ceiling = HPXML::FloorOrCeilingCeiling
       elsif ['multifamily-reference-water-heater'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.water_heating_systems[0].location = HPXML::LocationOtherNonFreezingSpace
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.water_heating_systems[0].location = HPXML::LocationOtherNonFreezingSpace
       elsif ['refrigerator-location'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.refrigerators[0].location = HPXML::LocationGarage
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.refrigerators[0].location = HPXML::LocationGarage
       elsif ['solar-fraction-one'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-solar-fraction.xml'))
-        hpxml.solar_thermal_systems[0].solar_fraction = 1.0
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-solar-fraction.xml')
+        hpxml_bldg.solar_thermal_systems[0].solar_fraction = 1.0
       elsif ['water-heater-location'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.water_heating_systems[0].location = HPXML::LocationCrawlspaceVented
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.water_heating_systems[0].location = HPXML::LocationCrawlspaceVented
       elsif ['water-heater-location-other'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.water_heating_systems[0].location = HPXML::LocationUnconditionedSpace
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.water_heating_systems[0].location = HPXML::LocationUnconditionedSpace
       elsif ['water-heater-recovery-efficiency'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-tank-gas.xml'))
-        hpxml.water_heating_systems[0].recovery_efficiency = hpxml.water_heating_systems[0].energy_factor
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-tank-gas.xml')
+        hpxml_bldg.water_heating_systems[0].recovery_efficiency = hpxml_bldg.water_heating_systems[0].energy_factor
       else
         fail "Unhandled case: #{error_case}."
       end
 
-      hpxml_doc = hpxml.to_oga()
+      hpxml_doc = hpxml.to_doc()
 
       # Perform additional raw XML manipulation
       if ['invalid-id2'].include? error_case
@@ -611,6 +656,7 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
                               'dhw-setpoint-low' => ['Hot water setpoint should typically be greater than or equal to 110 deg-F.'],
                               'erv-atre-low' => ['Adjusted total recovery efficiency should typically be at least half of the adjusted sensible recovery efficiency.'],
                               'erv-tre-low' => ['Total recovery efficiency should typically be at least half of the sensible recovery efficiency.'],
+                              'fuel-load-type-other' => ["Fuel load type 'other' is not currently handled, the fuel load will not be modeled."],
                               'garage-ventilation' => ['Ventilation fans for the garage are not currently modeled.'],
                               'heat-pump-low-backup-switchover-temp' => ['BackupHeatingSwitchoverTemperature is below 30 deg-F; this may result in significant unmet hours if the heat pump does not have sufficient capacity.'],
                               'heat-pump-low-backup-lockout-temp' => ['BackupHeatingLockoutTemperature is below 30 deg-F; this may result in significant unmet hours if the heat pump does not have sufficient capacity.'],
@@ -659,7 +705,16 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
                                                             'No exterior lighting specified, the model will not include exterior lighting energy use.',
                                                             'No garage lighting specified, the model will not include garage lighting energy use.'],
                               'missing-attached-surfaces' => ['ResidentialFacilityType is single-family attached or apartment unit, but no attached surfaces were found. This may result in erroneous results (e.g., for infiltration).'],
+                              'plug-load-type-sauna' => ["Plug load type 'sauna' is not currently handled, the plug load will not be modeled."],
+                              'plug-load-type-aquarium' => ["Plug load type 'aquarium' is not currently handled, the plug load will not be modeled."],
+                              'plug-load-type-water-bed' => ["Plug load type 'water bed' is not currently handled, the plug load will not be modeled."],
+                              'plug-load-type-space-heater' => ["Plug load type 'space heater' is not currently handled, the plug load will not be modeled."],
+                              'plug-load-type-computer' => ["Plug load type 'computer' is not currently handled, the plug load will not be modeled."],
+                              'plug-load-type-tv-crt' => ["Plug load type 'TV CRT' is not currently handled, the plug load will not be modeled."],
+                              'plug-load-type-tv-plasma' => ["Plug load type 'TV plasma' is not currently handled, the plug load will not be modeled."],
+                              'portable-spa' => ['Portable spa is not currently handled, the portable spa will not be modeled.'],
                               'slab-zero-exposed-perimeter' => ['Slab has zero exposed perimeter, this may indicate an input error.'],
+                              'unit-multiplier' => ['NumberofUnits is greater than 1, indicating that the HPXML Building represents multiple dwelling units; simulation outputs will reflect this unit multiplier.'],
                               'wrong-units' => ['Thickness is greater than 12 inches; this may indicate incorrect units.',
                                                 'Thickness is less than 1 inch; this may indicate incorrect units.',
                                                 'Depth is greater than 72 feet; this may indicate incorrect units.',
@@ -669,51 +724,54 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
       puts "[#{i + 1}/#{all_expected_warnings.size}] Testing #{warning_case}..."
       # Create HPXML object
       if ['battery-pv-output-power-low'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-pv-battery.xml'))
-        hpxml.batteries[0].rated_power_output = 0.1
-        hpxml.pv_systems[0].max_power_output = 0.1
-        hpxml.pv_systems[1].max_power_output = 0.1
+        hpxml, hpxml_bldg = _create_hpxml('base-pv-battery.xml')
+        hpxml_bldg.batteries[0].rated_power_output = 0.1
+        hpxml_bldg.pv_systems[0].max_power_output = 0.1
+        hpxml_bldg.pv_systems[1].max_power_output = 0.1
       elsif ['dhw-capacities-low'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-multiple.xml'))
-        hpxml.water_heating_systems.each do |water_heating_system|
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-multiple.xml')
+        hpxml_bldg.water_heating_systems.each do |water_heating_system|
           if [HPXML::WaterHeaterTypeStorage].include? water_heating_system.water_heater_type
             water_heating_system.heating_capacity = 0.1
           end
         end
       elsif ['dhw-efficiencies-low'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-multiple.xml'))
-        hpxml.water_heating_systems.each do |water_heating_system|
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-multiple.xml')
+        hpxml_bldg.water_heating_systems.each do |water_heating_system|
           if [HPXML::WaterHeaterTypeStorage,
               HPXML::WaterHeaterTypeTankless].include? water_heating_system.water_heater_type
             water_heating_system.energy_factor = 0.1
           end
         end
       elsif ['dhw-setpoint-low'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.water_heating_systems[0].temperature = 100
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.water_heating_systems[0].temperature = 100
       elsif ['erv-atre-low'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-mechvent-erv-atre-asre.xml'))
-        hpxml.ventilation_fans[0].total_recovery_efficiency_adjusted = 0.1
+        hpxml, hpxml_bldg = _create_hpxml('base-mechvent-erv-atre-asre.xml')
+        hpxml_bldg.ventilation_fans[0].total_recovery_efficiency_adjusted = 0.1
+      elsif ['fuel-load-type-other'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base-misc-loads-large-uncommon.xml')
+        hpxml_bldg.fuel_loads[0].fuel_load_type = HPXML::FuelLoadTypeOther
       elsif ['erv-tre-low'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-mechvent-erv.xml'))
-        hpxml.ventilation_fans[0].total_recovery_efficiency = 0.1
+        hpxml, hpxml_bldg = _create_hpxml('base-mechvent-erv.xml')
+        hpxml_bldg.ventilation_fans[0].total_recovery_efficiency = 0.1
       elsif ['garage-ventilation'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.ventilation_fans.add(id: 'VentilationFan1',
-                                   used_for_garage_ventilation: true)
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.ventilation_fans.add(id: 'VentilationFan1',
+                                        used_for_garage_ventilation: true)
       elsif ['heat-pump-low-backup-switchover-temp'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml'))
-        hpxml.heat_pumps[0].backup_heating_switchover_temp = 25.0
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml')
+        hpxml_bldg.heat_pumps[0].backup_heating_switchover_temp = 25.0
       elsif ['heat-pump-low-backup-lockout-temp'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml'))
-        hpxml.heat_pumps[0].backup_heating_lockout_temp = 25.0
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml')
+        hpxml_bldg.heat_pumps[0].backup_heating_lockout_temp = 25.0
       elsif ['hvac-dse-low'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-dse.xml'))
-        hpxml.hvac_distributions[0].annual_heating_dse = 0.1
-        hpxml.hvac_distributions[0].annual_cooling_dse = 0.1
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-dse.xml')
+        hpxml_bldg.hvac_distributions[0].annual_heating_dse = 0.1
+        hpxml_bldg.hvac_distributions[0].annual_cooling_dse = 0.1
       elsif ['hvac-capacities-low'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-multiple.xml'))
-        hpxml.hvac_systems.each do |hvac_system|
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-multiple.xml')
+        hpxml_bldg.hvac_systems.each do |hvac_system|
           if hvac_system.is_a? HPXML::HeatingSystem
             hvac_system.heating_capacity = 0.1
           elsif hvac_system.is_a? HPXML::CoolingSystem
@@ -725,8 +783,8 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
           end
         end
       elsif ['hvac-efficiencies-low'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-multiple.xml'))
-        hpxml.hvac_systems.each do |hvac_system|
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-multiple.xml')
+        hpxml_bldg.hvac_systems.each do |hvac_system|
           if hvac_system.is_a? HPXML::HeatingSystem
             if [HPXML::HVACTypeElectricResistance,
                 HPXML::HVACTypeStove].include? hvac_system.heating_system_type
@@ -754,40 +812,67 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
           end
         end
       elsif ['hvac-setpoints-high'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_controls[0].heating_setpoint_temp = 100
-        hpxml.hvac_controls[0].cooling_setpoint_temp = 100
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_controls[0].heating_setpoint_temp = 100
+        hpxml_bldg.hvac_controls[0].cooling_setpoint_temp = 100
       elsif ['hvac-setpoints-low'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_controls[0].heating_setpoint_temp = 0
-        hpxml.hvac_controls[0].cooling_setpoint_temp = 0
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_controls[0].heating_setpoint_temp = 0
+        hpxml_bldg.hvac_controls[0].cooling_setpoint_temp = 0
       elsif ['integrated-heating-efficiency-low'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-ptac-with-heating-electricity.xml'))
-        hpxml.cooling_systems[0].integrated_heating_system_efficiency_percent = 0.4
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-ptac-with-heating-electricity.xml')
+        hpxml_bldg.cooling_systems[0].integrated_heating_system_efficiency_percent = 0.4
       elsif ['lighting-groups-missing'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-garage.xml'))
-        hpxml.lighting_groups.reverse_each do |lg|
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-garage.xml')
+        hpxml_bldg.lighting_groups.reverse_each do |lg|
           lg.delete
         end
       elsif ['missing-attached-surfaces'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.building_construction.residential_facility_type = HPXML::ResidentialTypeSFA
-        hpxml.air_infiltration_measurements[0].infiltration_type = HPXML::InfiltrationTypeUnitExterior
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.building_construction.residential_facility_type = HPXML::ResidentialTypeSFA
+        hpxml_bldg.air_infiltration_measurements[0].infiltration_type = HPXML::InfiltrationTypeUnitExterior
+      elsif ['plug-load-type-sauna'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.plug_loads[0].plug_load_type = HPXML::PlugLoadTypeSauna
+      elsif ['plug-load-type-aquarium'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.plug_loads[0].plug_load_type = HPXML::PlugLoadTypeAquarium
+      elsif ['plug-load-type-water-bed'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.plug_loads[0].plug_load_type = HPXML::PlugLoadTypeWaterBed
+      elsif ['plug-load-type-space-heater'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.plug_loads[0].plug_load_type = HPXML::PlugLoadTypeSpaceHeater
+      elsif ['plug-load-type-computer'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.plug_loads[0].plug_load_type = HPXML::PlugLoadTypeComputer
+      elsif ['plug-load-type-tv-crt'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.plug_loads[0].plug_load_type = HPXML::PlugLoadTypeTelevisionCRT
+      elsif ['plug-load-type-tv-plasma'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.plug_loads[0].plug_load_type = HPXML::PlugLoadTypeTelevisionPlasma
+      elsif ['portable-spa'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.portable_spas.add(id: 'PorableSpa')
       elsif ['slab-zero-exposed-perimeter'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.slabs[0].exposed_perimeter = 0
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.slabs[0].exposed_perimeter = 0
+      elsif ['unit-multiplier'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.building_construction.number_of_units = 5
       elsif ['wrong-units'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-overhangs.xml'))
-        hpxml.slabs[0].thickness = 0.5
-        hpxml.foundation_walls[0].thickness = 72.0
-        hpxml.windows[0].overhangs_depth = 120.0
-        hpxml.windows[0].overhangs_distance_to_top_of_window = 24.0
-        hpxml.windows[0].overhangs_distance_to_bottom_of_window = 48.0
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-overhangs.xml')
+        hpxml_bldg.slabs[0].thickness = 0.5
+        hpxml_bldg.foundation_walls[0].thickness = 72.0
+        hpxml_bldg.windows[0].overhangs_depth = 120.0
+        hpxml_bldg.windows[0].overhangs_distance_to_top_of_window = 24.0
+        hpxml_bldg.windows[0].overhangs_distance_to_bottom_of_window = 48.0
       else
         fail "Unhandled case: #{warning_case}."
       end
 
-      hpxml_doc = hpxml.to_oga()
+      hpxml_doc = hpxml.to_doc()
 
       # Test against schematron
       XMLHelper.write_file(hpxml_doc, @tmp_hpxml_path)
@@ -812,7 +897,12 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
                             'emissions-wrong-filename' => ["Emissions File file path 'invalid-wrong-filename.csv' does not exist."],
                             'emissions-wrong-rows' => ['Emissions File has invalid number of rows'],
                             'heat-pump-backup-system-load-fraction' => ['Heat pump backup system cannot have a fraction heat load served specified.'],
-                            'heat-pump-switchover-temp-elec-backup' => ['Switchover temperature should not be used for a heat pump with electric backup; use compressor lockout temperature instead.'],
+                            'hvac-cooling-detailed-performance-incomplete-pair' => ['Cooling detailed performance data for outdoor temperature = 82.0 is incomplete; there must be exactly one minimum and one maximum capacity datapoint.',
+                                                                                    'Cooling detailed performance data for outdoor temperature = 81.0 is incomplete; there must be exactly one minimum and one maximum capacity datapoint.'],
+                            'hvac-heating-detailed-performance-incomplete-pair' => ['Heating detailed performance data for outdoor temperature = 5.0 is incomplete; there must be exactly one minimum and one maximum capacity datapoint.',
+                                                                                    'Heating detailed performance data for outdoor temperature = 4.0 is incomplete; there must be exactly one minimum and one maximum capacity datapoint.'],
+                            'heat-pump-switchover-temp-elec-backup' => ['Switchover temperature should only be used for a heat pump with fossil fuel backup; use compressor lockout temperature instead.'],
+                            'heat-pump-lockout-temps-elec-backup' => ['Similar compressor/backup lockout temperatures should only be used for a heat pump with fossil fuel backup.'],
                             'hvac-distribution-multiple-attached-cooling' => ["Multiple cooling systems found attached to distribution system 'HVACDistribution2'."],
                             'hvac-distribution-multiple-attached-heating' => ["Multiple heating systems found attached to distribution system 'HVACDistribution1'."],
                             'hvac-dse-multiple-attached-cooling' => ["Multiple cooling systems found attached to distribution system 'HVACDistribution1'."],
@@ -872,362 +962,407 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
                             'unattached-shared-dishwasher-dhw-distribution' => ["Attached hot water distribution 'foobar' not found for dishwasher"],
                             'unattached-shared-dishwasher-water-heater' => ["Attached water heating system 'foobar' not found for dishwasher"],
                             'unattached-window' => ["Attached wall 'foobar' not found for window 'Window1'."],
-                            'unavailable-period-missing-column' => ["Could not find column='foobar' in unavailable_periods.csv."] }
+                            'unavailable-period-missing-column' => ["Could not find column='foobar' in unavailable_periods.csv."],
+                            'unique-objects-vary-across-units-epw' => ['Weather station EPW filepath has different values across dwelling units.'],
+                            'unique-objects-vary-across-units-dst' => ['Unique object (OS:RunPeriodControl:DaylightSavingTime) has different values across dwelling units.'],
+                            'unique-objects-vary-across-units-tmains' => ['Unique object (OS:Site:WaterMainsTemperature) has different values across dwelling units.'],
+                            'whole-mf-building-batteries' => ['Modeling batteries for whole SFA/MF buildings is not currently supported.'],
+                            'whole-mf-building-dehumidifiers-unit-multiplier' => ['NumberofUnits greater than 1 is not supported for dehumidifiers.'],
+                            'whole-mf-building-gshps-unit-multiplier' => ['NumberofUnits greater than 1 is not supported for ground-to-air heat pumps.'] }
 
     all_expected_errors.each_with_index do |(error_case, expected_errors), i|
       puts "[#{i + 1}/#{all_expected_errors.size}] Testing #{error_case}..."
+      building_id = nil
       # Create HPXML object
       if ['battery-bad-values-max-not-one'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-battery-scheduled.xml'))
-        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml.header.schedules_filepaths[0]))
+        hpxml, hpxml_bldg = _create_hpxml('base-battery-scheduled.xml')
+        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
         csv_data[1][0] = 1.1
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
-        hpxml.header.schedules_filepaths = [@tmp_csv_path]
+        hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       elsif ['battery-bad-values-min-not-neg-one'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-battery-scheduled.xml'))
-        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml.header.schedules_filepaths[0]))
+        hpxml, hpxml_bldg = _create_hpxml('base-battery-scheduled.xml')
+        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
         csv_data[1][0] = -1.1
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
-        hpxml.header.schedules_filepaths = [@tmp_csv_path]
+        hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       elsif ['cfis-with-hydronic-distribution'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-boiler-gas-only.xml'))
-        hpxml.ventilation_fans.add(id: "VentilationFan#{hpxml.ventilation_fans.size + 1}",
-                                   fan_type: HPXML::MechVentTypeCFIS,
-                                   used_for_whole_building_ventilation: true,
-                                   distribution_system_idref: hpxml.hvac_distributions[0].id)
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-boiler-gas-only.xml')
+        hpxml_bldg.ventilation_fans.add(id: "VentilationFan#{hpxml_bldg.ventilation_fans.size + 1}",
+                                        fan_type: HPXML::MechVentTypeCFIS,
+                                        used_for_whole_building_ventilation: true,
+                                        distribution_system_idref: hpxml_bldg.hvac_distributions[0].id)
       elsif ['cfis-invalid-supplemental-fan'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-mechvent-cfis-supplemental-fan-exhaust.xml'))
-        suppl_fan = hpxml.ventilation_fans.find { |f| f.is_cfis_supplemental_fan? }
+        hpxml, hpxml_bldg = _create_hpxml('base-mechvent-cfis-supplemental-fan-exhaust.xml')
+        suppl_fan = hpxml_bldg.ventilation_fans.find { |f| f.is_cfis_supplemental_fan? }
         suppl_fan.fan_type = HPXML::MechVentTypeBalanced
       elsif ['cfis-invalid-supplemental-fan2'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-mechvent-cfis-supplemental-fan-exhaust.xml'))
-        suppl_fan = hpxml.ventilation_fans.find { |f| f.is_cfis_supplemental_fan? }
+        hpxml, hpxml_bldg = _create_hpxml('base-mechvent-cfis-supplemental-fan-exhaust.xml')
+        suppl_fan = hpxml_bldg.ventilation_fans.find { |f| f.is_cfis_supplemental_fan? }
         suppl_fan.used_for_whole_building_ventilation = false
         suppl_fan.used_for_garage_ventilation = true
       elsif ['cfis-invalid-supplemental-fan3'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-mechvent-cfis-supplemental-fan-exhaust.xml'))
-        suppl_fan = hpxml.ventilation_fans.find { |f| f.is_cfis_supplemental_fan? }
+        hpxml, hpxml_bldg = _create_hpxml('base-mechvent-cfis-supplemental-fan-exhaust.xml')
+        suppl_fan = hpxml_bldg.ventilation_fans.find { |f| f.is_cfis_supplemental_fan? }
         suppl_fan.is_shared_system = true
         suppl_fan.fraction_recirculation = 0.0
         suppl_fan.in_unit_flow_rate = suppl_fan.tested_flow_rate / 2.0
       elsif ['cfis-invalid-supplemental-fan4'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-mechvent-cfis-supplemental-fan-exhaust.xml'))
-        suppl_fan = hpxml.ventilation_fans.find { |f| f.is_cfis_supplemental_fan? }
+        hpxml, hpxml_bldg = _create_hpxml('base-mechvent-cfis-supplemental-fan-exhaust.xml')
+        suppl_fan = hpxml_bldg.ventilation_fans.find { |f| f.is_cfis_supplemental_fan? }
         suppl_fan.hours_in_operation = 12.0
       elsif ['dehumidifier-setpoints'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-appliances-dehumidifier-multiple.xml'))
-        hpxml.dehumidifiers[-1].rh_setpoint = 0.55
+        hpxml, hpxml_bldg = _create_hpxml('base-appliances-dehumidifier-multiple.xml')
+        hpxml_bldg.dehumidifiers[-1].rh_setpoint = 0.55
       elsif ['desuperheater-with-detailed-setpoints'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-tank-detailed-setpoints.xml'))
-        hpxml.water_heating_systems[0].uses_desuperheater = true
-        hpxml.water_heating_systems[0].related_hvac_idref = hpxml.cooling_systems[0].id
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-tank-detailed-setpoints.xml')
+        hpxml_bldg.water_heating_systems[0].uses_desuperheater = true
+        hpxml_bldg.water_heating_systems[0].related_hvac_idref = hpxml_bldg.cooling_systems[0].id
       elsif ['duplicate-id'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.plug_loads[-1].id = hpxml.plug_loads[0].id
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.plug_loads[-1].id = hpxml_bldg.plug_loads[0].id
       elsif ['emissions-duplicate-names'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-emissions.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base-misc-emissions.xml')
         hpxml.header.emissions_scenarios << hpxml.header.emissions_scenarios[0].dup
       elsif ['emissions-wrong-columns'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-emissions.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base-misc-emissions.xml')
         scenario = hpxml.header.emissions_scenarios[1]
         csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), scenario.elec_schedule_filepath))
         csv_data[10] = [431.0] * (scenario.elec_schedule_column_number - 1)
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
         hpxml.header.emissions_scenarios[1].elec_schedule_filepath = @tmp_csv_path
       elsif ['emissions-wrong-filename'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-emissions.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base-misc-emissions.xml')
         hpxml.header.emissions_scenarios[1].elec_schedule_filepath = 'invalid-wrong-filename.csv'
       elsif ['emissions-wrong-rows'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-emissions.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base-misc-emissions.xml')
         scenario = hpxml.header.emissions_scenarios[1]
         csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), scenario.elec_schedule_filepath))
         File.write(@tmp_csv_path, csv_data[0..-2].map(&:to_csv).join)
         hpxml.header.emissions_scenarios[1].elec_schedule_filepath = @tmp_csv_path
       elsif ['heat-pump-backup-system-load-fraction'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml'))
-        hpxml.heating_systems[0].fraction_heat_load_served = 0.5
-        hpxml.heat_pumps[0].fraction_heat_load_served = 0.5
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml')
+        hpxml_bldg.heating_systems[0].fraction_heat_load_served = 0.5
+        hpxml_bldg.heat_pumps[0].fraction_heat_load_served = 0.5
       elsif ['heat-pump-switchover-temp-elec-backup'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-1-speed.xml'))
-        hpxml.heat_pumps[0].backup_heating_switchover_temp = 35.0
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed.xml')
+        hpxml_bldg.heat_pumps[0].backup_heating_switchover_temp = 35.0
+      elsif ['hvac-cooling-detailed-performance-incomplete-pair'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml')
+        hpxml_bldg.heat_pumps[0].cooling_detailed_performance_data[-1].outdoor_temperature -= 1.0
+      elsif ['hvac-heating-detailed-performance-incomplete-pair'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml')
+        hpxml_bldg.heat_pumps[0].heating_detailed_performance_data[-1].outdoor_temperature -= 1.0
+      elsif ['heat-pump-lockout-temps-elec-backup'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed.xml')
+        hpxml_bldg.heat_pumps[0].compressor_lockout_temp = 35.0
+        hpxml_bldg.heat_pumps[0].backup_heating_lockout_temp = 35.0
       elsif ['hvac-invalid-distribution-system-type'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_distributions.add(id: "HVACDistribution#{hpxml.hvac_distributions.size + 1}",
-                                     distribution_system_type: HPXML::HVACDistributionTypeHydronic,
-                                     hydronic_type: HPXML::HydronicTypeBaseboard)
-        hpxml.heating_systems[-1].distribution_system_idref = hpxml.hvac_distributions[-1].id
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_distributions.add(id: "HVACDistribution#{hpxml_bldg.hvac_distributions.size + 1}",
+                                          distribution_system_type: HPXML::HVACDistributionTypeHydronic,
+                                          hydronic_type: HPXML::HydronicTypeBaseboard)
+        hpxml_bldg.heating_systems[-1].distribution_system_idref = hpxml_bldg.hvac_distributions[-1].id
       elsif ['hvac-distribution-multiple-attached-cooling'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-multiple.xml'))
-        hpxml.heat_pumps[0].distribution_system_idref = 'HVACDistribution2'
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-multiple.xml')
+        hpxml_bldg.heat_pumps[0].distribution_system_idref = 'HVACDistribution2'
       elsif ['hvac-distribution-multiple-attached-heating'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-multiple.xml'))
-        hpxml.heat_pumps[0].distribution_system_idref = 'HVACDistribution1'
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-multiple.xml')
+        hpxml_bldg.heat_pumps[0].distribution_system_idref = 'HVACDistribution1'
       elsif ['hvac-dse-multiple-attached-cooling'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-dse.xml'))
-        hpxml.cooling_systems[0].fraction_cool_load_served = 0.5
-        hpxml.cooling_systems << hpxml.cooling_systems[0].dup
-        hpxml.cooling_systems[1].id = "CoolingSystem#{hpxml.cooling_systems.size}"
-        hpxml.cooling_systems[0].primary_system = false
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-dse.xml')
+        hpxml_bldg.cooling_systems[0].fraction_cool_load_served = 0.5
+        hpxml_bldg.cooling_systems << hpxml_bldg.cooling_systems[0].dup
+        hpxml_bldg.cooling_systems[1].id = "CoolingSystem#{hpxml_bldg.cooling_systems.size}"
+        hpxml_bldg.cooling_systems[0].primary_system = false
       elsif ['hvac-dse-multiple-attached-heating'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-dse.xml'))
-        hpxml.heating_systems[0].fraction_heat_load_served = 0.5
-        hpxml.heating_systems << hpxml.heating_systems[0].dup
-        hpxml.heating_systems[1].id = "HeatingSystem#{hpxml.heating_systems.size}"
-        hpxml.heating_systems[0].primary_system = false
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-dse.xml')
+        hpxml_bldg.heating_systems[0].fraction_heat_load_served = 0.5
+        hpxml_bldg.heating_systems << hpxml_bldg.heating_systems[0].dup
+        hpxml_bldg.heating_systems[1].id = "HeatingSystem#{hpxml_bldg.heating_systems.size}"
+        hpxml_bldg.heating_systems[0].primary_system = false
       elsif ['hvac-inconsistent-fan-powers'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.cooling_systems[0].fan_watts_per_cfm = 0.55
-        hpxml.heating_systems[0].fan_watts_per_cfm = 0.45
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.cooling_systems[0].fan_watts_per_cfm = 0.55
+        hpxml_bldg.heating_systems[0].fan_watts_per_cfm = 0.45
       elsif ['hvac-shared-boiler-multiple'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-boiler-only-baseboard.xml'))
-        hpxml.hvac_distributions << hpxml.hvac_distributions[0].dup
-        hpxml.hvac_distributions[-1].id = "HVACDistribution#{hpxml.hvac_distributions.size}"
-        hpxml.heating_systems[0].fraction_heat_load_served = 0.5
-        hpxml.heating_systems[0].primary_system = false
-        hpxml.heating_systems << hpxml.heating_systems[0].dup
-        hpxml.heating_systems[1].id = "HeatingSystem#{hpxml.heating_systems.size}"
-        hpxml.heating_systems[1].distribution_system_idref = hpxml.hvac_distributions[-1].id
-        hpxml.heating_systems[1].primary_system = true
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml')
+        hpxml_bldg.hvac_distributions << hpxml_bldg.hvac_distributions[0].dup
+        hpxml_bldg.hvac_distributions[-1].id = "HVACDistribution#{hpxml_bldg.hvac_distributions.size}"
+        hpxml_bldg.heating_systems[0].fraction_heat_load_served = 0.5
+        hpxml_bldg.heating_systems[0].primary_system = false
+        hpxml_bldg.heating_systems << hpxml_bldg.heating_systems[0].dup
+        hpxml_bldg.heating_systems[1].id = "HeatingSystem#{hpxml_bldg.heating_systems.size}"
+        hpxml_bldg.heating_systems[1].distribution_system_idref = hpxml_bldg.hvac_distributions[-1].id
+        hpxml_bldg.heating_systems[1].primary_system = true
       elsif ['hvac-shared-chiller-multiple'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-chiller-only-baseboard.xml'))
-        hpxml.hvac_distributions << hpxml.hvac_distributions[0].dup
-        hpxml.hvac_distributions[-1].id = "HVACDistribution#{hpxml.hvac_distributions.size}"
-        hpxml.cooling_systems[0].fraction_cool_load_served = 0.5
-        hpxml.cooling_systems[0].primary_system = false
-        hpxml.cooling_systems << hpxml.cooling_systems[0].dup
-        hpxml.cooling_systems[1].id = "CoolingSystem#{hpxml.cooling_systems.size}"
-        hpxml.cooling_systems[1].distribution_system_idref = hpxml.hvac_distributions[-1].id
-        hpxml.cooling_systems[1].primary_system = true
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml')
+        hpxml_bldg.hvac_distributions << hpxml_bldg.hvac_distributions[0].dup
+        hpxml_bldg.hvac_distributions[-1].id = "HVACDistribution#{hpxml_bldg.hvac_distributions.size}"
+        hpxml_bldg.cooling_systems[0].fraction_cool_load_served = 0.5
+        hpxml_bldg.cooling_systems[0].primary_system = false
+        hpxml_bldg.cooling_systems << hpxml_bldg.cooling_systems[0].dup
+        hpxml_bldg.cooling_systems[1].id = "CoolingSystem#{hpxml_bldg.cooling_systems.size}"
+        hpxml_bldg.cooling_systems[1].distribution_system_idref = hpxml_bldg.hvac_distributions[-1].id
+        hpxml_bldg.cooling_systems[1].primary_system = true
       elsif ['hvac-shared-chiller-negative-seer-eq'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-chiller-only-baseboard.xml'))
-        hpxml.cooling_systems[0].shared_loop_watts *= 100.0
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml')
+        hpxml_bldg.cooling_systems[0].shared_loop_watts *= 100.0
       elsif ['invalid-battery-capacity-units'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-pv-battery.xml'))
-        hpxml.batteries[0].usable_capacity_kwh = nil
-        hpxml.batteries[0].usable_capacity_ah = 200.0
+        hpxml, hpxml_bldg = _create_hpxml('base-pv-battery.xml')
+        hpxml_bldg.batteries[0].usable_capacity_kwh = nil
+        hpxml_bldg.batteries[0].usable_capacity_ah = 200.0
       elsif ['invalid-battery-capacity-units2'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-pv-battery-ah.xml'))
-        hpxml.batteries[0].usable_capacity_kwh = 10.0
-        hpxml.batteries[0].usable_capacity_ah = nil
+        hpxml, hpxml_bldg = _create_hpxml('base-pv-battery-ah.xml')
+        hpxml_bldg.batteries[0].usable_capacity_kwh = 10.0
+        hpxml_bldg.batteries[0].usable_capacity_ah = nil
       elsif ['invalid-datatype-boolean'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base.xml')
       elsif ['invalid-datatype-integer'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base.xml')
       elsif ['invalid-datatype-float'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base.xml')
       elsif ['invalid-daylight-saving'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-simcontrol-daylight-saving-custom.xml'))
-        hpxml.header.dst_begin_month = 3
-        hpxml.header.dst_begin_day = 10
-        hpxml.header.dst_end_month = 4
-        hpxml.header.dst_end_day = 31
+        hpxml, hpxml_bldg = _create_hpxml('base-simcontrol-daylight-saving-custom.xml')
+        hpxml_bldg.dst_begin_month = 3
+        hpxml_bldg.dst_begin_day = 10
+        hpxml_bldg.dst_end_month = 4
+        hpxml_bldg.dst_end_day = 31
       elsif ['invalid-distribution-cfa-served'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_distributions[-1].conditioned_floor_area_served = 2701.1
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_distributions[-1].conditioned_floor_area_served = 2701.1
       elsif ['invalid-epw-filepath'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.climate_and_risk_zones.weather_station_epw_filepath = 'foo.epw'
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.climate_and_risk_zones.weather_station_epw_filepath = 'foo.epw'
       elsif ['invalid-id'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-skylights.xml'))
-        hpxml.skylights[0].id = ''
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-skylights.xml')
+        hpxml_bldg.skylights[0].id = ''
       elsif ['invalid-neighbor-shading-azimuth'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-neighbor-shading.xml'))
-        hpxml.neighbor_buildings[0].azimuth = 145
+        hpxml, hpxml_bldg = _create_hpxml('base-misc-neighbor-shading.xml')
+        hpxml_bldg.neighbor_buildings[0].azimuth = 145
       elsif ['invalid-relatedhvac-dhw-indirect'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-indirect.xml'))
-        hpxml.water_heating_systems[0].related_hvac_idref = 'HeatingSystem_bad'
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-indirect.xml')
+        hpxml_bldg.water_heating_systems[0].related_hvac_idref = 'HeatingSystem_bad'
       elsif ['invalid-relatedhvac-desuperheater'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-central-ac-only-1-speed.xml'))
-        hpxml.water_heating_systems[0].uses_desuperheater = true
-        hpxml.water_heating_systems[0].related_hvac_idref = 'CoolingSystem_bad'
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-central-ac-only-1-speed.xml')
+        hpxml_bldg.water_heating_systems[0].uses_desuperheater = true
+        hpxml_bldg.water_heating_systems[0].related_hvac_idref = 'CoolingSystem_bad'
       elsif ['invalid-runperiod'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base.xml')
         hpxml.header.sim_begin_month = 3
         hpxml.header.sim_begin_day = 10
         hpxml.header.sim_end_month = 4
         hpxml.header.sim_end_day = 31
       elsif ['invalid-shading-season'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.header.shading_summer_begin_month = 3
-        hpxml.header.shading_summer_begin_day = 10
-        hpxml.header.shading_summer_end_month = 4
-        hpxml.header.shading_summer_end_day = 31
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.header.shading_summer_begin_month = 3
+        hpxml_bldg.header.shading_summer_begin_day = 10
+        hpxml_bldg.header.shading_summer_end_month = 4
+        hpxml_bldg.header.shading_summer_end_day = 31
       elsif ['invalid-unavailable-period'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base.xml')
         hpxml.header.unavailable_periods.add(column_name: 'Power Outage',
                                              begin_month: 3,
                                              begin_day: 10,
                                              end_month: 4,
                                              end_day: 31)
       elsif ['invalid-schema-version'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base.xml')
       elsif ['invalid-skylights-physical-properties'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-skylights-physical-properties.xml'))
-        hpxml.skylights[1].thermal_break = false
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-skylights-physical-properties.xml')
+        hpxml_bldg.skylights[1].thermal_break = false
       elsif ['invalid-windows-physical-properties'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-windows-physical-properties.xml'))
-        hpxml.windows[2].thermal_break = false
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-windows-physical-properties.xml')
+        hpxml_bldg.windows[2].thermal_break = false
       elsif ['inverter-unequal-efficiencies'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-pv.xml'))
-        hpxml.inverters.add(id: 'Inverter2',
-                            inverter_efficiency: 0.5)
-        hpxml.pv_systems[1].inverter_idref = hpxml.inverters[-1].id
+        hpxml, hpxml_bldg = _create_hpxml('base-pv.xml')
+        hpxml_bldg.inverters.add(id: 'Inverter2',
+                                 inverter_efficiency: 0.5)
+        hpxml_bldg.pv_systems[1].inverter_idref = hpxml_bldg.inverters[-1].id
       elsif ['leap-year-TMY'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-simcontrol-calendar-year-custom.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base-simcontrol-calendar-year-custom.xml')
         hpxml.header.sim_calendar_year = 2008
       elsif ['net-area-negative-roof'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-skylights.xml'))
-        hpxml.skylights[0].area = 4000
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-skylights.xml')
+        hpxml_bldg.skylights[0].area = 4000
       elsif ['net-area-negative-wall'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.windows[0].area = 1000
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.windows[0].area = 1000
       elsif ['orphaned-hvac-distribution'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-furnace-gas-room-ac.xml'))
-        hpxml.heating_systems[0].delete
-        hpxml.hvac_controls[0].heating_setpoint_temp = nil
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-furnace-gas-room-ac.xml')
+        hpxml_bldg.heating_systems[0].delete
+        hpxml_bldg.hvac_controls[0].heating_setpoint_temp = nil
       elsif ['refrigerators-multiple-primary'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-loads-large-uncommon.xml'))
-        hpxml.refrigerators[1].primary_indicator = true
+        hpxml, hpxml_bldg = _create_hpxml('base-misc-loads-large-uncommon.xml')
+        hpxml_bldg.refrigerators[1].primary_indicator = true
       elsif ['refrigerators-no-primary'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-loads-large-uncommon.xml'))
-        hpxml.refrigerators[0].primary_indicator = false
+        hpxml, hpxml_bldg = _create_hpxml('base-misc-loads-large-uncommon.xml')
+        hpxml_bldg.refrigerators[0].primary_indicator = false
       elsif ['repeated-relatedhvac-dhw-indirect'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-indirect.xml'))
-        hpxml.water_heating_systems[0].fraction_dhw_load_served = 0.5
-        hpxml.water_heating_systems << hpxml.water_heating_systems[0].dup
-        hpxml.water_heating_systems[1].id = "WaterHeatingSystem#{hpxml.water_heating_systems.size}"
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-indirect.xml')
+        hpxml_bldg.water_heating_systems[0].fraction_dhw_load_served = 0.5
+        hpxml_bldg.water_heating_systems << hpxml_bldg.water_heating_systems[0].dup
+        hpxml_bldg.water_heating_systems[1].id = "WaterHeatingSystem#{hpxml_bldg.water_heating_systems.size}"
       elsif ['repeated-relatedhvac-desuperheater'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-central-ac-only-1-speed.xml'))
-        hpxml.water_heating_systems[0].fraction_dhw_load_served = 0.5
-        hpxml.water_heating_systems[0].uses_desuperheater = true
-        hpxml.water_heating_systems[0].related_hvac_idref = 'CoolingSystem1'
-        hpxml.water_heating_systems << hpxml.water_heating_systems[0].dup
-        hpxml.water_heating_systems[1].id = "WaterHeatingSystem#{hpxml.water_heating_systems.size}"
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-central-ac-only-1-speed.xml')
+        hpxml_bldg.water_heating_systems[0].fraction_dhw_load_served = 0.5
+        hpxml_bldg.water_heating_systems[0].uses_desuperheater = true
+        hpxml_bldg.water_heating_systems[0].related_hvac_idref = 'CoolingSystem1'
+        hpxml_bldg.water_heating_systems << hpxml_bldg.water_heating_systems[0].dup
+        hpxml_bldg.water_heating_systems[1].id = "WaterHeatingSystem#{hpxml_bldg.water_heating_systems.size}"
       elsif ['schedule-detailed-bad-values-max-not-one'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-schedules-detailed-occupancy-stochastic.xml'))
-        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml.header.schedules_filepaths[0]))
+        hpxml, hpxml_bldg = _create_hpxml('base-schedules-detailed-occupancy-stochastic.xml')
+        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
         csv_data[1][1] = 1.1
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
-        hpxml.header.schedules_filepaths = [@tmp_csv_path]
+        hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       elsif ['schedule-detailed-bad-values-negative'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-schedules-detailed-occupancy-stochastic.xml'))
-        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml.header.schedules_filepaths[0]))
+        hpxml, hpxml_bldg = _create_hpxml('base-schedules-detailed-occupancy-stochastic.xml')
+        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
         csv_data[1][1] = -0.5
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
-        hpxml.header.schedules_filepaths = [@tmp_csv_path]
+        hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       elsif ['schedule-detailed-bad-values-non-numeric'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-schedules-detailed-occupancy-stochastic.xml'))
-        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml.header.schedules_filepaths[0]))
+        hpxml, hpxml_bldg = _create_hpxml('base-schedules-detailed-occupancy-stochastic.xml')
+        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
         csv_data[1][1] = 'NA'
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
-        hpxml.header.schedules_filepaths = [@tmp_csv_path]
+        hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       elsif ['schedule-detailed-bad-values-mode-negative'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-tank-heat-pump-detailed-schedules.xml'))
-        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml.header.schedules_filepaths[1]))
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-tank-heat-pump-detailed-schedules.xml')
+        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[1]))
         csv_data[1][0] = -0.5
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
-        hpxml.header.schedules_filepaths = [@tmp_csv_path]
+        hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       elsif ['schedule-detailed-duplicate-columns'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-schedules-detailed-occupancy-stochastic.xml'))
-        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml.header.schedules_filepaths[0]))
+        hpxml, hpxml_bldg = _create_hpxml('base-schedules-detailed-occupancy-stochastic.xml')
+        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
-        hpxml.header.schedules_filepaths = []
-        hpxml.header.schedules_filepaths << @tmp_csv_path
-        hpxml.header.schedules_filepaths << @tmp_csv_path
+        hpxml_bldg.header.schedules_filepaths = []
+        hpxml_bldg.header.schedules_filepaths << @tmp_csv_path
+        hpxml_bldg.header.schedules_filepaths << @tmp_csv_path
       elsif ['schedule-detailed-wrong-filename'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.header.schedules_filepaths << 'invalid-wrong-filename.csv'
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.header.schedules_filepaths << 'invalid-wrong-filename.csv'
       elsif ['schedule-detailed-wrong-rows'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-schedules-detailed-occupancy-stochastic.xml'))
-        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml.header.schedules_filepaths[0]))
+        hpxml, hpxml_bldg = _create_hpxml('base-schedules-detailed-occupancy-stochastic.xml')
+        csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
         File.write(@tmp_csv_path, csv_data[0..-2].map(&:to_csv).join)
-        hpxml.header.schedules_filepaths = [@tmp_csv_path]
+        hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       elsif ['solar-thermal-system-with-combi-tankless'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-combi-tankless.xml'))
-        hpxml.solar_thermal_systems.add(id: "SolarThermalSystem#{hpxml.solar_thermal_systems.size + 1}",
-                                        system_type: HPXML::SolarThermalSystemType,
-                                        collector_area: 40,
-                                        collector_type: HPXML::SolarThermalTypeSingleGlazing,
-                                        collector_loop_type: HPXML::SolarThermalLoopTypeIndirect,
-                                        collector_azimuth: 180,
-                                        collector_tilt: 20,
-                                        collector_frta: 0.77,
-                                        collector_frul: 0.793,
-                                        water_heating_system_idref: 'WaterHeatingSystem1')
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-combi-tankless.xml')
+        hpxml_bldg.solar_thermal_systems.add(id: "SolarThermalSystem#{hpxml_bldg.solar_thermal_systems.size + 1}",
+                                             system_type: HPXML::SolarThermalSystemType,
+                                             collector_area: 40,
+                                             collector_type: HPXML::SolarThermalTypeSingleGlazing,
+                                             collector_loop_type: HPXML::SolarThermalLoopTypeIndirect,
+                                             collector_azimuth: 180,
+                                             collector_tilt: 20,
+                                             collector_frta: 0.77,
+                                             collector_frul: 0.793,
+                                             water_heating_system_idref: 'WaterHeatingSystem1')
       elsif ['solar-thermal-system-with-desuperheater'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-desuperheater.xml'))
-        hpxml.solar_thermal_systems.add(id: "SolarThermalSystem#{hpxml.solar_thermal_systems.size + 1}",
-                                        system_type: HPXML::SolarThermalSystemType,
-                                        collector_area: 40,
-                                        collector_type: HPXML::SolarThermalTypeSingleGlazing,
-                                        collector_loop_type: HPXML::SolarThermalLoopTypeIndirect,
-                                        collector_azimuth: 180,
-                                        collector_tilt: 20,
-                                        collector_frta: 0.77,
-                                        collector_frul: 0.793,
-                                        water_heating_system_idref: 'WaterHeatingSystem1')
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-desuperheater.xml')
+        hpxml_bldg.solar_thermal_systems.add(id: "SolarThermalSystem#{hpxml_bldg.solar_thermal_systems.size + 1}",
+                                             system_type: HPXML::SolarThermalSystemType,
+                                             collector_area: 40,
+                                             collector_type: HPXML::SolarThermalTypeSingleGlazing,
+                                             collector_loop_type: HPXML::SolarThermalLoopTypeIndirect,
+                                             collector_azimuth: 180,
+                                             collector_tilt: 20,
+                                             collector_frta: 0.77,
+                                             collector_frul: 0.793,
+                                             water_heating_system_idref: 'WaterHeatingSystem1')
       elsif ['solar-thermal-system-with-dhw-indirect'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-combi-tankless.xml'))
-        hpxml.solar_thermal_systems.add(id: "SolarThermalSystem#{hpxml.solar_thermal_systems.size + 1}",
-                                        system_type: HPXML::SolarThermalSystemType,
-                                        collector_area: 40,
-                                        collector_type: HPXML::SolarThermalTypeSingleGlazing,
-                                        collector_loop_type: HPXML::SolarThermalLoopTypeIndirect,
-                                        collector_azimuth: 180,
-                                        collector_tilt: 20,
-                                        collector_frta: 0.77,
-                                        collector_frul: 0.793,
-                                        water_heating_system_idref: 'WaterHeatingSystem1')
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-combi-tankless.xml')
+        hpxml_bldg.solar_thermal_systems.add(id: "SolarThermalSystem#{hpxml_bldg.solar_thermal_systems.size + 1}",
+                                             system_type: HPXML::SolarThermalSystemType,
+                                             collector_area: 40,
+                                             collector_type: HPXML::SolarThermalTypeSingleGlazing,
+                                             collector_loop_type: HPXML::SolarThermalLoopTypeIndirect,
+                                             collector_azimuth: 180,
+                                             collector_tilt: 20,
+                                             collector_frta: 0.77,
+                                             collector_frul: 0.793,
+                                             water_heating_system_idref: 'WaterHeatingSystem1')
       elsif ['storm-windows-unexpected-window-ufactor'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.windows[0].storm_type = 'clear'
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.windows[0].storm_type = 'clear'
       elsif ['unattached-cfis'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.ventilation_fans.add(id: "VentilationFan#{hpxml.ventilation_fans.size + 1}",
-                                   fan_type: HPXML::MechVentTypeCFIS,
-                                   used_for_whole_building_ventilation: true,
-                                   distribution_system_idref: hpxml.hvac_distributions[0].id)
-        hpxml.ventilation_fans[0].distribution_system_idref = 'foobar'
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.ventilation_fans.add(id: "VentilationFan#{hpxml_bldg.ventilation_fans.size + 1}",
+                                        fan_type: HPXML::MechVentTypeCFIS,
+                                        used_for_whole_building_ventilation: true,
+                                        distribution_system_idref: hpxml_bldg.hvac_distributions[0].id)
+        hpxml_bldg.ventilation_fans[0].distribution_system_idref = 'foobar'
       elsif ['unattached-door'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.doors[0].wall_idref = 'foobar'
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.doors[0].wall_idref = 'foobar'
       elsif ['unattached-hvac-distribution'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.heating_systems[0].distribution_system_idref = 'foobar'
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.heating_systems[0].distribution_system_idref = 'foobar'
       elsif ['unattached-pv-system'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-pv.xml'))
-        hpxml.pv_systems[0].inverter_idref = 'foobar'
+        hpxml, hpxml_bldg = _create_hpxml('base-pv.xml')
+        hpxml_bldg.pv_systems[0].inverter_idref = 'foobar'
       elsif ['unattached-skylight'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-skylights.xml'))
-        hpxml.skylights[0].roof_idref = 'foobar'
+        hpxml, hpxml_bldg = _create_hpxml('base-enclosure-skylights.xml')
+        hpxml_bldg.skylights[0].roof_idref = 'foobar'
       elsif ['unattached-solar-thermal-system'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-solar-indirect-flat-plate.xml'))
-        hpxml.solar_thermal_systems[0].water_heating_system_idref = 'foobar'
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-solar-indirect-flat-plate.xml')
+        hpxml_bldg.solar_thermal_systems[0].water_heating_system_idref = 'foobar'
       elsif ['unattached-shared-clothes-washer-dhw-distribution'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-laundry-room.xml'))
-        hpxml.clothes_washers[0].water_heating_system_idref = nil
-        hpxml.clothes_washers[0].hot_water_distribution_idref = 'foobar'
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-laundry-room.xml')
+        hpxml_bldg.clothes_washers[0].water_heating_system_idref = nil
+        hpxml_bldg.clothes_washers[0].hot_water_distribution_idref = 'foobar'
       elsif ['unattached-shared-clothes-washer-water-heater'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-laundry-room.xml'))
-        hpxml.clothes_washers[0].water_heating_system_idref = 'foobar'
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-laundry-room.xml')
+        hpxml_bldg.clothes_washers[0].water_heating_system_idref = 'foobar'
       elsif ['unattached-shared-dishwasher-dhw-distribution'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-laundry-room.xml'))
-        hpxml.dishwashers[0].water_heating_system_idref = nil
-        hpxml.dishwashers[0].hot_water_distribution_idref = 'foobar'
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-laundry-room.xml')
+        hpxml_bldg.dishwashers[0].water_heating_system_idref = nil
+        hpxml_bldg.dishwashers[0].hot_water_distribution_idref = 'foobar'
       elsif ['unattached-shared-dishwasher-water-heater'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-laundry-room.xml'))
-        hpxml.dishwashers[0].water_heating_system_idref = 'foobar'
+        hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-laundry-room.xml')
+        hpxml_bldg.dishwashers[0].water_heating_system_idref = 'foobar'
       elsif ['unattached-window'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.windows[0].wall_idref = 'foobar'
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.windows[0].wall_idref = 'foobar'
       elsif ['unavailable-period-missing-column'].include? error_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-schedules-simple-vacancy.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base-schedules-simple-vacancy.xml')
         hpxml.header.unavailable_periods[0].column_name = 'foobar'
+      elsif ['unique-objects-vary-across-units-epw'].include? error_case
+        building_id = 'ALL'
+        hpxml, hpxml_bldg = _create_hpxml('base-multiple-sfd-buildings.xml', building_id: building_id)
+        hpxml_bldg.climate_and_risk_zones.weather_station_epw_filepath = 'USA_AZ_Phoenix-Sky.Harbor.Intl.AP.722780_TMY3.epw'
+      elsif ['unique-objects-vary-across-units-dst'].include? error_case
+        building_id = 'ALL'
+        hpxml, hpxml_bldg = _create_hpxml('base-multiple-sfd-buildings.xml', building_id: building_id)
+        hpxml_bldg.dst_begin_month = 3
+        hpxml_bldg.dst_begin_day = 15
+        hpxml_bldg.dst_end_month = 10
+        hpxml_bldg.dst_end_day = 15
+      elsif ['unique-objects-vary-across-units-tmains'].include? error_case
+        building_id = 'ALL'
+        hpxml, hpxml_bldg = _create_hpxml('base-multiple-sfd-buildings.xml', building_id: building_id)
+        hpxml_bldg.hot_water_distributions[0].dwhr_facilities_connected = HPXML::DWHRFacilitiesConnectedOne
+        hpxml_bldg.hot_water_distributions[0].dwhr_equal_flow = true
+        hpxml_bldg.hot_water_distributions[0].dwhr_efficiency = 0.55
+      elsif ['whole-mf-building-batteries'].include? error_case
+        building_id = 'ALL'
+        hpxml, hpxml_bldg = _create_hpxml('base-multiple-sfd-buildings.xml', building_id: building_id)
+        hpxml_bldg.batteries.add(id: 'Battery1',
+                                 type: HPXML::BatteryTypeLithiumIon)
+      elsif ['whole-mf-building-dehumidifiers-unit-multiplier'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base-appliances-dehumidifier.xml')
+        hpxml_bldg.building_construction.number_of_units = 2
+      elsif ['whole-mf-building-gshps-unit-multiplier'].include? error_case
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-ground-to-air-heat-pump.xml')
+        hpxml_bldg.building_construction.number_of_units = 2
       else
         fail "Unhandled case: #{error_case}."
       end
 
-      hpxml_doc = hpxml.to_oga()
+      hpxml_doc = hpxml.to_doc()
 
       # Perform additional raw XML manipulation
       if ['invalid-datatype-boolean'].include? error_case
@@ -1242,13 +1377,16 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
       end
 
       XMLHelper.write_file(hpxml_doc, @tmp_hpxml_path)
-      _test_measure('error', expected_errors)
+      _test_measure('error', expected_errors, building_id: building_id)
     end
   end
 
   def test_ruby_warning_messages
     # Test case => Error message
     all_expected_warnings = { 'cfis-undersized-supplemental-fan' => ["CFIS supplemental fan 'VentilationFan2' is undersized (90.0 cfm) compared to the target hourly ventilation rate (110.0 cfm)."],
+                              'duct-lto-cfm25' => ['Ducts are entirely within conditioned space but there is moderate leakage to the outside. Leakage to the outside is typically zero or near-zero in these situations, consider revising leakage values. Leakage will be modeled as heat lost to the ambient environment.'],
+                              'duct-lto-cfm50' => ['Ducts are entirely within conditioned space but there is moderate leakage to the outside. Leakage to the outside is typically zero or near-zero in these situations, consider revising leakage values. Leakage will be modeled as heat lost to the ambient environment.'],
+                              'duct-lto-percent' => ['Ducts are entirely within conditioned space but there is moderate leakage to the outside. Leakage to the outside is typically zero or near-zero in these situations, consider revising leakage values. Leakage will be modeled as heat lost to the ambient environment.'],
                               'hvac-setpoint-adjustments' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
                               'hvac-setpoint-adjustments-daily-setbacks' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
                               'hvac-setpoint-adjustments-daily-schedules' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
@@ -1314,12 +1452,12 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
                                                                                   "Both 'pool_heater' schedule file and weekday fractions provided; the latter will be ignored.",
                                                                                   "Both 'pool_heater' schedule file and weekend fractions provided; the latter will be ignored.",
                                                                                   "Both 'pool_heater' schedule file and monthly multipliers provided; the latter will be ignored.",
-                                                                                  "Both 'hot_tub_pump' schedule file and weekday fractions provided; the latter will be ignored.",
-                                                                                  "Both 'hot_tub_pump' schedule file and weekend fractions provided; the latter will be ignored.",
-                                                                                  "Both 'hot_tub_pump' schedule file and monthly multipliers provided; the latter will be ignored.",
-                                                                                  "Both 'hot_tub_heater' schedule file and weekday fractions provided; the latter will be ignored.",
-                                                                                  "Both 'hot_tub_heater' schedule file and weekend fractions provided; the latter will be ignored.",
-                                                                                  "Both 'hot_tub_heater' schedule file and monthly multipliers provided; the latter will be ignored."],
+                                                                                  "Both 'permanent_spa_pump' schedule file and weekday fractions provided; the latter will be ignored.",
+                                                                                  "Both 'permanent_spa_pump' schedule file and weekend fractions provided; the latter will be ignored.",
+                                                                                  "Both 'permanent_spa_pump' schedule file and monthly multipliers provided; the latter will be ignored.",
+                                                                                  "Both 'permanent_spa_heater' schedule file and weekday fractions provided; the latter will be ignored.",
+                                                                                  "Both 'permanent_spa_heater' schedule file and weekend fractions provided; the latter will be ignored.",
+                                                                                  "Both 'permanent_spa_heater' schedule file and monthly multipliers provided; the latter will be ignored."],
                               'schedule-file-and-setpoints' => ["Both 'heating_setpoint' schedule file and heating setpoint temperature provided; the latter will be ignored.",
                                                                 "Both 'cooling_setpoint' schedule file and cooling setpoint temperature provided; the latter will be ignored.",
                                                                 "Both 'water_heater_setpoint' schedule file and setpoint temperature provided; the latter will be ignored."],
@@ -1327,44 +1465,78 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
 
     all_expected_warnings.each_with_index do |(warning_case, expected_warnings), i|
       puts "[#{i + 1}/#{all_expected_warnings.size}] Testing #{warning_case}..."
+      building_id = nil
       # Create HPXML object
       if ['cfis-undersized-supplemental-fan'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-mechvent-cfis-supplemental-fan-exhaust.xml'))
-        suppl_fan = hpxml.ventilation_fans.find { |f| f.is_cfis_supplemental_fan? }
+        hpxml, hpxml_bldg = _create_hpxml('base-mechvent-cfis-supplemental-fan-exhaust.xml')
+        suppl_fan = hpxml_bldg.ventilation_fans.find { |f| f.is_cfis_supplemental_fan? }
         suppl_fan.tested_flow_rate = 90.0
+      elsif ['duct-lto-cfm25'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base-atticroof-conditioned.xml')
+        hpxml_bldg.hvac_distributions[0].conditioned_floor_area_served = hpxml_bldg.building_construction.conditioned_floor_area
+        hpxml_bldg.hvac_distributions[0].duct_leakage_measurements.each do |dlm|
+          dlm.duct_leakage_units = HPXML::UnitsCFM25
+          dlm.duct_leakage_value = 100.0
+        end
+        hpxml_bldg.hvac_distributions[0].ducts.each do |duct|
+          duct.duct_surface_area = nil
+          duct.duct_location = nil
+        end
+      elsif ['duct-lto-cfm50'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base-atticroof-conditioned.xml')
+        hpxml_bldg.hvac_distributions[0].conditioned_floor_area_served = hpxml_bldg.building_construction.conditioned_floor_area
+        hpxml_bldg.hvac_distributions[0].duct_leakage_measurements.each do |dlm|
+          dlm.duct_leakage_units = HPXML::UnitsCFM50
+          dlm.duct_leakage_value = 200.0
+        end
+        hpxml_bldg.hvac_distributions[0].ducts.each do |duct|
+          duct.duct_surface_area = nil
+          duct.duct_location = nil
+        end
+      elsif ['duct-lto-percent'].include? warning_case
+        hpxml, hpxml_bldg = _create_hpxml('base-atticroof-conditioned.xml')
+        hpxml_bldg.hvac_distributions[0].conditioned_floor_area_served = hpxml_bldg.building_construction.conditioned_floor_area
+        hpxml_bldg.hvac_distributions[0].duct_leakage_measurements.each do |dlm|
+          dlm.duct_leakage_units = HPXML::UnitsPercent
+          dlm.duct_leakage_value = 0.2
+        end
+        hpxml_bldg.hvac_distributions[0].ducts.each do |duct|
+          duct.duct_surface_area = nil
+          duct.duct_location = nil
+        end
       elsif ['hvac-setpoint-adjustments'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.hvac_controls[0].heating_setpoint_temp = 76.0
-        hpxml.hvac_controls[0].cooling_setpoint_temp = 75.0
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.hvac_controls[0].heating_setpoint_temp = 76.0
+        hpxml_bldg.hvac_controls[0].cooling_setpoint_temp = 75.0
       elsif ['hvac-setpoint-adjustments-daily-setbacks'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-setpoints-daily-setbacks.xml'))
-        hpxml.hvac_controls[0].heating_setback_temp = 76.0
-        hpxml.hvac_controls[0].cooling_setpoint_temp = 75.0
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-setpoints-daily-setbacks.xml')
+        hpxml_bldg.hvac_controls[0].heating_setback_temp = 76.0
+        hpxml_bldg.hvac_controls[0].cooling_setpoint_temp = 75.0
       elsif ['hvac-setpoint-adjustments-daily-schedules'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-setpoints-daily-schedules.xml'))
-        hpxml.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'
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-setpoints-daily-schedules.xml')
+        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 ['power-outage'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-schedules-simple-power-outage.xml'))
+        hpxml, _hpxml_bldg = _create_hpxml('base-schedules-simple-power-outage.xml')
       elsif ['schedule-file-and-weekday-weekend-multipliers'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-loads-large-uncommon.xml'))
+        hpxml, hpxml_bldg = _create_hpxml('base-misc-loads-large-uncommon.xml')
         hpxml.header.utility_bill_scenarios.clear # we don't want the propane warning
-        hpxml.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/occupancy-stochastic.csv')
-        hpxml.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/occupancy-non-stochastic.csv')
+        hpxml_bldg.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/occupancy-stochastic.csv')
+        hpxml_bldg.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/occupancy-non-stochastic.csv')
       elsif ['schedule-file-and-setpoints'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-        hpxml.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/setpoints.csv')
-        hpxml.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/water-heater-setpoints.csv')
+        hpxml, hpxml_bldg = _create_hpxml('base.xml')
+        hpxml_bldg.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/setpoints.csv')
+        hpxml_bldg.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/water-heater-setpoints.csv')
       elsif ['schedule-file-and-operating-mode'].include? warning_case
-        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-dhw-tank-heat-pump-operating-mode-heat-pump-only.xml'))
-        hpxml.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/water-heater-operating-modes.csv')
+        hpxml, hpxml_bldg = _create_hpxml('base-dhw-tank-heat-pump-operating-mode-heat-pump-only.xml')
+        hpxml_bldg.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/water-heater-operating-modes.csv')
       else
         fail "Unhandled case: #{warning_case}."
       end
 
-      hpxml_doc = hpxml.to_oga()
+      hpxml_doc = hpxml.to_doc()
 
       XMLHelper.write_file(hpxml_doc, @tmp_hpxml_path)
-      _test_measure('warning', expected_warnings)
+      _test_measure('warning', expected_warnings, building_id: building_id)
     end
   end
 
@@ -1388,7 +1560,7 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
     end
   end
 
-  def _test_measure(error_or_warning, expected_errors_or_warnings)
+  def _test_measure(error_or_warning, expected_errors_or_warnings, building_id: nil)
     # create an instance of the measure
     measure = HPXMLtoOpenStudio.new
 
@@ -1400,6 +1572,7 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
     args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
     args_hash['debug'] = true
     args_hash['output_dir'] = File.absolute_path(@tmp_output_path)
+    args_hash['building_id'] = building_id unless building_id.nil?
     arguments = measure.arguments(model)
     argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
 
@@ -1462,4 +1635,15 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
       end
     end
   end
+
+  def _create_hpxml(hpxml_name, building_id: nil)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, hpxml_name), building_id: building_id)
+    if not hpxml.errors.empty?
+      hpxml.errors.each do |error|
+        puts error
+      end
+      flunk "Did not successfully create HPXML file: #{hpxml_name}"
+    end
+    return hpxml, hpxml.buildings[0]
+  end
 end