urbanopt-cli 0.8.3 → 0.9.1

data/example_files/resources/hpxml-measures/ReportUtilityBills/tests/utility_bills_test.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
 require 'oga'
-require_relative '../../HPXMLtoOpenStudio/resources/minitest_helper'
+require_relative '../../HPXMLtoOpenStudio/resources/utility_bills'
 require_relative '../../HPXMLtoOpenStudio/resources/constants'
 require_relative '../../HPXMLtoOpenStudio/resources/energyplus'
 require_relative '../../HPXMLtoOpenStudio/resources/hpxml'
 require_relative '../../HPXMLtoOpenStudio/resources/hpxml_defaults'
+require_relative '../../HPXMLtoOpenStudio/resources/minitest_helper'
 require_relative '../../HPXMLtoOpenStudio/resources/schedules'
 require_relative '../../HPXMLtoOpenStudio/resources/unit_conversions'
 require_relative '../../HPXMLtoOpenStudio/resources/xmlhelper'
+require_relative '../../HPXMLtoOpenStudio/resources/version'
 require_relative '../resources/util.rb'
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
@@ -16,267 +18,330 @@ require_relative '../measure.rb'
 require 'csv'
 
 class ReportUtilityBillsTest < MiniTest::Test
-  # BEopt 2.8.0.0:
+  # BEopt 2.9.0.0:
   # - Standard, New Construction, Single-Family Detached
   # - 600 sq ft (30 x 20)
   # - EPW Location: USA_CO_Denver.Intl.AP.725650_TMY3.epw
   # - Cooking Range: Propane
   # - Water Heater: Oil Standard
   # - PV System: None, 1.0 kW, 10.0 kW
-  # - Timestep: 10 min
-  # - User-Specified rates (calculated using Constants.Auto):
-  #   - Electricity: 0.1195179675994109 $/kWh
-  #   - Natural Gas: 0.7468734851091381 $/therm
-  #   - Fuel Oil: 3.495346153846154 $/gal
-  #   - Propane: 2.4532692307692305 $/gal
+  # - Timestep: 60 min
+  # - User-Specified rates (calculated using default value):
+  #   - Electricity: 0.1195179675994109 USD/kWh
+  #   - Natural Gas: 0.7734017611590879 USD/therm
+  #   - Fuel Oil: 3.495346153846154 USD/gal
+  #   - Propane: 2.4532692307692305 USD/gal
+  # - Sample Tiered Rate
+  #   - Tier 1: 150 Max kWh
+  #   - Tier 2: 300 Max kWh
+  # - Sample Tiered Time-of-Use Rate
+  #   - Tier 1: 150 Max kWh (Period 1 and 2)
+  #   - Tier 2: 300 Max kWh (Period 2)
   # - All other options left at default values
-  # Then retrieve 1.csv from output folder, copy it, rename it
+  # Then retrieve 1.csv from output folder
 
   def setup
     @args_hash = {}
-    @args_hash['electricity_fixed_charge'] = 8.0
-    @args_hash['electricity_marginal_rate'] = Constants.Auto
-    @args_hash['natural_gas_fixed_charge'] = 8.0
-    @args_hash['natural_gas_marginal_rate'] = Constants.Auto
-    @args_hash['fuel_oil_marginal_rate'] = Constants.Auto
-    @args_hash['propane_marginal_rate'] = Constants.Auto
-    @args_hash['wood_cord_marginal_rate'] = 0.015
-    @args_hash['wood_pellets_marginal_rate'] = 0.015
-    @args_hash['coal_marginal_rate'] = 0.015
-    @args_hash['pv_compensation_type'] = 'Net Metering'
-    @args_hash['pv_annual_excess_sellback_rate_type'] = 'User-Specified'
-    @args_hash['pv_net_metering_annual_excess_sellback_rate'] = 0.03
-    @args_hash['pv_feed_in_tariff_rate'] = 0.12
-    @args_hash['pv_grid_connection_fee_units'] = '$/kW'
-    @args_hash['pv_monthly_grid_connection_fee'] = 0.0
-
-    # From BEopt Output screen (Utility Bills $/yr)
+
+    # From BEopt Output screen (Utility Bills USD/yr)
     @expected_bills = {
-      'Electricity: Fixed ($)' => 96,
-      'Electricity: Marginal ($)' => 629,
-      'Electricity: PV Credit ($)' => 0,
-      'Electricity: Total ($)' => 725,
-      'Natural Gas: Fixed ($)' => 96,
-      'Natural Gas: Marginal ($)' => 154,
-      'Natural Gas: Total ($)' => 250,
-      'Fuel Oil: Total ($)' => 462,
-      'Propane: Total ($)' => 76,
-      'Wood Cord: Total ($)' => 0,
-      'Wood Pellets: Total ($)' => 0,
-      'Coal: Total ($)' => 0,
-      'Total ($)' => 1514,
+      'Test: Electricity: Fixed (USD)' => 96,
+      'Test: Electricity: Energy (USD)' => 632,
+      'Test: Electricity: PV Credit (USD)' => 0,
+      'Test: Natural Gas: Fixed (USD)' => 96,
+      'Test: Natural Gas: Energy (USD)' => 149,
+      'Test: Fuel Oil: Fixed (USD)' => 0,
+      'Test: Fuel Oil: Energy (USD)' => 462,
+      'Test: Propane: Fixed (USD)' => 0,
+      'Test: Propane: Energy (USD)' => 76,
+      'Test: Coal: Fixed (USD)' => 0,
+      'Test: Coal: Energy (USD)' => 0,
+      'Test: Wood Cord: Fixed (USD)' => 0,
+      'Test: Wood Cord: Energy (USD)' => 0,
+      'Test: Wood Pellets: Fixed (USD)' => 0,
+      'Test: Wood Pellets: Energy (USD)' => 0
     }
 
     @measure = ReportUtilityBills.new
-    @hpxml = HPXML.new(hpxml_path: File.join(File.dirname(__FILE__), '../../workflow/sample_files/base-pv.xml'))
+    @hpxml_path = File.join(File.dirname(__FILE__), '../../workflow/sample_files/base-pv.xml')
+    @hpxml = HPXML.new(hpxml_path: @hpxml_path)
+    @hpxml.header.utility_bill_scenarios.clear
+    @hpxml.header.utility_bill_scenarios.add(name: 'Test',
+                                             elec_fixed_charge: 8.0,
+                                             natural_gas_fixed_charge: 8.0,
+                                             propane_marginal_rate: 2.4532692307692305,
+                                             fuel_oil_marginal_rate: 3.495346153846154)
+
+    # Check for presence of fuels once
+    has_fuel = {}
+    hpxml_doc = @hpxml.to_oga
+    Constants.FossilFuels.each do |fuel|
+      has_fuel[fuel] = @hpxml.has_fuel(fuel, hpxml_doc)
+    end
+
     HPXMLDefaults.apply_header(@hpxml, nil)
+    HPXMLDefaults.apply_utility_bill_scenarios(nil, @hpxml, has_fuel)
+
+    @root_path = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..'))
+    @sample_files_path = File.join(@root_path, 'workflow', 'sample_files')
+    @tmp_hpxml_path = File.join(@sample_files_path, 'tmp.xml')
+    @bills_csv = File.join(File.dirname(__FILE__), 'results_bills.csv')
+
+    @fuels_pv_none_simple = _load_timeseries(0, false)
+    @fuels_pv_1kw_simple = _load_timeseries(1, false)
+    @fuels_pv_10kw_simple = _load_timeseries(10, false)
+    @fuels_pv_none_detailed = _load_timeseries(0, true)
+    @fuels_pv_1kw_detailed = _load_timeseries(1, true)
+    @fuels_pv_10kw_detailed = _load_timeseries(10, true)
   end
 
-  def test_simple_calculations_pv_none
-    fuels, utility_rates, utility_bills = @measure.setup_outputs()
-    _load_timeseries(fuels, '../tests/PV_None.csv')
-    bills_csv = _bill_calcs(fuels, utility_rates, utility_bills, @hpxml.header, [])
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    _check_bills(@expected_bills, actual_bills)
+  def teardown
+    File.delete(@tmp_hpxml_path) if File.exist? @tmp_hpxml_path
+    File.delete(@bills_csv) if File.exist? @bills_csv
   end
 
-  def test_simple_calculations_pv_1kW
-    fuels, utility_rates, utility_bills = @measure.setup_outputs()
-    _load_timeseries(fuels, '../tests/PV_1kW.csv')
-    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
-    bills_csv = _bill_calcs(fuels, utility_rates, utility_bills, @hpxml.header, @hpxml.pv_systems)
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    @expected_bills['Electricity: PV Credit ($)'] = -177
-    @expected_bills['Electricity: Total ($)'] = 548
-    @expected_bills['Total ($)'] = 1337
-    _check_bills(@expected_bills, actual_bills)
+  # Simple (non-JSON) Calculations
+
+  def test_simple_pv_none
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_none_simple, @hpxml.header, [], utility_bill_scenario)
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
   end
 
-  def test_simple_calculations_pv_10kW
-    fuels, utility_rates, utility_bills = @measure.setup_outputs()
-    _load_timeseries(fuels, '../tests/PV_10kW.csv')
-    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
-    bills_csv = _bill_calcs(fuels, utility_rates, utility_bills, @hpxml.header, @hpxml.pv_systems)
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    @expected_bills['Electricity: PV Credit ($)'] = -918
-    @expected_bills['Electricity: Total ($)'] = -193
-    @expected_bills['Total ($)'] = 596
-    _check_bills(@expected_bills, actual_bills)
+  def test_simple_pv_1kW_net_metering_user_excess_rate
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_simple, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -177
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
   end
 
-  def test_simple_calculations_pv_10kW_retail
-    @args_hash['pv_annual_excess_sellback_rate_type'] = 'Retail Electricity Cost'
-    fuels, utility_rates, utility_bills = @measure.setup_outputs()
-    _load_timeseries(fuels, '../tests/PV_10kW.csv')
+  def test_simple_pv_10kW_net_metering_user_excess_rate
     @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
-    bills_csv = _bill_calcs(fuels, utility_rates, utility_bills, @hpxml.header, @hpxml.pv_systems)
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    @expected_bills['Electricity: PV Credit ($)'] = -1779
-    @expected_bills['Electricity: Total ($)'] = -1054
-    @expected_bills['Total ($)'] = -265
-    _check_bills(@expected_bills, actual_bills)
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_simple, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -920
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
   end
 
-  def test_simple_calculations_pv_1kW_feed_in_tariff
-    @args_hash['pv_compensation_type'] = 'Feed-In Tariff'
-    fuels, utility_rates, utility_bills = @measure.setup_outputs()
-    _load_timeseries(fuels, '../tests/PV_1kW.csv')
-    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
-    bills_csv = _bill_calcs(fuels, utility_rates, utility_bills, @hpxml.header, @hpxml.pv_systems)
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    @expected_bills['Electricity: PV Credit ($)'] = -178
-    @expected_bills['Electricity: Total ($)'] = 547
-    @expected_bills['Total ($)'] = 1336
-    _check_bills(@expected_bills, actual_bills)
+  def test_simple_pv_10kW_net_metering_retail_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate_type = HPXML::PVAnnualExcessSellbackRateTypeRetailElectricityCost
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_simple, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1777
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
   end
 
-  def test_simple_calculations_pv_10kW_feed_in_tariff
-    @args_hash['pv_compensation_type'] = 'Feed-In Tariff'
-    fuels, utility_rates, utility_bills = @measure.setup_outputs()
-    _load_timeseries(fuels, '../tests/PV_10kW.csv')
+  def test_simple_pv_10kW_net_metering_zero_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate = 0.0
     @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
-    bills_csv = _bill_calcs(fuels, utility_rates, utility_bills, @hpxml.header, @hpxml.pv_systems)
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    @expected_bills['Electricity: PV Credit ($)'] = -1787
-    @expected_bills['Electricity: Total ($)'] = -1061
-    @expected_bills['Total ($)'] = -272
-    _check_bills(@expected_bills, actual_bills)
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_simple, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -632
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
   end
 
-  def test_simple_calculations_pv_1kW_grid_fee_dollars_per_kW
-    @args_hash['pv_monthly_grid_connection_fee'] = 2.50
-    fuels, utility_rates, utility_bills = @measure.setup_outputs()
-    _load_timeseries(fuels, '../tests/PV_1kW.csv')
+  def test_simple_pv_1kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
     @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
-    bills_csv = _bill_calcs(fuels, utility_rates, utility_bills, @hpxml.header, @hpxml.pv_systems)
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    @expected_bills['Electricity: Fixed ($)'] = 126
-    @expected_bills['Electricity: PV Credit ($)'] = -177
-    @expected_bills['Electricity: Total ($)'] = 578
-    @expected_bills['Total ($)'] = 1367
-    _check_bills(@expected_bills, actual_bills)
-  end
-
-  def test_simple_calculations_pv_1kW_grid_fee_dollars
-    @args_hash['pv_grid_connection_fee_units'] = '$'
-    @args_hash['pv_monthly_grid_connection_fee'] = 7.50
-    fuels, utility_rates, utility_bills = @measure.setup_outputs()
-    _load_timeseries(fuels, '../tests/PV_1kW.csv')
-    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
-    bills_csv = _bill_calcs(fuels, utility_rates, utility_bills, @hpxml.header, @hpxml.pv_systems)
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    @expected_bills['Electricity: Fixed ($)'] = 186
-    @expected_bills['Electricity: PV Credit ($)'] = -177
-    @expected_bills['Electricity: Total ($)'] = 638
-    @expected_bills['Total ($)'] = 1427
-    _check_bills(@expected_bills, actual_bills)
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_simple, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -178
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_simple_pv_10kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_simple, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1785
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
   end
 
   def test_workflow_wood_cord
-    @args_hash['hpxml_path'] = '../workflow/sample_files/base-hvac-furnace-wood-only.xml'
-    @args_hash['wood_cord_marginal_rate'] = 0.0500
-    bills_csv = _test_measure()
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    assert_operator(actual_bills['Wood Cord: Total ($)'], :>, 0)
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-furnace-wood-only.xml'))
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', wood_marginal_rate: 0.015)
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 2', wood_marginal_rate: 0.03)
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    actual_bills = _test_measure()
+    expected_val = actual_bills['Test 1: Wood Cord: Total (USD)']
+    assert_in_delta(expected_val * 2, actual_bills['Test 2: Wood Cord: Total (USD)'], 1)
   end
 
   def test_workflow_wood_pellets
-    @args_hash['hpxml_path'] = '../workflow/sample_files/base-hvac-stove-wood-pellets-only.xml'
-    @args_hash['wood_pellets_marginal_rate'] = 0.0500
-    bills_csv = _test_measure()
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    assert_operator(actual_bills['Wood Pellets: Total ($)'], :>, 0)
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-stove-wood-pellets-only.xml'))
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', wood_pellets_marginal_rate: 0.02)
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 2', wood_pellets_marginal_rate: 0.01)
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    actual_bills = _test_measure()
+    expected_val = actual_bills['Test 1: Wood Pellets: Total (USD)']
+    assert_in_delta(expected_val / 2, actual_bills['Test 2: Wood Pellets: Total (USD)'], 1)
   end
 
   def test_workflow_coal
-    @args_hash['hpxml_path'] = '../workflow/sample_files/base-hvac-furnace-coal-only.xml'
-    @args_hash['coal_marginal_rate'] = 0.0500
-    bills_csv = _test_measure()
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    assert_operator(actual_bills['Coal: Total ($)'], :>, 0)
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-furnace-coal-only.xml'))
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', coal_marginal_rate: 0.05)
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 2', coal_marginal_rate: 0.1)
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 3', coal_marginal_rate: 0.025)
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    actual_bills = _test_measure()
+    expected_val = actual_bills['Test 1: Coal: Total (USD)']
+    assert_in_delta(expected_val * 2, actual_bills['Test 2: Coal: Total (USD)'], 1)
+    assert_in_delta(expected_val / 2, actual_bills['Test 3: Coal: Total (USD)'], 1)
   end
 
   def test_workflow_leap_year
-    @args_hash['hpxml_path'] = '../workflow/sample_files/base-location-AMY-2012.xml'
-    bills_csv = _test_measure()
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    assert_operator(actual_bills['Total ($)'], :>, 0)
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-location-AMY-2012.xml'))
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    actual_bills = _test_measure()
+    assert_operator(actual_bills['Bills: Total (USD)'], :>, 0)
   end
 
   def test_workflow_semi_annual_run_period
-    @args_hash['hpxml_path'] = '../workflow/sample_files/base-simcontrol-runperiod-1-month.xml'
-    bills_csv = _test_measure()
-    assert(File.exist?(bills_csv))
-    actual_bills = _get_actual_bills(bills_csv)
-    assert_operator(actual_bills['Total ($)'], :>, 0)
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-simcontrol-runperiod-1-month.xml'))
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    actual_bills = _test_measure()
+    assert_operator(actual_bills['Bills: Total (USD)'], :>, 0)
+  end
+
+  def test_workflow_no_bill_scenarios
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-misc-bills-none.xml'))
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    actual_bills = _test_measure(hpxml: hpxml)
+    assert_nil(actual_bills)
+  end
+
+  def test_workflow_detailed_calculations
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', elec_tariff_filepath: '../../ReportUtilityBills/tests/JacksonElectricMemberCorp-ResidentialSeniorCitizenLowIncomeAssistance.json')
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    actual_bills = _test_measure()
+    assert_operator(actual_bills['Test 1: Total (USD)'], :>, 0)
   end
 
   def test_auto_marginal_rate
-    fuel_types = [FT::Elec, FT::Gas, FT::Oil, FT::Propane]
+    fuel_types = [HPXML::FuelTypeElectricity, HPXML::FuelTypeNaturalGas, HPXML::FuelTypeOil, HPXML::FuelTypePropane]
 
     # Check that we can successfully look up "auto" rates for every state
     # and every fuel type.
-    runner = OpenStudio::Measure::OSRunner.new(OpenStudio::WorkflowJSON.new)
     Constants.StateCodesMap.keys.each do |state_code|
       fuel_types.each do |fuel_type|
-        flatratebuy = @measure.get_auto_marginal_rate(runner, state_code, fuel_type, 0)
+        flatratebuy, _ = UtilityBills.get_rates_from_eia_data(nil, state_code, fuel_type, 0)
         refute_nil(flatratebuy)
       end
     end
 
+    # Check that we can successfully look up "auto" rates for the US too.
+    fuel_types.each do |fuel_type|
+      flatratebuy, _ = UtilityBills.get_rates_from_eia_data(nil, 'US', fuel_type, 0)
+      refute_nil(flatratebuy)
+    end
+
     # Check that any other state code is gracefully handled (no error)
     fuel_types.each do |fuel_type|
-      flatratebuy = @measure.get_auto_marginal_rate(runner, 'XX', fuel_type, 0)
+      UtilityBills.get_rates_from_eia_data(nil, 'XX', fuel_type, 0)
     end
   end
 
   def test_warning_region
-    @args_hash['hpxml_path'] = '../workflow/sample_files/base-appliances-oil-location-miami-fl.xml'
-    expected_warnings = ['Could not find state average Fuel Oil rate based on Florida; using region (PADD 1C) average.']
-    bills_csv = _test_measure(expected_warnings: expected_warnings)
-    assert(File.exist?(bills_csv))
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-appliances-oil-location-miami-fl.xml'))
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    expected_warnings = ['Could not find state average fuel oil rate based on Florida; using region (PADD 1C) average.']
+    actual_bills = _test_measure(expected_warnings: expected_warnings)
+    assert_nil(actual_bills)
   end
 
   def test_warning_national
-    @args_hash['hpxml_path'] = '../workflow/sample_files/base-appliances-propane-location-portland-or.xml'
-    expected_warnings = ['Could not find state average Propane rate based on Oregon; using national average.']
-    bills_csv = _test_measure(expected_warnings: expected_warnings)
-    assert(File.exist?(bills_csv))
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-appliances-propane-location-portland-or.xml'))
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    expected_warnings = ['Could not find state average propane rate based on Oregon; using national average.']
+    actual_bills = _test_measure(expected_warnings: expected_warnings)
+    assert_nil(actual_bills)
   end
 
   def test_warning_dse
-    @args_hash['hpxml_path'] = '../workflow/sample_files/base-hvac-dse.xml'
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-dse.xml'))
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
     expected_warnings = ['DSE is not currently supported when calculating utility bills.']
-    bills_csv = _test_measure(expected_warnings: expected_warnings)
-    assert(!File.exist?(bills_csv))
+    actual_bills = _test_measure(expected_warnings: expected_warnings)
+    assert_nil(actual_bills)
   end
 
   def test_warning_no_rates
-    @args_hash['hpxml_path'] = '../workflow/sample_files/base-location-capetown-zaf.xml'
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-location-capetown-zaf.xml'))
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
     expected_warnings = ['Could not find a marginal Electricity rate.', 'Could not find a marginal Natural Gas rate.']
-    bills_csv = _test_measure(expected_warnings: expected_warnings)
-    assert(!File.exist?(bills_csv))
+    actual_bills = _test_measure(expected_warnings: expected_warnings)
+    assert_nil(actual_bills)
+  end
+
+  def test_warning_invalid_fixed_charge_units
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', elec_tariff_filepath: '../../ReportUtilityBills/tests/Invalid Fixed Charge Units.json')
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    expected_warnings = ['Fixed charge units must be $/month.']
+    actual_bills = _test_measure(expected_warnings: expected_warnings)
+    assert_nil(actual_bills)
   end
 
-  def test_error_user_specified_but_no_rates
-    skip
-    @args_hash['electricity_bill_type'] = 'Detailed'
-    @args_hash['electricity_utility_rate_type'] = 'User-Specified'
-    expected_errors = ['Must specify a utility rate json path when choosing User-Specified utility rate type.']
-    bills_csv = _test_measure(expected_errors: expected_errors)
-    assert(!File.exist?(bills_csv))
+  def test_warning_invalid_min_charge_units
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', elec_tariff_filepath: '../../ReportUtilityBills/tests/Invalid Min Charge Units.json')
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    expected_warnings = ['Min charge units must be either $/month or $/year.']
+    actual_bills = _test_measure(expected_warnings: expected_warnings)
+    assert_nil(actual_bills)
+  end
+
+  def test_warning_demand_charges
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', elec_tariff_filepath: '../../ReportUtilityBills/tests/Contains Demand Charges.json')
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    expected_warnings = ['Demand charges are not currently supported when calculating detailed utility bills.']
+    actual_bills = _test_measure(expected_warnings: expected_warnings)
+    assert_nil(actual_bills)
+  end
+
+  def test_warning_missing_required_fields
+    @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+    hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', elec_tariff_filepath: '../../ReportUtilityBills/tests/Missing Required Fields.json')
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    expected_warnings = ['Tariff file must contain energyweekdayschedule, energyweekendschedule, and energyratestructure fields.']
+    actual_bills = _test_measure(expected_warnings: expected_warnings)
+    assert_nil(actual_bills)
   end
 
   def test_monthly_prorate
@@ -305,64 +370,724 @@ class ReportUtilityBillsTest < MiniTest::Test
     assert_equal(0.0, CalculateUtilityBill.calculate_monthly_prorate(header, 5))
   end
 
-  def _check_bills(expected_bills, actual_bills)
-    bills = expected_bills.keys | actual_bills.keys
-    bills.each do |bill|
-      assert(expected_bills.keys.include?(bill))
-      assert(actual_bills.keys.include?(bill))
-      assert_in_delta(expected_bills[bill], actual_bills[bill], 1) # within a dollar
+  # Detailed (JSON) Calculations
+
+  # Flat (Same as simple tests above)
+
+  def test_detailed_flat_pv_none
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate.json'
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_none_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
     end
   end
 
-  def _get_actual_bills(bills_csv)
-    actual_bills = {}
-    File.readlines(bills_csv).each do |line|
-      next if line.strip.empty?
+  def test_detailed_flat_pv_1kW_net_metering_user_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -177
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
 
-      key, value = line.split(',').map { |x| x.strip }
-      actual_bills[key] = Float(value)
+  def test_detailed_flat_pv_10kW_net_metering_user_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -920
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_flat_pv_10kW_net_metering_retail_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate_type = HPXML::PVAnnualExcessSellbackRateTypeRetailElectricityCost
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1777
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_flat_pv_10kW_net_metering_zero_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate = 0.0
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -632
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_flat_pv_1kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -178
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_flat_pv_10kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1785
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  # Tiered
+
+  def test_detailed_tiered_pv_none
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Rate.json'
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_none_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 580
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tiered_pv_1kW_net_metering_user_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 580
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -190
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tiered_pv_10kW_net_metering_user_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 580
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -867
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tiered_pv_10kW_net_metering_retail_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate_type = HPXML::PVAnnualExcessSellbackRateTypeRetailElectricityCost
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 580
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1443
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
     end
-    return actual_bills
   end
 
-  def _load_timeseries(fuels, path)
-    columns = CSV.read(File.join(File.dirname(__FILE__), path)).transpose
+  def test_detailed_tiered_pv_10kW_net_metering_zero_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate = 0.0
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 580
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -580
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tiered_pv_1kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 580
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -178
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tiered_pv_10kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 580
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1785
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  # Time-of-Use
+
+  def test_detailed_tou_pv_none
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Time-of-Use Rate.json'
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_none_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 393
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tou_pv_1kW_net_metering_user_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Time-of-Use Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 393
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -112
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tou_pv_10kW_net_metering_user_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Time-of-Use Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 393
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -681
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tou_pv_10kW_net_metering_retail_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Time-of-Use Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate_type = HPXML::PVAnnualExcessSellbackRateTypeRetailElectricityCost
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 393
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1127
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tou_pv_10kW_net_metering_zero_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate = 0.0
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Time-of-Use Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 393
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -393
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tou_pv_1kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Time-of-Use Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 393
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -178
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tou_pv_10kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Time-of-Use Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 393
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1785
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  # Tiered and Time-of-Use
+
+  def test_detailed_tiered_tou_pv_none
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Time-of-Use Rate.json'
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_none_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 377
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tiered_tou_pv_1kW_net_metering_user_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Time-of-Use Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 377
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -108
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tiered_tou_pv_10kW_net_metering_user_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Time-of-Use Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 377
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -665
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tiered_tou_pv_10kW_net_metering_retail_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Time-of-Use Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate_type = HPXML::PVAnnualExcessSellbackRateTypeRetailElectricityCost
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 377
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1000
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tiered_tou_pv_10kW_net_metering_zero_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate = 0.0
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Time-of-Use Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 377
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -377
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tiered_tou_pv_1kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Time-of-Use Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 377
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -178
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_tiered_tou_pv_10kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Time-of-Use Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 377
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1785
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  # Real-time Pricing
+
+  def test_detailed_rtp_pv_none
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Real-Time Pricing Rate.json'
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_none_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 354
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_rtp_pv_1kW_net_metering_user_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Real-Time Pricing Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 354
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -106
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_rtp_pv_10kW_net_metering_user_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Real-Time Pricing Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 354
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -641
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_rtp_pv_10kW_net_metering_retail_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Real-Time Pricing Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate_type = HPXML::PVAnnualExcessSellbackRateTypeRetailElectricityCost
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 354
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1060
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_rtp_pv_10kW_net_metering_zero_excess_rate
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate = 0.0
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Real-Time Pricing Rate.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 354
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -354
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_rtp_pv_1kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Real-Time Pricing Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 354
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -178
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_rtp_pv_10kW_feed_in_tariff
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Real-Time Pricing Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_compensation_type = HPXML::PVCompensationTypeFeedInTariff
+    @hpxml.header.utility_bill_scenarios[-1].pv_feed_in_tariff_rate = 0.12
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 108
+      @expected_bills['Test: Electricity: Energy (USD)'] = 354
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1785
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  # Extra Fees & Charges
+
+  def test_simple_pv_1kW_grid_fee_dollars_per_kW
+    @hpxml.header.utility_bill_scenarios[-1].pv_monthly_grid_connection_fee_dollars_per_kw = 2.50
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_simple, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 126
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -177
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_simple_pv_1kW_grid_fee_dollars
+    @hpxml.header.utility_bill_scenarios[-1].pv_monthly_grid_connection_fee_dollars = 7.50
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_simple, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 186
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -177
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_pv_1kW_grid_fee_dollars_per_kW
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_monthly_grid_connection_fee_dollars_per_kw = 2.50
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 126
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -177
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_pv_1kW_grid_fee_dollars
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_monthly_grid_connection_fee_dollars = 7.50
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 186
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -177
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_pv_none_min_monthly_charge
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate Min Monthly Charge.json'
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_none_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 96
+      @expected_bills['Test: Electricity: Energy (USD)'] = 632
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_pv_none_min_annual_charge
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate Min Annual Charge.json'
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_none_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 96
+      @expected_bills['Test: Electricity: Energy (USD)'] = 632
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_pv_1kW_net_metering_user_excess_rate_min_monthly_charge
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate Min Monthly Charge.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 96
+      @expected_bills['Test: Electricity: Energy (USD)'] = 632
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -177
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_pv_1kW_net_metering_user_excess_rate_min_annual_charge
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate Min Annual Charge.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 1000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_1kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 96
+      @expected_bills['Test: Electricity: Energy (USD)'] = 632
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -177
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_pv_10kW_net_metering_user_excess_rate_min_monthly_charge
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate Min Monthly Charge.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 180
+      @expected_bills['Test: Electricity: Energy (USD)'] = 632
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -920
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_pv_10kW_net_metering_user_excess_rate_min_annual_charge
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate Min Annual Charge.json'
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 200
+      @expected_bills['Test: Electricity: Energy (USD)'] = 632
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -920
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_pv_10kW_net_metering_retail_excess_rate_min_monthly_charge
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate Min Monthly Charge.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate_type = HPXML::PVAnnualExcessSellbackRateTypeRetailElectricityCost
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 180
+      @expected_bills['Test: Electricity: Energy (USD)'] = 632
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1777
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_detailed_pv_10kW_net_metering_retail_excess_rate_min_annual_charge
+    @hpxml.header.utility_bill_scenarios[-1].elec_tariff_filepath = '../../ReportUtilityBills/resources/detailed_rates/Sample Flat Rate Min Annual Charge.json'
+    @hpxml.header.utility_bill_scenarios[-1].pv_net_metering_annual_excess_sellback_rate_type = HPXML::PVAnnualExcessSellbackRateTypeRetailElectricityCost
+    @hpxml.pv_systems.each { |pv_system| pv_system.max_power_output = 10000.0 / @hpxml.pv_systems.size }
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      actual_bills = _bill_calcs(@fuels_pv_10kw_detailed, @hpxml.header, @hpxml.pv_systems, utility_bill_scenario)
+      @expected_bills['Test: Electricity: Fixed (USD)'] = 200
+      @expected_bills['Test: Electricity: Energy (USD)'] = 632
+      @expected_bills['Test: Electricity: PV Credit (USD)'] = -1777
+      expected_bills = _get_expected_bills(@expected_bills)
+      _check_bills(expected_bills, actual_bills)
+    end
+  end
+
+  def test_downloaded_utility_rates
+    require 'rubygems/package'
+    require 'zip'
+    require 'tempfile'
+
+    @hpxml.header.utility_bill_scenarios.each do |utility_bill_scenario|
+      Zip.on_exists_proc = true
+      Zip::File.open(File.join(File.dirname(__FILE__), '../resources/detailed_rates/openei_rates.zip')) do |zip_file|
+        zip_file.each do |entry|
+          next unless entry.file?
+
+          tmpdir = Dir.tmpdir
+          tmpfile = Tempfile.new(['rate', '.json'], tmpdir)
+          tmp_path = tmpfile.path.to_s
+
+          File.open(tmp_path, 'wb') do |f|
+            f.print entry.get_input_stream.read
+
+            utility_bill_scenario.elec_tariff_filepath = tmp_path
+            File.delete(@bills_csv) if File.exist? @bills_csv
+            actual_bills = _bill_calcs(@fuels_pv_none_detailed, @hpxml.header, [], utility_bill_scenario)
+            if !File.exist?(@bills_csv)
+              puts entry.name
+              assert(false)
+            end
+            if entry.name.include? 'North Slope Borough Power Light - Aged or Handicappedseniors over 60'
+              # No cost if < 600 kWh/month, which is the case for PV_None.csv
+              assert_nil(actual_bills['Test: Electricity: Total (USD)'])
+            else
+              assert_operator(actual_bills['Test: Electricity: Total (USD)'], :>, 0)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def _get_expected_bills(expected_bills)
+    expected_bills['Test: Electricity: Total (USD)'] = expected_bills['Test: Electricity: Fixed (USD)'] + expected_bills['Test: Electricity: Energy (USD)'] + expected_bills['Test: Electricity: PV Credit (USD)']
+    expected_bills['Test: Natural Gas: Total (USD)'] = expected_bills['Test: Natural Gas: Fixed (USD)'] + expected_bills['Test: Natural Gas: Energy (USD)']
+    expected_bills['Test: Fuel Oil: Total (USD)'] = expected_bills['Test: Fuel Oil: Fixed (USD)'] + expected_bills['Test: Fuel Oil: Energy (USD)']
+    expected_bills['Test: Propane: Total (USD)'] = expected_bills['Test: Propane: Fixed (USD)'] + expected_bills['Test: Propane: Energy (USD)']
+    expected_bills['Test: Coal: Total (USD)'] = expected_bills['Test: Coal: Fixed (USD)'] + expected_bills['Test: Coal: Energy (USD)']
+    expected_bills['Test: Wood Cord: Total (USD)'] = expected_bills['Test: Wood Cord: Fixed (USD)'] + expected_bills['Test: Wood Cord: Energy (USD)']
+    expected_bills['Test: Wood Pellets: Total (USD)'] = expected_bills['Test: Wood Pellets: Fixed (USD)'] + expected_bills['Test: Wood Pellets: Energy (USD)']
+    expected_bills['Test: Total (USD)'] = expected_bills['Test: Electricity: Total (USD)'] + expected_bills['Test: Natural Gas: Total (USD)'] + expected_bills['Test: Fuel Oil: Total (USD)'] + expected_bills['Test: Propane: Total (USD)'] + expected_bills['Test: Wood Cord: Total (USD)'] + expected_bills['Test: Wood Pellets: Total (USD)'] + expected_bills['Test: Coal: Total (USD)']
+    return expected_bills
+  end
+
+  def _check_bills(expected_bills, actual_bills)
+    bills = expected_bills.keys | actual_bills.keys
+    bills.each do |bill|
+      assert(expected_bills.keys.include?(bill))
+      if expected_bills[bill] != 0
+        assert(actual_bills.keys.include?(bill))
+        assert_in_delta(expected_bills[bill], actual_bills[bill], 1) # within a dollar
+      end
+    end
+  end
+
+  def _load_timeseries(pv_size_kw, use_hourly_electricity)
+    fuels = @measure.setup_fuel_outputs()
+    columns = CSV.read(File.join(File.dirname(__FILE__), 'data.csv')).transpose
     columns.each do |col|
       col_name = col[0]
       next if col_name == 'Date/Time'
 
       values = col[1..-1].map { |v| Float(v) }
 
-      if col_name == 'ELECTRICITY:UNIT_1 [J](Hourly)'
-        fuel = fuels[[FT::Elec, false]]
-        unit_conv = UnitConversions.convert(1.0, 'J', fuel.units)
-        fuel.timeseries = values.map { |v| v * unit_conv }
-      elsif col_name == 'GAS:UNIT_1 [J](Hourly)'
-        fuel = fuels[[FT::Gas, false]]
-        unit_conv = UnitConversions.convert(1.0, 'J', fuel.units)
-        fuel.timeseries = values.map { |v| v * unit_conv }
-      elsif col_name == 'Appl_1:ExteriorEquipment:Propane [J](Hourly)'
-        fuel = fuels[[FT::Propane, false]]
-        unit_conv = UnitConversions.convert(1.0, 'J', fuel.units) / 91.6
-        fuel.timeseries = values.map { |v| v * unit_conv }
-      elsif col_name == 'FUELOIL:UNIT_1 [m3](Hourly)'
-        fuel = fuels[[FT::Oil, false]]
-        unit_conv = UnitConversions.convert(1.0, 'm^3', 'gal')
-        fuel.timeseries = values.map { |v| v * unit_conv }
-      elsif col_name == 'PV:ELECTRICITY_1 [J](Hourly) '
-        fuel = fuels[[FT::Elec, true]]
-        unit_conv = UnitConversions.convert(1.0, 'J', fuel.units)
-        fuel.timeseries = values.map { |v| v * unit_conv }
+      if col_name == 'Electricity [kWh]'
+        fuels[[FT::Elec, false]].timeseries = values
+      elsif col_name == 'Gas [therm]'
+        fuels[[FT::Gas, false]].timeseries = values
+      elsif col_name == 'Propane [gal]'
+        fuels[[FT::Propane, false]].timeseries = values
+      elsif col_name == 'Oil [gal]'
+        fuels[[FT::Oil, false]].timeseries = values
+      elsif col_name == "PV_#{pv_size_kw}kW [kWh]"
+        fuels[[FT::Elec, true]].timeseries = values
       end
     end
 
-    fuels.each do |(fuel_type, is_production), fuel|
+    fuels.values.each do |fuel|
       fuel.timeseries = [0] * fuels[[FT::Elec, false]].timeseries.size if fuel.timeseries.empty?
     end
 
-    # Convert hourly data to monthly data
+    # Convert hourly data to monthly data as appropriate
     num_days_in_month = Constants.NumDaysInMonths(2002) # Arbitrary non-leap year
-    fuels.each do |(fuel_type, is_production), fuel|
+    fuels.each do |(fuel_type, _is_production), fuel|
+      next unless fuel_type != FT::Elec || (fuel_type == FT::Elec && !use_hourly_electricity)
+
       ts_data = fuel.timeseries.dup
       fuel.timeseries = []
       start_day = 0
@@ -371,28 +1096,31 @@ class ReportUtilityBillsTest < MiniTest::Test
         start_day += num_days
       end
     end
+
+    return fuels
   end
 
-  def _bill_calcs(fuels, utility_rates, utility_bills, header, pv_systems)
-    args = Hash[@args_hash.collect { |k, v| [k.to_sym, v] }]
-    args[:electricity_bill_type] = 'Simple'
+  def _bill_calcs(fuels, header, pv_systems, utility_bill_scenario)
     runner = OpenStudio::Measure::OSRunner.new(OpenStudio::WorkflowJSON.new)
     output_format = 'csv'
     output_path = File.join(File.dirname(__FILE__), "results_bills.#{output_format}")
 
-    @measure.get_utility_rates(fuels, utility_rates, args, header.state_code, pv_systems)
-    net_elec = @measure.get_utility_bills(fuels, utility_rates, utility_bills, args, header)
-    @measure.annual_true_up(utility_rates, utility_bills, net_elec)
-    @measure.get_annual_bills(utility_bills)
+    utility_rates, utility_bills = @measure.setup_utility_outputs()
+    @measure.get_utility_rates(@hpxml_path, fuels, utility_rates, utility_bill_scenario, pv_systems)
+    @measure.get_utility_bills(fuels, utility_rates, utility_bills, utility_bill_scenario, header)
+
+    @measure.report_runperiod_output_results(runner, utility_bills, output_format, output_path, utility_bill_scenario.name)
 
-    @measure.write_output(runner, utility_bills, output_format, output_path)
+    # Check written values exist and are registered
+    assert(File.exist?(@bills_csv))
+    actual_bills = _get_actual_bills(@bills_csv)
 
-    bills_csv = File.join(File.dirname(__FILE__), 'results_bills.csv')
+    _check_for_runner_registered_values(runner, nil, actual_bills)
 
-    return bills_csv
+    return actual_bills
   end
 
-  def _test_measure(expected_errors: [], expected_warnings: [])
+  def _test_measure(hpxml: nil, expected_errors: [], expected_warnings: [])
     # Run measure via OSW
     require 'json'
     template_osw = File.join(File.dirname(__FILE__), '..', '..', 'workflow', 'template-run-hpxml.osw')
@@ -428,7 +1156,7 @@ class ReportUtilityBillsTest < MiniTest::Test
 
     bills_csv = File.join(File.dirname(template_osw), 'run', 'results_bills.csv')
 
-    # check warnings/errors
+    # Check warnings/errors
     if not expected_errors.empty?
       expected_errors.each do |expected_error|
         assert(cli_output.include?("ERROR] #{expected_error}"))
@@ -440,6 +1168,49 @@ class ReportUtilityBillsTest < MiniTest::Test
       end
     end
 
-    return bills_csv
+    if !hpxml.nil?
+      return if hpxml.header.utility_bill_scenarios.empty?
+    elsif (not expected_errors.empty?) || (not expected_warnings.empty?)
+      return
+    end
+
+    # Check written values exist and are registered
+    assert(File.exist?(bills_csv))
+    actual_bills = _get_actual_bills(bills_csv)
+
+    _check_for_runner_registered_values(nil, File.join(File.dirname(bills_csv), 'results.json'), actual_bills)
+
+    return actual_bills
+  end
+
+  def _get_actual_bills(bills_csv)
+    actual_bills = {}
+    File.readlines(bills_csv).each do |line|
+      next if line.strip.empty?
+
+      key, value = line.split(',').map { |x| x.strip }
+      actual_bills[key] = Float(value)
+    end
+    return actual_bills
+  end
+
+  def _check_for_runner_registered_values(runner, results_json, actual_bills)
+    if !runner.nil?
+      runner_bills = {}
+      runner.result.stepValues.each do |step_value|
+        runner_bills[step_value.name] = get_value_from_workflow_step_value(step_value)
+      end
+    elsif !results_json.nil?
+      require 'json'
+      runner_bills = JSON.parse(File.read(results_json))
+      runner_bills = runner_bills['ReportUtilityBills']
+    end
+
+    actual_bills.each do |name, value|
+      name = OpenStudio::toUnderscoreCase(name).chomp('_')
+
+      assert_includes(runner_bills.keys, name)
+      assert_equal(value, runner_bills[name])
+    end
   end
 end