diff --git a/debt_fraction_calculator/debt_fraction_dev.ipynb b/debt_fraction_calculator/debt_fraction_dev.ipynb
new file mode 100644
index 0000000..3f208a3
--- /dev/null
+++ b/debt_fraction_calculator/debt_fraction_dev.ipynb
@@ -0,0 +1,370 @@
+{
+ "cells": [
+  {
+   "attachments": {},
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Development notebook for debt fraction calculator. Use this to test code changes without re-running the scrape.\n",
+    "\n",
+    "debt_fraction_calc.py has a few more comments and polish"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import pandas as pd\n",
+    "import numpy as np\n",
+    "import PySAM.Singleowner as singleowner\n",
+    "import os\n",
+    "import sys\n",
+    "\n",
+    "sys.path.insert(0, os.path.dirname(os.getcwd()))\n",
+    "from lcoe_calculator.process_all import ProcessAll\n",
+    "from lcoe_calculator.extractor import Extractor\n",
+    "\n",
+    "from lcoe_calculator.tech_processors import FixedOffShoreWindProc, FloatingOffShoreWindProc, LandBasedWindProc, DistributedWindProc,\\\n",
+    "    UtilityPvProc, CommPvProc, ResPvProc, UtilityPvPlusBatteryProc,\\\n",
+    "    CspProc, GeothermalProc, HydropowerProc, PumpedStorageHydroProc,\\\n",
+    "    NuclearProc, BiopowerProc\n",
+    "\n",
+    "from lcoe_calculator.macrs import MACRS_6, MACRS_16, MACRS_21"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Data master version on sharepoint - empty string if you haven't renamed the file\n",
+    "version_string = \"_v1.46\"\n",
+    "\n",
+    "# Path to data master spreadsheet\n",
+    "data_master_filename = \"path/to/2024-ATB-Data_Workbook.xlsx\"\n",
+    "\n",
+    "techs = [UtilityPvPlusBatteryProc\n",
+    "            ]\n",
+    "\n",
+    "\n",
+    "CRP_CHOICES = [20]\n",
+    "scraper = ProcessAll(data_master_filename, techs=techs)\n",
+    "scraper.process()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df_itc, df_ptc = Extractor.get_tax_credits_sheet(data_master_filename)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "print(set(scraper.data.Parameter))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "fuel_filename = 'fuel_prices.csv'\n",
+    "df_fuel = pd.read_csv(fuel_filename).set_index(\"Price\")\n",
+    "df_fuel.columns = df_fuel.columns.astype(int)\n",
+    "print(df_fuel)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def calculate_debt_fraction(input_vals, debug=False):\n",
+    "    model = singleowner.default(\"GenericSystemSingleOwner\")\n",
+    "\n",
+    "    analysis_period = 20\n",
+    "    ac_capacity = 1000 # kW\n",
+    "    capacity_factor = input_vals[\"CF\"]\n",
+    "    gen = [capacity_factor * ac_capacity] * 8760 # Distribute evenly throughout the year\n",
+    "\n",
+    "    capex = input_vals[\"OCC\"]\n",
+    "    con_fin_costs = input_vals[\"CFC\"]\n",
+    "    initial_investment = capex * ac_capacity\n",
+    "    con_fin_total = con_fin_costs * ac_capacity\n",
+    "    o_and_m = input_vals[\"Fixed O&M\"]\n",
+    "    v_o_and_m = input_vals[\"Variable O&M\"]\n",
+    "    dscr = input_vals[\"DSCR\"]\n",
+    "\n",
+    "    ## Set these here so we can adjust below\n",
+    "    irr_target = input_vals[\"IRR\"] \n",
+    "    tax_federal = input_vals[\"Tax Rate (Federal and State)\"] * 100\n",
+    "    tax_state = 0\n",
+    "    inflation = input_vals[\"Inflation Rate\"] * 100\n",
+    "\n",
+    "    degradation = 0.0 # ATB presents average capactity factors\n",
+    "\n",
+    "    model.value(\"analysis_period\", analysis_period)\n",
+    "    model.value(\"flip_target_year\", analysis_period)\n",
+    "    model.value(\"gen\", gen)\n",
+    "    model.value(\"system_pre_curtailment_kwac\", gen)\n",
+    "    model.value(\"system_capacity\", ac_capacity)\n",
+    "    model.value(\"cp_system_nameplate\", ac_capacity / 1000)\n",
+    "    model.value(\"total_installed_cost\", initial_investment)\n",
+    "\n",
+    "    ## Single Owner should apply the O&M cost to each year, so no need to multiply by analysis period?\n",
+    "    model.value(\"om_capacity\", [o_and_m] ) \n",
+    "    model.value(\"om_production\", [v_o_and_m])\n",
+    "    if 'Fuel' in input_vals:\n",
+    "        model.value(\"om_fuel_cost\", [input_vals['Fuel']])\n",
+    "    if 'Heat Rate' in input_vals:\n",
+    "        model.value(\"system_heat_rate\", input_vals['Heat Rate'])\n",
+    "\n",
+    "    model.value(\"degradation\", [degradation]) # Specify length 1 so degradation is applied each year. An array of 0.7 len(analysis_period) assumes degradation the first year, but not afterwards\n",
+    "    model.value(\"system_use_lifetime_output\", 0) # Do degradation in the financial model\n",
+    "\n",
+    "    model.value(\"debt_option\", 1) # Use DSCR\n",
+    "    model.value(\"dscr\", dscr)\n",
+    "    # model.value(\"debt_percent\", 51.9)\n",
+    "    model.value(\"inflation_rate\", inflation)\n",
+    "    model.value(\"term_int_rate\", input_vals['Interest Rate Nominal'] * 100)\n",
+    "    model.value(\"term_tenor\", 18)\n",
+    "    model.value(\"real_discount_rate\", input_vals['Calculated Rate of Return on Equity Real'] * 100) ## \"real equity rate\" (also get this from data?)\n",
+    "    model.value(\"flip_target_percent\", irr_target) ## \"nominal equity rate\"\n",
+    "    model.value(\"ppa_escalation\", 0.0)\n",
+    "\n",
+    "    model.value(\"federal_tax_rate\", [tax_federal])\n",
+    "    model.value(\"state_tax_rate\", [tax_state])\n",
+    "\n",
+    "    # This group is included in fixed O&M\n",
+    "    model.value(\"insurance_rate\", 0)\n",
+    "    model.value(\"property_tax_rate\", 0)\n",
+    "    model.value(\"prop_tax_cost_assessed_percent\", 0)\n",
+    "\n",
+    "    model.value(\"reserves_interest\", 0)\n",
+    "    model.value(\"salvage_percentage\", 0)\n",
+    "    model.value(\"months_receivables_reserve\", 0)\n",
+    "    model.value(\"months_working_reserve\", 0)\n",
+    "    model.value(\"dscr_reserve_months\", 0)\n",
+    "    model.value(\"equip1_reserve_cost\", 0)\n",
+    "    model.value(\"equip2_reserve_cost\", 0)\n",
+    "    model.value(\"equip3_reserve_cost\", 0)\n",
+    "    model.value(\"cost_debt_closing\", 0)\n",
+    "    model.value(\"cost_debt_fee\", 0)\n",
+    "    model.value(\"loan_moratorium\", 0)\n",
+    "    model.value(\"construction_financing_cost\", con_fin_total)\n",
+    "    model.value(\"itc_fed_percent\", [input_vals[\"ITC\"] * 100])\n",
+    "    model.value('itc_fed_percent_maxvalue', [1e38])\n",
+    "    model.value(\"itc_sta_amount\", [0])\n",
+    "    model.value(\"ptc_fed_amount\", [input_vals[\"PTC\"] / 1000]) # Convert $/MWh to $/kWh\n",
+    "\n",
+    "    if input_vals[\"MACRS\"] == MACRS_6:\n",
+    "        model.value(\"depr_alloc_macrs_5_percent\", 100)\n",
+    "        model.value(\"depr_itc_fed_macrs_5\", 1)\n",
+    "        model.value(\"depr_itc_sta_macrs_5\", 1)\n",
+    "        model.value(\"depr_alloc_macrs_15_percent\", 0)\n",
+    "        model.value(\"depr_alloc_sl_20_percent\", 0)\n",
+    "    elif input_vals[\"MACRS\"] == MACRS_16:\n",
+    "        model.value(\"depr_alloc_macrs_5_percent\", 0)\n",
+    "        model.value(\"depr_alloc_macrs_15_percent\", 100)\n",
+    "        model.value(\"depr_itc_fed_macrs_15\", 1)\n",
+    "        model.value(\"depr_itc_sta_macrs_15\", 1)\n",
+    "        model.value(\"depr_alloc_sl_20_percent\", 0)\n",
+    "    elif input_vals[\"MACRS\"] == MACRS_21:\n",
+    "        model.value(\"depr_alloc_macrs_5_percent\", 0)\n",
+    "        model.value(\"depr_alloc_macrs_15_percent\", 0)\n",
+    "        model.value(\"depr_alloc_sl_20_percent\", 100)\n",
+    "        model.value(\"depr_itc_fed_sl_20\", 1)\n",
+    "        model.value(\"depr_itc_fed_sl_20\", 1)\n",
+    "    model.value(\"depr_alloc_custom_percent\", 0)\n",
+    "    model.value(\"depr_alloc_sl_5_percent\", 0)\n",
+    "    model.value(\"depr_alloc_sl_15_percent\", 0)\n",
+    "    model.value(\"depr_alloc_sl_39_percent\", 0)\n",
+    "    model.value(\"depr_bonus_fed\", 0)\n",
+    "    model.value(\"depr_bonus_sta\", 0)\n",
+    "    model.value(\"depr_bonus_fed_macrs_5\", 0)\n",
+    "    model.value(\"depr_bonus_sta_macrs_5\", 0)\n",
+    "    model.value(\"depr_bonus_fed_macrs_15\", 0)\n",
+    "    model.value(\"depr_bonus_sta_macrs_15\", 0)\n",
+    "\n",
+    "    model.value(\"depr_fedbas_method\", 0)\n",
+    "    model.value(\"depr_stabas_method\", 0)\n",
+    "\n",
+    "    model.value(\"ppa_soln_mode\", 0)\n",
+    "    model.value(\"payment_option\", 0)\n",
+    "\n",
+    "    model.value('en_electricity_rates', 1 )\n",
+    "\n",
+    "    model.execute()\n",
+    "\n",
+    "    if debug:\n",
+    "        print(\"LCOE: \" + str(model.Outputs.lcoe_real)) #Cents / kWh - multiply by 10 to get $ / MWh\n",
+    "        print(\"NPV: \" + str(model.Outputs.project_return_aftertax_npv))\n",
+    "        print()\n",
+    "        print(\"IRR in target year: \" + str(model.Outputs.flip_target_irr))\n",
+    "        print(\"IRR at end of project: \" + str(model.Outputs.analysis_period_irr))\n",
+    "        print(\"O&M: \" + str(model.Outputs.cf_om_capacity_expense))\n",
+    "        print(\"PPA price: \" + str(model.Outputs.cf_ppa_price))\n",
+    "        print(\"Debt Principal: \" + str(model.Outputs.cf_debt_payment_principal))\n",
+    "        print(\"Debt Interest: \" + str(model.Outputs.cf_debt_payment_interest))\n",
+    "        print(\"Depreciation: \" + str(model.Outputs.cf_feddepr_total))\n",
+    "        print(\"Production: \" + str(model.Outputs.cf_energy_net))\n",
+    "        print(\"Tax \" + str(model.Outputs.cf_fedtax))\n",
+    "        print(\"ITC \" + str(model.Outputs.itc_total_fed))\n",
+    "        print(\"PTC \" + str(model.Outputs.cf_ptc_fed))\n",
+    "        print(\"Debt fraction \" + str(model.Outputs.debt_fraction))\n",
+    "\n",
+    "    return model.Outputs.debt_fraction"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "d = scraper.data\n",
+    "print(d.columns)\n",
+    "print(set(d.Parameter))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "fin_cases = ['Market','R&D']\n",
+    "\n",
+    "d = scraper.data\n",
+    "debt_frac_dict = {}\n",
+    "\n",
+    "years = range(2021, 2051)\n",
+    "print (years)\n",
+    "cols = [\"Technology\", \"Case\", *years]\n",
+    "\n",
+    "for tech in techs:\n",
+    "    for fin_case in fin_cases:\n",
+    "        print(\"Fin case \" , fin_case)\n",
+    "        debt_fracs = [tech.tech_name, fin_case]\n",
+    "        for year in years:\n",
+    "            input_vals = d[(d.DisplayName == tech.default_tech_detail) & (d.Case == fin_case) & (d.Scenario == 'Moderate') & (d.CRPYears == 20) & \n",
+    "                ((d.Parameter == 'Fixed O&M') | (d.Parameter == 'Variable O&M') |(d.Parameter == 'OCC') | (d.Parameter == 'CFC') | (d.Parameter == 'CF')\n",
+    "                | (d.Parameter == 'Heat Rate') | (d.Parameter == 'Fuel'))]\n",
+    "            input_vals = input_vals.set_index('Parameter')[year].to_dict()\n",
+    "\n",
+    "            gen_vals = d[(d.Technology == tech.tech_name) & (d.CRPYears == 20) & (d.Case == fin_case) & \n",
+    "                ((d.Parameter == 'Inflation Rate') | (d.Parameter == 'Tax Rate (Federal and State)') | (d.Parameter == 'Calculated Rate of Return on Equity Real') | (d.Parameter == 'Interest Rate Nominal'))]\n",
+    "            gen_vals = gen_vals.set_index('Parameter')[year].to_dict()\n",
+    "\n",
+    "            if tech.has_itc and tech.has_ptc and fin_case == 'Market':\n",
+    "                input_vals[\"PTC\"] = df_ptc.loc[tech.sheet_name][year]\n",
+    "                input_vals[\"ITC\"] = df_itc.loc[tech.sheet_name][year]\n",
+    "            else:\n",
+    "                input_vals[\"PTC\"] = 0\n",
+    "                input_vals[\"ITC\"] = 0\n",
+    "            input_vals[\"DSCR\"] = tech.dscr\n",
+    "            input_vals[\"IRR\"] = tech.irr_target\n",
+    "            if isinstance(tech.depreciation_schedule, list):\n",
+    "                input_vals[\"MACRS\"] = tech.depreciation_schedule\n",
+    "            elif isinstance(tech.depreciation_schedule, dict):\n",
+    "                input_vals[\"MACRS\"] = tech.depreciation_schedule[year]\n",
+    "            input_vals.update(gen_vals)\n",
+    "            debt_frac = calculate_debt_fraction(input_vals)\n",
+    "\n",
+    "            debt_fracs.append(debt_frac / 100.0)\n",
+    "        \n",
+    "        debt_frac_dict[tech.tech_name + fin_case] = debt_fracs\n",
+    "\n",
+    "df_df = pd.DataFrame.from_dict(debt_frac_dict, orient='index', columns=cols)\n",
+    "df_df.to_csv(\"2023_debt_fractions.csv\")\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df_fuel.at['Natural Gas ($/MMBtu)', year]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "\"\"\"\n",
+    "if tech == NaturalGasProc:\n",
+    "    input_vals['Fuel'] = df_fuel.at['Natural Gas ($/MMBtu)', year]\n",
+    "if tech == CoalProc:\n",
+    "    input_vals['Fuel'] = df_fuel.at['Coal ($/MMBtu)', year]\n",
+    "\"\"\""
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "print(input_vals)\n",
+    "\n",
+    "print(debt_frac)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "atb_datamaster_etl",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.11.5"
+  },
+  "orig_nbformat": 4,
+  "vscode": {
+   "interpreter": {
+    "hash": "7453c7a7c4c6aacca0bd3e48c10e9f590f02fc03a145dba291554d026d9242d0"
+   }
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}
diff --git a/example_notebooks/Full work flow.ipynb b/example_notebooks/Full work flow.ipynb
index 49b1c6c..7e2a57b 100644
--- a/example_notebooks/Full work flow.ipynb	
+++ b/example_notebooks/Full work flow.ipynb	
@@ -33,7 +33,7 @@
     "sys.path.insert(0, os.path.dirname(os.getcwd()))\n",
     "from lcoe_calculator.process_all import ProcessAll\n",
     "from lcoe_calculator.tech_processors import (ALL_TECHS,\n",
-    "    OffShoreWindProc, LandBasedWindProc, DistributedWindProc,\n",
+    "    FixedOffShoreWindProc, FloatingOffShoreWindProc, LandBasedWindProc, DistributedWindProc,\n",
     "    UtilityPvProc, CommPvProc, ResPvProc, UtilityPvPlusBatteryProc,\n",
     "    CspProc, GeothermalProc, HydropowerProc, PumpedStorageHydroProc,\n",
     "    PumpedStorageHydroOneResProc,\n",
@@ -68,14 +68,14 @@
    "outputs": [],
    "source": [
     "# The below line MUST be updated to reflect the location of the ATB workbook on your computer\n",
-    "atb_electricity_workbook = 'path/to/2023_v2_Workbook_Corrected_07_20_23.xlsx'\n",
+    "atb_electricity_workbook = 'path/to/2024_v1_Workbook_06_25_24.xlsx'\n",
     "\n",
     "# ---- Comment/uncomment the below lines to process all techs or a subset of techs\n",
     "# Process all technologies\n",
     "techs = ALL_TECHS\n",
     "\n",
     "# Process a couple technologies\n",
-    "techs = [LandBasedWindProc, OffShoreWindProc]\n",
+    "techs = [LandBasedWindProc, UtilityPvProc]\n",
     "\n",
     "# Or process a single technology\n",
     "techs = LandBasedWindProc\n",
@@ -188,7 +188,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.11.9"
   },
   "vscode": {
    "interpreter": {
diff --git a/example_notebooks/Process ATB electricity technology.ipynb b/example_notebooks/Process ATB electricity technology.ipynb
index 207a856..50828e7 100644
--- a/example_notebooks/Process ATB electricity technology.ipynb	
+++ b/example_notebooks/Process ATB electricity technology.ipynb	
@@ -34,7 +34,7 @@
     "\n",
     "# Electricity technology processors\n",
     "from lcoe_calculator.tech_processors import (\n",
-    "    OffShoreWindProc, LandBasedWindProc, DistributedWindProc,\n",
+    "    FixedOffShoreWindProc, FloatingOffShoreWindProc, LandBasedWindProc, DistributedWindProc,\n",
     "    UtilityPvProc, CommPvProc, ResPvProc, UtilityPvPlusBatteryProc,\n",
     "    CspProc, GeothermalProc, HydropowerProc, PumpedStorageHydroProc,\n",
     "    PumpedStorageHydroOneResProc,\n",
@@ -95,7 +95,7 @@
     "# Finally, choose a technology processor from the list imported from lcoe_calculator.tech_processors \n",
     "# above and initialize it. Several options are shown in comments, but only one should be used at a time. \n",
     "# Microsoft Excel may open and ask for permission to view the workbook. \n",
-    "proc = OffShoreWindProc(atb_electricity_workbook, crp=crp, case=financial_case)\n",
+    "proc = LandBasedWindProc(atb_electricity_workbook, crp=crp, case=financial_case)\n",
     "\n",
     "# proc = NuclearProc(atb_electricity_workbook, crp=crp, case=financial_case)\n",
     "# proc = UtilityPvProc(atb_electricity_workbook, crp=crp, case=financial_case)\n",
@@ -235,7 +235,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,
diff --git a/tests/data/Commercial_Battery_Storage/Market/20/df_capex.csv b/tests/data/Commercial_Battery_Storage/Market/20/df_capex.csv
index 06d3842..99a1130 100644
--- a/tests/data/Commercial_Battery_Storage/Market/20/df_capex.csv
+++ b/tests/data/Commercial_Battery_Storage/Market/20/df_capex.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1708.6543909919249,1229.202267834563,1160.201233161033,1101.1694678729955,1061.4942353446183,1021.8190028162413,982.1437702878638,942.4685377594872,902.7933052311091,885.8161957502836,868.8390862694572,851.8619767886321,834.8848673078062,817.9077578269802,800.9306483461546,783.953538865329,766.9764293845036,749.9993199036779,733.0222104228524,716.0451009420265,699.0679914612008,682.090881980375,665.1137724995492,648.1366630187232,631.1595535378978,614.1824440570718,597.2053345762464,580.2282250954207,563.2511156145947
-Commercial Battery Storage 1Hr/Moderate,1708.6543909919249,1590.624987004306,1487.3121448901431,1425.1790892978179,1379.3391876603653,1334.6853757167942,1292.9572915743656,1255.0914656195782,1218.3219152841134,1203.0928913430623,1187.8638674020106,1172.63484346096,1157.4058195199086,1142.1767955788566,1126.947771637805,1111.7187476967542,1096.4897237557022,1081.2606998146514,1066.0316758736005,1050.8026519325483,1035.573627991497,1020.3446040504459,1005.1155801093947,989.8865561683439,974.6575322272922,959.4285082862408,944.1994843451894,928.9704604041373,913.7414364630855
-Commercial Battery Storage 1Hr/Conservative,1708.6543909919249,1771.9378869545883,1784.5945861471214,1759.2811877620552,1693.466351960886,1627.651516159715,1561.8366803585438,1496.0218445573746,1430.207008756204,1426.1229100007417,1422.0388112452806,1417.954712489819,1413.8706137343568,1409.7865149788954,1405.7024162234334,1401.6183174679713,1397.5342187125088,1393.450119957048,1389.3660212015861,1385.2819224461239,1381.1978236906623,1377.1137249352007,1373.029626179739,1368.945527424277,1364.8614286688157,1360.777329913353,1356.693231157892,1352.6091324024303,1348.5250336469667
-Commercial Battery Storage 2Hr/Advanced,1994.1302219816112,1434.5729622912497,1354.043482885758,1285.1489025432334,1238.8448748439548,1192.5408471446756,1146.2368194453961,1099.9327917461178,1053.628764046838,1033.8151801669806,1014.0015962871227,994.1880124072657,974.3744285274082,954.5608446475507,934.7472607676935,914.9336768878362,895.120093007979,875.3065091281218,855.4929252482646,835.679341368407,815.8657574885497,796.0521736086923,776.2385897288349,756.4250058489774,736.6114219691202,716.7978380892628,696.9842542094057,677.1706703295481,657.3570864496904
-Commercial Battery Storage 2Hr/Moderate,1994.1302219816112,1851.1933165698713,1724.0139307570337,1650.5989181034563,1592.4081710027563,1536.487544521381,1484.3981468363497,1437.1700920735836,1391.7973402916673,1374.3998735380221,1357.0024067843756,1339.6049400307306,1322.207473277085,1304.8100065234382,1287.4125397697926,1270.0150730161472,1252.617606262501,1235.2201395088557,1217.82267275521,1200.4252060015635,1183.027739247918,1165.6302724942723,1148.2328057406269,1130.8353389869812,1113.4378722333354,1096.0404054796895,1078.6429387260437,1061.2454719723974,1043.8480052187508
-Commercial Battery Storage 2Hr/Conservative,1994.1302219816112,2067.986896869819,2082.75823184746,2053.2155618921765,1976.4046200084417,1899.5936781247049,1822.7827362409682,1745.9717943572332,1669.160852473497,1664.3943971851945,1659.6279418968936,1654.8614866085916,1650.095031320289,1645.3285760319875,1640.5621207436857,1635.795665455383,1631.0292101670807,1626.2627548787793,1621.496299590477,1616.7298443021753,1611.9633890138734,1607.1969337255719,1602.4304784372691,1597.6640231489675,1592.897567860666,1588.1311125723632,1583.3646572840619,1578.5982019957598,1573.831746707456
-Commercial Battery Storage 4Hr/Advanced,2565.0818839609838,1845.3143512046233,1741.7279823352078,1653.1077718837093,1593.5461538426268,1533.9845358015439,1474.422917760461,1414.8612997193786,1355.2996816782952,1329.8131490003748,1304.3266163224534,1278.8400836445333,1253.3535509666126,1227.8670182886915,1202.380485610771,1176.8939529328507,1151.40742025493,1125.9208875770094,1100.434354899089,1074.947822221168,1049.4612895432476,1023.974756865327,998.4882241874063,973.0016915094855,947.515158831565,922.0286261536444,896.5420934757237,871.0555607978032,845.5690281198819
-Commercial Battery Storage 4Hr/Moderate,2565.0818839609838,2372.3299757010022,2197.417502490815,2101.4385757147334,2018.5461376875394,1940.0918821305554,1867.2798573603184,1801.327344981595,1738.7481903067749,1717.0138379279408,1695.2794855491056,1673.5451331702714,1651.8107807914373,1630.0764284126017,1608.342076033767,1586.6077236549331,1564.873371276098,1543.139018897264,1521.4046665184292,1499.6703141395942,1477.9359617607597,1456.2016093819252,1434.467257003091,1412.7329046242564,1390.9985522454217,1369.264199866587,1347.5298474877525,1325.795495108917,1304.0611427300819
-Commercial Battery Storage 4Hr/Conservative,2565.0818839609838,2660.0849167002793,2679.085523248138,2641.084310152419,2542.281156103553,2443.4780020546855,2344.6748480058177,2245.871693956951,2147.068539908083,2140.9373715541,2134.806203200119,2128.6750348461364,2122.5438664921535,2116.4126981381714,2110.28152978419,2104.1503614302064,2098.019193076224,2091.8880247222423,2085.7568563682594,2079.6256880142773,2073.4945196602953,2067.3633513063132,2061.2321829523307,2055.1010145983487,2048.969846244366,2042.8386778903835,2036.7075095364014,2030.5763411824191,2024.4451728284348
-Commercial Battery Storage 6Hr/Advanced,3136.033545940357,2256.055740117997,2129.4124817846578,2021.0666412241858,1948.2474328412993,1875.4282244584126,1802.609016075526,1729.7898076926394,1656.9705993097525,1625.811117833769,1594.6516363577841,1563.4921548818006,1532.3326734058166,1501.1731919298325,1470.0137104538487,1438.8542289778648,1407.694747501881,1376.535266025897,1345.375784549913,1314.2163030739293,1283.0568215979456,1251.8973401219614,1220.7378586459774,1189.5783771699935,1158.4188956940097,1127.2594142180258,1096.0999327420418,1064.9404512660578,1033.7809697900732
-Commercial Battery Storage 6Hr/Moderate,3136.033545940357,2893.4666348321325,2670.821074224597,2552.2782333260106,2444.684104372322,2343.696219739729,2250.161567884287,2165.4845978896064,2085.699040321883,2059.6278023178597,2033.5565643138357,2007.4853263098128,1981.4140883057896,1955.3428503017649,1929.2716122977417,1903.2003742937188,1877.1291362896952,1851.057898285672,1824.9866602816487,1798.9154222776247,1772.844184273601,1746.772946269578,1720.701708265555,1694.6304702615314,1668.559232257508,1642.4879942534842,1616.416756249461,1590.345518245437,1564.2742802414125
-Commercial Battery Storage 6Hr/Conservative,3136.033545940357,3252.1829365307394,3275.412814648816,3228.9530584126624,3108.157692198665,2987.362325984666,2866.5669597706665,2745.771593556668,2624.976227342669,2617.480345923006,2609.984464503344,2602.4885830836815,2594.992701664018,2587.496820244356,2580.0009388246935,2572.5050574050297,2565.0091759853676,2557.513294565705,2550.017413146042,2542.5215317263796,2535.025650306717,2527.529768887054,2520.0338874673917,2512.5380060477296,2505.0421246280666,2497.5462432084037,2490.050361788741,2482.554480369078,2475.058598949414
-Commercial Battery Storage 8Hr/Advanced,3706.98520791973,2666.7971290313712,2517.0969812341077,2389.0255105646615,2302.9487118399716,2216.8719131152807,2130.7951143905907,2044.7183156659,1958.6415169412098,1921.809086667163,1884.9766563931148,1848.1442261190678,1811.3117958450207,1774.4793655709734,1737.6469352969264,1700.8145050228793,1663.982074748832,1627.149644474785,1590.3172142007375,1553.4847839266906,1516.6523536526431,1479.8199233785963,1442.9874931045488,1406.1550628305017,1369.3226325564544,1332.4902022824072,1295.65777200836,1258.8253417343126,1221.9929114602648
-Commercial Battery Storage 8Hr/Moderate,3706.98520791973,3414.603293963263,3144.2246459583776,3003.1178909372875,2870.8220710571054,2747.300557348903,2633.0432784082554,2529.6418507976173,2432.6498903369907,2402.241766707779,2371.8336430785657,2341.425519449354,2311.0173958201417,2280.6092721909286,2250.2011485617163,2219.793024932505,2189.3849013032927,2158.9767776740805,2128.5686540448683,2098.1605304156556,2067.752406786443,2037.3442831572306,2006.936159528019,1976.5280358988066,1946.1199122695941,1915.711788640382,1885.3036650111699,1854.8955413819567,1824.487417752743
-Commercial Battery Storage 8Hr/Conservative,3706.98520791973,3844.2809563612,3871.740106049494,3816.821806672905,3674.0342282937763,3531.2466499146462,3388.4590715355152,3245.6714931563856,3102.883914777255,3094.0233202919117,3085.162725806569,3076.302131321226,3067.4415368358823,3058.5809423505398,3049.7203478651977,3040.8597533798534,3031.9991588945104,3023.138564409168,3014.2779699238245,3005.4173754384815,2996.556780953139,2987.696186467796,2978.835591982453,2969.97499749711,2961.1144030117675,2952.2538085264237,2943.3932140410807,2934.5326195557373,2925.6720250703925
+Commercial Battery Storage 1Hr/Advanced,1449.5551538746543,1678.6945173616073,1154.3527863636048,969.1872776423813,934.2673750062493,899.3474723701173,864.427569733985,829.5076670978531,794.5877644617208,779.6454699284909,764.7031753952613,749.7608808620316,734.8185863288019,719.8762917955719,704.9339972623422,689.9917027291125,675.049408195883,660.1071136626532,645.1648191294237,630.2225245961939,615.280230062964,600.3379355297344,585.3956409965047,570.453346463275,555.5110519300454,540.5687573968155,525.626462863586,510.6841683303562,495.7418737971263
+Commercial Battery Storage 1Hr/Moderate,1449.5551538746543,1678.6945173616073,1303.7378359944178,1248.67500031219,1206.5601367175132,1165.7704918962165,1127.702544108846,1093.1730727032002,1059.7934828817756,1046.5460643457536,1033.2986458097316,1020.0512272737096,1006.8038087376874,993.556390201665,980.3089716656427,967.0615531296208,953.8141345935983,940.5667160575764,927.3192975215544,914.0718789855322,900.82446044951,887.5770419134877,874.3296233774657,861.0822048414435,847.8347863054215,834.5873677693995,821.3399492333772,808.0925306973547,794.8451121613319
+Commercial Battery Storage 1Hr/Conservative,1449.5551538746543,1678.6945173616073,1570.6995327287318,1548.4201067325798,1490.4935991425843,1432.5670915525884,1374.6405839625925,1316.7140763725972,1258.7875687826013,1255.192975334533,1251.5983818864654,1248.0037884383978,1244.4091949903298,1240.8146015422617,1237.220008094194,1233.625414646126,1230.0308211980584,1226.4362277499906,1222.8416343019223,1219.247040853855,1215.6524474057867,1212.0578539577189,1208.4632605096513,1204.8686670615832,1201.2740736135156,1197.6794801654476,1194.0848867173795,1190.490293269312,1186.8956998212425
+Commercial Battery Storage 2Hr/Advanced,1735.0309848643408,2030.1238494557992,1415.7884430528595,1160.0593136115042,1118.2622747750129,1076.4652359385218,1034.6681971020303,992.871158265539,951.0741194290474,933.1890848852948,915.3040503415423,897.4190157977898,879.5339812540375,861.6489467102847,843.7639121665324,825.87887762278,807.9938430790276,790.1088085352751,772.2237739915228,754.3387394477702,736.4537049040177,718.5686703602654,700.6836358165128,682.7986012727605,664.913566729008,647.0285321852556,629.1434976415031,611.2584630977507,593.373428553998
+Commercial Battery Storage 2Hr/Moderate,1735.0309848643408,2030.1238494557992,1549.3074121099241,1482.539952387204,1427.611531539591,1375.1329725003989,1326.315535158743,1282.0730886209008,1239.767987212379,1224.270887372225,1208.7737875320697,1193.2766876919154,1177.7795878517607,1162.2824880116057,1146.785388171451,1131.2882883312964,1115.7911884911416,1100.294088650987,1084.7969888108325,1069.2998889706778,1053.802789130523,1038.3056892903683,1022.8085894502136,1007.311489610059,991.8143897699043,976.3172899297498,960.8201900895951,945.32309024944,929.8259904092845
+Commercial Battery Storage 2Hr/Conservative,1735.0309848643408,2030.1238494557992,1880.0335743774986,1853.3664314785274,1784.0318599412014,1714.697288403875,1645.3627168665491,1576.0281453292228,1506.6935737918968,1502.3910600215736,1498.0885462512513,1493.7860324809285,1489.4835187106053,1485.1810049402823,1480.87849116996,1476.5759773996365,1472.2734636293142,1467.9709498589914,1463.6684360886686,1459.365922318346,1455.0634085480228,1450.7608947777,1446.4583810073775,1442.1558672370545,1437.853353466732,1433.5508396964087,1429.2483259260862,1424.9458121557632,1420.6432983854393
+Commercial Battery Storage 4Hr/Advanced,2305.9826468437136,2732.982513644183,1938.6597564313684,1541.8033855497501,1486.2520743125408,1430.7007630753303,1375.1494518381207,1319.5981406009105,1264.0468293637007,1240.2763147989026,1216.5058002341045,1192.7352856693064,1168.9647711045084,1145.1942565397103,1121.4237419749124,1097.6532274101148,1073.882712845317,1050.112198280519,1026.3416837157208,1002.5711691509232,978.8006545861251,955.0301400213274,931.2596254565292,907.4891108917313,883.7185963269334,859.9480817621356,836.1775671973376,812.4070526325396,788.6365380677414
+Commercial Battery Storage 4Hr/Moderate,2305.9826468437136,2732.982513644183,2040.4465643409367,1950.269856537232,1869.7143211837465,1793.8579337087638,1723.5415172585374,1659.8731204563014,1599.716995873586,1579.7205334251666,1559.7240709767466,1539.7276085283268,1519.7311460799074,1499.734683631487,1479.7382211830675,1459.741758734648,1439.745296286228,1419.7488338378082,1399.7523713893884,1379.755908940969,1359.7594464925494,1339.7629840441289,1319.7665215957093,1299.7700591472899,1279.7735966988698,1259.7771342504502,1239.7806718020306,1219.7842093536105,1199.7877469051898
+Commercial Battery Storage 4Hr/Conservative,2305.9826468437136,2732.982513644183,2498.7016576750316,2463.259080970422,2371.1083815384354,2278.9576821064484,2186.806982674462,2094.6562832424743,2002.505583810488,1996.7872293956545,1991.0688749808223,1985.350520565989,1979.6321661511565,1973.9138117363236,1968.1954573214914,1962.4771029066583,1956.758748491826,1951.0403940769934,1945.3220396621607,1939.603685247328,1933.8853308324951,1928.1669764176622,1922.44862200283,1916.730267587997,1911.0119131731649,1905.2935587583313,1899.575204343499,1893.8568499286664,1888.1384955138321
+Commercial Battery Storage 6Hr/Advanced,2876.9343088230867,3435.841177832567,2461.5310698098765,1923.547457487996,1854.2418738500678,1784.9362902121393,1715.6307065742108,1646.325122936282,1577.0195392983542,1547.3635447125102,1517.7075501266665,1488.0515555408233,1458.3955609549796,1428.7395663691364,1399.0835717832927,1369.4275771974496,1339.7715826116057,1310.1155880257627,1280.459593439919,1250.8035988540762,1221.1476042682325,1191.4916096823893,1161.8356150965456,1132.1796205107023,1102.5236259248586,1072.8676313390156,1043.211636753172,1013.5556421673288,983.8996475814847
+Commercial Battery Storage 6Hr/Moderate,2876.9343088230867,3435.841177832567,2531.585716571949,2417.9997606872607,2311.8171108279016,2212.5828949171287,2120.767499358332,2037.6731522917025,1959.666004534793,1935.1701794781086,1910.6743544214232,1886.1785293647383,1861.6827043080536,1837.1868792513685,1812.6910541946838,1788.1952291379996,1763.6994040813145,1739.2035790246293,1714.7077539679447,1690.2119289112597,1665.716103854575,1641.2202787978897,1616.7244537412057,1592.2286286845206,1567.7328036278354,1543.2369785711508,1518.741153514466,1494.2453284577812,1469.7495034010947
+Commercial Battery Storage 6Hr/Conservative,2876.9343088230867,3435.841177832567,3117.369740972565,3073.151730462317,2958.184903135669,2843.218075809022,2728.251248482374,2613.2844211557253,2498.3175938290783,2491.1833987697355,2484.049203710393,2476.9150086510504,2469.780813591708,2462.6466185323648,2455.512423473023,2448.37822841368,2441.244033354338,2434.109838294996,2426.975643235653,2419.8414481763098,2412.7072531169674,2405.5730580576246,2398.4388629982827,2391.30466793894,2384.170472879597,2377.0362778202543,2369.902082760912,2362.7678877015696,2355.6336926422255
+Commercial Battery Storage 8Hr/Advanced,3447.8859708024584,4138.69984202095,2984.402383188387,2305.291529426242,2222.2316733875955,2139.171817348948,2056.111961310301,1973.0521052716535,1889.992249233007,1854.4507746261181,1818.9093000192288,1783.3678254123395,1747.8263508054508,1712.2848761985622,1676.7434015916729,1641.2019269847844,1605.660452377895,1570.1189777710063,1534.5775031641174,1499.0360285572287,1463.4945539503399,1427.953079343451,1392.411604736562,1356.870130129673,1321.328655522784,1285.7871809158955,1250.2457063090064,1214.7042317021176,1179.162757095228
+Commercial Battery Storage 8Hr/Moderate,3447.8859708024584,4138.69984202095,3022.7248688029617,2885.729664837289,2753.9199004720567,2631.307856125494,2517.9934814581266,2415.473184127103,2319.6150131959994,2290.6198255310505,2261.6246378661003,2232.6294502011506,2203.6342625362,2174.63907487125,2145.6438872063004,2116.648699541351,2087.6535118764004,2058.6583242114507,2029.6631365465005,2000.667948881551,1971.672761216601,1942.6775735516508,1913.6823858867015,1884.687198221751,1855.6920105568013,1826.696822891851,1797.701635226902,1768.7064475619518,1739.711259897
+Commercial Battery Storage 8Hr/Conservative,3447.8859708024584,4138.69984202095,3736.037824270098,3683.044379954212,3545.261424732903,3407.4784695115954,3269.6955142902866,3131.9125590689773,2994.1296038476694,2985.5795681438162,2977.0295324399644,2968.4794967361113,2959.929461032259,2951.379425328406,2942.829389624554,2934.279353920702,2925.7293182168496,2917.1792825129974,2908.6292468091447,2900.079211105292,2891.52917540144,2882.9791396975875,2874.429103993735,2865.8790682898816,2857.3290325860307,2848.7789968821776,2840.2289611783253,2831.678925474473,2823.128889770619
diff --git a/tests/data/Commercial_Battery_Storage/Market/20/df_fom.csv b/tests/data/Commercial_Battery_Storage/Market/20/df_fom.csv
index 97d9ec5..16afd60 100644
--- a/tests/data/Commercial_Battery_Storage/Market/20/df_fom.csv
+++ b/tests/data/Commercial_Battery_Storage/Market/20/df_fom.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,41.17291488823829,29.61970578766454,27.957009257113175,26.534539118786462,25.578497346574345,24.62245557436223,23.666413802150103,22.710372029938,21.75433025772586,21.34523811633819,20.9361459749505,20.52705383356284,20.117961692175157,19.708869550787476,19.299777409399805,18.89068526801213,18.481593126624464,18.07250098523679,17.66340884384912,17.254316702461438,16.845224561073763,16.436132419686086,16.02704027829841,15.61794813691073,15.208855995523061,14.799763854135382,14.390671712747713,13.981579571360038,13.572487429972355
-Commercial Battery Storage 1Hr/Moderate,41.17291488823829,38.328796949401884,35.839299437409984,34.34209846854473,33.237508576900005,32.161499520720575,31.155990819895443,30.243549756665427,29.3575253070036,28.990556240666066,28.62358717432851,28.256618107990985,27.889649041653442,27.52267997531588,27.155710908978335,26.788741842640803,26.421772776303243,26.05480370996571,25.68783464362818,25.32086557729062,24.953896510953076,24.58692744461554,24.219958378277997,23.852989311940465,23.486020245602916,23.11905117926537,22.752082112927823,22.385113046590263,22.01814398025271
-Commercial Battery Storage 1Hr/Conservative,41.17291488823829,42.69783766187673,43.00282221660443,42.39285310714903,40.806933422565066,39.22101373798106,37.635094053397054,36.049174368813084,34.46325468422909,34.36484142327924,34.266428162329404,34.16801490137956,34.0696016404297,33.97118837947987,33.87277511853002,33.77436185758017,33.675948596630306,33.57753533568048,33.47912207473063,33.38070881378078,33.28229555283093,33.1838822918811,33.08546903093124,32.9870557699814,32.88864250903156,32.7902292480817,32.69181598713187,32.59340272618203,32.49498946523214
-Commercial Battery Storage 2Hr/Advanced,48.0519374418654,34.568459712379976,32.62796582488783,30.96783449133187,29.85206069793281,28.736286904533735,27.62051311113465,26.50473931773559,25.3889655243365,24.911523739141572,24.43408195394663,23.95664016875171,23.47919838355678,23.001756598361847,22.524314813166924,22.046873027971998,21.569431242777075,21.091989457582148,20.614547672387225,20.13710588719229,19.659664101997365,19.182222316802434,18.704780531607508,18.227338746412578,17.74989696121765,17.27245517602272,16.7950133908278,16.317571605632867,15.840129820437932
-Commercial Battery Storage 2Hr/Moderate,48.0519374418654,44.60763116674487,41.543028953906195,39.773970165048425,38.37176578112428,37.02426378964313,35.76908173013936,34.631041943195925,33.53770881672469,33.118487456515645,32.69926609630657,32.28004473609754,31.860823375888483,31.4416020156794,31.022380655470347,30.6031592952613,30.183937935052235,29.764716574843188,29.345495214634134,28.92627385442506,28.507052494216005,28.08783113400695,27.668609773797904,27.24938841358885,26.830167053379792,26.41094569317073,25.991724332961674,25.572502972752602,25.153281612543527
-Commercial Battery Storage 2Hr/Conservative,48.0519374418654,49.83163882860114,50.187579105948295,49.47569855125398,47.62480910904883,45.773919666843625,43.92303022463843,42.07214078243327,40.221251340228086,40.10639554555217,39.991539750876285,39.87668395620038,39.76182816152447,39.64697236684857,39.53211657217267,39.41726077749675,39.30240498282083,39.18754918814495,39.07269339346904,38.957837598793134,38.84298180411724,38.72812600944134,38.61327021476542,38.498414420089524,38.38355862541363,38.2687028307377,38.15384703606181,38.038991241385915,37.92413544670996
-Commercial Battery Storage 4Hr/Advanced,61.80998254911963,44.46596756181086,41.969878960437136,39.8344252364227,38.39918740064972,36.963949564876735,35.52871172910374,34.093473893330774,32.65823605755777,32.04409498474834,31.42995391193889,30.815812839129467,30.201671766320032,29.587530693510587,28.97338962070116,28.35924854789173,27.745107475082296,27.13096640227286,26.516825329463433,25.902684256653995,25.288543183844567,24.674402111035135,24.0602610382257,23.44611996541626,22.83197889260683,22.217837819797396,21.603696746987964,20.989555674178533,20.375414601369084
-Commercial Battery Storage 4Hr/Moderate,61.80998254911963,57.16529960143086,52.9504879868986,50.63771355805582,48.64028018957285,46.749792327488244,44.99526355062722,43.406026316256934,41.89807583616687,41.3743498882148,40.8506239402627,40.32689799231063,39.803172044358554,39.279446096406446,38.755720148454365,38.23199420050229,37.7082682525502,37.184542304598125,36.660816356646045,36.13709040869394,35.61336446074187,35.08963851278978,34.56591256483771,34.04218661688562,33.51846066893354,32.99473472098145,32.471008773029375,31.94728282507727,31.42355687712517
-Commercial Battery Storage 4Hr/Conservative,61.80998254911963,64.09924116204998,64.55709288463605,63.64138943946389,61.260560482016345,58.879731524568776,56.4989025671212,54.118073609673644,51.73724465222606,51.58950379009803,51.44176292797004,51.294022065842015,51.14628120371398,50.998540341585965,50.85079947945796,50.703058617329916,50.55531775520189,50.40757689307389,50.25983603094585,50.11209516881784,49.96435430668983,49.81661344456181,49.668872582433785,49.521131720305775,49.37339085817776,49.225649996049725,49.07790913392171,48.93016827179369,48.78242740966562
-Commercial Battery Storage 6Hr/Advanced,75.56802765637387,54.36347541124174,51.31179209598644,48.70101598151354,46.946314103366646,45.19161222521975,43.436910347072846,41.68220846892595,39.92750659077904,39.17666623035511,38.425825869931145,37.674985509507216,36.92414514908327,36.17330478865933,35.42246442823539,34.67162406781146,33.92078370738752,33.16994334696358,32.41910298653964,31.668262626115705,30.91742226569177,30.166581905267822,29.415741544843883,28.664901184419946,27.914060823996007,27.163220463572067,26.412380103148127,25.661539742724187,24.910699382300233
-Commercial Battery Storage 6Hr/Moderate,75.56802765637387,69.72296803611682,64.35794701989103,61.501456951063226,58.90879459802141,56.47532086533334,54.22144537111508,52.181010689317944,50.25844285560906,49.630212319913966,49.00198178421883,48.37375124852373,47.74552071282863,47.11729017713349,46.48905964143839,45.860829105743285,45.23259857004817,44.604368034353065,43.976137498657955,43.34790696296283,42.71967642726772,42.09144589157262,41.463215355877516,40.8349848201824,40.20675428448729,39.57852374879217,38.95029321309707,38.32206267740194,37.69383214170681
-Commercial Battery Storage 6Hr/Conservative,75.56802765637387,78.36684349549881,78.9266066633238,77.8070803276738,74.89631185498388,71.98554338229393,69.07477490960395,66.16400643691401,63.25323796422405,63.07261203464391,62.89198610506378,62.711360175483655,62.5307342459035,62.35010831632337,62.16948238674325,61.98885645716308,61.80823052758296,61.627604598002826,61.44697866842269,61.26635273884255,61.08572680926242,60.90510087968228,60.72447495010214,60.543849020522025,60.36322309094189,60.182597161361734,60.0019712317816,59.821345302201465,59.64071937262128
-Commercial Battery Storage 8Hr/Advanced,89.3260727636281,64.26098326067262,60.653705231535746,57.56760672660437,55.49344080608356,53.41927488556274,51.34510896504194,49.27094304452112,47.196777124000306,46.30923747596188,45.4216978279234,44.53415817988497,43.64661853184652,42.75907888380807,41.87153923576963,40.98399958773119,40.09645993969275,39.2089202916543,38.32138064361585,37.43384099557741,36.546301347538964,35.65876169950052,34.77122205146207,33.883682403423634,32.996142755385186,32.10860310734674,31.221063459308297,30.333523811269846,29.445984163231387
-Commercial Battery Storage 8Hr/Moderate,89.3260727636281,82.28063647080279,75.76540605288343,72.36520034407062,69.17730900646998,66.20084940317844,63.44762719160293,60.955995062378946,58.61880987505124,57.886074751613116,57.15333962817496,56.420604504736836,55.6878693812987,54.95513425786054,54.2223991344224,53.489664010984285,52.756928887546145,52.02419376410801,51.29145864066987,50.558723517231726,49.82598839379358,49.09325327035544,48.36051814691732,47.627783023479175,46.895047900041035,46.1623127766029,45.42957765316476,44.69684252972661,43.964107406288434
-Commercial Battery Storage 8Hr/Conservative,89.3260727636281,92.63444582894763,93.29612044201154,91.97277121588371,88.5320632279514,85.09135524001907,81.65064725208671,78.20993926415439,74.76923127622204,74.55572027918977,74.34220928215754,74.12869828512528,73.91518728809301,73.70167629106076,73.48816529402853,73.27465429699626,73.061143299964,72.84763230293177,72.6341213058995,72.42061030886725,72.20709931183501,71.99358831480275,71.7800773177705,71.56656632073826,71.35305532370602,71.13954432667374,70.9260333296415,70.71252233260923,70.49901133557694
+Commercial Battery Storage 1Hr/Advanced,34.929480935955034,40.450981105990294,27.816081048641998,23.354205217573295,22.512751154819053,21.671297092064812,20.829843029310563,19.98838896655632,19.146934903802073,18.786875067070252,18.426815230338434,18.06675539360662,17.706695556874802,17.34663572014298,16.986575883411163,16.626516046679345,16.26645620994753,15.906396373215713,15.546336536483901,15.186276699752083,14.826216863020262,14.466157026288446,14.106097189556628,13.746037352824812,13.385977516092996,13.025917679361175,12.66585784262936,12.305798005897543,11.945738169165722
+Commercial Battery Storage 1Hr/Moderate,34.929480935955034,40.450981105990294,31.415766254995575,30.088934182341433,29.074105377022438,28.091209957443898,27.173898427106042,26.341852464613194,25.537514841997783,25.218295906472818,24.899076970947846,24.579858035422884,24.260639099897908,23.94142016437293,23.622201228847956,23.302982293322994,22.98376335779801,22.664544422273046,22.34532548674808,22.02610655122311,21.706887615698136,21.38766868017316,21.06844974464819,20.74923080912322,20.430011873598254,20.110792938073285,19.79157400254831,19.47235506702333,19.153136131498343
+Commercial Battery Storage 1Hr/Conservative,34.929480935955034,40.450981105990294,37.848659457980084,37.3117990401364,35.915961953742816,34.520124867349224,33.124287780955626,31.72845069456205,30.332613608168455,30.245995804781536,30.15937800139463,30.072760198007728,29.986142394620817,29.8995245912339,29.812906787846998,29.726288984460087,29.639671181073183,29.553053377686275,29.466435574299357,29.379817770912457,29.29319996752554,29.206582164138634,29.119964360751727,29.033346557364816,28.946728753977915,28.860110950590997,28.773493147204086,28.686875343817185,28.60025754043024
+Commercial Battery Storage 2Hr/Advanced,41.80850348958215,48.91926471900621,34.115814978666606,27.953589465747214,26.94641918504685,25.93924890434649,24.93207862364612,23.924908342945756,22.917738062245384,22.4867679322265,22.055797802207618,21.624827672188736,21.19385754216986,20.76288741215097,20.331917282132093,19.900947152113215,19.469977022094334,19.039006892075452,18.608036762056575,18.17706663203769,17.746096502018812,17.315126371999934,16.88415624198105,16.453186111962168,16.022215981943287,15.591245851924407,15.160275721905528,14.729305591886646,14.29833546186776
+Commercial Battery Storage 2Hr/Moderate,41.80850348958215,48.91926471900621,37.33318016259971,35.72430539485247,34.40071227477674,33.136152714827524,31.959814068857657,30.893717557267323,29.87430465035396,29.50087584222455,29.127447034095116,28.7540182259657,28.380589417836276,28.007160609706844,27.633731801577422,27.260302993448,26.886874185318575,26.513445377189157,26.14001656905974,25.76658776093031,25.39315895280089,25.01973014467146,24.646301336542038,24.272872528412616,23.899443720283195,23.526014912153773,23.15258610402435,22.77915729589492,22.405728487765476
+Commercial Battery Storage 2Hr/Conservative,41.80850348958215,48.91926471900621,45.30258591378353,44.659996042666045,42.989262377760554,41.31852871285506,39.64779504794958,37.97706138304408,36.30632771813859,36.20265137832118,36.09897503850379,35.99529869868639,35.89162235886898,35.787946019051574,35.684269679234184,35.580593339416765,35.476916999599375,35.37324065978198,35.26956431996457,35.165887980147176,35.062211640329764,34.95853530051237,34.85485896069497,34.751182620877564,34.64750628106017,34.543829941242755,34.440153601425365,34.33647726160796,34.23280092179053
+Commercial Battery Storage 4Hr/Advanced,55.566548596836384,65.85583194503802,46.715282838715815,37.152357962095046,35.81375524550245,34.47515252890983,33.136549812317234,31.797947095724613,30.459344379132006,29.886553662538997,29.313762945945985,28.740972229352977,28.168181512759965,27.595390796166953,27.022600079573948,26.449809362980943,25.87701864638794,25.30422792979493,24.73143721320192,24.15864649660892,23.58585578001591,23.013065063422903,22.44027434682989,21.867483630236887,21.294692913643875,20.721902197050873,20.14911148045786,19.576320763864857,19.003530047271838
+Commercial Battery Storage 4Hr/Moderate,55.566548596836384,65.85583194503802,49.16800797780799,46.99504781987456,45.05392607028535,43.22603822959478,41.53164535236091,39.99744774257557,38.547884267066316,38.066035713728,37.58418716038966,37.10233860705133,36.62049005371301,36.138641500374675,35.65679294703635,35.174944393698034,34.693095840359696,34.211247287021365,33.729398733683034,33.24755018034472,32.76570162700639,32.283853073668055,31.80200452032973,31.32015596699141,30.838307413653077,30.356458860314753,29.87461030697643,29.392761753638094,28.910913200299742
+Commercial Battery Storage 4Hr/Conservative,55.566548596836384,65.85583194503802,60.21043882539041,59.35639004772531,57.13586322579603,54.915336403866746,52.694809581937456,50.47428276000815,48.253755938078875,48.11596252540048,47.9781691127221,47.840375700043694,47.70258228736532,47.56478887468692,47.42699546200855,47.28920204933015,47.15140863665177,47.01361522397339,46.875821811295,46.73802839861661,46.60023498593822,46.46244157325983,46.324648160581454,46.18685474790306,46.049061335224685,45.91126792254628,45.7734745098679,45.63568109718952,45.49788768451109
+Commercial Battery Storage 6Hr/Advanced,69.32459370409062,82.79239917106983,59.31475069876501,46.35112645844288,44.681091305958034,43.011056153473184,41.341021000988334,39.67098584850348,38.000950696018634,37.28633939285149,36.57172808968435,35.85711678651722,35.14250548335008,34.427894180182946,33.71328287701581,32.99867157384868,32.284060270681536,31.569448967514404,30.854837664347265,30.140226361180147,29.42561505801301,28.711003754845873,27.99639245167873,27.2817811485116,26.567169845344463,25.852558542177334,25.137947239010195,24.423335935843067,23.708724632675917
+Commercial Battery Storage 6Hr/Moderate,69.32459370409062,82.79239917106983,61.00283579301626,58.26579024489666,55.70713986579395,53.31592374436204,51.10347663586416,49.101177927883825,47.22146388377867,46.631195585231445,46.0409272866842,45.45065898813697,44.86039068958974,44.270122391042506,43.679854092495276,43.08958579394806,42.49931749540082,41.90904919685358,41.31878089830636,40.72851259975912,40.1382443012119,39.547976002664655,38.95770770411744,38.367439405570195,37.77717110702296,37.18690280847573,36.596634509928506,36.00636621138127,35.416097912834
+Commercial Battery Storage 6Hr/Conservative,69.32459370409062,82.79239917106983,75.11829173699729,74.05278405278459,71.2824640738315,68.51214409487842,65.74182411592533,62.971504136972214,60.20118415801914,60.02927367247976,59.8573631869404,59.68545270140102,59.513542215861655,59.34163173032226,59.16972124478291,58.997810759243535,58.82590027370417,58.65398978816481,58.48207930262543,58.31016881708604,58.13825833154667,57.966347846007295,57.794437360467946,57.62252687492857,57.45061638938919,57.27870590384981,57.10679541831045,56.93488493277107,56.76297444723166
+Commercial Battery Storage 8Hr/Advanced,83.08263881134484,99.72896639710163,71.91421855881426,55.549894954790716,53.54842736641364,51.54695977803652,49.54549218965944,47.54402460128233,45.542557012905256,44.68612512316399,43.82969323342272,42.97326134368145,42.11682945394019,41.26039756419894,40.403965674457666,39.547533784716414,38.691101894975134,37.83467000523388,36.978238115492616,36.121806225751364,35.265374336010105,34.40894244626884,33.55251055652757,32.69607866678631,31.839646777045047,30.9832148873038,30.126782997562533,29.27035110782127,28.413919218079993
+Commercial Battery Storage 8Hr/Moderate,83.08263881134484,99.72896639710163,72.83766360822453,69.53653266991874,66.36035366130254,63.405809259129285,60.67530791936741,58.204908113192076,55.89504350049101,55.1963554567349,54.49766741297876,53.79897936922262,53.10029132546647,52.40160328171034,51.7029152379542,51.00422719419808,50.30553915044194,49.606851106685795,48.90816306292966,48.20947501917353,47.510786975417396,46.812098931661254,46.11341088790513,45.41472284414898,44.71603480039285,44.017346756636705,43.31865871288059,42.61997066912445,41.92128262536826
+Commercial Battery Storage 8Hr/Conservative,83.08263881134484,99.72896639710163,90.02614464860417,88.74917805784388,85.42906492186697,82.1089517858901,78.7888386499132,75.46872551393629,72.14861237795942,71.94258481955904,71.73655726115871,71.53052970275833,71.32450214435798,71.11847458595761,70.91244702755726,70.70641946915691,70.50039191075656,70.29436435235621,70.08833679395585,69.88230923555548,69.67628167715513,69.47025411875477,69.26422656035443,69.05819900195404,68.85217144355373,68.64614388515335,68.440116326753,68.23408876835263,68.02806120995224
diff --git a/tests/data/Commercial_Battery_Storage/Market/20/df_occ.csv b/tests/data/Commercial_Battery_Storage/Market/20/df_occ.csv
index ed451d5..4a2c2f7 100644
--- a/tests/data/Commercial_Battery_Storage/Market/20/df_occ.csv
+++ b/tests/data/Commercial_Battery_Storage/Market/20/df_occ.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1646.9165955295314,1184.7882315065815,1118.280370284527,1061.3815647514584,1023.1398938629737,984.8982229744892,946.6565520860041,908.4148811975199,870.1732103090344,853.8095246535275,837.4458389980199,821.0821533425135,804.7184676870063,788.354782031499,771.9910963759921,755.6274107204853,739.2637250649785,722.9000394094716,706.5363537539647,690.1726680984575,673.8089824429505,657.4452967874435,641.0816111319365,624.7179254764292,608.3542398209224,591.9905541654152,575.6268685099085,559.2631828544015,542.8994971988942
-Commercial Battery Storage 1Hr/Moderate,1646.9165955295314,1533.1518779760752,1433.5719774963993,1373.683938741789,1329.500343076,1286.459980828823,1246.2396327958177,1209.741990266617,1174.3010122801438,1159.6222496266425,1144.9434869731404,1130.2647243196393,1115.5859616661376,1100.9071990126351,1086.2284363591334,1071.5496737056321,1056.8709110521297,1042.1921483986284,1027.5133857451272,1012.8346230916246,998.155860438123,983.4770977846215,968.7983351311199,954.1195724776186,939.4408098241166,924.7620471706148,910.0832845171129,895.4045218636105,880.7257592101083
-Commercial Battery Storage 1Hr/Conservative,1646.9165955295314,1707.9135064750692,1720.112888664177,1695.7141242859611,1632.2773369026027,1568.8405495192424,1505.403762135882,1441.9669747525234,1378.5301873691635,1374.5936569311693,1370.657126493176,1366.7205960551823,1362.7840656171882,1358.8475351791947,1354.9110047412007,1350.9744743032065,1347.0379438652121,1343.101413427219,1339.1648829892251,1335.228352551231,1331.2918221132372,1327.3552916752437,1323.4187612372498,1319.482230799256,1315.5457003612626,1311.609169923268,1307.6726394852747,1303.736109047281,1299.7995786092854
-Commercial Battery Storage 2Hr/Advanced,1922.0774976746159,1382.738388495199,1305.118632995513,1238.7133796532748,1194.0824279173123,1149.4514761813493,1104.820524445386,1060.1895727094236,1015.5586209734599,996.4609495656629,977.3632781578651,958.2656067500684,939.1679353422712,920.0702639344738,900.972592526677,881.8749211188799,862.777249711083,843.6795783032859,824.5819068954889,805.4842354876916,786.3865640798945,767.2888926720974,748.1912212643002,729.093549856503,709.995878448706,690.8982070409088,671.800535633112,652.7028642253147,633.6051928175173
-Commercial Battery Storage 2Hr/Moderate,1922.0774976746159,1784.3052466697948,1661.7211581562476,1590.9588066019369,1534.870631244971,1480.9705515857252,1430.7632692055745,1385.241677727837,1341.5083526689875,1324.7394982606259,1307.9706438522628,1291.2017894439014,1274.4329350355392,1257.664080627176,1240.8952262188138,1224.126371810452,1207.3575174020893,1190.5886629937274,1173.8198085853653,1157.0509541770023,1140.2820997686401,1123.513245360278,1106.744390951916,1089.975536543554,1073.2066821351916,1056.4378277268293,1039.668973318467,1022.900118910104,1006.131264501741
-Commercial Battery Storage 2Hr/Conservative,1922.0774976746159,1993.2655531440457,2007.5031642379317,1979.027942050159,1904.9923643619532,1830.956786673745,1756.921208985537,1682.8856312973307,1608.8500536091233,1604.2558218220865,1599.6615900350514,1595.0673582480151,1590.4731264609786,1585.8788946739428,1581.2846628869067,1576.6904310998698,1572.0961993128333,1567.501967525798,1562.9077357387614,1558.3135039517254,1553.7192721646893,1549.1250403776535,1544.5308085906167,1539.936576803581,1535.342345016545,1530.7481132295081,1526.1538814424725,1521.5596496554365,1516.9654178683984
-Commercial Battery Storage 4Hr/Advanced,2472.399301964785,1778.638702472434,1678.7951584174853,1593.3770094569081,1535.9674960259888,1478.5579825950692,1421.1484691641497,1363.7389557332308,1306.3294423023108,1281.7637993899336,1257.1981564775556,1232.6325135651787,1208.0668706528013,1183.5012277404235,1158.9355848280463,1134.3699419156692,1109.8042990032918,1085.2386560909144,1060.6730131785373,1036.1073702661597,1011.5417273537827,986.9760844414053,962.4104415290279,937.8447986166503,913.2791557042732,888.7135127918958,864.1478698795185,839.5822269671412,815.0165840547633
-Commercial Battery Storage 4Hr/Moderate,2472.399301964785,2286.611984057234,2118.019519475944,2025.5085423222329,1945.6112075829137,1869.9916930995296,1799.8105420250888,1736.2410526502772,1675.9230334466747,1654.973995528592,1634.024957610508,1613.075919692425,1592.126881774342,1571.1778438562578,1550.2288059381744,1529.2797680200918,1508.330730102008,1487.381692183925,1466.4326542658416,1445.4836163477578,1424.5345784296746,1403.5855405115913,1382.6365025935083,1361.687464675425,1340.7384267573416,1319.789388839258,1298.8403509211748,1277.8913130030908,1256.9422750850067
-Commercial Battery Storage 4Hr/Conservative,2472.399301964785,2563.969646481999,2582.2837153854416,2545.6555775785555,2450.4224192806537,2355.189260982751,2259.956102684848,2164.7229443869455,2069.4897860890424,2063.580151603921,2057.6705171188014,2051.7608826336805,2045.851248148559,2039.9416136634384,2034.0319791783184,2028.1223446931965,2022.2127102080756,2016.3030757229553,2010.393441237834,2004.4838067527135,1998.574172267593,1992.6645377824723,1986.7549032973513,1980.8452688122309,1974.9356343271102,1969.0259998419888,1963.1163653568683,1957.2067308717474,1951.2970963866248
-Commercial Battery Storage 6Hr/Advanced,3022.7211062549545,2174.5390164496694,2052.4716838394575,1948.0406392605416,1877.8525641346657,1807.6644890087898,1737.4764138829137,1667.2883387570378,1597.1002636311614,1567.0666492142043,1537.0330347972458,1506.9994203802887,1476.965805963331,1446.9321915463731,1416.8985771294158,1386.8649627124582,1356.8313482955007,1326.797733878543,1296.7641194615856,1266.7305050446282,1236.6968906276707,1206.6632762107129,1176.6296617937553,1146.5960473767977,1116.5624329598402,1086.5288185428826,1056.495204125925,1026.4615897089675,996.4279752920093
-Commercial Battery Storage 6Hr/Moderate,3022.7211062549545,2788.918721444673,2574.317880795641,2460.058278042529,2356.351783920856,2259.0128346133333,2168.857814844603,2087.2404275727176,2010.3377142243623,1985.2084927965584,1960.079271368753,1934.9500499409492,1909.820828513145,1884.6916070853395,1859.5623856575353,1834.4331642297313,1809.3039428019267,1784.1747213741226,1759.0454999463182,1733.916278518513,1708.7870570907087,1683.6578356629045,1658.5286142351006,1633.399392807296,1608.2701713794916,1583.1409499516867,1558.0117285238825,1532.8825070960775,1507.7532856682722
-Commercial Battery Storage 6Hr/Conservative,3022.7211062549545,3134.673739819952,3157.0642665329515,3112.2832131069517,2995.852474199355,2879.4217352917567,2762.990996384158,2646.5602574765603,2530.129518568962,2522.9044813857563,2515.679444202551,2508.454407019346,2501.22936983614,2494.004332652935,2486.7792954697297,2479.5542582865232,2472.329221103318,2465.104183920113,2457.8791467369074,2450.654109553702,2443.4290723704967,2436.204035187291,2428.9789980040855,2421.753960820881,2414.5289236376752,2407.303886454469,2400.078849271264,2392.8538120880585,2385.628774904851
-Commercial Battery Storage 8Hr/Advanced,3573.042910545124,2570.4393304269047,2426.1482092614297,2302.7042690641747,2219.7376322433424,2136.7709954225097,2053.8043586016774,1970.8377217808447,1887.8710849600122,1852.369499038475,1816.867913116936,1781.3663271953985,1745.8647412738608,1710.3631553523228,1674.8615694307853,1639.3599835092475,1603.8583975877098,1568.356811666172,1532.855225744634,1497.3536398230965,1461.8520539015585,1426.350467980021,1390.8488820584828,1355.3472961369453,1319.8457102154073,1284.3441242938695,1248.8425383723318,1213.3409524507938,1177.8393665292554
-Commercial Battery Storage 8Hr/Moderate,3573.042910545124,3291.2254588321116,3030.616242115337,2894.6080137628246,2767.092360258799,2648.0339761271375,2537.905087664117,2438.2398024951576,2344.7523950020495,2315.4429900645246,2286.1335851269982,2256.8241801894733,2227.514775251948,2198.2053703144215,2168.895965376896,2139.586560439371,2110.2771555018458,2080.9677505643203,2051.658345626795,2022.3489406892688,1993.0395357517432,1963.7301308142175,1934.4207258766928,1905.111320939167,1875.8019160016413,1846.4925110641161,1817.1831061265905,1787.8737011890641,1758.5642962515374
-Commercial Battery Storage 8Hr/Conservative,3573.042910545124,3705.377833157905,3731.8448176804613,3678.910848635348,3541.2825291180557,3403.6542096007624,3266.0258900834683,3128.397570566175,2990.7692510488814,2982.2288111675907,2973.6883712863014,2965.147931405011,2956.6074915237205,2948.0670516424307,2939.5266117611413,2930.98617187985,2922.44573199856,2913.9052921172706,2905.36485223598,2896.82441235469,2888.2839724734004,2879.74353259211,2871.2030927108203,2862.66265282953,2854.1222129482408,2845.5817730669496,2837.04133318566,2828.500893304369,2819.9604534230775
+Commercial Battery Storage 1Hr/Advanced,1397.1792374382012,1618.0392442396117,1112.6432419456798,934.1682087029318,900.510046192762,866.8518836825924,833.1937211724224,799.5355586622528,765.8773961520828,751.47500268281,737.0726092135374,722.6702157442647,708.267822274992,693.8654288057191,679.4630353364465,665.0606418671738,650.6582483979013,636.2558549286285,621.853461459356,607.4510679900833,593.0486745208104,578.6462810515378,564.2438875822651,549.8414941129925,535.4391006437198,521.036707174447,506.6343137051744,492.2319202359017,477.8295267666288
+Commercial Battery Storage 1Hr/Moderate,1397.1792374382012,1618.0392442396117,1256.6306501998229,1203.5573672936573,1162.9642150808975,1123.6483982977559,1086.9559370842417,1053.6740985845277,1021.5005936799113,1008.7318362589127,995.9630788379138,983.1943214169153,970.4255639959163,957.6568065749171,944.8880491539182,932.1192917329197,919.3505343119205,906.5817768909218,893.8130194699231,881.0442620489242,868.2755046279253,855.5067472069263,842.7379897859277,829.9692323649288,817.2004749439301,804.4317175229313,791.6629601019323,778.8942026809332,766.1254452599337
+Commercial Battery Storage 1Hr/Conservative,1397.1792374382012,1618.0392442396117,1513.9463783192034,1492.471961605456,1436.6384781497127,1380.8049946939689,1324.971511238225,1269.138027782482,1213.304544326738,1209.8398321912614,1206.3751200557851,1202.9104079203091,1199.4456957848327,1195.980983649356,1192.51627151388,1189.0515593784035,1185.5868472429272,1182.122135107451,1178.6574229719743,1175.1927108364982,1171.7279987010215,1168.2632865655453,1164.798574430069,1161.3338622945926,1157.8691501591165,1154.4044380236398,1150.9397258881634,1147.4750137526873,1144.0103016172095
+Commercial Battery Storage 2Hr/Advanced,1672.340139583286,1956.770588760248,1364.6325991466642,1118.1435786298885,1077.8567674018739,1037.5699561738595,997.2831449458447,956.9963337178301,916.7095224898153,899.47071728906,882.2319120883046,864.9931068875494,847.7543016867943,830.5154964860387,813.2766912852836,796.0378860845285,778.7990808837733,761.5602756830181,744.321470482263,727.0826652815076,709.8438600807524,692.6050548799973,675.366249679242,658.1274444784867,640.8886392777315,623.6498340769763,606.411028876221,589.1722236754658,571.9334184747104
+Commercial Battery Storage 2Hr/Moderate,1672.340139583286,1956.770588760248,1493.3272065039885,1428.972215794099,1376.0284909910695,1325.446108593101,1278.3925627543063,1235.7487022906928,1194.9721860141583,1180.035033688982,1165.0978813638046,1150.160729038628,1135.223576713451,1120.2864243882736,1105.3492720630968,1090.41211973792,1075.474967412743,1060.5378150875663,1045.6006627623894,1030.6635104372124,1015.7263581120354,1000.7892057868584,985.8520534616815,970.9149011365046,955.9777488113277,941.0405964861509,926.103444160974,911.1662918357968,896.229139510619
+Commercial Battery Storage 2Hr/Conservative,1672.340139583286,1956.770588760248,1812.103436551341,1786.3998417066416,1719.5704951104221,1652.7411485142025,1585.911801917983,1519.082455321763,1452.2531087255436,1448.1060551328471,1443.9590015401516,1439.8119479474556,1435.664894354759,1431.5178407620629,1427.3707871693673,1423.2237335766706,1419.076679983975,1414.929626391279,1410.7825727985828,1406.635519205887,1402.4884656131906,1398.3414120204945,1394.1943584277988,1390.0473048351025,1385.9002512424067,1381.7531976497103,1377.6061440570145,1373.4590904643183,1369.312036871621
+Commercial Battery Storage 4Hr/Advanced,2222.661943873455,2634.2332778015207,1868.6113135486326,1486.0943184838018,1432.550209820098,1379.0061011563932,1325.4619924926892,1271.9178838289845,1218.3737751652802,1195.4621465015598,1172.5505178378394,1149.638889174119,1126.7272605103985,1103.8156318466781,1080.904003182958,1057.9923745192377,1035.0807458555175,1012.1691171917971,989.2574885280768,966.3458598643567,943.4342312006363,920.5226025369161,897.6109738731956,874.6993452094754,851.787716545755,828.8760878820349,805.9644592183145,783.0528305545942,760.1412018908735
+Commercial Battery Storage 4Hr/Moderate,2222.661943873455,2634.2332778015207,1966.7203191123194,1879.8019127949822,1802.157042811414,1729.041529183791,1661.2658140944363,1599.8979097030226,1541.9153706826526,1522.6414285491198,1503.3674864155864,1484.0935442820532,1464.8196021485205,1445.5456600149869,1426.271717881454,1406.9977757479212,1387.7238336143878,1368.4498914808546,1349.1759493473214,1329.9020072137887,1310.6280650802557,1291.354122946722,1272.0801808131891,1252.8062386796564,1233.532296546123,1214.25835441259,1194.984412279057,1175.7104701455237,1156.4365280119896
+Commercial Battery Storage 4Hr/Conservative,2222.661943873455,2634.2332778015207,2408.4175530156162,2374.2556019090125,2285.434529031841,2196.6134561546696,2107.792383277498,2018.9713104003258,1930.1502375231548,1924.6385010160188,1919.1267645088838,1913.6150280017478,1908.1032914946124,1902.5915549874767,1897.0798184803418,1891.5680819732058,1886.0563454660708,1880.5446089589354,1875.0328724518,1869.5211359446644,1864.0093994375288,1858.497662930393,1852.985926423258,1847.4741899161224,1841.9624534089874,1836.4507169018511,1830.938980394716,1825.4272438875805,1819.9155073804436
+Commercial Battery Storage 6Hr/Advanced,2772.9837481636246,3311.695966842793,2372.5900279506004,1854.045058337715,1787.2436522383214,1720.4422461389272,1653.6408400395333,1586.8394339401389,1520.0380278407454,1491.4535757140595,1462.869123587374,1434.2846714606887,1405.7002193340031,1377.1157672073177,1348.531315080632,1319.9468629539472,1291.3624108272613,1262.7779587005762,1234.1935065738905,1205.6090544472058,1177.0246023205202,1148.4401501938348,1119.8556980671492,1091.271245940464,1062.6867938137784,1034.1023416870933,1005.5178895604078,976.9334374337226,948.3489853070366
+Commercial Battery Storage 6Hr/Moderate,2772.9837481636246,3311.695966842793,2440.11343172065,2330.631609795866,2228.2855946317577,2132.6369497744813,2044.1390654345664,1964.0471171153529,1888.8585553511466,1865.2478234092578,1841.637091467368,1818.0263595254787,1794.4156275835896,1770.8048956417,1747.194163699811,1723.5834317579222,1699.9726998160327,1676.3619678741431,1652.751235932254,1629.1405039903648,1605.5297720484757,1581.919040106586,1558.3083081646973,1534.6975762228078,1511.0868442809183,1487.4761123390292,1463.8653803971401,1440.2546484552508,1416.64391651336
+Commercial Battery Storage 6Hr/Conservative,2772.9837481636246,3311.695966842793,3004.7316694798915,2962.1113621113836,2851.29856295326,2740.485763795137,2629.672964637013,2518.8601654788886,2408.0473663207654,2401.1709468991903,2394.2945274776157,2387.4181080560406,2380.541688634466,2373.6652692128905,2366.7888497913164,2359.9124303697413,2353.0360109481667,2346.159591526592,2339.283172105017,2332.4067526834415,2325.530333261867,2318.653913840292,2311.7774944187177,2304.9010749971426,2298.0246555755675,2291.1482361539925,2284.271816732418,2277.395397310843,2270.5189778892664
+Commercial Battery Storage 8Hr/Advanced,3323.305552453793,3989.158655884065,2876.56874235257,2221.9957981916286,2141.9370946565455,2061.878391121461,1981.8196875863775,1901.7609840512932,1821.70228051621,1787.4450049265595,1753.1877293369087,1718.9304537472578,1684.6731781576075,1650.4159025679573,1616.1586269783065,1581.9013513886564,1547.6440757990053,1513.3868002093552,1479.1295246197046,1444.8722490300545,1410.6149734404041,1376.3576978507535,1342.100422261103,1307.8431466714526,1273.5858710818018,1239.3285954921519,1205.0713199025013,1170.8140443128507,1136.5567687231996
+Commercial Battery Storage 8Hr/Moderate,3323.305552453793,3989.158655884065,2913.5065443289814,2781.4613067967493,2654.4141464521017,2536.2323703651714,2427.0123167746965,2328.196324527683,2235.8017400196404,2207.854218269396,2179.90669651915,2151.9591747689046,2124.0116530186588,2096.0641312684133,2068.116609518168,2040.1690877679232,2012.2215660176773,1984.2740442674317,1956.3265225171863,1928.379000766941,1900.4314790166957,1872.48395726645,1844.536435516205,1816.5889137659592,1788.6413920157138,1760.6938702654681,1732.7463485152236,1704.7988267649778,1676.8513050147305
+Commercial Battery Storage 8Hr/Conservative,3323.305552453793,3989.158655884065,3601.0457859441667,3549.9671223137548,3417.1625968746785,3284.358071435604,3151.553545996528,3018.749020557452,2885.944495118377,2877.703392782362,2869.462290446348,2861.221188110333,2852.980085774319,2844.7389834383043,2836.4978811022906,2828.2567787662765,2820.0156764302624,2811.7745740942482,2803.5334717582336,2795.292369422219,2787.0512670862054,2778.810164750191,2770.569062414177,2762.3279600781616,2754.086857742149,2745.845755406134,2737.6046530701196,2729.3635507341055,2721.1224483980895
diff --git a/tests/data/Commercial_Battery_Storage/Market/30/df_capex.csv b/tests/data/Commercial_Battery_Storage/Market/30/df_capex.csv
index 06d3842..99a1130 100644
--- a/tests/data/Commercial_Battery_Storage/Market/30/df_capex.csv
+++ b/tests/data/Commercial_Battery_Storage/Market/30/df_capex.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1708.6543909919249,1229.202267834563,1160.201233161033,1101.1694678729955,1061.4942353446183,1021.8190028162413,982.1437702878638,942.4685377594872,902.7933052311091,885.8161957502836,868.8390862694572,851.8619767886321,834.8848673078062,817.9077578269802,800.9306483461546,783.953538865329,766.9764293845036,749.9993199036779,733.0222104228524,716.0451009420265,699.0679914612008,682.090881980375,665.1137724995492,648.1366630187232,631.1595535378978,614.1824440570718,597.2053345762464,580.2282250954207,563.2511156145947
-Commercial Battery Storage 1Hr/Moderate,1708.6543909919249,1590.624987004306,1487.3121448901431,1425.1790892978179,1379.3391876603653,1334.6853757167942,1292.9572915743656,1255.0914656195782,1218.3219152841134,1203.0928913430623,1187.8638674020106,1172.63484346096,1157.4058195199086,1142.1767955788566,1126.947771637805,1111.7187476967542,1096.4897237557022,1081.2606998146514,1066.0316758736005,1050.8026519325483,1035.573627991497,1020.3446040504459,1005.1155801093947,989.8865561683439,974.6575322272922,959.4285082862408,944.1994843451894,928.9704604041373,913.7414364630855
-Commercial Battery Storage 1Hr/Conservative,1708.6543909919249,1771.9378869545883,1784.5945861471214,1759.2811877620552,1693.466351960886,1627.651516159715,1561.8366803585438,1496.0218445573746,1430.207008756204,1426.1229100007417,1422.0388112452806,1417.954712489819,1413.8706137343568,1409.7865149788954,1405.7024162234334,1401.6183174679713,1397.5342187125088,1393.450119957048,1389.3660212015861,1385.2819224461239,1381.1978236906623,1377.1137249352007,1373.029626179739,1368.945527424277,1364.8614286688157,1360.777329913353,1356.693231157892,1352.6091324024303,1348.5250336469667
-Commercial Battery Storage 2Hr/Advanced,1994.1302219816112,1434.5729622912497,1354.043482885758,1285.1489025432334,1238.8448748439548,1192.5408471446756,1146.2368194453961,1099.9327917461178,1053.628764046838,1033.8151801669806,1014.0015962871227,994.1880124072657,974.3744285274082,954.5608446475507,934.7472607676935,914.9336768878362,895.120093007979,875.3065091281218,855.4929252482646,835.679341368407,815.8657574885497,796.0521736086923,776.2385897288349,756.4250058489774,736.6114219691202,716.7978380892628,696.9842542094057,677.1706703295481,657.3570864496904
-Commercial Battery Storage 2Hr/Moderate,1994.1302219816112,1851.1933165698713,1724.0139307570337,1650.5989181034563,1592.4081710027563,1536.487544521381,1484.3981468363497,1437.1700920735836,1391.7973402916673,1374.3998735380221,1357.0024067843756,1339.6049400307306,1322.207473277085,1304.8100065234382,1287.4125397697926,1270.0150730161472,1252.617606262501,1235.2201395088557,1217.82267275521,1200.4252060015635,1183.027739247918,1165.6302724942723,1148.2328057406269,1130.8353389869812,1113.4378722333354,1096.0404054796895,1078.6429387260437,1061.2454719723974,1043.8480052187508
-Commercial Battery Storage 2Hr/Conservative,1994.1302219816112,2067.986896869819,2082.75823184746,2053.2155618921765,1976.4046200084417,1899.5936781247049,1822.7827362409682,1745.9717943572332,1669.160852473497,1664.3943971851945,1659.6279418968936,1654.8614866085916,1650.095031320289,1645.3285760319875,1640.5621207436857,1635.795665455383,1631.0292101670807,1626.2627548787793,1621.496299590477,1616.7298443021753,1611.9633890138734,1607.1969337255719,1602.4304784372691,1597.6640231489675,1592.897567860666,1588.1311125723632,1583.3646572840619,1578.5982019957598,1573.831746707456
-Commercial Battery Storage 4Hr/Advanced,2565.0818839609838,1845.3143512046233,1741.7279823352078,1653.1077718837093,1593.5461538426268,1533.9845358015439,1474.422917760461,1414.8612997193786,1355.2996816782952,1329.8131490003748,1304.3266163224534,1278.8400836445333,1253.3535509666126,1227.8670182886915,1202.380485610771,1176.8939529328507,1151.40742025493,1125.9208875770094,1100.434354899089,1074.947822221168,1049.4612895432476,1023.974756865327,998.4882241874063,973.0016915094855,947.515158831565,922.0286261536444,896.5420934757237,871.0555607978032,845.5690281198819
-Commercial Battery Storage 4Hr/Moderate,2565.0818839609838,2372.3299757010022,2197.417502490815,2101.4385757147334,2018.5461376875394,1940.0918821305554,1867.2798573603184,1801.327344981595,1738.7481903067749,1717.0138379279408,1695.2794855491056,1673.5451331702714,1651.8107807914373,1630.0764284126017,1608.342076033767,1586.6077236549331,1564.873371276098,1543.139018897264,1521.4046665184292,1499.6703141395942,1477.9359617607597,1456.2016093819252,1434.467257003091,1412.7329046242564,1390.9985522454217,1369.264199866587,1347.5298474877525,1325.795495108917,1304.0611427300819
-Commercial Battery Storage 4Hr/Conservative,2565.0818839609838,2660.0849167002793,2679.085523248138,2641.084310152419,2542.281156103553,2443.4780020546855,2344.6748480058177,2245.871693956951,2147.068539908083,2140.9373715541,2134.806203200119,2128.6750348461364,2122.5438664921535,2116.4126981381714,2110.28152978419,2104.1503614302064,2098.019193076224,2091.8880247222423,2085.7568563682594,2079.6256880142773,2073.4945196602953,2067.3633513063132,2061.2321829523307,2055.1010145983487,2048.969846244366,2042.8386778903835,2036.7075095364014,2030.5763411824191,2024.4451728284348
-Commercial Battery Storage 6Hr/Advanced,3136.033545940357,2256.055740117997,2129.4124817846578,2021.0666412241858,1948.2474328412993,1875.4282244584126,1802.609016075526,1729.7898076926394,1656.9705993097525,1625.811117833769,1594.6516363577841,1563.4921548818006,1532.3326734058166,1501.1731919298325,1470.0137104538487,1438.8542289778648,1407.694747501881,1376.535266025897,1345.375784549913,1314.2163030739293,1283.0568215979456,1251.8973401219614,1220.7378586459774,1189.5783771699935,1158.4188956940097,1127.2594142180258,1096.0999327420418,1064.9404512660578,1033.7809697900732
-Commercial Battery Storage 6Hr/Moderate,3136.033545940357,2893.4666348321325,2670.821074224597,2552.2782333260106,2444.684104372322,2343.696219739729,2250.161567884287,2165.4845978896064,2085.699040321883,2059.6278023178597,2033.5565643138357,2007.4853263098128,1981.4140883057896,1955.3428503017649,1929.2716122977417,1903.2003742937188,1877.1291362896952,1851.057898285672,1824.9866602816487,1798.9154222776247,1772.844184273601,1746.772946269578,1720.701708265555,1694.6304702615314,1668.559232257508,1642.4879942534842,1616.416756249461,1590.345518245437,1564.2742802414125
-Commercial Battery Storage 6Hr/Conservative,3136.033545940357,3252.1829365307394,3275.412814648816,3228.9530584126624,3108.157692198665,2987.362325984666,2866.5669597706665,2745.771593556668,2624.976227342669,2617.480345923006,2609.984464503344,2602.4885830836815,2594.992701664018,2587.496820244356,2580.0009388246935,2572.5050574050297,2565.0091759853676,2557.513294565705,2550.017413146042,2542.5215317263796,2535.025650306717,2527.529768887054,2520.0338874673917,2512.5380060477296,2505.0421246280666,2497.5462432084037,2490.050361788741,2482.554480369078,2475.058598949414
-Commercial Battery Storage 8Hr/Advanced,3706.98520791973,2666.7971290313712,2517.0969812341077,2389.0255105646615,2302.9487118399716,2216.8719131152807,2130.7951143905907,2044.7183156659,1958.6415169412098,1921.809086667163,1884.9766563931148,1848.1442261190678,1811.3117958450207,1774.4793655709734,1737.6469352969264,1700.8145050228793,1663.982074748832,1627.149644474785,1590.3172142007375,1553.4847839266906,1516.6523536526431,1479.8199233785963,1442.9874931045488,1406.1550628305017,1369.3226325564544,1332.4902022824072,1295.65777200836,1258.8253417343126,1221.9929114602648
-Commercial Battery Storage 8Hr/Moderate,3706.98520791973,3414.603293963263,3144.2246459583776,3003.1178909372875,2870.8220710571054,2747.300557348903,2633.0432784082554,2529.6418507976173,2432.6498903369907,2402.241766707779,2371.8336430785657,2341.425519449354,2311.0173958201417,2280.6092721909286,2250.2011485617163,2219.793024932505,2189.3849013032927,2158.9767776740805,2128.5686540448683,2098.1605304156556,2067.752406786443,2037.3442831572306,2006.936159528019,1976.5280358988066,1946.1199122695941,1915.711788640382,1885.3036650111699,1854.8955413819567,1824.487417752743
-Commercial Battery Storage 8Hr/Conservative,3706.98520791973,3844.2809563612,3871.740106049494,3816.821806672905,3674.0342282937763,3531.2466499146462,3388.4590715355152,3245.6714931563856,3102.883914777255,3094.0233202919117,3085.162725806569,3076.302131321226,3067.4415368358823,3058.5809423505398,3049.7203478651977,3040.8597533798534,3031.9991588945104,3023.138564409168,3014.2779699238245,3005.4173754384815,2996.556780953139,2987.696186467796,2978.835591982453,2969.97499749711,2961.1144030117675,2952.2538085264237,2943.3932140410807,2934.5326195557373,2925.6720250703925
+Commercial Battery Storage 1Hr/Advanced,1449.5551538746543,1678.6945173616073,1154.3527863636048,969.1872776423813,934.2673750062493,899.3474723701173,864.427569733985,829.5076670978531,794.5877644617208,779.6454699284909,764.7031753952613,749.7608808620316,734.8185863288019,719.8762917955719,704.9339972623422,689.9917027291125,675.049408195883,660.1071136626532,645.1648191294237,630.2225245961939,615.280230062964,600.3379355297344,585.3956409965047,570.453346463275,555.5110519300454,540.5687573968155,525.626462863586,510.6841683303562,495.7418737971263
+Commercial Battery Storage 1Hr/Moderate,1449.5551538746543,1678.6945173616073,1303.7378359944178,1248.67500031219,1206.5601367175132,1165.7704918962165,1127.702544108846,1093.1730727032002,1059.7934828817756,1046.5460643457536,1033.2986458097316,1020.0512272737096,1006.8038087376874,993.556390201665,980.3089716656427,967.0615531296208,953.8141345935983,940.5667160575764,927.3192975215544,914.0718789855322,900.82446044951,887.5770419134877,874.3296233774657,861.0822048414435,847.8347863054215,834.5873677693995,821.3399492333772,808.0925306973547,794.8451121613319
+Commercial Battery Storage 1Hr/Conservative,1449.5551538746543,1678.6945173616073,1570.6995327287318,1548.4201067325798,1490.4935991425843,1432.5670915525884,1374.6405839625925,1316.7140763725972,1258.7875687826013,1255.192975334533,1251.5983818864654,1248.0037884383978,1244.4091949903298,1240.8146015422617,1237.220008094194,1233.625414646126,1230.0308211980584,1226.4362277499906,1222.8416343019223,1219.247040853855,1215.6524474057867,1212.0578539577189,1208.4632605096513,1204.8686670615832,1201.2740736135156,1197.6794801654476,1194.0848867173795,1190.490293269312,1186.8956998212425
+Commercial Battery Storage 2Hr/Advanced,1735.0309848643408,2030.1238494557992,1415.7884430528595,1160.0593136115042,1118.2622747750129,1076.4652359385218,1034.6681971020303,992.871158265539,951.0741194290474,933.1890848852948,915.3040503415423,897.4190157977898,879.5339812540375,861.6489467102847,843.7639121665324,825.87887762278,807.9938430790276,790.1088085352751,772.2237739915228,754.3387394477702,736.4537049040177,718.5686703602654,700.6836358165128,682.7986012727605,664.913566729008,647.0285321852556,629.1434976415031,611.2584630977507,593.373428553998
+Commercial Battery Storage 2Hr/Moderate,1735.0309848643408,2030.1238494557992,1549.3074121099241,1482.539952387204,1427.611531539591,1375.1329725003989,1326.315535158743,1282.0730886209008,1239.767987212379,1224.270887372225,1208.7737875320697,1193.2766876919154,1177.7795878517607,1162.2824880116057,1146.785388171451,1131.2882883312964,1115.7911884911416,1100.294088650987,1084.7969888108325,1069.2998889706778,1053.802789130523,1038.3056892903683,1022.8085894502136,1007.311489610059,991.8143897699043,976.3172899297498,960.8201900895951,945.32309024944,929.8259904092845
+Commercial Battery Storage 2Hr/Conservative,1735.0309848643408,2030.1238494557992,1880.0335743774986,1853.3664314785274,1784.0318599412014,1714.697288403875,1645.3627168665491,1576.0281453292228,1506.6935737918968,1502.3910600215736,1498.0885462512513,1493.7860324809285,1489.4835187106053,1485.1810049402823,1480.87849116996,1476.5759773996365,1472.2734636293142,1467.9709498589914,1463.6684360886686,1459.365922318346,1455.0634085480228,1450.7608947777,1446.4583810073775,1442.1558672370545,1437.853353466732,1433.5508396964087,1429.2483259260862,1424.9458121557632,1420.6432983854393
+Commercial Battery Storage 4Hr/Advanced,2305.9826468437136,2732.982513644183,1938.6597564313684,1541.8033855497501,1486.2520743125408,1430.7007630753303,1375.1494518381207,1319.5981406009105,1264.0468293637007,1240.2763147989026,1216.5058002341045,1192.7352856693064,1168.9647711045084,1145.1942565397103,1121.4237419749124,1097.6532274101148,1073.882712845317,1050.112198280519,1026.3416837157208,1002.5711691509232,978.8006545861251,955.0301400213274,931.2596254565292,907.4891108917313,883.7185963269334,859.9480817621356,836.1775671973376,812.4070526325396,788.6365380677414
+Commercial Battery Storage 4Hr/Moderate,2305.9826468437136,2732.982513644183,2040.4465643409367,1950.269856537232,1869.7143211837465,1793.8579337087638,1723.5415172585374,1659.8731204563014,1599.716995873586,1579.7205334251666,1559.7240709767466,1539.7276085283268,1519.7311460799074,1499.734683631487,1479.7382211830675,1459.741758734648,1439.745296286228,1419.7488338378082,1399.7523713893884,1379.755908940969,1359.7594464925494,1339.7629840441289,1319.7665215957093,1299.7700591472899,1279.7735966988698,1259.7771342504502,1239.7806718020306,1219.7842093536105,1199.7877469051898
+Commercial Battery Storage 4Hr/Conservative,2305.9826468437136,2732.982513644183,2498.7016576750316,2463.259080970422,2371.1083815384354,2278.9576821064484,2186.806982674462,2094.6562832424743,2002.505583810488,1996.7872293956545,1991.0688749808223,1985.350520565989,1979.6321661511565,1973.9138117363236,1968.1954573214914,1962.4771029066583,1956.758748491826,1951.0403940769934,1945.3220396621607,1939.603685247328,1933.8853308324951,1928.1669764176622,1922.44862200283,1916.730267587997,1911.0119131731649,1905.2935587583313,1899.575204343499,1893.8568499286664,1888.1384955138321
+Commercial Battery Storage 6Hr/Advanced,2876.9343088230867,3435.841177832567,2461.5310698098765,1923.547457487996,1854.2418738500678,1784.9362902121393,1715.6307065742108,1646.325122936282,1577.0195392983542,1547.3635447125102,1517.7075501266665,1488.0515555408233,1458.3955609549796,1428.7395663691364,1399.0835717832927,1369.4275771974496,1339.7715826116057,1310.1155880257627,1280.459593439919,1250.8035988540762,1221.1476042682325,1191.4916096823893,1161.8356150965456,1132.1796205107023,1102.5236259248586,1072.8676313390156,1043.211636753172,1013.5556421673288,983.8996475814847
+Commercial Battery Storage 6Hr/Moderate,2876.9343088230867,3435.841177832567,2531.585716571949,2417.9997606872607,2311.8171108279016,2212.5828949171287,2120.767499358332,2037.6731522917025,1959.666004534793,1935.1701794781086,1910.6743544214232,1886.1785293647383,1861.6827043080536,1837.1868792513685,1812.6910541946838,1788.1952291379996,1763.6994040813145,1739.2035790246293,1714.7077539679447,1690.2119289112597,1665.716103854575,1641.2202787978897,1616.7244537412057,1592.2286286845206,1567.7328036278354,1543.2369785711508,1518.741153514466,1494.2453284577812,1469.7495034010947
+Commercial Battery Storage 6Hr/Conservative,2876.9343088230867,3435.841177832567,3117.369740972565,3073.151730462317,2958.184903135669,2843.218075809022,2728.251248482374,2613.2844211557253,2498.3175938290783,2491.1833987697355,2484.049203710393,2476.9150086510504,2469.780813591708,2462.6466185323648,2455.512423473023,2448.37822841368,2441.244033354338,2434.109838294996,2426.975643235653,2419.8414481763098,2412.7072531169674,2405.5730580576246,2398.4388629982827,2391.30466793894,2384.170472879597,2377.0362778202543,2369.902082760912,2362.7678877015696,2355.6336926422255
+Commercial Battery Storage 8Hr/Advanced,3447.8859708024584,4138.69984202095,2984.402383188387,2305.291529426242,2222.2316733875955,2139.171817348948,2056.111961310301,1973.0521052716535,1889.992249233007,1854.4507746261181,1818.9093000192288,1783.3678254123395,1747.8263508054508,1712.2848761985622,1676.7434015916729,1641.2019269847844,1605.660452377895,1570.1189777710063,1534.5775031641174,1499.0360285572287,1463.4945539503399,1427.953079343451,1392.411604736562,1356.870130129673,1321.328655522784,1285.7871809158955,1250.2457063090064,1214.7042317021176,1179.162757095228
+Commercial Battery Storage 8Hr/Moderate,3447.8859708024584,4138.69984202095,3022.7248688029617,2885.729664837289,2753.9199004720567,2631.307856125494,2517.9934814581266,2415.473184127103,2319.6150131959994,2290.6198255310505,2261.6246378661003,2232.6294502011506,2203.6342625362,2174.63907487125,2145.6438872063004,2116.648699541351,2087.6535118764004,2058.6583242114507,2029.6631365465005,2000.667948881551,1971.672761216601,1942.6775735516508,1913.6823858867015,1884.687198221751,1855.6920105568013,1826.696822891851,1797.701635226902,1768.7064475619518,1739.711259897
+Commercial Battery Storage 8Hr/Conservative,3447.8859708024584,4138.69984202095,3736.037824270098,3683.044379954212,3545.261424732903,3407.4784695115954,3269.6955142902866,3131.9125590689773,2994.1296038476694,2985.5795681438162,2977.0295324399644,2968.4794967361113,2959.929461032259,2951.379425328406,2942.829389624554,2934.279353920702,2925.7293182168496,2917.1792825129974,2908.6292468091447,2900.079211105292,2891.52917540144,2882.9791396975875,2874.429103993735,2865.8790682898816,2857.3290325860307,2848.7789968821776,2840.2289611783253,2831.678925474473,2823.128889770619
diff --git a/tests/data/Commercial_Battery_Storage/Market/30/df_fom.csv b/tests/data/Commercial_Battery_Storage/Market/30/df_fom.csv
index 97d9ec5..16afd60 100644
--- a/tests/data/Commercial_Battery_Storage/Market/30/df_fom.csv
+++ b/tests/data/Commercial_Battery_Storage/Market/30/df_fom.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,41.17291488823829,29.61970578766454,27.957009257113175,26.534539118786462,25.578497346574345,24.62245557436223,23.666413802150103,22.710372029938,21.75433025772586,21.34523811633819,20.9361459749505,20.52705383356284,20.117961692175157,19.708869550787476,19.299777409399805,18.89068526801213,18.481593126624464,18.07250098523679,17.66340884384912,17.254316702461438,16.845224561073763,16.436132419686086,16.02704027829841,15.61794813691073,15.208855995523061,14.799763854135382,14.390671712747713,13.981579571360038,13.572487429972355
-Commercial Battery Storage 1Hr/Moderate,41.17291488823829,38.328796949401884,35.839299437409984,34.34209846854473,33.237508576900005,32.161499520720575,31.155990819895443,30.243549756665427,29.3575253070036,28.990556240666066,28.62358717432851,28.256618107990985,27.889649041653442,27.52267997531588,27.155710908978335,26.788741842640803,26.421772776303243,26.05480370996571,25.68783464362818,25.32086557729062,24.953896510953076,24.58692744461554,24.219958378277997,23.852989311940465,23.486020245602916,23.11905117926537,22.752082112927823,22.385113046590263,22.01814398025271
-Commercial Battery Storage 1Hr/Conservative,41.17291488823829,42.69783766187673,43.00282221660443,42.39285310714903,40.806933422565066,39.22101373798106,37.635094053397054,36.049174368813084,34.46325468422909,34.36484142327924,34.266428162329404,34.16801490137956,34.0696016404297,33.97118837947987,33.87277511853002,33.77436185758017,33.675948596630306,33.57753533568048,33.47912207473063,33.38070881378078,33.28229555283093,33.1838822918811,33.08546903093124,32.9870557699814,32.88864250903156,32.7902292480817,32.69181598713187,32.59340272618203,32.49498946523214
-Commercial Battery Storage 2Hr/Advanced,48.0519374418654,34.568459712379976,32.62796582488783,30.96783449133187,29.85206069793281,28.736286904533735,27.62051311113465,26.50473931773559,25.3889655243365,24.911523739141572,24.43408195394663,23.95664016875171,23.47919838355678,23.001756598361847,22.524314813166924,22.046873027971998,21.569431242777075,21.091989457582148,20.614547672387225,20.13710588719229,19.659664101997365,19.182222316802434,18.704780531607508,18.227338746412578,17.74989696121765,17.27245517602272,16.7950133908278,16.317571605632867,15.840129820437932
-Commercial Battery Storage 2Hr/Moderate,48.0519374418654,44.60763116674487,41.543028953906195,39.773970165048425,38.37176578112428,37.02426378964313,35.76908173013936,34.631041943195925,33.53770881672469,33.118487456515645,32.69926609630657,32.28004473609754,31.860823375888483,31.4416020156794,31.022380655470347,30.6031592952613,30.183937935052235,29.764716574843188,29.345495214634134,28.92627385442506,28.507052494216005,28.08783113400695,27.668609773797904,27.24938841358885,26.830167053379792,26.41094569317073,25.991724332961674,25.572502972752602,25.153281612543527
-Commercial Battery Storage 2Hr/Conservative,48.0519374418654,49.83163882860114,50.187579105948295,49.47569855125398,47.62480910904883,45.773919666843625,43.92303022463843,42.07214078243327,40.221251340228086,40.10639554555217,39.991539750876285,39.87668395620038,39.76182816152447,39.64697236684857,39.53211657217267,39.41726077749675,39.30240498282083,39.18754918814495,39.07269339346904,38.957837598793134,38.84298180411724,38.72812600944134,38.61327021476542,38.498414420089524,38.38355862541363,38.2687028307377,38.15384703606181,38.038991241385915,37.92413544670996
-Commercial Battery Storage 4Hr/Advanced,61.80998254911963,44.46596756181086,41.969878960437136,39.8344252364227,38.39918740064972,36.963949564876735,35.52871172910374,34.093473893330774,32.65823605755777,32.04409498474834,31.42995391193889,30.815812839129467,30.201671766320032,29.587530693510587,28.97338962070116,28.35924854789173,27.745107475082296,27.13096640227286,26.516825329463433,25.902684256653995,25.288543183844567,24.674402111035135,24.0602610382257,23.44611996541626,22.83197889260683,22.217837819797396,21.603696746987964,20.989555674178533,20.375414601369084
-Commercial Battery Storage 4Hr/Moderate,61.80998254911963,57.16529960143086,52.9504879868986,50.63771355805582,48.64028018957285,46.749792327488244,44.99526355062722,43.406026316256934,41.89807583616687,41.3743498882148,40.8506239402627,40.32689799231063,39.803172044358554,39.279446096406446,38.755720148454365,38.23199420050229,37.7082682525502,37.184542304598125,36.660816356646045,36.13709040869394,35.61336446074187,35.08963851278978,34.56591256483771,34.04218661688562,33.51846066893354,32.99473472098145,32.471008773029375,31.94728282507727,31.42355687712517
-Commercial Battery Storage 4Hr/Conservative,61.80998254911963,64.09924116204998,64.55709288463605,63.64138943946389,61.260560482016345,58.879731524568776,56.4989025671212,54.118073609673644,51.73724465222606,51.58950379009803,51.44176292797004,51.294022065842015,51.14628120371398,50.998540341585965,50.85079947945796,50.703058617329916,50.55531775520189,50.40757689307389,50.25983603094585,50.11209516881784,49.96435430668983,49.81661344456181,49.668872582433785,49.521131720305775,49.37339085817776,49.225649996049725,49.07790913392171,48.93016827179369,48.78242740966562
-Commercial Battery Storage 6Hr/Advanced,75.56802765637387,54.36347541124174,51.31179209598644,48.70101598151354,46.946314103366646,45.19161222521975,43.436910347072846,41.68220846892595,39.92750659077904,39.17666623035511,38.425825869931145,37.674985509507216,36.92414514908327,36.17330478865933,35.42246442823539,34.67162406781146,33.92078370738752,33.16994334696358,32.41910298653964,31.668262626115705,30.91742226569177,30.166581905267822,29.415741544843883,28.664901184419946,27.914060823996007,27.163220463572067,26.412380103148127,25.661539742724187,24.910699382300233
-Commercial Battery Storage 6Hr/Moderate,75.56802765637387,69.72296803611682,64.35794701989103,61.501456951063226,58.90879459802141,56.47532086533334,54.22144537111508,52.181010689317944,50.25844285560906,49.630212319913966,49.00198178421883,48.37375124852373,47.74552071282863,47.11729017713349,46.48905964143839,45.860829105743285,45.23259857004817,44.604368034353065,43.976137498657955,43.34790696296283,42.71967642726772,42.09144589157262,41.463215355877516,40.8349848201824,40.20675428448729,39.57852374879217,38.95029321309707,38.32206267740194,37.69383214170681
-Commercial Battery Storage 6Hr/Conservative,75.56802765637387,78.36684349549881,78.9266066633238,77.8070803276738,74.89631185498388,71.98554338229393,69.07477490960395,66.16400643691401,63.25323796422405,63.07261203464391,62.89198610506378,62.711360175483655,62.5307342459035,62.35010831632337,62.16948238674325,61.98885645716308,61.80823052758296,61.627604598002826,61.44697866842269,61.26635273884255,61.08572680926242,60.90510087968228,60.72447495010214,60.543849020522025,60.36322309094189,60.182597161361734,60.0019712317816,59.821345302201465,59.64071937262128
-Commercial Battery Storage 8Hr/Advanced,89.3260727636281,64.26098326067262,60.653705231535746,57.56760672660437,55.49344080608356,53.41927488556274,51.34510896504194,49.27094304452112,47.196777124000306,46.30923747596188,45.4216978279234,44.53415817988497,43.64661853184652,42.75907888380807,41.87153923576963,40.98399958773119,40.09645993969275,39.2089202916543,38.32138064361585,37.43384099557741,36.546301347538964,35.65876169950052,34.77122205146207,33.883682403423634,32.996142755385186,32.10860310734674,31.221063459308297,30.333523811269846,29.445984163231387
-Commercial Battery Storage 8Hr/Moderate,89.3260727636281,82.28063647080279,75.76540605288343,72.36520034407062,69.17730900646998,66.20084940317844,63.44762719160293,60.955995062378946,58.61880987505124,57.886074751613116,57.15333962817496,56.420604504736836,55.6878693812987,54.95513425786054,54.2223991344224,53.489664010984285,52.756928887546145,52.02419376410801,51.29145864066987,50.558723517231726,49.82598839379358,49.09325327035544,48.36051814691732,47.627783023479175,46.895047900041035,46.1623127766029,45.42957765316476,44.69684252972661,43.964107406288434
-Commercial Battery Storage 8Hr/Conservative,89.3260727636281,92.63444582894763,93.29612044201154,91.97277121588371,88.5320632279514,85.09135524001907,81.65064725208671,78.20993926415439,74.76923127622204,74.55572027918977,74.34220928215754,74.12869828512528,73.91518728809301,73.70167629106076,73.48816529402853,73.27465429699626,73.061143299964,72.84763230293177,72.6341213058995,72.42061030886725,72.20709931183501,71.99358831480275,71.7800773177705,71.56656632073826,71.35305532370602,71.13954432667374,70.9260333296415,70.71252233260923,70.49901133557694
+Commercial Battery Storage 1Hr/Advanced,34.929480935955034,40.450981105990294,27.816081048641998,23.354205217573295,22.512751154819053,21.671297092064812,20.829843029310563,19.98838896655632,19.146934903802073,18.786875067070252,18.426815230338434,18.06675539360662,17.706695556874802,17.34663572014298,16.986575883411163,16.626516046679345,16.26645620994753,15.906396373215713,15.546336536483901,15.186276699752083,14.826216863020262,14.466157026288446,14.106097189556628,13.746037352824812,13.385977516092996,13.025917679361175,12.66585784262936,12.305798005897543,11.945738169165722
+Commercial Battery Storage 1Hr/Moderate,34.929480935955034,40.450981105990294,31.415766254995575,30.088934182341433,29.074105377022438,28.091209957443898,27.173898427106042,26.341852464613194,25.537514841997783,25.218295906472818,24.899076970947846,24.579858035422884,24.260639099897908,23.94142016437293,23.622201228847956,23.302982293322994,22.98376335779801,22.664544422273046,22.34532548674808,22.02610655122311,21.706887615698136,21.38766868017316,21.06844974464819,20.74923080912322,20.430011873598254,20.110792938073285,19.79157400254831,19.47235506702333,19.153136131498343
+Commercial Battery Storage 1Hr/Conservative,34.929480935955034,40.450981105990294,37.848659457980084,37.3117990401364,35.915961953742816,34.520124867349224,33.124287780955626,31.72845069456205,30.332613608168455,30.245995804781536,30.15937800139463,30.072760198007728,29.986142394620817,29.8995245912339,29.812906787846998,29.726288984460087,29.639671181073183,29.553053377686275,29.466435574299357,29.379817770912457,29.29319996752554,29.206582164138634,29.119964360751727,29.033346557364816,28.946728753977915,28.860110950590997,28.773493147204086,28.686875343817185,28.60025754043024
+Commercial Battery Storage 2Hr/Advanced,41.80850348958215,48.91926471900621,34.115814978666606,27.953589465747214,26.94641918504685,25.93924890434649,24.93207862364612,23.924908342945756,22.917738062245384,22.4867679322265,22.055797802207618,21.624827672188736,21.19385754216986,20.76288741215097,20.331917282132093,19.900947152113215,19.469977022094334,19.039006892075452,18.608036762056575,18.17706663203769,17.746096502018812,17.315126371999934,16.88415624198105,16.453186111962168,16.022215981943287,15.591245851924407,15.160275721905528,14.729305591886646,14.29833546186776
+Commercial Battery Storage 2Hr/Moderate,41.80850348958215,48.91926471900621,37.33318016259971,35.72430539485247,34.40071227477674,33.136152714827524,31.959814068857657,30.893717557267323,29.87430465035396,29.50087584222455,29.127447034095116,28.7540182259657,28.380589417836276,28.007160609706844,27.633731801577422,27.260302993448,26.886874185318575,26.513445377189157,26.14001656905974,25.76658776093031,25.39315895280089,25.01973014467146,24.646301336542038,24.272872528412616,23.899443720283195,23.526014912153773,23.15258610402435,22.77915729589492,22.405728487765476
+Commercial Battery Storage 2Hr/Conservative,41.80850348958215,48.91926471900621,45.30258591378353,44.659996042666045,42.989262377760554,41.31852871285506,39.64779504794958,37.97706138304408,36.30632771813859,36.20265137832118,36.09897503850379,35.99529869868639,35.89162235886898,35.787946019051574,35.684269679234184,35.580593339416765,35.476916999599375,35.37324065978198,35.26956431996457,35.165887980147176,35.062211640329764,34.95853530051237,34.85485896069497,34.751182620877564,34.64750628106017,34.543829941242755,34.440153601425365,34.33647726160796,34.23280092179053
+Commercial Battery Storage 4Hr/Advanced,55.566548596836384,65.85583194503802,46.715282838715815,37.152357962095046,35.81375524550245,34.47515252890983,33.136549812317234,31.797947095724613,30.459344379132006,29.886553662538997,29.313762945945985,28.740972229352977,28.168181512759965,27.595390796166953,27.022600079573948,26.449809362980943,25.87701864638794,25.30422792979493,24.73143721320192,24.15864649660892,23.58585578001591,23.013065063422903,22.44027434682989,21.867483630236887,21.294692913643875,20.721902197050873,20.14911148045786,19.576320763864857,19.003530047271838
+Commercial Battery Storage 4Hr/Moderate,55.566548596836384,65.85583194503802,49.16800797780799,46.99504781987456,45.05392607028535,43.22603822959478,41.53164535236091,39.99744774257557,38.547884267066316,38.066035713728,37.58418716038966,37.10233860705133,36.62049005371301,36.138641500374675,35.65679294703635,35.174944393698034,34.693095840359696,34.211247287021365,33.729398733683034,33.24755018034472,32.76570162700639,32.283853073668055,31.80200452032973,31.32015596699141,30.838307413653077,30.356458860314753,29.87461030697643,29.392761753638094,28.910913200299742
+Commercial Battery Storage 4Hr/Conservative,55.566548596836384,65.85583194503802,60.21043882539041,59.35639004772531,57.13586322579603,54.915336403866746,52.694809581937456,50.47428276000815,48.253755938078875,48.11596252540048,47.9781691127221,47.840375700043694,47.70258228736532,47.56478887468692,47.42699546200855,47.28920204933015,47.15140863665177,47.01361522397339,46.875821811295,46.73802839861661,46.60023498593822,46.46244157325983,46.324648160581454,46.18685474790306,46.049061335224685,45.91126792254628,45.7734745098679,45.63568109718952,45.49788768451109
+Commercial Battery Storage 6Hr/Advanced,69.32459370409062,82.79239917106983,59.31475069876501,46.35112645844288,44.681091305958034,43.011056153473184,41.341021000988334,39.67098584850348,38.000950696018634,37.28633939285149,36.57172808968435,35.85711678651722,35.14250548335008,34.427894180182946,33.71328287701581,32.99867157384868,32.284060270681536,31.569448967514404,30.854837664347265,30.140226361180147,29.42561505801301,28.711003754845873,27.99639245167873,27.2817811485116,26.567169845344463,25.852558542177334,25.137947239010195,24.423335935843067,23.708724632675917
+Commercial Battery Storage 6Hr/Moderate,69.32459370409062,82.79239917106983,61.00283579301626,58.26579024489666,55.70713986579395,53.31592374436204,51.10347663586416,49.101177927883825,47.22146388377867,46.631195585231445,46.0409272866842,45.45065898813697,44.86039068958974,44.270122391042506,43.679854092495276,43.08958579394806,42.49931749540082,41.90904919685358,41.31878089830636,40.72851259975912,40.1382443012119,39.547976002664655,38.95770770411744,38.367439405570195,37.77717110702296,37.18690280847573,36.596634509928506,36.00636621138127,35.416097912834
+Commercial Battery Storage 6Hr/Conservative,69.32459370409062,82.79239917106983,75.11829173699729,74.05278405278459,71.2824640738315,68.51214409487842,65.74182411592533,62.971504136972214,60.20118415801914,60.02927367247976,59.8573631869404,59.68545270140102,59.513542215861655,59.34163173032226,59.16972124478291,58.997810759243535,58.82590027370417,58.65398978816481,58.48207930262543,58.31016881708604,58.13825833154667,57.966347846007295,57.794437360467946,57.62252687492857,57.45061638938919,57.27870590384981,57.10679541831045,56.93488493277107,56.76297444723166
+Commercial Battery Storage 8Hr/Advanced,83.08263881134484,99.72896639710163,71.91421855881426,55.549894954790716,53.54842736641364,51.54695977803652,49.54549218965944,47.54402460128233,45.542557012905256,44.68612512316399,43.82969323342272,42.97326134368145,42.11682945394019,41.26039756419894,40.403965674457666,39.547533784716414,38.691101894975134,37.83467000523388,36.978238115492616,36.121806225751364,35.265374336010105,34.40894244626884,33.55251055652757,32.69607866678631,31.839646777045047,30.9832148873038,30.126782997562533,29.27035110782127,28.413919218079993
+Commercial Battery Storage 8Hr/Moderate,83.08263881134484,99.72896639710163,72.83766360822453,69.53653266991874,66.36035366130254,63.405809259129285,60.67530791936741,58.204908113192076,55.89504350049101,55.1963554567349,54.49766741297876,53.79897936922262,53.10029132546647,52.40160328171034,51.7029152379542,51.00422719419808,50.30553915044194,49.606851106685795,48.90816306292966,48.20947501917353,47.510786975417396,46.812098931661254,46.11341088790513,45.41472284414898,44.71603480039285,44.017346756636705,43.31865871288059,42.61997066912445,41.92128262536826
+Commercial Battery Storage 8Hr/Conservative,83.08263881134484,99.72896639710163,90.02614464860417,88.74917805784388,85.42906492186697,82.1089517858901,78.7888386499132,75.46872551393629,72.14861237795942,71.94258481955904,71.73655726115871,71.53052970275833,71.32450214435798,71.11847458595761,70.91244702755726,70.70641946915691,70.50039191075656,70.29436435235621,70.08833679395585,69.88230923555548,69.67628167715513,69.47025411875477,69.26422656035443,69.05819900195404,68.85217144355373,68.64614388515335,68.440116326753,68.23408876835263,68.02806120995224
diff --git a/tests/data/Commercial_Battery_Storage/Market/30/df_occ.csv b/tests/data/Commercial_Battery_Storage/Market/30/df_occ.csv
index ed451d5..4a2c2f7 100644
--- a/tests/data/Commercial_Battery_Storage/Market/30/df_occ.csv
+++ b/tests/data/Commercial_Battery_Storage/Market/30/df_occ.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1646.9165955295314,1184.7882315065815,1118.280370284527,1061.3815647514584,1023.1398938629737,984.8982229744892,946.6565520860041,908.4148811975199,870.1732103090344,853.8095246535275,837.4458389980199,821.0821533425135,804.7184676870063,788.354782031499,771.9910963759921,755.6274107204853,739.2637250649785,722.9000394094716,706.5363537539647,690.1726680984575,673.8089824429505,657.4452967874435,641.0816111319365,624.7179254764292,608.3542398209224,591.9905541654152,575.6268685099085,559.2631828544015,542.8994971988942
-Commercial Battery Storage 1Hr/Moderate,1646.9165955295314,1533.1518779760752,1433.5719774963993,1373.683938741789,1329.500343076,1286.459980828823,1246.2396327958177,1209.741990266617,1174.3010122801438,1159.6222496266425,1144.9434869731404,1130.2647243196393,1115.5859616661376,1100.9071990126351,1086.2284363591334,1071.5496737056321,1056.8709110521297,1042.1921483986284,1027.5133857451272,1012.8346230916246,998.155860438123,983.4770977846215,968.7983351311199,954.1195724776186,939.4408098241166,924.7620471706148,910.0832845171129,895.4045218636105,880.7257592101083
-Commercial Battery Storage 1Hr/Conservative,1646.9165955295314,1707.9135064750692,1720.112888664177,1695.7141242859611,1632.2773369026027,1568.8405495192424,1505.403762135882,1441.9669747525234,1378.5301873691635,1374.5936569311693,1370.657126493176,1366.7205960551823,1362.7840656171882,1358.8475351791947,1354.9110047412007,1350.9744743032065,1347.0379438652121,1343.101413427219,1339.1648829892251,1335.228352551231,1331.2918221132372,1327.3552916752437,1323.4187612372498,1319.482230799256,1315.5457003612626,1311.609169923268,1307.6726394852747,1303.736109047281,1299.7995786092854
-Commercial Battery Storage 2Hr/Advanced,1922.0774976746159,1382.738388495199,1305.118632995513,1238.7133796532748,1194.0824279173123,1149.4514761813493,1104.820524445386,1060.1895727094236,1015.5586209734599,996.4609495656629,977.3632781578651,958.2656067500684,939.1679353422712,920.0702639344738,900.972592526677,881.8749211188799,862.777249711083,843.6795783032859,824.5819068954889,805.4842354876916,786.3865640798945,767.2888926720974,748.1912212643002,729.093549856503,709.995878448706,690.8982070409088,671.800535633112,652.7028642253147,633.6051928175173
-Commercial Battery Storage 2Hr/Moderate,1922.0774976746159,1784.3052466697948,1661.7211581562476,1590.9588066019369,1534.870631244971,1480.9705515857252,1430.7632692055745,1385.241677727837,1341.5083526689875,1324.7394982606259,1307.9706438522628,1291.2017894439014,1274.4329350355392,1257.664080627176,1240.8952262188138,1224.126371810452,1207.3575174020893,1190.5886629937274,1173.8198085853653,1157.0509541770023,1140.2820997686401,1123.513245360278,1106.744390951916,1089.975536543554,1073.2066821351916,1056.4378277268293,1039.668973318467,1022.900118910104,1006.131264501741
-Commercial Battery Storage 2Hr/Conservative,1922.0774976746159,1993.2655531440457,2007.5031642379317,1979.027942050159,1904.9923643619532,1830.956786673745,1756.921208985537,1682.8856312973307,1608.8500536091233,1604.2558218220865,1599.6615900350514,1595.0673582480151,1590.4731264609786,1585.8788946739428,1581.2846628869067,1576.6904310998698,1572.0961993128333,1567.501967525798,1562.9077357387614,1558.3135039517254,1553.7192721646893,1549.1250403776535,1544.5308085906167,1539.936576803581,1535.342345016545,1530.7481132295081,1526.1538814424725,1521.5596496554365,1516.9654178683984
-Commercial Battery Storage 4Hr/Advanced,2472.399301964785,1778.638702472434,1678.7951584174853,1593.3770094569081,1535.9674960259888,1478.5579825950692,1421.1484691641497,1363.7389557332308,1306.3294423023108,1281.7637993899336,1257.1981564775556,1232.6325135651787,1208.0668706528013,1183.5012277404235,1158.9355848280463,1134.3699419156692,1109.8042990032918,1085.2386560909144,1060.6730131785373,1036.1073702661597,1011.5417273537827,986.9760844414053,962.4104415290279,937.8447986166503,913.2791557042732,888.7135127918958,864.1478698795185,839.5822269671412,815.0165840547633
-Commercial Battery Storage 4Hr/Moderate,2472.399301964785,2286.611984057234,2118.019519475944,2025.5085423222329,1945.6112075829137,1869.9916930995296,1799.8105420250888,1736.2410526502772,1675.9230334466747,1654.973995528592,1634.024957610508,1613.075919692425,1592.126881774342,1571.1778438562578,1550.2288059381744,1529.2797680200918,1508.330730102008,1487.381692183925,1466.4326542658416,1445.4836163477578,1424.5345784296746,1403.5855405115913,1382.6365025935083,1361.687464675425,1340.7384267573416,1319.789388839258,1298.8403509211748,1277.8913130030908,1256.9422750850067
-Commercial Battery Storage 4Hr/Conservative,2472.399301964785,2563.969646481999,2582.2837153854416,2545.6555775785555,2450.4224192806537,2355.189260982751,2259.956102684848,2164.7229443869455,2069.4897860890424,2063.580151603921,2057.6705171188014,2051.7608826336805,2045.851248148559,2039.9416136634384,2034.0319791783184,2028.1223446931965,2022.2127102080756,2016.3030757229553,2010.393441237834,2004.4838067527135,1998.574172267593,1992.6645377824723,1986.7549032973513,1980.8452688122309,1974.9356343271102,1969.0259998419888,1963.1163653568683,1957.2067308717474,1951.2970963866248
-Commercial Battery Storage 6Hr/Advanced,3022.7211062549545,2174.5390164496694,2052.4716838394575,1948.0406392605416,1877.8525641346657,1807.6644890087898,1737.4764138829137,1667.2883387570378,1597.1002636311614,1567.0666492142043,1537.0330347972458,1506.9994203802887,1476.965805963331,1446.9321915463731,1416.8985771294158,1386.8649627124582,1356.8313482955007,1326.797733878543,1296.7641194615856,1266.7305050446282,1236.6968906276707,1206.6632762107129,1176.6296617937553,1146.5960473767977,1116.5624329598402,1086.5288185428826,1056.495204125925,1026.4615897089675,996.4279752920093
-Commercial Battery Storage 6Hr/Moderate,3022.7211062549545,2788.918721444673,2574.317880795641,2460.058278042529,2356.351783920856,2259.0128346133333,2168.857814844603,2087.2404275727176,2010.3377142243623,1985.2084927965584,1960.079271368753,1934.9500499409492,1909.820828513145,1884.6916070853395,1859.5623856575353,1834.4331642297313,1809.3039428019267,1784.1747213741226,1759.0454999463182,1733.916278518513,1708.7870570907087,1683.6578356629045,1658.5286142351006,1633.399392807296,1608.2701713794916,1583.1409499516867,1558.0117285238825,1532.8825070960775,1507.7532856682722
-Commercial Battery Storage 6Hr/Conservative,3022.7211062549545,3134.673739819952,3157.0642665329515,3112.2832131069517,2995.852474199355,2879.4217352917567,2762.990996384158,2646.5602574765603,2530.129518568962,2522.9044813857563,2515.679444202551,2508.454407019346,2501.22936983614,2494.004332652935,2486.7792954697297,2479.5542582865232,2472.329221103318,2465.104183920113,2457.8791467369074,2450.654109553702,2443.4290723704967,2436.204035187291,2428.9789980040855,2421.753960820881,2414.5289236376752,2407.303886454469,2400.078849271264,2392.8538120880585,2385.628774904851
-Commercial Battery Storage 8Hr/Advanced,3573.042910545124,2570.4393304269047,2426.1482092614297,2302.7042690641747,2219.7376322433424,2136.7709954225097,2053.8043586016774,1970.8377217808447,1887.8710849600122,1852.369499038475,1816.867913116936,1781.3663271953985,1745.8647412738608,1710.3631553523228,1674.8615694307853,1639.3599835092475,1603.8583975877098,1568.356811666172,1532.855225744634,1497.3536398230965,1461.8520539015585,1426.350467980021,1390.8488820584828,1355.3472961369453,1319.8457102154073,1284.3441242938695,1248.8425383723318,1213.3409524507938,1177.8393665292554
-Commercial Battery Storage 8Hr/Moderate,3573.042910545124,3291.2254588321116,3030.616242115337,2894.6080137628246,2767.092360258799,2648.0339761271375,2537.905087664117,2438.2398024951576,2344.7523950020495,2315.4429900645246,2286.1335851269982,2256.8241801894733,2227.514775251948,2198.2053703144215,2168.895965376896,2139.586560439371,2110.2771555018458,2080.9677505643203,2051.658345626795,2022.3489406892688,1993.0395357517432,1963.7301308142175,1934.4207258766928,1905.111320939167,1875.8019160016413,1846.4925110641161,1817.1831061265905,1787.8737011890641,1758.5642962515374
-Commercial Battery Storage 8Hr/Conservative,3573.042910545124,3705.377833157905,3731.8448176804613,3678.910848635348,3541.2825291180557,3403.6542096007624,3266.0258900834683,3128.397570566175,2990.7692510488814,2982.2288111675907,2973.6883712863014,2965.147931405011,2956.6074915237205,2948.0670516424307,2939.5266117611413,2930.98617187985,2922.44573199856,2913.9052921172706,2905.36485223598,2896.82441235469,2888.2839724734004,2879.74353259211,2871.2030927108203,2862.66265282953,2854.1222129482408,2845.5817730669496,2837.04133318566,2828.500893304369,2819.9604534230775
+Commercial Battery Storage 1Hr/Advanced,1397.1792374382012,1618.0392442396117,1112.6432419456798,934.1682087029318,900.510046192762,866.8518836825924,833.1937211724224,799.5355586622528,765.8773961520828,751.47500268281,737.0726092135374,722.6702157442647,708.267822274992,693.8654288057191,679.4630353364465,665.0606418671738,650.6582483979013,636.2558549286285,621.853461459356,607.4510679900833,593.0486745208104,578.6462810515378,564.2438875822651,549.8414941129925,535.4391006437198,521.036707174447,506.6343137051744,492.2319202359017,477.8295267666288
+Commercial Battery Storage 1Hr/Moderate,1397.1792374382012,1618.0392442396117,1256.6306501998229,1203.5573672936573,1162.9642150808975,1123.6483982977559,1086.9559370842417,1053.6740985845277,1021.5005936799113,1008.7318362589127,995.9630788379138,983.1943214169153,970.4255639959163,957.6568065749171,944.8880491539182,932.1192917329197,919.3505343119205,906.5817768909218,893.8130194699231,881.0442620489242,868.2755046279253,855.5067472069263,842.7379897859277,829.9692323649288,817.2004749439301,804.4317175229313,791.6629601019323,778.8942026809332,766.1254452599337
+Commercial Battery Storage 1Hr/Conservative,1397.1792374382012,1618.0392442396117,1513.9463783192034,1492.471961605456,1436.6384781497127,1380.8049946939689,1324.971511238225,1269.138027782482,1213.304544326738,1209.8398321912614,1206.3751200557851,1202.9104079203091,1199.4456957848327,1195.980983649356,1192.51627151388,1189.0515593784035,1185.5868472429272,1182.122135107451,1178.6574229719743,1175.1927108364982,1171.7279987010215,1168.2632865655453,1164.798574430069,1161.3338622945926,1157.8691501591165,1154.4044380236398,1150.9397258881634,1147.4750137526873,1144.0103016172095
+Commercial Battery Storage 2Hr/Advanced,1672.340139583286,1956.770588760248,1364.6325991466642,1118.1435786298885,1077.8567674018739,1037.5699561738595,997.2831449458447,956.9963337178301,916.7095224898153,899.47071728906,882.2319120883046,864.9931068875494,847.7543016867943,830.5154964860387,813.2766912852836,796.0378860845285,778.7990808837733,761.5602756830181,744.321470482263,727.0826652815076,709.8438600807524,692.6050548799973,675.366249679242,658.1274444784867,640.8886392777315,623.6498340769763,606.411028876221,589.1722236754658,571.9334184747104
+Commercial Battery Storage 2Hr/Moderate,1672.340139583286,1956.770588760248,1493.3272065039885,1428.972215794099,1376.0284909910695,1325.446108593101,1278.3925627543063,1235.7487022906928,1194.9721860141583,1180.035033688982,1165.0978813638046,1150.160729038628,1135.223576713451,1120.2864243882736,1105.3492720630968,1090.41211973792,1075.474967412743,1060.5378150875663,1045.6006627623894,1030.6635104372124,1015.7263581120354,1000.7892057868584,985.8520534616815,970.9149011365046,955.9777488113277,941.0405964861509,926.103444160974,911.1662918357968,896.229139510619
+Commercial Battery Storage 2Hr/Conservative,1672.340139583286,1956.770588760248,1812.103436551341,1786.3998417066416,1719.5704951104221,1652.7411485142025,1585.911801917983,1519.082455321763,1452.2531087255436,1448.1060551328471,1443.9590015401516,1439.8119479474556,1435.664894354759,1431.5178407620629,1427.3707871693673,1423.2237335766706,1419.076679983975,1414.929626391279,1410.7825727985828,1406.635519205887,1402.4884656131906,1398.3414120204945,1394.1943584277988,1390.0473048351025,1385.9002512424067,1381.7531976497103,1377.6061440570145,1373.4590904643183,1369.312036871621
+Commercial Battery Storage 4Hr/Advanced,2222.661943873455,2634.2332778015207,1868.6113135486326,1486.0943184838018,1432.550209820098,1379.0061011563932,1325.4619924926892,1271.9178838289845,1218.3737751652802,1195.4621465015598,1172.5505178378394,1149.638889174119,1126.7272605103985,1103.8156318466781,1080.904003182958,1057.9923745192377,1035.0807458555175,1012.1691171917971,989.2574885280768,966.3458598643567,943.4342312006363,920.5226025369161,897.6109738731956,874.6993452094754,851.787716545755,828.8760878820349,805.9644592183145,783.0528305545942,760.1412018908735
+Commercial Battery Storage 4Hr/Moderate,2222.661943873455,2634.2332778015207,1966.7203191123194,1879.8019127949822,1802.157042811414,1729.041529183791,1661.2658140944363,1599.8979097030226,1541.9153706826526,1522.6414285491198,1503.3674864155864,1484.0935442820532,1464.8196021485205,1445.5456600149869,1426.271717881454,1406.9977757479212,1387.7238336143878,1368.4498914808546,1349.1759493473214,1329.9020072137887,1310.6280650802557,1291.354122946722,1272.0801808131891,1252.8062386796564,1233.532296546123,1214.25835441259,1194.984412279057,1175.7104701455237,1156.4365280119896
+Commercial Battery Storage 4Hr/Conservative,2222.661943873455,2634.2332778015207,2408.4175530156162,2374.2556019090125,2285.434529031841,2196.6134561546696,2107.792383277498,2018.9713104003258,1930.1502375231548,1924.6385010160188,1919.1267645088838,1913.6150280017478,1908.1032914946124,1902.5915549874767,1897.0798184803418,1891.5680819732058,1886.0563454660708,1880.5446089589354,1875.0328724518,1869.5211359446644,1864.0093994375288,1858.497662930393,1852.985926423258,1847.4741899161224,1841.9624534089874,1836.4507169018511,1830.938980394716,1825.4272438875805,1819.9155073804436
+Commercial Battery Storage 6Hr/Advanced,2772.9837481636246,3311.695966842793,2372.5900279506004,1854.045058337715,1787.2436522383214,1720.4422461389272,1653.6408400395333,1586.8394339401389,1520.0380278407454,1491.4535757140595,1462.869123587374,1434.2846714606887,1405.7002193340031,1377.1157672073177,1348.531315080632,1319.9468629539472,1291.3624108272613,1262.7779587005762,1234.1935065738905,1205.6090544472058,1177.0246023205202,1148.4401501938348,1119.8556980671492,1091.271245940464,1062.6867938137784,1034.1023416870933,1005.5178895604078,976.9334374337226,948.3489853070366
+Commercial Battery Storage 6Hr/Moderate,2772.9837481636246,3311.695966842793,2440.11343172065,2330.631609795866,2228.2855946317577,2132.6369497744813,2044.1390654345664,1964.0471171153529,1888.8585553511466,1865.2478234092578,1841.637091467368,1818.0263595254787,1794.4156275835896,1770.8048956417,1747.194163699811,1723.5834317579222,1699.9726998160327,1676.3619678741431,1652.751235932254,1629.1405039903648,1605.5297720484757,1581.919040106586,1558.3083081646973,1534.6975762228078,1511.0868442809183,1487.4761123390292,1463.8653803971401,1440.2546484552508,1416.64391651336
+Commercial Battery Storage 6Hr/Conservative,2772.9837481636246,3311.695966842793,3004.7316694798915,2962.1113621113836,2851.29856295326,2740.485763795137,2629.672964637013,2518.8601654788886,2408.0473663207654,2401.1709468991903,2394.2945274776157,2387.4181080560406,2380.541688634466,2373.6652692128905,2366.7888497913164,2359.9124303697413,2353.0360109481667,2346.159591526592,2339.283172105017,2332.4067526834415,2325.530333261867,2318.653913840292,2311.7774944187177,2304.9010749971426,2298.0246555755675,2291.1482361539925,2284.271816732418,2277.395397310843,2270.5189778892664
+Commercial Battery Storage 8Hr/Advanced,3323.305552453793,3989.158655884065,2876.56874235257,2221.9957981916286,2141.9370946565455,2061.878391121461,1981.8196875863775,1901.7609840512932,1821.70228051621,1787.4450049265595,1753.1877293369087,1718.9304537472578,1684.6731781576075,1650.4159025679573,1616.1586269783065,1581.9013513886564,1547.6440757990053,1513.3868002093552,1479.1295246197046,1444.8722490300545,1410.6149734404041,1376.3576978507535,1342.100422261103,1307.8431466714526,1273.5858710818018,1239.3285954921519,1205.0713199025013,1170.8140443128507,1136.5567687231996
+Commercial Battery Storage 8Hr/Moderate,3323.305552453793,3989.158655884065,2913.5065443289814,2781.4613067967493,2654.4141464521017,2536.2323703651714,2427.0123167746965,2328.196324527683,2235.8017400196404,2207.854218269396,2179.90669651915,2151.9591747689046,2124.0116530186588,2096.0641312684133,2068.116609518168,2040.1690877679232,2012.2215660176773,1984.2740442674317,1956.3265225171863,1928.379000766941,1900.4314790166957,1872.48395726645,1844.536435516205,1816.5889137659592,1788.6413920157138,1760.6938702654681,1732.7463485152236,1704.7988267649778,1676.8513050147305
+Commercial Battery Storage 8Hr/Conservative,3323.305552453793,3989.158655884065,3601.0457859441667,3549.9671223137548,3417.1625968746785,3284.358071435604,3151.553545996528,3018.749020557452,2885.944495118377,2877.703392782362,2869.462290446348,2861.221188110333,2852.980085774319,2844.7389834383043,2836.4978811022906,2828.2567787662765,2820.0156764302624,2811.7745740942482,2803.5334717582336,2795.292369422219,2787.0512670862054,2778.810164750191,2770.569062414177,2762.3279600781616,2754.086857742149,2745.845755406134,2737.6046530701196,2729.3635507341055,2721.1224483980895
diff --git a/tests/data/Commercial_Battery_Storage/Market/TechLife/df_capex.csv b/tests/data/Commercial_Battery_Storage/Market/TechLife/df_capex.csv
index 06d3842..99a1130 100644
--- a/tests/data/Commercial_Battery_Storage/Market/TechLife/df_capex.csv
+++ b/tests/data/Commercial_Battery_Storage/Market/TechLife/df_capex.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1708.6543909919249,1229.202267834563,1160.201233161033,1101.1694678729955,1061.4942353446183,1021.8190028162413,982.1437702878638,942.4685377594872,902.7933052311091,885.8161957502836,868.8390862694572,851.8619767886321,834.8848673078062,817.9077578269802,800.9306483461546,783.953538865329,766.9764293845036,749.9993199036779,733.0222104228524,716.0451009420265,699.0679914612008,682.090881980375,665.1137724995492,648.1366630187232,631.1595535378978,614.1824440570718,597.2053345762464,580.2282250954207,563.2511156145947
-Commercial Battery Storage 1Hr/Moderate,1708.6543909919249,1590.624987004306,1487.3121448901431,1425.1790892978179,1379.3391876603653,1334.6853757167942,1292.9572915743656,1255.0914656195782,1218.3219152841134,1203.0928913430623,1187.8638674020106,1172.63484346096,1157.4058195199086,1142.1767955788566,1126.947771637805,1111.7187476967542,1096.4897237557022,1081.2606998146514,1066.0316758736005,1050.8026519325483,1035.573627991497,1020.3446040504459,1005.1155801093947,989.8865561683439,974.6575322272922,959.4285082862408,944.1994843451894,928.9704604041373,913.7414364630855
-Commercial Battery Storage 1Hr/Conservative,1708.6543909919249,1771.9378869545883,1784.5945861471214,1759.2811877620552,1693.466351960886,1627.651516159715,1561.8366803585438,1496.0218445573746,1430.207008756204,1426.1229100007417,1422.0388112452806,1417.954712489819,1413.8706137343568,1409.7865149788954,1405.7024162234334,1401.6183174679713,1397.5342187125088,1393.450119957048,1389.3660212015861,1385.2819224461239,1381.1978236906623,1377.1137249352007,1373.029626179739,1368.945527424277,1364.8614286688157,1360.777329913353,1356.693231157892,1352.6091324024303,1348.5250336469667
-Commercial Battery Storage 2Hr/Advanced,1994.1302219816112,1434.5729622912497,1354.043482885758,1285.1489025432334,1238.8448748439548,1192.5408471446756,1146.2368194453961,1099.9327917461178,1053.628764046838,1033.8151801669806,1014.0015962871227,994.1880124072657,974.3744285274082,954.5608446475507,934.7472607676935,914.9336768878362,895.120093007979,875.3065091281218,855.4929252482646,835.679341368407,815.8657574885497,796.0521736086923,776.2385897288349,756.4250058489774,736.6114219691202,716.7978380892628,696.9842542094057,677.1706703295481,657.3570864496904
-Commercial Battery Storage 2Hr/Moderate,1994.1302219816112,1851.1933165698713,1724.0139307570337,1650.5989181034563,1592.4081710027563,1536.487544521381,1484.3981468363497,1437.1700920735836,1391.7973402916673,1374.3998735380221,1357.0024067843756,1339.6049400307306,1322.207473277085,1304.8100065234382,1287.4125397697926,1270.0150730161472,1252.617606262501,1235.2201395088557,1217.82267275521,1200.4252060015635,1183.027739247918,1165.6302724942723,1148.2328057406269,1130.8353389869812,1113.4378722333354,1096.0404054796895,1078.6429387260437,1061.2454719723974,1043.8480052187508
-Commercial Battery Storage 2Hr/Conservative,1994.1302219816112,2067.986896869819,2082.75823184746,2053.2155618921765,1976.4046200084417,1899.5936781247049,1822.7827362409682,1745.9717943572332,1669.160852473497,1664.3943971851945,1659.6279418968936,1654.8614866085916,1650.095031320289,1645.3285760319875,1640.5621207436857,1635.795665455383,1631.0292101670807,1626.2627548787793,1621.496299590477,1616.7298443021753,1611.9633890138734,1607.1969337255719,1602.4304784372691,1597.6640231489675,1592.897567860666,1588.1311125723632,1583.3646572840619,1578.5982019957598,1573.831746707456
-Commercial Battery Storage 4Hr/Advanced,2565.0818839609838,1845.3143512046233,1741.7279823352078,1653.1077718837093,1593.5461538426268,1533.9845358015439,1474.422917760461,1414.8612997193786,1355.2996816782952,1329.8131490003748,1304.3266163224534,1278.8400836445333,1253.3535509666126,1227.8670182886915,1202.380485610771,1176.8939529328507,1151.40742025493,1125.9208875770094,1100.434354899089,1074.947822221168,1049.4612895432476,1023.974756865327,998.4882241874063,973.0016915094855,947.515158831565,922.0286261536444,896.5420934757237,871.0555607978032,845.5690281198819
-Commercial Battery Storage 4Hr/Moderate,2565.0818839609838,2372.3299757010022,2197.417502490815,2101.4385757147334,2018.5461376875394,1940.0918821305554,1867.2798573603184,1801.327344981595,1738.7481903067749,1717.0138379279408,1695.2794855491056,1673.5451331702714,1651.8107807914373,1630.0764284126017,1608.342076033767,1586.6077236549331,1564.873371276098,1543.139018897264,1521.4046665184292,1499.6703141395942,1477.9359617607597,1456.2016093819252,1434.467257003091,1412.7329046242564,1390.9985522454217,1369.264199866587,1347.5298474877525,1325.795495108917,1304.0611427300819
-Commercial Battery Storage 4Hr/Conservative,2565.0818839609838,2660.0849167002793,2679.085523248138,2641.084310152419,2542.281156103553,2443.4780020546855,2344.6748480058177,2245.871693956951,2147.068539908083,2140.9373715541,2134.806203200119,2128.6750348461364,2122.5438664921535,2116.4126981381714,2110.28152978419,2104.1503614302064,2098.019193076224,2091.8880247222423,2085.7568563682594,2079.6256880142773,2073.4945196602953,2067.3633513063132,2061.2321829523307,2055.1010145983487,2048.969846244366,2042.8386778903835,2036.7075095364014,2030.5763411824191,2024.4451728284348
-Commercial Battery Storage 6Hr/Advanced,3136.033545940357,2256.055740117997,2129.4124817846578,2021.0666412241858,1948.2474328412993,1875.4282244584126,1802.609016075526,1729.7898076926394,1656.9705993097525,1625.811117833769,1594.6516363577841,1563.4921548818006,1532.3326734058166,1501.1731919298325,1470.0137104538487,1438.8542289778648,1407.694747501881,1376.535266025897,1345.375784549913,1314.2163030739293,1283.0568215979456,1251.8973401219614,1220.7378586459774,1189.5783771699935,1158.4188956940097,1127.2594142180258,1096.0999327420418,1064.9404512660578,1033.7809697900732
-Commercial Battery Storage 6Hr/Moderate,3136.033545940357,2893.4666348321325,2670.821074224597,2552.2782333260106,2444.684104372322,2343.696219739729,2250.161567884287,2165.4845978896064,2085.699040321883,2059.6278023178597,2033.5565643138357,2007.4853263098128,1981.4140883057896,1955.3428503017649,1929.2716122977417,1903.2003742937188,1877.1291362896952,1851.057898285672,1824.9866602816487,1798.9154222776247,1772.844184273601,1746.772946269578,1720.701708265555,1694.6304702615314,1668.559232257508,1642.4879942534842,1616.416756249461,1590.345518245437,1564.2742802414125
-Commercial Battery Storage 6Hr/Conservative,3136.033545940357,3252.1829365307394,3275.412814648816,3228.9530584126624,3108.157692198665,2987.362325984666,2866.5669597706665,2745.771593556668,2624.976227342669,2617.480345923006,2609.984464503344,2602.4885830836815,2594.992701664018,2587.496820244356,2580.0009388246935,2572.5050574050297,2565.0091759853676,2557.513294565705,2550.017413146042,2542.5215317263796,2535.025650306717,2527.529768887054,2520.0338874673917,2512.5380060477296,2505.0421246280666,2497.5462432084037,2490.050361788741,2482.554480369078,2475.058598949414
-Commercial Battery Storage 8Hr/Advanced,3706.98520791973,2666.7971290313712,2517.0969812341077,2389.0255105646615,2302.9487118399716,2216.8719131152807,2130.7951143905907,2044.7183156659,1958.6415169412098,1921.809086667163,1884.9766563931148,1848.1442261190678,1811.3117958450207,1774.4793655709734,1737.6469352969264,1700.8145050228793,1663.982074748832,1627.149644474785,1590.3172142007375,1553.4847839266906,1516.6523536526431,1479.8199233785963,1442.9874931045488,1406.1550628305017,1369.3226325564544,1332.4902022824072,1295.65777200836,1258.8253417343126,1221.9929114602648
-Commercial Battery Storage 8Hr/Moderate,3706.98520791973,3414.603293963263,3144.2246459583776,3003.1178909372875,2870.8220710571054,2747.300557348903,2633.0432784082554,2529.6418507976173,2432.6498903369907,2402.241766707779,2371.8336430785657,2341.425519449354,2311.0173958201417,2280.6092721909286,2250.2011485617163,2219.793024932505,2189.3849013032927,2158.9767776740805,2128.5686540448683,2098.1605304156556,2067.752406786443,2037.3442831572306,2006.936159528019,1976.5280358988066,1946.1199122695941,1915.711788640382,1885.3036650111699,1854.8955413819567,1824.487417752743
-Commercial Battery Storage 8Hr/Conservative,3706.98520791973,3844.2809563612,3871.740106049494,3816.821806672905,3674.0342282937763,3531.2466499146462,3388.4590715355152,3245.6714931563856,3102.883914777255,3094.0233202919117,3085.162725806569,3076.302131321226,3067.4415368358823,3058.5809423505398,3049.7203478651977,3040.8597533798534,3031.9991588945104,3023.138564409168,3014.2779699238245,3005.4173754384815,2996.556780953139,2987.696186467796,2978.835591982453,2969.97499749711,2961.1144030117675,2952.2538085264237,2943.3932140410807,2934.5326195557373,2925.6720250703925
+Commercial Battery Storage 1Hr/Advanced,1449.5551538746543,1678.6945173616073,1154.3527863636048,969.1872776423813,934.2673750062493,899.3474723701173,864.427569733985,829.5076670978531,794.5877644617208,779.6454699284909,764.7031753952613,749.7608808620316,734.8185863288019,719.8762917955719,704.9339972623422,689.9917027291125,675.049408195883,660.1071136626532,645.1648191294237,630.2225245961939,615.280230062964,600.3379355297344,585.3956409965047,570.453346463275,555.5110519300454,540.5687573968155,525.626462863586,510.6841683303562,495.7418737971263
+Commercial Battery Storage 1Hr/Moderate,1449.5551538746543,1678.6945173616073,1303.7378359944178,1248.67500031219,1206.5601367175132,1165.7704918962165,1127.702544108846,1093.1730727032002,1059.7934828817756,1046.5460643457536,1033.2986458097316,1020.0512272737096,1006.8038087376874,993.556390201665,980.3089716656427,967.0615531296208,953.8141345935983,940.5667160575764,927.3192975215544,914.0718789855322,900.82446044951,887.5770419134877,874.3296233774657,861.0822048414435,847.8347863054215,834.5873677693995,821.3399492333772,808.0925306973547,794.8451121613319
+Commercial Battery Storage 1Hr/Conservative,1449.5551538746543,1678.6945173616073,1570.6995327287318,1548.4201067325798,1490.4935991425843,1432.5670915525884,1374.6405839625925,1316.7140763725972,1258.7875687826013,1255.192975334533,1251.5983818864654,1248.0037884383978,1244.4091949903298,1240.8146015422617,1237.220008094194,1233.625414646126,1230.0308211980584,1226.4362277499906,1222.8416343019223,1219.247040853855,1215.6524474057867,1212.0578539577189,1208.4632605096513,1204.8686670615832,1201.2740736135156,1197.6794801654476,1194.0848867173795,1190.490293269312,1186.8956998212425
+Commercial Battery Storage 2Hr/Advanced,1735.0309848643408,2030.1238494557992,1415.7884430528595,1160.0593136115042,1118.2622747750129,1076.4652359385218,1034.6681971020303,992.871158265539,951.0741194290474,933.1890848852948,915.3040503415423,897.4190157977898,879.5339812540375,861.6489467102847,843.7639121665324,825.87887762278,807.9938430790276,790.1088085352751,772.2237739915228,754.3387394477702,736.4537049040177,718.5686703602654,700.6836358165128,682.7986012727605,664.913566729008,647.0285321852556,629.1434976415031,611.2584630977507,593.373428553998
+Commercial Battery Storage 2Hr/Moderate,1735.0309848643408,2030.1238494557992,1549.3074121099241,1482.539952387204,1427.611531539591,1375.1329725003989,1326.315535158743,1282.0730886209008,1239.767987212379,1224.270887372225,1208.7737875320697,1193.2766876919154,1177.7795878517607,1162.2824880116057,1146.785388171451,1131.2882883312964,1115.7911884911416,1100.294088650987,1084.7969888108325,1069.2998889706778,1053.802789130523,1038.3056892903683,1022.8085894502136,1007.311489610059,991.8143897699043,976.3172899297498,960.8201900895951,945.32309024944,929.8259904092845
+Commercial Battery Storage 2Hr/Conservative,1735.0309848643408,2030.1238494557992,1880.0335743774986,1853.3664314785274,1784.0318599412014,1714.697288403875,1645.3627168665491,1576.0281453292228,1506.6935737918968,1502.3910600215736,1498.0885462512513,1493.7860324809285,1489.4835187106053,1485.1810049402823,1480.87849116996,1476.5759773996365,1472.2734636293142,1467.9709498589914,1463.6684360886686,1459.365922318346,1455.0634085480228,1450.7608947777,1446.4583810073775,1442.1558672370545,1437.853353466732,1433.5508396964087,1429.2483259260862,1424.9458121557632,1420.6432983854393
+Commercial Battery Storage 4Hr/Advanced,2305.9826468437136,2732.982513644183,1938.6597564313684,1541.8033855497501,1486.2520743125408,1430.7007630753303,1375.1494518381207,1319.5981406009105,1264.0468293637007,1240.2763147989026,1216.5058002341045,1192.7352856693064,1168.9647711045084,1145.1942565397103,1121.4237419749124,1097.6532274101148,1073.882712845317,1050.112198280519,1026.3416837157208,1002.5711691509232,978.8006545861251,955.0301400213274,931.2596254565292,907.4891108917313,883.7185963269334,859.9480817621356,836.1775671973376,812.4070526325396,788.6365380677414
+Commercial Battery Storage 4Hr/Moderate,2305.9826468437136,2732.982513644183,2040.4465643409367,1950.269856537232,1869.7143211837465,1793.8579337087638,1723.5415172585374,1659.8731204563014,1599.716995873586,1579.7205334251666,1559.7240709767466,1539.7276085283268,1519.7311460799074,1499.734683631487,1479.7382211830675,1459.741758734648,1439.745296286228,1419.7488338378082,1399.7523713893884,1379.755908940969,1359.7594464925494,1339.7629840441289,1319.7665215957093,1299.7700591472899,1279.7735966988698,1259.7771342504502,1239.7806718020306,1219.7842093536105,1199.7877469051898
+Commercial Battery Storage 4Hr/Conservative,2305.9826468437136,2732.982513644183,2498.7016576750316,2463.259080970422,2371.1083815384354,2278.9576821064484,2186.806982674462,2094.6562832424743,2002.505583810488,1996.7872293956545,1991.0688749808223,1985.350520565989,1979.6321661511565,1973.9138117363236,1968.1954573214914,1962.4771029066583,1956.758748491826,1951.0403940769934,1945.3220396621607,1939.603685247328,1933.8853308324951,1928.1669764176622,1922.44862200283,1916.730267587997,1911.0119131731649,1905.2935587583313,1899.575204343499,1893.8568499286664,1888.1384955138321
+Commercial Battery Storage 6Hr/Advanced,2876.9343088230867,3435.841177832567,2461.5310698098765,1923.547457487996,1854.2418738500678,1784.9362902121393,1715.6307065742108,1646.325122936282,1577.0195392983542,1547.3635447125102,1517.7075501266665,1488.0515555408233,1458.3955609549796,1428.7395663691364,1399.0835717832927,1369.4275771974496,1339.7715826116057,1310.1155880257627,1280.459593439919,1250.8035988540762,1221.1476042682325,1191.4916096823893,1161.8356150965456,1132.1796205107023,1102.5236259248586,1072.8676313390156,1043.211636753172,1013.5556421673288,983.8996475814847
+Commercial Battery Storage 6Hr/Moderate,2876.9343088230867,3435.841177832567,2531.585716571949,2417.9997606872607,2311.8171108279016,2212.5828949171287,2120.767499358332,2037.6731522917025,1959.666004534793,1935.1701794781086,1910.6743544214232,1886.1785293647383,1861.6827043080536,1837.1868792513685,1812.6910541946838,1788.1952291379996,1763.6994040813145,1739.2035790246293,1714.7077539679447,1690.2119289112597,1665.716103854575,1641.2202787978897,1616.7244537412057,1592.2286286845206,1567.7328036278354,1543.2369785711508,1518.741153514466,1494.2453284577812,1469.7495034010947
+Commercial Battery Storage 6Hr/Conservative,2876.9343088230867,3435.841177832567,3117.369740972565,3073.151730462317,2958.184903135669,2843.218075809022,2728.251248482374,2613.2844211557253,2498.3175938290783,2491.1833987697355,2484.049203710393,2476.9150086510504,2469.780813591708,2462.6466185323648,2455.512423473023,2448.37822841368,2441.244033354338,2434.109838294996,2426.975643235653,2419.8414481763098,2412.7072531169674,2405.5730580576246,2398.4388629982827,2391.30466793894,2384.170472879597,2377.0362778202543,2369.902082760912,2362.7678877015696,2355.6336926422255
+Commercial Battery Storage 8Hr/Advanced,3447.8859708024584,4138.69984202095,2984.402383188387,2305.291529426242,2222.2316733875955,2139.171817348948,2056.111961310301,1973.0521052716535,1889.992249233007,1854.4507746261181,1818.9093000192288,1783.3678254123395,1747.8263508054508,1712.2848761985622,1676.7434015916729,1641.2019269847844,1605.660452377895,1570.1189777710063,1534.5775031641174,1499.0360285572287,1463.4945539503399,1427.953079343451,1392.411604736562,1356.870130129673,1321.328655522784,1285.7871809158955,1250.2457063090064,1214.7042317021176,1179.162757095228
+Commercial Battery Storage 8Hr/Moderate,3447.8859708024584,4138.69984202095,3022.7248688029617,2885.729664837289,2753.9199004720567,2631.307856125494,2517.9934814581266,2415.473184127103,2319.6150131959994,2290.6198255310505,2261.6246378661003,2232.6294502011506,2203.6342625362,2174.63907487125,2145.6438872063004,2116.648699541351,2087.6535118764004,2058.6583242114507,2029.6631365465005,2000.667948881551,1971.672761216601,1942.6775735516508,1913.6823858867015,1884.687198221751,1855.6920105568013,1826.696822891851,1797.701635226902,1768.7064475619518,1739.711259897
+Commercial Battery Storage 8Hr/Conservative,3447.8859708024584,4138.69984202095,3736.037824270098,3683.044379954212,3545.261424732903,3407.4784695115954,3269.6955142902866,3131.9125590689773,2994.1296038476694,2985.5795681438162,2977.0295324399644,2968.4794967361113,2959.929461032259,2951.379425328406,2942.829389624554,2934.279353920702,2925.7293182168496,2917.1792825129974,2908.6292468091447,2900.079211105292,2891.52917540144,2882.9791396975875,2874.429103993735,2865.8790682898816,2857.3290325860307,2848.7789968821776,2840.2289611783253,2831.678925474473,2823.128889770619
diff --git a/tests/data/Commercial_Battery_Storage/Market/TechLife/df_fom.csv b/tests/data/Commercial_Battery_Storage/Market/TechLife/df_fom.csv
index 97d9ec5..16afd60 100644
--- a/tests/data/Commercial_Battery_Storage/Market/TechLife/df_fom.csv
+++ b/tests/data/Commercial_Battery_Storage/Market/TechLife/df_fom.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,41.17291488823829,29.61970578766454,27.957009257113175,26.534539118786462,25.578497346574345,24.62245557436223,23.666413802150103,22.710372029938,21.75433025772586,21.34523811633819,20.9361459749505,20.52705383356284,20.117961692175157,19.708869550787476,19.299777409399805,18.89068526801213,18.481593126624464,18.07250098523679,17.66340884384912,17.254316702461438,16.845224561073763,16.436132419686086,16.02704027829841,15.61794813691073,15.208855995523061,14.799763854135382,14.390671712747713,13.981579571360038,13.572487429972355
-Commercial Battery Storage 1Hr/Moderate,41.17291488823829,38.328796949401884,35.839299437409984,34.34209846854473,33.237508576900005,32.161499520720575,31.155990819895443,30.243549756665427,29.3575253070036,28.990556240666066,28.62358717432851,28.256618107990985,27.889649041653442,27.52267997531588,27.155710908978335,26.788741842640803,26.421772776303243,26.05480370996571,25.68783464362818,25.32086557729062,24.953896510953076,24.58692744461554,24.219958378277997,23.852989311940465,23.486020245602916,23.11905117926537,22.752082112927823,22.385113046590263,22.01814398025271
-Commercial Battery Storage 1Hr/Conservative,41.17291488823829,42.69783766187673,43.00282221660443,42.39285310714903,40.806933422565066,39.22101373798106,37.635094053397054,36.049174368813084,34.46325468422909,34.36484142327924,34.266428162329404,34.16801490137956,34.0696016404297,33.97118837947987,33.87277511853002,33.77436185758017,33.675948596630306,33.57753533568048,33.47912207473063,33.38070881378078,33.28229555283093,33.1838822918811,33.08546903093124,32.9870557699814,32.88864250903156,32.7902292480817,32.69181598713187,32.59340272618203,32.49498946523214
-Commercial Battery Storage 2Hr/Advanced,48.0519374418654,34.568459712379976,32.62796582488783,30.96783449133187,29.85206069793281,28.736286904533735,27.62051311113465,26.50473931773559,25.3889655243365,24.911523739141572,24.43408195394663,23.95664016875171,23.47919838355678,23.001756598361847,22.524314813166924,22.046873027971998,21.569431242777075,21.091989457582148,20.614547672387225,20.13710588719229,19.659664101997365,19.182222316802434,18.704780531607508,18.227338746412578,17.74989696121765,17.27245517602272,16.7950133908278,16.317571605632867,15.840129820437932
-Commercial Battery Storage 2Hr/Moderate,48.0519374418654,44.60763116674487,41.543028953906195,39.773970165048425,38.37176578112428,37.02426378964313,35.76908173013936,34.631041943195925,33.53770881672469,33.118487456515645,32.69926609630657,32.28004473609754,31.860823375888483,31.4416020156794,31.022380655470347,30.6031592952613,30.183937935052235,29.764716574843188,29.345495214634134,28.92627385442506,28.507052494216005,28.08783113400695,27.668609773797904,27.24938841358885,26.830167053379792,26.41094569317073,25.991724332961674,25.572502972752602,25.153281612543527
-Commercial Battery Storage 2Hr/Conservative,48.0519374418654,49.83163882860114,50.187579105948295,49.47569855125398,47.62480910904883,45.773919666843625,43.92303022463843,42.07214078243327,40.221251340228086,40.10639554555217,39.991539750876285,39.87668395620038,39.76182816152447,39.64697236684857,39.53211657217267,39.41726077749675,39.30240498282083,39.18754918814495,39.07269339346904,38.957837598793134,38.84298180411724,38.72812600944134,38.61327021476542,38.498414420089524,38.38355862541363,38.2687028307377,38.15384703606181,38.038991241385915,37.92413544670996
-Commercial Battery Storage 4Hr/Advanced,61.80998254911963,44.46596756181086,41.969878960437136,39.8344252364227,38.39918740064972,36.963949564876735,35.52871172910374,34.093473893330774,32.65823605755777,32.04409498474834,31.42995391193889,30.815812839129467,30.201671766320032,29.587530693510587,28.97338962070116,28.35924854789173,27.745107475082296,27.13096640227286,26.516825329463433,25.902684256653995,25.288543183844567,24.674402111035135,24.0602610382257,23.44611996541626,22.83197889260683,22.217837819797396,21.603696746987964,20.989555674178533,20.375414601369084
-Commercial Battery Storage 4Hr/Moderate,61.80998254911963,57.16529960143086,52.9504879868986,50.63771355805582,48.64028018957285,46.749792327488244,44.99526355062722,43.406026316256934,41.89807583616687,41.3743498882148,40.8506239402627,40.32689799231063,39.803172044358554,39.279446096406446,38.755720148454365,38.23199420050229,37.7082682525502,37.184542304598125,36.660816356646045,36.13709040869394,35.61336446074187,35.08963851278978,34.56591256483771,34.04218661688562,33.51846066893354,32.99473472098145,32.471008773029375,31.94728282507727,31.42355687712517
-Commercial Battery Storage 4Hr/Conservative,61.80998254911963,64.09924116204998,64.55709288463605,63.64138943946389,61.260560482016345,58.879731524568776,56.4989025671212,54.118073609673644,51.73724465222606,51.58950379009803,51.44176292797004,51.294022065842015,51.14628120371398,50.998540341585965,50.85079947945796,50.703058617329916,50.55531775520189,50.40757689307389,50.25983603094585,50.11209516881784,49.96435430668983,49.81661344456181,49.668872582433785,49.521131720305775,49.37339085817776,49.225649996049725,49.07790913392171,48.93016827179369,48.78242740966562
-Commercial Battery Storage 6Hr/Advanced,75.56802765637387,54.36347541124174,51.31179209598644,48.70101598151354,46.946314103366646,45.19161222521975,43.436910347072846,41.68220846892595,39.92750659077904,39.17666623035511,38.425825869931145,37.674985509507216,36.92414514908327,36.17330478865933,35.42246442823539,34.67162406781146,33.92078370738752,33.16994334696358,32.41910298653964,31.668262626115705,30.91742226569177,30.166581905267822,29.415741544843883,28.664901184419946,27.914060823996007,27.163220463572067,26.412380103148127,25.661539742724187,24.910699382300233
-Commercial Battery Storage 6Hr/Moderate,75.56802765637387,69.72296803611682,64.35794701989103,61.501456951063226,58.90879459802141,56.47532086533334,54.22144537111508,52.181010689317944,50.25844285560906,49.630212319913966,49.00198178421883,48.37375124852373,47.74552071282863,47.11729017713349,46.48905964143839,45.860829105743285,45.23259857004817,44.604368034353065,43.976137498657955,43.34790696296283,42.71967642726772,42.09144589157262,41.463215355877516,40.8349848201824,40.20675428448729,39.57852374879217,38.95029321309707,38.32206267740194,37.69383214170681
-Commercial Battery Storage 6Hr/Conservative,75.56802765637387,78.36684349549881,78.9266066633238,77.8070803276738,74.89631185498388,71.98554338229393,69.07477490960395,66.16400643691401,63.25323796422405,63.07261203464391,62.89198610506378,62.711360175483655,62.5307342459035,62.35010831632337,62.16948238674325,61.98885645716308,61.80823052758296,61.627604598002826,61.44697866842269,61.26635273884255,61.08572680926242,60.90510087968228,60.72447495010214,60.543849020522025,60.36322309094189,60.182597161361734,60.0019712317816,59.821345302201465,59.64071937262128
-Commercial Battery Storage 8Hr/Advanced,89.3260727636281,64.26098326067262,60.653705231535746,57.56760672660437,55.49344080608356,53.41927488556274,51.34510896504194,49.27094304452112,47.196777124000306,46.30923747596188,45.4216978279234,44.53415817988497,43.64661853184652,42.75907888380807,41.87153923576963,40.98399958773119,40.09645993969275,39.2089202916543,38.32138064361585,37.43384099557741,36.546301347538964,35.65876169950052,34.77122205146207,33.883682403423634,32.996142755385186,32.10860310734674,31.221063459308297,30.333523811269846,29.445984163231387
-Commercial Battery Storage 8Hr/Moderate,89.3260727636281,82.28063647080279,75.76540605288343,72.36520034407062,69.17730900646998,66.20084940317844,63.44762719160293,60.955995062378946,58.61880987505124,57.886074751613116,57.15333962817496,56.420604504736836,55.6878693812987,54.95513425786054,54.2223991344224,53.489664010984285,52.756928887546145,52.02419376410801,51.29145864066987,50.558723517231726,49.82598839379358,49.09325327035544,48.36051814691732,47.627783023479175,46.895047900041035,46.1623127766029,45.42957765316476,44.69684252972661,43.964107406288434
-Commercial Battery Storage 8Hr/Conservative,89.3260727636281,92.63444582894763,93.29612044201154,91.97277121588371,88.5320632279514,85.09135524001907,81.65064725208671,78.20993926415439,74.76923127622204,74.55572027918977,74.34220928215754,74.12869828512528,73.91518728809301,73.70167629106076,73.48816529402853,73.27465429699626,73.061143299964,72.84763230293177,72.6341213058995,72.42061030886725,72.20709931183501,71.99358831480275,71.7800773177705,71.56656632073826,71.35305532370602,71.13954432667374,70.9260333296415,70.71252233260923,70.49901133557694
+Commercial Battery Storage 1Hr/Advanced,34.929480935955034,40.450981105990294,27.816081048641998,23.354205217573295,22.512751154819053,21.671297092064812,20.829843029310563,19.98838896655632,19.146934903802073,18.786875067070252,18.426815230338434,18.06675539360662,17.706695556874802,17.34663572014298,16.986575883411163,16.626516046679345,16.26645620994753,15.906396373215713,15.546336536483901,15.186276699752083,14.826216863020262,14.466157026288446,14.106097189556628,13.746037352824812,13.385977516092996,13.025917679361175,12.66585784262936,12.305798005897543,11.945738169165722
+Commercial Battery Storage 1Hr/Moderate,34.929480935955034,40.450981105990294,31.415766254995575,30.088934182341433,29.074105377022438,28.091209957443898,27.173898427106042,26.341852464613194,25.537514841997783,25.218295906472818,24.899076970947846,24.579858035422884,24.260639099897908,23.94142016437293,23.622201228847956,23.302982293322994,22.98376335779801,22.664544422273046,22.34532548674808,22.02610655122311,21.706887615698136,21.38766868017316,21.06844974464819,20.74923080912322,20.430011873598254,20.110792938073285,19.79157400254831,19.47235506702333,19.153136131498343
+Commercial Battery Storage 1Hr/Conservative,34.929480935955034,40.450981105990294,37.848659457980084,37.3117990401364,35.915961953742816,34.520124867349224,33.124287780955626,31.72845069456205,30.332613608168455,30.245995804781536,30.15937800139463,30.072760198007728,29.986142394620817,29.8995245912339,29.812906787846998,29.726288984460087,29.639671181073183,29.553053377686275,29.466435574299357,29.379817770912457,29.29319996752554,29.206582164138634,29.119964360751727,29.033346557364816,28.946728753977915,28.860110950590997,28.773493147204086,28.686875343817185,28.60025754043024
+Commercial Battery Storage 2Hr/Advanced,41.80850348958215,48.91926471900621,34.115814978666606,27.953589465747214,26.94641918504685,25.93924890434649,24.93207862364612,23.924908342945756,22.917738062245384,22.4867679322265,22.055797802207618,21.624827672188736,21.19385754216986,20.76288741215097,20.331917282132093,19.900947152113215,19.469977022094334,19.039006892075452,18.608036762056575,18.17706663203769,17.746096502018812,17.315126371999934,16.88415624198105,16.453186111962168,16.022215981943287,15.591245851924407,15.160275721905528,14.729305591886646,14.29833546186776
+Commercial Battery Storage 2Hr/Moderate,41.80850348958215,48.91926471900621,37.33318016259971,35.72430539485247,34.40071227477674,33.136152714827524,31.959814068857657,30.893717557267323,29.87430465035396,29.50087584222455,29.127447034095116,28.7540182259657,28.380589417836276,28.007160609706844,27.633731801577422,27.260302993448,26.886874185318575,26.513445377189157,26.14001656905974,25.76658776093031,25.39315895280089,25.01973014467146,24.646301336542038,24.272872528412616,23.899443720283195,23.526014912153773,23.15258610402435,22.77915729589492,22.405728487765476
+Commercial Battery Storage 2Hr/Conservative,41.80850348958215,48.91926471900621,45.30258591378353,44.659996042666045,42.989262377760554,41.31852871285506,39.64779504794958,37.97706138304408,36.30632771813859,36.20265137832118,36.09897503850379,35.99529869868639,35.89162235886898,35.787946019051574,35.684269679234184,35.580593339416765,35.476916999599375,35.37324065978198,35.26956431996457,35.165887980147176,35.062211640329764,34.95853530051237,34.85485896069497,34.751182620877564,34.64750628106017,34.543829941242755,34.440153601425365,34.33647726160796,34.23280092179053
+Commercial Battery Storage 4Hr/Advanced,55.566548596836384,65.85583194503802,46.715282838715815,37.152357962095046,35.81375524550245,34.47515252890983,33.136549812317234,31.797947095724613,30.459344379132006,29.886553662538997,29.313762945945985,28.740972229352977,28.168181512759965,27.595390796166953,27.022600079573948,26.449809362980943,25.87701864638794,25.30422792979493,24.73143721320192,24.15864649660892,23.58585578001591,23.013065063422903,22.44027434682989,21.867483630236887,21.294692913643875,20.721902197050873,20.14911148045786,19.576320763864857,19.003530047271838
+Commercial Battery Storage 4Hr/Moderate,55.566548596836384,65.85583194503802,49.16800797780799,46.99504781987456,45.05392607028535,43.22603822959478,41.53164535236091,39.99744774257557,38.547884267066316,38.066035713728,37.58418716038966,37.10233860705133,36.62049005371301,36.138641500374675,35.65679294703635,35.174944393698034,34.693095840359696,34.211247287021365,33.729398733683034,33.24755018034472,32.76570162700639,32.283853073668055,31.80200452032973,31.32015596699141,30.838307413653077,30.356458860314753,29.87461030697643,29.392761753638094,28.910913200299742
+Commercial Battery Storage 4Hr/Conservative,55.566548596836384,65.85583194503802,60.21043882539041,59.35639004772531,57.13586322579603,54.915336403866746,52.694809581937456,50.47428276000815,48.253755938078875,48.11596252540048,47.9781691127221,47.840375700043694,47.70258228736532,47.56478887468692,47.42699546200855,47.28920204933015,47.15140863665177,47.01361522397339,46.875821811295,46.73802839861661,46.60023498593822,46.46244157325983,46.324648160581454,46.18685474790306,46.049061335224685,45.91126792254628,45.7734745098679,45.63568109718952,45.49788768451109
+Commercial Battery Storage 6Hr/Advanced,69.32459370409062,82.79239917106983,59.31475069876501,46.35112645844288,44.681091305958034,43.011056153473184,41.341021000988334,39.67098584850348,38.000950696018634,37.28633939285149,36.57172808968435,35.85711678651722,35.14250548335008,34.427894180182946,33.71328287701581,32.99867157384868,32.284060270681536,31.569448967514404,30.854837664347265,30.140226361180147,29.42561505801301,28.711003754845873,27.99639245167873,27.2817811485116,26.567169845344463,25.852558542177334,25.137947239010195,24.423335935843067,23.708724632675917
+Commercial Battery Storage 6Hr/Moderate,69.32459370409062,82.79239917106983,61.00283579301626,58.26579024489666,55.70713986579395,53.31592374436204,51.10347663586416,49.101177927883825,47.22146388377867,46.631195585231445,46.0409272866842,45.45065898813697,44.86039068958974,44.270122391042506,43.679854092495276,43.08958579394806,42.49931749540082,41.90904919685358,41.31878089830636,40.72851259975912,40.1382443012119,39.547976002664655,38.95770770411744,38.367439405570195,37.77717110702296,37.18690280847573,36.596634509928506,36.00636621138127,35.416097912834
+Commercial Battery Storage 6Hr/Conservative,69.32459370409062,82.79239917106983,75.11829173699729,74.05278405278459,71.2824640738315,68.51214409487842,65.74182411592533,62.971504136972214,60.20118415801914,60.02927367247976,59.8573631869404,59.68545270140102,59.513542215861655,59.34163173032226,59.16972124478291,58.997810759243535,58.82590027370417,58.65398978816481,58.48207930262543,58.31016881708604,58.13825833154667,57.966347846007295,57.794437360467946,57.62252687492857,57.45061638938919,57.27870590384981,57.10679541831045,56.93488493277107,56.76297444723166
+Commercial Battery Storage 8Hr/Advanced,83.08263881134484,99.72896639710163,71.91421855881426,55.549894954790716,53.54842736641364,51.54695977803652,49.54549218965944,47.54402460128233,45.542557012905256,44.68612512316399,43.82969323342272,42.97326134368145,42.11682945394019,41.26039756419894,40.403965674457666,39.547533784716414,38.691101894975134,37.83467000523388,36.978238115492616,36.121806225751364,35.265374336010105,34.40894244626884,33.55251055652757,32.69607866678631,31.839646777045047,30.9832148873038,30.126782997562533,29.27035110782127,28.413919218079993
+Commercial Battery Storage 8Hr/Moderate,83.08263881134484,99.72896639710163,72.83766360822453,69.53653266991874,66.36035366130254,63.405809259129285,60.67530791936741,58.204908113192076,55.89504350049101,55.1963554567349,54.49766741297876,53.79897936922262,53.10029132546647,52.40160328171034,51.7029152379542,51.00422719419808,50.30553915044194,49.606851106685795,48.90816306292966,48.20947501917353,47.510786975417396,46.812098931661254,46.11341088790513,45.41472284414898,44.71603480039285,44.017346756636705,43.31865871288059,42.61997066912445,41.92128262536826
+Commercial Battery Storage 8Hr/Conservative,83.08263881134484,99.72896639710163,90.02614464860417,88.74917805784388,85.42906492186697,82.1089517858901,78.7888386499132,75.46872551393629,72.14861237795942,71.94258481955904,71.73655726115871,71.53052970275833,71.32450214435798,71.11847458595761,70.91244702755726,70.70641946915691,70.50039191075656,70.29436435235621,70.08833679395585,69.88230923555548,69.67628167715513,69.47025411875477,69.26422656035443,69.05819900195404,68.85217144355373,68.64614388515335,68.440116326753,68.23408876835263,68.02806120995224
diff --git a/tests/data/Commercial_Battery_Storage/Market/TechLife/df_occ.csv b/tests/data/Commercial_Battery_Storage/Market/TechLife/df_occ.csv
index ed451d5..4a2c2f7 100644
--- a/tests/data/Commercial_Battery_Storage/Market/TechLife/df_occ.csv
+++ b/tests/data/Commercial_Battery_Storage/Market/TechLife/df_occ.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1646.9165955295314,1184.7882315065815,1118.280370284527,1061.3815647514584,1023.1398938629737,984.8982229744892,946.6565520860041,908.4148811975199,870.1732103090344,853.8095246535275,837.4458389980199,821.0821533425135,804.7184676870063,788.354782031499,771.9910963759921,755.6274107204853,739.2637250649785,722.9000394094716,706.5363537539647,690.1726680984575,673.8089824429505,657.4452967874435,641.0816111319365,624.7179254764292,608.3542398209224,591.9905541654152,575.6268685099085,559.2631828544015,542.8994971988942
-Commercial Battery Storage 1Hr/Moderate,1646.9165955295314,1533.1518779760752,1433.5719774963993,1373.683938741789,1329.500343076,1286.459980828823,1246.2396327958177,1209.741990266617,1174.3010122801438,1159.6222496266425,1144.9434869731404,1130.2647243196393,1115.5859616661376,1100.9071990126351,1086.2284363591334,1071.5496737056321,1056.8709110521297,1042.1921483986284,1027.5133857451272,1012.8346230916246,998.155860438123,983.4770977846215,968.7983351311199,954.1195724776186,939.4408098241166,924.7620471706148,910.0832845171129,895.4045218636105,880.7257592101083
-Commercial Battery Storage 1Hr/Conservative,1646.9165955295314,1707.9135064750692,1720.112888664177,1695.7141242859611,1632.2773369026027,1568.8405495192424,1505.403762135882,1441.9669747525234,1378.5301873691635,1374.5936569311693,1370.657126493176,1366.7205960551823,1362.7840656171882,1358.8475351791947,1354.9110047412007,1350.9744743032065,1347.0379438652121,1343.101413427219,1339.1648829892251,1335.228352551231,1331.2918221132372,1327.3552916752437,1323.4187612372498,1319.482230799256,1315.5457003612626,1311.609169923268,1307.6726394852747,1303.736109047281,1299.7995786092854
-Commercial Battery Storage 2Hr/Advanced,1922.0774976746159,1382.738388495199,1305.118632995513,1238.7133796532748,1194.0824279173123,1149.4514761813493,1104.820524445386,1060.1895727094236,1015.5586209734599,996.4609495656629,977.3632781578651,958.2656067500684,939.1679353422712,920.0702639344738,900.972592526677,881.8749211188799,862.777249711083,843.6795783032859,824.5819068954889,805.4842354876916,786.3865640798945,767.2888926720974,748.1912212643002,729.093549856503,709.995878448706,690.8982070409088,671.800535633112,652.7028642253147,633.6051928175173
-Commercial Battery Storage 2Hr/Moderate,1922.0774976746159,1784.3052466697948,1661.7211581562476,1590.9588066019369,1534.870631244971,1480.9705515857252,1430.7632692055745,1385.241677727837,1341.5083526689875,1324.7394982606259,1307.9706438522628,1291.2017894439014,1274.4329350355392,1257.664080627176,1240.8952262188138,1224.126371810452,1207.3575174020893,1190.5886629937274,1173.8198085853653,1157.0509541770023,1140.2820997686401,1123.513245360278,1106.744390951916,1089.975536543554,1073.2066821351916,1056.4378277268293,1039.668973318467,1022.900118910104,1006.131264501741
-Commercial Battery Storage 2Hr/Conservative,1922.0774976746159,1993.2655531440457,2007.5031642379317,1979.027942050159,1904.9923643619532,1830.956786673745,1756.921208985537,1682.8856312973307,1608.8500536091233,1604.2558218220865,1599.6615900350514,1595.0673582480151,1590.4731264609786,1585.8788946739428,1581.2846628869067,1576.6904310998698,1572.0961993128333,1567.501967525798,1562.9077357387614,1558.3135039517254,1553.7192721646893,1549.1250403776535,1544.5308085906167,1539.936576803581,1535.342345016545,1530.7481132295081,1526.1538814424725,1521.5596496554365,1516.9654178683984
-Commercial Battery Storage 4Hr/Advanced,2472.399301964785,1778.638702472434,1678.7951584174853,1593.3770094569081,1535.9674960259888,1478.5579825950692,1421.1484691641497,1363.7389557332308,1306.3294423023108,1281.7637993899336,1257.1981564775556,1232.6325135651787,1208.0668706528013,1183.5012277404235,1158.9355848280463,1134.3699419156692,1109.8042990032918,1085.2386560909144,1060.6730131785373,1036.1073702661597,1011.5417273537827,986.9760844414053,962.4104415290279,937.8447986166503,913.2791557042732,888.7135127918958,864.1478698795185,839.5822269671412,815.0165840547633
-Commercial Battery Storage 4Hr/Moderate,2472.399301964785,2286.611984057234,2118.019519475944,2025.5085423222329,1945.6112075829137,1869.9916930995296,1799.8105420250888,1736.2410526502772,1675.9230334466747,1654.973995528592,1634.024957610508,1613.075919692425,1592.126881774342,1571.1778438562578,1550.2288059381744,1529.2797680200918,1508.330730102008,1487.381692183925,1466.4326542658416,1445.4836163477578,1424.5345784296746,1403.5855405115913,1382.6365025935083,1361.687464675425,1340.7384267573416,1319.789388839258,1298.8403509211748,1277.8913130030908,1256.9422750850067
-Commercial Battery Storage 4Hr/Conservative,2472.399301964785,2563.969646481999,2582.2837153854416,2545.6555775785555,2450.4224192806537,2355.189260982751,2259.956102684848,2164.7229443869455,2069.4897860890424,2063.580151603921,2057.6705171188014,2051.7608826336805,2045.851248148559,2039.9416136634384,2034.0319791783184,2028.1223446931965,2022.2127102080756,2016.3030757229553,2010.393441237834,2004.4838067527135,1998.574172267593,1992.6645377824723,1986.7549032973513,1980.8452688122309,1974.9356343271102,1969.0259998419888,1963.1163653568683,1957.2067308717474,1951.2970963866248
-Commercial Battery Storage 6Hr/Advanced,3022.7211062549545,2174.5390164496694,2052.4716838394575,1948.0406392605416,1877.8525641346657,1807.6644890087898,1737.4764138829137,1667.2883387570378,1597.1002636311614,1567.0666492142043,1537.0330347972458,1506.9994203802887,1476.965805963331,1446.9321915463731,1416.8985771294158,1386.8649627124582,1356.8313482955007,1326.797733878543,1296.7641194615856,1266.7305050446282,1236.6968906276707,1206.6632762107129,1176.6296617937553,1146.5960473767977,1116.5624329598402,1086.5288185428826,1056.495204125925,1026.4615897089675,996.4279752920093
-Commercial Battery Storage 6Hr/Moderate,3022.7211062549545,2788.918721444673,2574.317880795641,2460.058278042529,2356.351783920856,2259.0128346133333,2168.857814844603,2087.2404275727176,2010.3377142243623,1985.2084927965584,1960.079271368753,1934.9500499409492,1909.820828513145,1884.6916070853395,1859.5623856575353,1834.4331642297313,1809.3039428019267,1784.1747213741226,1759.0454999463182,1733.916278518513,1708.7870570907087,1683.6578356629045,1658.5286142351006,1633.399392807296,1608.2701713794916,1583.1409499516867,1558.0117285238825,1532.8825070960775,1507.7532856682722
-Commercial Battery Storage 6Hr/Conservative,3022.7211062549545,3134.673739819952,3157.0642665329515,3112.2832131069517,2995.852474199355,2879.4217352917567,2762.990996384158,2646.5602574765603,2530.129518568962,2522.9044813857563,2515.679444202551,2508.454407019346,2501.22936983614,2494.004332652935,2486.7792954697297,2479.5542582865232,2472.329221103318,2465.104183920113,2457.8791467369074,2450.654109553702,2443.4290723704967,2436.204035187291,2428.9789980040855,2421.753960820881,2414.5289236376752,2407.303886454469,2400.078849271264,2392.8538120880585,2385.628774904851
-Commercial Battery Storage 8Hr/Advanced,3573.042910545124,2570.4393304269047,2426.1482092614297,2302.7042690641747,2219.7376322433424,2136.7709954225097,2053.8043586016774,1970.8377217808447,1887.8710849600122,1852.369499038475,1816.867913116936,1781.3663271953985,1745.8647412738608,1710.3631553523228,1674.8615694307853,1639.3599835092475,1603.8583975877098,1568.356811666172,1532.855225744634,1497.3536398230965,1461.8520539015585,1426.350467980021,1390.8488820584828,1355.3472961369453,1319.8457102154073,1284.3441242938695,1248.8425383723318,1213.3409524507938,1177.8393665292554
-Commercial Battery Storage 8Hr/Moderate,3573.042910545124,3291.2254588321116,3030.616242115337,2894.6080137628246,2767.092360258799,2648.0339761271375,2537.905087664117,2438.2398024951576,2344.7523950020495,2315.4429900645246,2286.1335851269982,2256.8241801894733,2227.514775251948,2198.2053703144215,2168.895965376896,2139.586560439371,2110.2771555018458,2080.9677505643203,2051.658345626795,2022.3489406892688,1993.0395357517432,1963.7301308142175,1934.4207258766928,1905.111320939167,1875.8019160016413,1846.4925110641161,1817.1831061265905,1787.8737011890641,1758.5642962515374
-Commercial Battery Storage 8Hr/Conservative,3573.042910545124,3705.377833157905,3731.8448176804613,3678.910848635348,3541.2825291180557,3403.6542096007624,3266.0258900834683,3128.397570566175,2990.7692510488814,2982.2288111675907,2973.6883712863014,2965.147931405011,2956.6074915237205,2948.0670516424307,2939.5266117611413,2930.98617187985,2922.44573199856,2913.9052921172706,2905.36485223598,2896.82441235469,2888.2839724734004,2879.74353259211,2871.2030927108203,2862.66265282953,2854.1222129482408,2845.5817730669496,2837.04133318566,2828.500893304369,2819.9604534230775
+Commercial Battery Storage 1Hr/Advanced,1397.1792374382012,1618.0392442396117,1112.6432419456798,934.1682087029318,900.510046192762,866.8518836825924,833.1937211724224,799.5355586622528,765.8773961520828,751.47500268281,737.0726092135374,722.6702157442647,708.267822274992,693.8654288057191,679.4630353364465,665.0606418671738,650.6582483979013,636.2558549286285,621.853461459356,607.4510679900833,593.0486745208104,578.6462810515378,564.2438875822651,549.8414941129925,535.4391006437198,521.036707174447,506.6343137051744,492.2319202359017,477.8295267666288
+Commercial Battery Storage 1Hr/Moderate,1397.1792374382012,1618.0392442396117,1256.6306501998229,1203.5573672936573,1162.9642150808975,1123.6483982977559,1086.9559370842417,1053.6740985845277,1021.5005936799113,1008.7318362589127,995.9630788379138,983.1943214169153,970.4255639959163,957.6568065749171,944.8880491539182,932.1192917329197,919.3505343119205,906.5817768909218,893.8130194699231,881.0442620489242,868.2755046279253,855.5067472069263,842.7379897859277,829.9692323649288,817.2004749439301,804.4317175229313,791.6629601019323,778.8942026809332,766.1254452599337
+Commercial Battery Storage 1Hr/Conservative,1397.1792374382012,1618.0392442396117,1513.9463783192034,1492.471961605456,1436.6384781497127,1380.8049946939689,1324.971511238225,1269.138027782482,1213.304544326738,1209.8398321912614,1206.3751200557851,1202.9104079203091,1199.4456957848327,1195.980983649356,1192.51627151388,1189.0515593784035,1185.5868472429272,1182.122135107451,1178.6574229719743,1175.1927108364982,1171.7279987010215,1168.2632865655453,1164.798574430069,1161.3338622945926,1157.8691501591165,1154.4044380236398,1150.9397258881634,1147.4750137526873,1144.0103016172095
+Commercial Battery Storage 2Hr/Advanced,1672.340139583286,1956.770588760248,1364.6325991466642,1118.1435786298885,1077.8567674018739,1037.5699561738595,997.2831449458447,956.9963337178301,916.7095224898153,899.47071728906,882.2319120883046,864.9931068875494,847.7543016867943,830.5154964860387,813.2766912852836,796.0378860845285,778.7990808837733,761.5602756830181,744.321470482263,727.0826652815076,709.8438600807524,692.6050548799973,675.366249679242,658.1274444784867,640.8886392777315,623.6498340769763,606.411028876221,589.1722236754658,571.9334184747104
+Commercial Battery Storage 2Hr/Moderate,1672.340139583286,1956.770588760248,1493.3272065039885,1428.972215794099,1376.0284909910695,1325.446108593101,1278.3925627543063,1235.7487022906928,1194.9721860141583,1180.035033688982,1165.0978813638046,1150.160729038628,1135.223576713451,1120.2864243882736,1105.3492720630968,1090.41211973792,1075.474967412743,1060.5378150875663,1045.6006627623894,1030.6635104372124,1015.7263581120354,1000.7892057868584,985.8520534616815,970.9149011365046,955.9777488113277,941.0405964861509,926.103444160974,911.1662918357968,896.229139510619
+Commercial Battery Storage 2Hr/Conservative,1672.340139583286,1956.770588760248,1812.103436551341,1786.3998417066416,1719.5704951104221,1652.7411485142025,1585.911801917983,1519.082455321763,1452.2531087255436,1448.1060551328471,1443.9590015401516,1439.8119479474556,1435.664894354759,1431.5178407620629,1427.3707871693673,1423.2237335766706,1419.076679983975,1414.929626391279,1410.7825727985828,1406.635519205887,1402.4884656131906,1398.3414120204945,1394.1943584277988,1390.0473048351025,1385.9002512424067,1381.7531976497103,1377.6061440570145,1373.4590904643183,1369.312036871621
+Commercial Battery Storage 4Hr/Advanced,2222.661943873455,2634.2332778015207,1868.6113135486326,1486.0943184838018,1432.550209820098,1379.0061011563932,1325.4619924926892,1271.9178838289845,1218.3737751652802,1195.4621465015598,1172.5505178378394,1149.638889174119,1126.7272605103985,1103.8156318466781,1080.904003182958,1057.9923745192377,1035.0807458555175,1012.1691171917971,989.2574885280768,966.3458598643567,943.4342312006363,920.5226025369161,897.6109738731956,874.6993452094754,851.787716545755,828.8760878820349,805.9644592183145,783.0528305545942,760.1412018908735
+Commercial Battery Storage 4Hr/Moderate,2222.661943873455,2634.2332778015207,1966.7203191123194,1879.8019127949822,1802.157042811414,1729.041529183791,1661.2658140944363,1599.8979097030226,1541.9153706826526,1522.6414285491198,1503.3674864155864,1484.0935442820532,1464.8196021485205,1445.5456600149869,1426.271717881454,1406.9977757479212,1387.7238336143878,1368.4498914808546,1349.1759493473214,1329.9020072137887,1310.6280650802557,1291.354122946722,1272.0801808131891,1252.8062386796564,1233.532296546123,1214.25835441259,1194.984412279057,1175.7104701455237,1156.4365280119896
+Commercial Battery Storage 4Hr/Conservative,2222.661943873455,2634.2332778015207,2408.4175530156162,2374.2556019090125,2285.434529031841,2196.6134561546696,2107.792383277498,2018.9713104003258,1930.1502375231548,1924.6385010160188,1919.1267645088838,1913.6150280017478,1908.1032914946124,1902.5915549874767,1897.0798184803418,1891.5680819732058,1886.0563454660708,1880.5446089589354,1875.0328724518,1869.5211359446644,1864.0093994375288,1858.497662930393,1852.985926423258,1847.4741899161224,1841.9624534089874,1836.4507169018511,1830.938980394716,1825.4272438875805,1819.9155073804436
+Commercial Battery Storage 6Hr/Advanced,2772.9837481636246,3311.695966842793,2372.5900279506004,1854.045058337715,1787.2436522383214,1720.4422461389272,1653.6408400395333,1586.8394339401389,1520.0380278407454,1491.4535757140595,1462.869123587374,1434.2846714606887,1405.7002193340031,1377.1157672073177,1348.531315080632,1319.9468629539472,1291.3624108272613,1262.7779587005762,1234.1935065738905,1205.6090544472058,1177.0246023205202,1148.4401501938348,1119.8556980671492,1091.271245940464,1062.6867938137784,1034.1023416870933,1005.5178895604078,976.9334374337226,948.3489853070366
+Commercial Battery Storage 6Hr/Moderate,2772.9837481636246,3311.695966842793,2440.11343172065,2330.631609795866,2228.2855946317577,2132.6369497744813,2044.1390654345664,1964.0471171153529,1888.8585553511466,1865.2478234092578,1841.637091467368,1818.0263595254787,1794.4156275835896,1770.8048956417,1747.194163699811,1723.5834317579222,1699.9726998160327,1676.3619678741431,1652.751235932254,1629.1405039903648,1605.5297720484757,1581.919040106586,1558.3083081646973,1534.6975762228078,1511.0868442809183,1487.4761123390292,1463.8653803971401,1440.2546484552508,1416.64391651336
+Commercial Battery Storage 6Hr/Conservative,2772.9837481636246,3311.695966842793,3004.7316694798915,2962.1113621113836,2851.29856295326,2740.485763795137,2629.672964637013,2518.8601654788886,2408.0473663207654,2401.1709468991903,2394.2945274776157,2387.4181080560406,2380.541688634466,2373.6652692128905,2366.7888497913164,2359.9124303697413,2353.0360109481667,2346.159591526592,2339.283172105017,2332.4067526834415,2325.530333261867,2318.653913840292,2311.7774944187177,2304.9010749971426,2298.0246555755675,2291.1482361539925,2284.271816732418,2277.395397310843,2270.5189778892664
+Commercial Battery Storage 8Hr/Advanced,3323.305552453793,3989.158655884065,2876.56874235257,2221.9957981916286,2141.9370946565455,2061.878391121461,1981.8196875863775,1901.7609840512932,1821.70228051621,1787.4450049265595,1753.1877293369087,1718.9304537472578,1684.6731781576075,1650.4159025679573,1616.1586269783065,1581.9013513886564,1547.6440757990053,1513.3868002093552,1479.1295246197046,1444.8722490300545,1410.6149734404041,1376.3576978507535,1342.100422261103,1307.8431466714526,1273.5858710818018,1239.3285954921519,1205.0713199025013,1170.8140443128507,1136.5567687231996
+Commercial Battery Storage 8Hr/Moderate,3323.305552453793,3989.158655884065,2913.5065443289814,2781.4613067967493,2654.4141464521017,2536.2323703651714,2427.0123167746965,2328.196324527683,2235.8017400196404,2207.854218269396,2179.90669651915,2151.9591747689046,2124.0116530186588,2096.0641312684133,2068.116609518168,2040.1690877679232,2012.2215660176773,1984.2740442674317,1956.3265225171863,1928.379000766941,1900.4314790166957,1872.48395726645,1844.536435516205,1816.5889137659592,1788.6413920157138,1760.6938702654681,1732.7463485152236,1704.7988267649778,1676.8513050147305
+Commercial Battery Storage 8Hr/Conservative,3323.305552453793,3989.158655884065,3601.0457859441667,3549.9671223137548,3417.1625968746785,3284.358071435604,3151.553545996528,3018.749020557452,2885.944495118377,2877.703392782362,2869.462290446348,2861.221188110333,2852.980085774319,2844.7389834383043,2836.4978811022906,2828.2567787662765,2820.0156764302624,2811.7745740942482,2803.5334717582336,2795.292369422219,2787.0512670862054,2778.810164750191,2770.569062414177,2762.3279600781616,2754.086857742149,2745.845755406134,2737.6046530701196,2729.3635507341055,2721.1224483980895
diff --git a/tests/data/Commercial_Battery_Storage/R&D/20/df_capex.csv b/tests/data/Commercial_Battery_Storage/R&D/20/df_capex.csv
index 06d3842..99a1130 100644
--- a/tests/data/Commercial_Battery_Storage/R&D/20/df_capex.csv
+++ b/tests/data/Commercial_Battery_Storage/R&D/20/df_capex.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1708.6543909919249,1229.202267834563,1160.201233161033,1101.1694678729955,1061.4942353446183,1021.8190028162413,982.1437702878638,942.4685377594872,902.7933052311091,885.8161957502836,868.8390862694572,851.8619767886321,834.8848673078062,817.9077578269802,800.9306483461546,783.953538865329,766.9764293845036,749.9993199036779,733.0222104228524,716.0451009420265,699.0679914612008,682.090881980375,665.1137724995492,648.1366630187232,631.1595535378978,614.1824440570718,597.2053345762464,580.2282250954207,563.2511156145947
-Commercial Battery Storage 1Hr/Moderate,1708.6543909919249,1590.624987004306,1487.3121448901431,1425.1790892978179,1379.3391876603653,1334.6853757167942,1292.9572915743656,1255.0914656195782,1218.3219152841134,1203.0928913430623,1187.8638674020106,1172.63484346096,1157.4058195199086,1142.1767955788566,1126.947771637805,1111.7187476967542,1096.4897237557022,1081.2606998146514,1066.0316758736005,1050.8026519325483,1035.573627991497,1020.3446040504459,1005.1155801093947,989.8865561683439,974.6575322272922,959.4285082862408,944.1994843451894,928.9704604041373,913.7414364630855
-Commercial Battery Storage 1Hr/Conservative,1708.6543909919249,1771.9378869545883,1784.5945861471214,1759.2811877620552,1693.466351960886,1627.651516159715,1561.8366803585438,1496.0218445573746,1430.207008756204,1426.1229100007417,1422.0388112452806,1417.954712489819,1413.8706137343568,1409.7865149788954,1405.7024162234334,1401.6183174679713,1397.5342187125088,1393.450119957048,1389.3660212015861,1385.2819224461239,1381.1978236906623,1377.1137249352007,1373.029626179739,1368.945527424277,1364.8614286688157,1360.777329913353,1356.693231157892,1352.6091324024303,1348.5250336469667
-Commercial Battery Storage 2Hr/Advanced,1994.1302219816112,1434.5729622912497,1354.043482885758,1285.1489025432334,1238.8448748439548,1192.5408471446756,1146.2368194453961,1099.9327917461178,1053.628764046838,1033.8151801669806,1014.0015962871227,994.1880124072657,974.3744285274082,954.5608446475507,934.7472607676935,914.9336768878362,895.120093007979,875.3065091281218,855.4929252482646,835.679341368407,815.8657574885497,796.0521736086923,776.2385897288349,756.4250058489774,736.6114219691202,716.7978380892628,696.9842542094057,677.1706703295481,657.3570864496904
-Commercial Battery Storage 2Hr/Moderate,1994.1302219816112,1851.1933165698713,1724.0139307570337,1650.5989181034563,1592.4081710027563,1536.487544521381,1484.3981468363497,1437.1700920735836,1391.7973402916673,1374.3998735380221,1357.0024067843756,1339.6049400307306,1322.207473277085,1304.8100065234382,1287.4125397697926,1270.0150730161472,1252.617606262501,1235.2201395088557,1217.82267275521,1200.4252060015635,1183.027739247918,1165.6302724942723,1148.2328057406269,1130.8353389869812,1113.4378722333354,1096.0404054796895,1078.6429387260437,1061.2454719723974,1043.8480052187508
-Commercial Battery Storage 2Hr/Conservative,1994.1302219816112,2067.986896869819,2082.75823184746,2053.2155618921765,1976.4046200084417,1899.5936781247049,1822.7827362409682,1745.9717943572332,1669.160852473497,1664.3943971851945,1659.6279418968936,1654.8614866085916,1650.095031320289,1645.3285760319875,1640.5621207436857,1635.795665455383,1631.0292101670807,1626.2627548787793,1621.496299590477,1616.7298443021753,1611.9633890138734,1607.1969337255719,1602.4304784372691,1597.6640231489675,1592.897567860666,1588.1311125723632,1583.3646572840619,1578.5982019957598,1573.831746707456
-Commercial Battery Storage 4Hr/Advanced,2565.0818839609838,1845.3143512046233,1741.7279823352078,1653.1077718837093,1593.5461538426268,1533.9845358015439,1474.422917760461,1414.8612997193786,1355.2996816782952,1329.8131490003748,1304.3266163224534,1278.8400836445333,1253.3535509666126,1227.8670182886915,1202.380485610771,1176.8939529328507,1151.40742025493,1125.9208875770094,1100.434354899089,1074.947822221168,1049.4612895432476,1023.974756865327,998.4882241874063,973.0016915094855,947.515158831565,922.0286261536444,896.5420934757237,871.0555607978032,845.5690281198819
-Commercial Battery Storage 4Hr/Moderate,2565.0818839609838,2372.3299757010022,2197.417502490815,2101.4385757147334,2018.5461376875394,1940.0918821305554,1867.2798573603184,1801.327344981595,1738.7481903067749,1717.0138379279408,1695.2794855491056,1673.5451331702714,1651.8107807914373,1630.0764284126017,1608.342076033767,1586.6077236549331,1564.873371276098,1543.139018897264,1521.4046665184292,1499.6703141395942,1477.9359617607597,1456.2016093819252,1434.467257003091,1412.7329046242564,1390.9985522454217,1369.264199866587,1347.5298474877525,1325.795495108917,1304.0611427300819
-Commercial Battery Storage 4Hr/Conservative,2565.0818839609838,2660.0849167002793,2679.085523248138,2641.084310152419,2542.281156103553,2443.4780020546855,2344.6748480058177,2245.871693956951,2147.068539908083,2140.9373715541,2134.806203200119,2128.6750348461364,2122.5438664921535,2116.4126981381714,2110.28152978419,2104.1503614302064,2098.019193076224,2091.8880247222423,2085.7568563682594,2079.6256880142773,2073.4945196602953,2067.3633513063132,2061.2321829523307,2055.1010145983487,2048.969846244366,2042.8386778903835,2036.7075095364014,2030.5763411824191,2024.4451728284348
-Commercial Battery Storage 6Hr/Advanced,3136.033545940357,2256.055740117997,2129.4124817846578,2021.0666412241858,1948.2474328412993,1875.4282244584126,1802.609016075526,1729.7898076926394,1656.9705993097525,1625.811117833769,1594.6516363577841,1563.4921548818006,1532.3326734058166,1501.1731919298325,1470.0137104538487,1438.8542289778648,1407.694747501881,1376.535266025897,1345.375784549913,1314.2163030739293,1283.0568215979456,1251.8973401219614,1220.7378586459774,1189.5783771699935,1158.4188956940097,1127.2594142180258,1096.0999327420418,1064.9404512660578,1033.7809697900732
-Commercial Battery Storage 6Hr/Moderate,3136.033545940357,2893.4666348321325,2670.821074224597,2552.2782333260106,2444.684104372322,2343.696219739729,2250.161567884287,2165.4845978896064,2085.699040321883,2059.6278023178597,2033.5565643138357,2007.4853263098128,1981.4140883057896,1955.3428503017649,1929.2716122977417,1903.2003742937188,1877.1291362896952,1851.057898285672,1824.9866602816487,1798.9154222776247,1772.844184273601,1746.772946269578,1720.701708265555,1694.6304702615314,1668.559232257508,1642.4879942534842,1616.416756249461,1590.345518245437,1564.2742802414125
-Commercial Battery Storage 6Hr/Conservative,3136.033545940357,3252.1829365307394,3275.412814648816,3228.9530584126624,3108.157692198665,2987.362325984666,2866.5669597706665,2745.771593556668,2624.976227342669,2617.480345923006,2609.984464503344,2602.4885830836815,2594.992701664018,2587.496820244356,2580.0009388246935,2572.5050574050297,2565.0091759853676,2557.513294565705,2550.017413146042,2542.5215317263796,2535.025650306717,2527.529768887054,2520.0338874673917,2512.5380060477296,2505.0421246280666,2497.5462432084037,2490.050361788741,2482.554480369078,2475.058598949414
-Commercial Battery Storage 8Hr/Advanced,3706.98520791973,2666.7971290313712,2517.0969812341077,2389.0255105646615,2302.9487118399716,2216.8719131152807,2130.7951143905907,2044.7183156659,1958.6415169412098,1921.809086667163,1884.9766563931148,1848.1442261190678,1811.3117958450207,1774.4793655709734,1737.6469352969264,1700.8145050228793,1663.982074748832,1627.149644474785,1590.3172142007375,1553.4847839266906,1516.6523536526431,1479.8199233785963,1442.9874931045488,1406.1550628305017,1369.3226325564544,1332.4902022824072,1295.65777200836,1258.8253417343126,1221.9929114602648
-Commercial Battery Storage 8Hr/Moderate,3706.98520791973,3414.603293963263,3144.2246459583776,3003.1178909372875,2870.8220710571054,2747.300557348903,2633.0432784082554,2529.6418507976173,2432.6498903369907,2402.241766707779,2371.8336430785657,2341.425519449354,2311.0173958201417,2280.6092721909286,2250.2011485617163,2219.793024932505,2189.3849013032927,2158.9767776740805,2128.5686540448683,2098.1605304156556,2067.752406786443,2037.3442831572306,2006.936159528019,1976.5280358988066,1946.1199122695941,1915.711788640382,1885.3036650111699,1854.8955413819567,1824.487417752743
-Commercial Battery Storage 8Hr/Conservative,3706.98520791973,3844.2809563612,3871.740106049494,3816.821806672905,3674.0342282937763,3531.2466499146462,3388.4590715355152,3245.6714931563856,3102.883914777255,3094.0233202919117,3085.162725806569,3076.302131321226,3067.4415368358823,3058.5809423505398,3049.7203478651977,3040.8597533798534,3031.9991588945104,3023.138564409168,3014.2779699238245,3005.4173754384815,2996.556780953139,2987.696186467796,2978.835591982453,2969.97499749711,2961.1144030117675,2952.2538085264237,2943.3932140410807,2934.5326195557373,2925.6720250703925
+Commercial Battery Storage 1Hr/Advanced,1449.5551538746543,1678.6945173616073,1154.3527863636048,969.1872776423813,934.2673750062493,899.3474723701173,864.427569733985,829.5076670978531,794.5877644617208,779.6454699284909,764.7031753952613,749.7608808620316,734.8185863288019,719.8762917955719,704.9339972623422,689.9917027291125,675.049408195883,660.1071136626532,645.1648191294237,630.2225245961939,615.280230062964,600.3379355297344,585.3956409965047,570.453346463275,555.5110519300454,540.5687573968155,525.626462863586,510.6841683303562,495.7418737971263
+Commercial Battery Storage 1Hr/Moderate,1449.5551538746543,1678.6945173616073,1303.7378359944178,1248.67500031219,1206.5601367175132,1165.7704918962165,1127.702544108846,1093.1730727032002,1059.7934828817756,1046.5460643457536,1033.2986458097316,1020.0512272737096,1006.8038087376874,993.556390201665,980.3089716656427,967.0615531296208,953.8141345935983,940.5667160575764,927.3192975215544,914.0718789855322,900.82446044951,887.5770419134877,874.3296233774657,861.0822048414435,847.8347863054215,834.5873677693995,821.3399492333772,808.0925306973547,794.8451121613319
+Commercial Battery Storage 1Hr/Conservative,1449.5551538746543,1678.6945173616073,1570.6995327287318,1548.4201067325798,1490.4935991425843,1432.5670915525884,1374.6405839625925,1316.7140763725972,1258.7875687826013,1255.192975334533,1251.5983818864654,1248.0037884383978,1244.4091949903298,1240.8146015422617,1237.220008094194,1233.625414646126,1230.0308211980584,1226.4362277499906,1222.8416343019223,1219.247040853855,1215.6524474057867,1212.0578539577189,1208.4632605096513,1204.8686670615832,1201.2740736135156,1197.6794801654476,1194.0848867173795,1190.490293269312,1186.8956998212425
+Commercial Battery Storage 2Hr/Advanced,1735.0309848643408,2030.1238494557992,1415.7884430528595,1160.0593136115042,1118.2622747750129,1076.4652359385218,1034.6681971020303,992.871158265539,951.0741194290474,933.1890848852948,915.3040503415423,897.4190157977898,879.5339812540375,861.6489467102847,843.7639121665324,825.87887762278,807.9938430790276,790.1088085352751,772.2237739915228,754.3387394477702,736.4537049040177,718.5686703602654,700.6836358165128,682.7986012727605,664.913566729008,647.0285321852556,629.1434976415031,611.2584630977507,593.373428553998
+Commercial Battery Storage 2Hr/Moderate,1735.0309848643408,2030.1238494557992,1549.3074121099241,1482.539952387204,1427.611531539591,1375.1329725003989,1326.315535158743,1282.0730886209008,1239.767987212379,1224.270887372225,1208.7737875320697,1193.2766876919154,1177.7795878517607,1162.2824880116057,1146.785388171451,1131.2882883312964,1115.7911884911416,1100.294088650987,1084.7969888108325,1069.2998889706778,1053.802789130523,1038.3056892903683,1022.8085894502136,1007.311489610059,991.8143897699043,976.3172899297498,960.8201900895951,945.32309024944,929.8259904092845
+Commercial Battery Storage 2Hr/Conservative,1735.0309848643408,2030.1238494557992,1880.0335743774986,1853.3664314785274,1784.0318599412014,1714.697288403875,1645.3627168665491,1576.0281453292228,1506.6935737918968,1502.3910600215736,1498.0885462512513,1493.7860324809285,1489.4835187106053,1485.1810049402823,1480.87849116996,1476.5759773996365,1472.2734636293142,1467.9709498589914,1463.6684360886686,1459.365922318346,1455.0634085480228,1450.7608947777,1446.4583810073775,1442.1558672370545,1437.853353466732,1433.5508396964087,1429.2483259260862,1424.9458121557632,1420.6432983854393
+Commercial Battery Storage 4Hr/Advanced,2305.9826468437136,2732.982513644183,1938.6597564313684,1541.8033855497501,1486.2520743125408,1430.7007630753303,1375.1494518381207,1319.5981406009105,1264.0468293637007,1240.2763147989026,1216.5058002341045,1192.7352856693064,1168.9647711045084,1145.1942565397103,1121.4237419749124,1097.6532274101148,1073.882712845317,1050.112198280519,1026.3416837157208,1002.5711691509232,978.8006545861251,955.0301400213274,931.2596254565292,907.4891108917313,883.7185963269334,859.9480817621356,836.1775671973376,812.4070526325396,788.6365380677414
+Commercial Battery Storage 4Hr/Moderate,2305.9826468437136,2732.982513644183,2040.4465643409367,1950.269856537232,1869.7143211837465,1793.8579337087638,1723.5415172585374,1659.8731204563014,1599.716995873586,1579.7205334251666,1559.7240709767466,1539.7276085283268,1519.7311460799074,1499.734683631487,1479.7382211830675,1459.741758734648,1439.745296286228,1419.7488338378082,1399.7523713893884,1379.755908940969,1359.7594464925494,1339.7629840441289,1319.7665215957093,1299.7700591472899,1279.7735966988698,1259.7771342504502,1239.7806718020306,1219.7842093536105,1199.7877469051898
+Commercial Battery Storage 4Hr/Conservative,2305.9826468437136,2732.982513644183,2498.7016576750316,2463.259080970422,2371.1083815384354,2278.9576821064484,2186.806982674462,2094.6562832424743,2002.505583810488,1996.7872293956545,1991.0688749808223,1985.350520565989,1979.6321661511565,1973.9138117363236,1968.1954573214914,1962.4771029066583,1956.758748491826,1951.0403940769934,1945.3220396621607,1939.603685247328,1933.8853308324951,1928.1669764176622,1922.44862200283,1916.730267587997,1911.0119131731649,1905.2935587583313,1899.575204343499,1893.8568499286664,1888.1384955138321
+Commercial Battery Storage 6Hr/Advanced,2876.9343088230867,3435.841177832567,2461.5310698098765,1923.547457487996,1854.2418738500678,1784.9362902121393,1715.6307065742108,1646.325122936282,1577.0195392983542,1547.3635447125102,1517.7075501266665,1488.0515555408233,1458.3955609549796,1428.7395663691364,1399.0835717832927,1369.4275771974496,1339.7715826116057,1310.1155880257627,1280.459593439919,1250.8035988540762,1221.1476042682325,1191.4916096823893,1161.8356150965456,1132.1796205107023,1102.5236259248586,1072.8676313390156,1043.211636753172,1013.5556421673288,983.8996475814847
+Commercial Battery Storage 6Hr/Moderate,2876.9343088230867,3435.841177832567,2531.585716571949,2417.9997606872607,2311.8171108279016,2212.5828949171287,2120.767499358332,2037.6731522917025,1959.666004534793,1935.1701794781086,1910.6743544214232,1886.1785293647383,1861.6827043080536,1837.1868792513685,1812.6910541946838,1788.1952291379996,1763.6994040813145,1739.2035790246293,1714.7077539679447,1690.2119289112597,1665.716103854575,1641.2202787978897,1616.7244537412057,1592.2286286845206,1567.7328036278354,1543.2369785711508,1518.741153514466,1494.2453284577812,1469.7495034010947
+Commercial Battery Storage 6Hr/Conservative,2876.9343088230867,3435.841177832567,3117.369740972565,3073.151730462317,2958.184903135669,2843.218075809022,2728.251248482374,2613.2844211557253,2498.3175938290783,2491.1833987697355,2484.049203710393,2476.9150086510504,2469.780813591708,2462.6466185323648,2455.512423473023,2448.37822841368,2441.244033354338,2434.109838294996,2426.975643235653,2419.8414481763098,2412.7072531169674,2405.5730580576246,2398.4388629982827,2391.30466793894,2384.170472879597,2377.0362778202543,2369.902082760912,2362.7678877015696,2355.6336926422255
+Commercial Battery Storage 8Hr/Advanced,3447.8859708024584,4138.69984202095,2984.402383188387,2305.291529426242,2222.2316733875955,2139.171817348948,2056.111961310301,1973.0521052716535,1889.992249233007,1854.4507746261181,1818.9093000192288,1783.3678254123395,1747.8263508054508,1712.2848761985622,1676.7434015916729,1641.2019269847844,1605.660452377895,1570.1189777710063,1534.5775031641174,1499.0360285572287,1463.4945539503399,1427.953079343451,1392.411604736562,1356.870130129673,1321.328655522784,1285.7871809158955,1250.2457063090064,1214.7042317021176,1179.162757095228
+Commercial Battery Storage 8Hr/Moderate,3447.8859708024584,4138.69984202095,3022.7248688029617,2885.729664837289,2753.9199004720567,2631.307856125494,2517.9934814581266,2415.473184127103,2319.6150131959994,2290.6198255310505,2261.6246378661003,2232.6294502011506,2203.6342625362,2174.63907487125,2145.6438872063004,2116.648699541351,2087.6535118764004,2058.6583242114507,2029.6631365465005,2000.667948881551,1971.672761216601,1942.6775735516508,1913.6823858867015,1884.687198221751,1855.6920105568013,1826.696822891851,1797.701635226902,1768.7064475619518,1739.711259897
+Commercial Battery Storage 8Hr/Conservative,3447.8859708024584,4138.69984202095,3736.037824270098,3683.044379954212,3545.261424732903,3407.4784695115954,3269.6955142902866,3131.9125590689773,2994.1296038476694,2985.5795681438162,2977.0295324399644,2968.4794967361113,2959.929461032259,2951.379425328406,2942.829389624554,2934.279353920702,2925.7293182168496,2917.1792825129974,2908.6292468091447,2900.079211105292,2891.52917540144,2882.9791396975875,2874.429103993735,2865.8790682898816,2857.3290325860307,2848.7789968821776,2840.2289611783253,2831.678925474473,2823.128889770619
diff --git a/tests/data/Commercial_Battery_Storage/R&D/20/df_fom.csv b/tests/data/Commercial_Battery_Storage/R&D/20/df_fom.csv
index 97d9ec5..16afd60 100644
--- a/tests/data/Commercial_Battery_Storage/R&D/20/df_fom.csv
+++ b/tests/data/Commercial_Battery_Storage/R&D/20/df_fom.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,41.17291488823829,29.61970578766454,27.957009257113175,26.534539118786462,25.578497346574345,24.62245557436223,23.666413802150103,22.710372029938,21.75433025772586,21.34523811633819,20.9361459749505,20.52705383356284,20.117961692175157,19.708869550787476,19.299777409399805,18.89068526801213,18.481593126624464,18.07250098523679,17.66340884384912,17.254316702461438,16.845224561073763,16.436132419686086,16.02704027829841,15.61794813691073,15.208855995523061,14.799763854135382,14.390671712747713,13.981579571360038,13.572487429972355
-Commercial Battery Storage 1Hr/Moderate,41.17291488823829,38.328796949401884,35.839299437409984,34.34209846854473,33.237508576900005,32.161499520720575,31.155990819895443,30.243549756665427,29.3575253070036,28.990556240666066,28.62358717432851,28.256618107990985,27.889649041653442,27.52267997531588,27.155710908978335,26.788741842640803,26.421772776303243,26.05480370996571,25.68783464362818,25.32086557729062,24.953896510953076,24.58692744461554,24.219958378277997,23.852989311940465,23.486020245602916,23.11905117926537,22.752082112927823,22.385113046590263,22.01814398025271
-Commercial Battery Storage 1Hr/Conservative,41.17291488823829,42.69783766187673,43.00282221660443,42.39285310714903,40.806933422565066,39.22101373798106,37.635094053397054,36.049174368813084,34.46325468422909,34.36484142327924,34.266428162329404,34.16801490137956,34.0696016404297,33.97118837947987,33.87277511853002,33.77436185758017,33.675948596630306,33.57753533568048,33.47912207473063,33.38070881378078,33.28229555283093,33.1838822918811,33.08546903093124,32.9870557699814,32.88864250903156,32.7902292480817,32.69181598713187,32.59340272618203,32.49498946523214
-Commercial Battery Storage 2Hr/Advanced,48.0519374418654,34.568459712379976,32.62796582488783,30.96783449133187,29.85206069793281,28.736286904533735,27.62051311113465,26.50473931773559,25.3889655243365,24.911523739141572,24.43408195394663,23.95664016875171,23.47919838355678,23.001756598361847,22.524314813166924,22.046873027971998,21.569431242777075,21.091989457582148,20.614547672387225,20.13710588719229,19.659664101997365,19.182222316802434,18.704780531607508,18.227338746412578,17.74989696121765,17.27245517602272,16.7950133908278,16.317571605632867,15.840129820437932
-Commercial Battery Storage 2Hr/Moderate,48.0519374418654,44.60763116674487,41.543028953906195,39.773970165048425,38.37176578112428,37.02426378964313,35.76908173013936,34.631041943195925,33.53770881672469,33.118487456515645,32.69926609630657,32.28004473609754,31.860823375888483,31.4416020156794,31.022380655470347,30.6031592952613,30.183937935052235,29.764716574843188,29.345495214634134,28.92627385442506,28.507052494216005,28.08783113400695,27.668609773797904,27.24938841358885,26.830167053379792,26.41094569317073,25.991724332961674,25.572502972752602,25.153281612543527
-Commercial Battery Storage 2Hr/Conservative,48.0519374418654,49.83163882860114,50.187579105948295,49.47569855125398,47.62480910904883,45.773919666843625,43.92303022463843,42.07214078243327,40.221251340228086,40.10639554555217,39.991539750876285,39.87668395620038,39.76182816152447,39.64697236684857,39.53211657217267,39.41726077749675,39.30240498282083,39.18754918814495,39.07269339346904,38.957837598793134,38.84298180411724,38.72812600944134,38.61327021476542,38.498414420089524,38.38355862541363,38.2687028307377,38.15384703606181,38.038991241385915,37.92413544670996
-Commercial Battery Storage 4Hr/Advanced,61.80998254911963,44.46596756181086,41.969878960437136,39.8344252364227,38.39918740064972,36.963949564876735,35.52871172910374,34.093473893330774,32.65823605755777,32.04409498474834,31.42995391193889,30.815812839129467,30.201671766320032,29.587530693510587,28.97338962070116,28.35924854789173,27.745107475082296,27.13096640227286,26.516825329463433,25.902684256653995,25.288543183844567,24.674402111035135,24.0602610382257,23.44611996541626,22.83197889260683,22.217837819797396,21.603696746987964,20.989555674178533,20.375414601369084
-Commercial Battery Storage 4Hr/Moderate,61.80998254911963,57.16529960143086,52.9504879868986,50.63771355805582,48.64028018957285,46.749792327488244,44.99526355062722,43.406026316256934,41.89807583616687,41.3743498882148,40.8506239402627,40.32689799231063,39.803172044358554,39.279446096406446,38.755720148454365,38.23199420050229,37.7082682525502,37.184542304598125,36.660816356646045,36.13709040869394,35.61336446074187,35.08963851278978,34.56591256483771,34.04218661688562,33.51846066893354,32.99473472098145,32.471008773029375,31.94728282507727,31.42355687712517
-Commercial Battery Storage 4Hr/Conservative,61.80998254911963,64.09924116204998,64.55709288463605,63.64138943946389,61.260560482016345,58.879731524568776,56.4989025671212,54.118073609673644,51.73724465222606,51.58950379009803,51.44176292797004,51.294022065842015,51.14628120371398,50.998540341585965,50.85079947945796,50.703058617329916,50.55531775520189,50.40757689307389,50.25983603094585,50.11209516881784,49.96435430668983,49.81661344456181,49.668872582433785,49.521131720305775,49.37339085817776,49.225649996049725,49.07790913392171,48.93016827179369,48.78242740966562
-Commercial Battery Storage 6Hr/Advanced,75.56802765637387,54.36347541124174,51.31179209598644,48.70101598151354,46.946314103366646,45.19161222521975,43.436910347072846,41.68220846892595,39.92750659077904,39.17666623035511,38.425825869931145,37.674985509507216,36.92414514908327,36.17330478865933,35.42246442823539,34.67162406781146,33.92078370738752,33.16994334696358,32.41910298653964,31.668262626115705,30.91742226569177,30.166581905267822,29.415741544843883,28.664901184419946,27.914060823996007,27.163220463572067,26.412380103148127,25.661539742724187,24.910699382300233
-Commercial Battery Storage 6Hr/Moderate,75.56802765637387,69.72296803611682,64.35794701989103,61.501456951063226,58.90879459802141,56.47532086533334,54.22144537111508,52.181010689317944,50.25844285560906,49.630212319913966,49.00198178421883,48.37375124852373,47.74552071282863,47.11729017713349,46.48905964143839,45.860829105743285,45.23259857004817,44.604368034353065,43.976137498657955,43.34790696296283,42.71967642726772,42.09144589157262,41.463215355877516,40.8349848201824,40.20675428448729,39.57852374879217,38.95029321309707,38.32206267740194,37.69383214170681
-Commercial Battery Storage 6Hr/Conservative,75.56802765637387,78.36684349549881,78.9266066633238,77.8070803276738,74.89631185498388,71.98554338229393,69.07477490960395,66.16400643691401,63.25323796422405,63.07261203464391,62.89198610506378,62.711360175483655,62.5307342459035,62.35010831632337,62.16948238674325,61.98885645716308,61.80823052758296,61.627604598002826,61.44697866842269,61.26635273884255,61.08572680926242,60.90510087968228,60.72447495010214,60.543849020522025,60.36322309094189,60.182597161361734,60.0019712317816,59.821345302201465,59.64071937262128
-Commercial Battery Storage 8Hr/Advanced,89.3260727636281,64.26098326067262,60.653705231535746,57.56760672660437,55.49344080608356,53.41927488556274,51.34510896504194,49.27094304452112,47.196777124000306,46.30923747596188,45.4216978279234,44.53415817988497,43.64661853184652,42.75907888380807,41.87153923576963,40.98399958773119,40.09645993969275,39.2089202916543,38.32138064361585,37.43384099557741,36.546301347538964,35.65876169950052,34.77122205146207,33.883682403423634,32.996142755385186,32.10860310734674,31.221063459308297,30.333523811269846,29.445984163231387
-Commercial Battery Storage 8Hr/Moderate,89.3260727636281,82.28063647080279,75.76540605288343,72.36520034407062,69.17730900646998,66.20084940317844,63.44762719160293,60.955995062378946,58.61880987505124,57.886074751613116,57.15333962817496,56.420604504736836,55.6878693812987,54.95513425786054,54.2223991344224,53.489664010984285,52.756928887546145,52.02419376410801,51.29145864066987,50.558723517231726,49.82598839379358,49.09325327035544,48.36051814691732,47.627783023479175,46.895047900041035,46.1623127766029,45.42957765316476,44.69684252972661,43.964107406288434
-Commercial Battery Storage 8Hr/Conservative,89.3260727636281,92.63444582894763,93.29612044201154,91.97277121588371,88.5320632279514,85.09135524001907,81.65064725208671,78.20993926415439,74.76923127622204,74.55572027918977,74.34220928215754,74.12869828512528,73.91518728809301,73.70167629106076,73.48816529402853,73.27465429699626,73.061143299964,72.84763230293177,72.6341213058995,72.42061030886725,72.20709931183501,71.99358831480275,71.7800773177705,71.56656632073826,71.35305532370602,71.13954432667374,70.9260333296415,70.71252233260923,70.49901133557694
+Commercial Battery Storage 1Hr/Advanced,34.929480935955034,40.450981105990294,27.816081048641998,23.354205217573295,22.512751154819053,21.671297092064812,20.829843029310563,19.98838896655632,19.146934903802073,18.786875067070252,18.426815230338434,18.06675539360662,17.706695556874802,17.34663572014298,16.986575883411163,16.626516046679345,16.26645620994753,15.906396373215713,15.546336536483901,15.186276699752083,14.826216863020262,14.466157026288446,14.106097189556628,13.746037352824812,13.385977516092996,13.025917679361175,12.66585784262936,12.305798005897543,11.945738169165722
+Commercial Battery Storage 1Hr/Moderate,34.929480935955034,40.450981105990294,31.415766254995575,30.088934182341433,29.074105377022438,28.091209957443898,27.173898427106042,26.341852464613194,25.537514841997783,25.218295906472818,24.899076970947846,24.579858035422884,24.260639099897908,23.94142016437293,23.622201228847956,23.302982293322994,22.98376335779801,22.664544422273046,22.34532548674808,22.02610655122311,21.706887615698136,21.38766868017316,21.06844974464819,20.74923080912322,20.430011873598254,20.110792938073285,19.79157400254831,19.47235506702333,19.153136131498343
+Commercial Battery Storage 1Hr/Conservative,34.929480935955034,40.450981105990294,37.848659457980084,37.3117990401364,35.915961953742816,34.520124867349224,33.124287780955626,31.72845069456205,30.332613608168455,30.245995804781536,30.15937800139463,30.072760198007728,29.986142394620817,29.8995245912339,29.812906787846998,29.726288984460087,29.639671181073183,29.553053377686275,29.466435574299357,29.379817770912457,29.29319996752554,29.206582164138634,29.119964360751727,29.033346557364816,28.946728753977915,28.860110950590997,28.773493147204086,28.686875343817185,28.60025754043024
+Commercial Battery Storage 2Hr/Advanced,41.80850348958215,48.91926471900621,34.115814978666606,27.953589465747214,26.94641918504685,25.93924890434649,24.93207862364612,23.924908342945756,22.917738062245384,22.4867679322265,22.055797802207618,21.624827672188736,21.19385754216986,20.76288741215097,20.331917282132093,19.900947152113215,19.469977022094334,19.039006892075452,18.608036762056575,18.17706663203769,17.746096502018812,17.315126371999934,16.88415624198105,16.453186111962168,16.022215981943287,15.591245851924407,15.160275721905528,14.729305591886646,14.29833546186776
+Commercial Battery Storage 2Hr/Moderate,41.80850348958215,48.91926471900621,37.33318016259971,35.72430539485247,34.40071227477674,33.136152714827524,31.959814068857657,30.893717557267323,29.87430465035396,29.50087584222455,29.127447034095116,28.7540182259657,28.380589417836276,28.007160609706844,27.633731801577422,27.260302993448,26.886874185318575,26.513445377189157,26.14001656905974,25.76658776093031,25.39315895280089,25.01973014467146,24.646301336542038,24.272872528412616,23.899443720283195,23.526014912153773,23.15258610402435,22.77915729589492,22.405728487765476
+Commercial Battery Storage 2Hr/Conservative,41.80850348958215,48.91926471900621,45.30258591378353,44.659996042666045,42.989262377760554,41.31852871285506,39.64779504794958,37.97706138304408,36.30632771813859,36.20265137832118,36.09897503850379,35.99529869868639,35.89162235886898,35.787946019051574,35.684269679234184,35.580593339416765,35.476916999599375,35.37324065978198,35.26956431996457,35.165887980147176,35.062211640329764,34.95853530051237,34.85485896069497,34.751182620877564,34.64750628106017,34.543829941242755,34.440153601425365,34.33647726160796,34.23280092179053
+Commercial Battery Storage 4Hr/Advanced,55.566548596836384,65.85583194503802,46.715282838715815,37.152357962095046,35.81375524550245,34.47515252890983,33.136549812317234,31.797947095724613,30.459344379132006,29.886553662538997,29.313762945945985,28.740972229352977,28.168181512759965,27.595390796166953,27.022600079573948,26.449809362980943,25.87701864638794,25.30422792979493,24.73143721320192,24.15864649660892,23.58585578001591,23.013065063422903,22.44027434682989,21.867483630236887,21.294692913643875,20.721902197050873,20.14911148045786,19.576320763864857,19.003530047271838
+Commercial Battery Storage 4Hr/Moderate,55.566548596836384,65.85583194503802,49.16800797780799,46.99504781987456,45.05392607028535,43.22603822959478,41.53164535236091,39.99744774257557,38.547884267066316,38.066035713728,37.58418716038966,37.10233860705133,36.62049005371301,36.138641500374675,35.65679294703635,35.174944393698034,34.693095840359696,34.211247287021365,33.729398733683034,33.24755018034472,32.76570162700639,32.283853073668055,31.80200452032973,31.32015596699141,30.838307413653077,30.356458860314753,29.87461030697643,29.392761753638094,28.910913200299742
+Commercial Battery Storage 4Hr/Conservative,55.566548596836384,65.85583194503802,60.21043882539041,59.35639004772531,57.13586322579603,54.915336403866746,52.694809581937456,50.47428276000815,48.253755938078875,48.11596252540048,47.9781691127221,47.840375700043694,47.70258228736532,47.56478887468692,47.42699546200855,47.28920204933015,47.15140863665177,47.01361522397339,46.875821811295,46.73802839861661,46.60023498593822,46.46244157325983,46.324648160581454,46.18685474790306,46.049061335224685,45.91126792254628,45.7734745098679,45.63568109718952,45.49788768451109
+Commercial Battery Storage 6Hr/Advanced,69.32459370409062,82.79239917106983,59.31475069876501,46.35112645844288,44.681091305958034,43.011056153473184,41.341021000988334,39.67098584850348,38.000950696018634,37.28633939285149,36.57172808968435,35.85711678651722,35.14250548335008,34.427894180182946,33.71328287701581,32.99867157384868,32.284060270681536,31.569448967514404,30.854837664347265,30.140226361180147,29.42561505801301,28.711003754845873,27.99639245167873,27.2817811485116,26.567169845344463,25.852558542177334,25.137947239010195,24.423335935843067,23.708724632675917
+Commercial Battery Storage 6Hr/Moderate,69.32459370409062,82.79239917106983,61.00283579301626,58.26579024489666,55.70713986579395,53.31592374436204,51.10347663586416,49.101177927883825,47.22146388377867,46.631195585231445,46.0409272866842,45.45065898813697,44.86039068958974,44.270122391042506,43.679854092495276,43.08958579394806,42.49931749540082,41.90904919685358,41.31878089830636,40.72851259975912,40.1382443012119,39.547976002664655,38.95770770411744,38.367439405570195,37.77717110702296,37.18690280847573,36.596634509928506,36.00636621138127,35.416097912834
+Commercial Battery Storage 6Hr/Conservative,69.32459370409062,82.79239917106983,75.11829173699729,74.05278405278459,71.2824640738315,68.51214409487842,65.74182411592533,62.971504136972214,60.20118415801914,60.02927367247976,59.8573631869404,59.68545270140102,59.513542215861655,59.34163173032226,59.16972124478291,58.997810759243535,58.82590027370417,58.65398978816481,58.48207930262543,58.31016881708604,58.13825833154667,57.966347846007295,57.794437360467946,57.62252687492857,57.45061638938919,57.27870590384981,57.10679541831045,56.93488493277107,56.76297444723166
+Commercial Battery Storage 8Hr/Advanced,83.08263881134484,99.72896639710163,71.91421855881426,55.549894954790716,53.54842736641364,51.54695977803652,49.54549218965944,47.54402460128233,45.542557012905256,44.68612512316399,43.82969323342272,42.97326134368145,42.11682945394019,41.26039756419894,40.403965674457666,39.547533784716414,38.691101894975134,37.83467000523388,36.978238115492616,36.121806225751364,35.265374336010105,34.40894244626884,33.55251055652757,32.69607866678631,31.839646777045047,30.9832148873038,30.126782997562533,29.27035110782127,28.413919218079993
+Commercial Battery Storage 8Hr/Moderate,83.08263881134484,99.72896639710163,72.83766360822453,69.53653266991874,66.36035366130254,63.405809259129285,60.67530791936741,58.204908113192076,55.89504350049101,55.1963554567349,54.49766741297876,53.79897936922262,53.10029132546647,52.40160328171034,51.7029152379542,51.00422719419808,50.30553915044194,49.606851106685795,48.90816306292966,48.20947501917353,47.510786975417396,46.812098931661254,46.11341088790513,45.41472284414898,44.71603480039285,44.017346756636705,43.31865871288059,42.61997066912445,41.92128262536826
+Commercial Battery Storage 8Hr/Conservative,83.08263881134484,99.72896639710163,90.02614464860417,88.74917805784388,85.42906492186697,82.1089517858901,78.7888386499132,75.46872551393629,72.14861237795942,71.94258481955904,71.73655726115871,71.53052970275833,71.32450214435798,71.11847458595761,70.91244702755726,70.70641946915691,70.50039191075656,70.29436435235621,70.08833679395585,69.88230923555548,69.67628167715513,69.47025411875477,69.26422656035443,69.05819900195404,68.85217144355373,68.64614388515335,68.440116326753,68.23408876835263,68.02806120995224
diff --git a/tests/data/Commercial_Battery_Storage/R&D/20/df_occ.csv b/tests/data/Commercial_Battery_Storage/R&D/20/df_occ.csv
index ed451d5..4a2c2f7 100644
--- a/tests/data/Commercial_Battery_Storage/R&D/20/df_occ.csv
+++ b/tests/data/Commercial_Battery_Storage/R&D/20/df_occ.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1646.9165955295314,1184.7882315065815,1118.280370284527,1061.3815647514584,1023.1398938629737,984.8982229744892,946.6565520860041,908.4148811975199,870.1732103090344,853.8095246535275,837.4458389980199,821.0821533425135,804.7184676870063,788.354782031499,771.9910963759921,755.6274107204853,739.2637250649785,722.9000394094716,706.5363537539647,690.1726680984575,673.8089824429505,657.4452967874435,641.0816111319365,624.7179254764292,608.3542398209224,591.9905541654152,575.6268685099085,559.2631828544015,542.8994971988942
-Commercial Battery Storage 1Hr/Moderate,1646.9165955295314,1533.1518779760752,1433.5719774963993,1373.683938741789,1329.500343076,1286.459980828823,1246.2396327958177,1209.741990266617,1174.3010122801438,1159.6222496266425,1144.9434869731404,1130.2647243196393,1115.5859616661376,1100.9071990126351,1086.2284363591334,1071.5496737056321,1056.8709110521297,1042.1921483986284,1027.5133857451272,1012.8346230916246,998.155860438123,983.4770977846215,968.7983351311199,954.1195724776186,939.4408098241166,924.7620471706148,910.0832845171129,895.4045218636105,880.7257592101083
-Commercial Battery Storage 1Hr/Conservative,1646.9165955295314,1707.9135064750692,1720.112888664177,1695.7141242859611,1632.2773369026027,1568.8405495192424,1505.403762135882,1441.9669747525234,1378.5301873691635,1374.5936569311693,1370.657126493176,1366.7205960551823,1362.7840656171882,1358.8475351791947,1354.9110047412007,1350.9744743032065,1347.0379438652121,1343.101413427219,1339.1648829892251,1335.228352551231,1331.2918221132372,1327.3552916752437,1323.4187612372498,1319.482230799256,1315.5457003612626,1311.609169923268,1307.6726394852747,1303.736109047281,1299.7995786092854
-Commercial Battery Storage 2Hr/Advanced,1922.0774976746159,1382.738388495199,1305.118632995513,1238.7133796532748,1194.0824279173123,1149.4514761813493,1104.820524445386,1060.1895727094236,1015.5586209734599,996.4609495656629,977.3632781578651,958.2656067500684,939.1679353422712,920.0702639344738,900.972592526677,881.8749211188799,862.777249711083,843.6795783032859,824.5819068954889,805.4842354876916,786.3865640798945,767.2888926720974,748.1912212643002,729.093549856503,709.995878448706,690.8982070409088,671.800535633112,652.7028642253147,633.6051928175173
-Commercial Battery Storage 2Hr/Moderate,1922.0774976746159,1784.3052466697948,1661.7211581562476,1590.9588066019369,1534.870631244971,1480.9705515857252,1430.7632692055745,1385.241677727837,1341.5083526689875,1324.7394982606259,1307.9706438522628,1291.2017894439014,1274.4329350355392,1257.664080627176,1240.8952262188138,1224.126371810452,1207.3575174020893,1190.5886629937274,1173.8198085853653,1157.0509541770023,1140.2820997686401,1123.513245360278,1106.744390951916,1089.975536543554,1073.2066821351916,1056.4378277268293,1039.668973318467,1022.900118910104,1006.131264501741
-Commercial Battery Storage 2Hr/Conservative,1922.0774976746159,1993.2655531440457,2007.5031642379317,1979.027942050159,1904.9923643619532,1830.956786673745,1756.921208985537,1682.8856312973307,1608.8500536091233,1604.2558218220865,1599.6615900350514,1595.0673582480151,1590.4731264609786,1585.8788946739428,1581.2846628869067,1576.6904310998698,1572.0961993128333,1567.501967525798,1562.9077357387614,1558.3135039517254,1553.7192721646893,1549.1250403776535,1544.5308085906167,1539.936576803581,1535.342345016545,1530.7481132295081,1526.1538814424725,1521.5596496554365,1516.9654178683984
-Commercial Battery Storage 4Hr/Advanced,2472.399301964785,1778.638702472434,1678.7951584174853,1593.3770094569081,1535.9674960259888,1478.5579825950692,1421.1484691641497,1363.7389557332308,1306.3294423023108,1281.7637993899336,1257.1981564775556,1232.6325135651787,1208.0668706528013,1183.5012277404235,1158.9355848280463,1134.3699419156692,1109.8042990032918,1085.2386560909144,1060.6730131785373,1036.1073702661597,1011.5417273537827,986.9760844414053,962.4104415290279,937.8447986166503,913.2791557042732,888.7135127918958,864.1478698795185,839.5822269671412,815.0165840547633
-Commercial Battery Storage 4Hr/Moderate,2472.399301964785,2286.611984057234,2118.019519475944,2025.5085423222329,1945.6112075829137,1869.9916930995296,1799.8105420250888,1736.2410526502772,1675.9230334466747,1654.973995528592,1634.024957610508,1613.075919692425,1592.126881774342,1571.1778438562578,1550.2288059381744,1529.2797680200918,1508.330730102008,1487.381692183925,1466.4326542658416,1445.4836163477578,1424.5345784296746,1403.5855405115913,1382.6365025935083,1361.687464675425,1340.7384267573416,1319.789388839258,1298.8403509211748,1277.8913130030908,1256.9422750850067
-Commercial Battery Storage 4Hr/Conservative,2472.399301964785,2563.969646481999,2582.2837153854416,2545.6555775785555,2450.4224192806537,2355.189260982751,2259.956102684848,2164.7229443869455,2069.4897860890424,2063.580151603921,2057.6705171188014,2051.7608826336805,2045.851248148559,2039.9416136634384,2034.0319791783184,2028.1223446931965,2022.2127102080756,2016.3030757229553,2010.393441237834,2004.4838067527135,1998.574172267593,1992.6645377824723,1986.7549032973513,1980.8452688122309,1974.9356343271102,1969.0259998419888,1963.1163653568683,1957.2067308717474,1951.2970963866248
-Commercial Battery Storage 6Hr/Advanced,3022.7211062549545,2174.5390164496694,2052.4716838394575,1948.0406392605416,1877.8525641346657,1807.6644890087898,1737.4764138829137,1667.2883387570378,1597.1002636311614,1567.0666492142043,1537.0330347972458,1506.9994203802887,1476.965805963331,1446.9321915463731,1416.8985771294158,1386.8649627124582,1356.8313482955007,1326.797733878543,1296.7641194615856,1266.7305050446282,1236.6968906276707,1206.6632762107129,1176.6296617937553,1146.5960473767977,1116.5624329598402,1086.5288185428826,1056.495204125925,1026.4615897089675,996.4279752920093
-Commercial Battery Storage 6Hr/Moderate,3022.7211062549545,2788.918721444673,2574.317880795641,2460.058278042529,2356.351783920856,2259.0128346133333,2168.857814844603,2087.2404275727176,2010.3377142243623,1985.2084927965584,1960.079271368753,1934.9500499409492,1909.820828513145,1884.6916070853395,1859.5623856575353,1834.4331642297313,1809.3039428019267,1784.1747213741226,1759.0454999463182,1733.916278518513,1708.7870570907087,1683.6578356629045,1658.5286142351006,1633.399392807296,1608.2701713794916,1583.1409499516867,1558.0117285238825,1532.8825070960775,1507.7532856682722
-Commercial Battery Storage 6Hr/Conservative,3022.7211062549545,3134.673739819952,3157.0642665329515,3112.2832131069517,2995.852474199355,2879.4217352917567,2762.990996384158,2646.5602574765603,2530.129518568962,2522.9044813857563,2515.679444202551,2508.454407019346,2501.22936983614,2494.004332652935,2486.7792954697297,2479.5542582865232,2472.329221103318,2465.104183920113,2457.8791467369074,2450.654109553702,2443.4290723704967,2436.204035187291,2428.9789980040855,2421.753960820881,2414.5289236376752,2407.303886454469,2400.078849271264,2392.8538120880585,2385.628774904851
-Commercial Battery Storage 8Hr/Advanced,3573.042910545124,2570.4393304269047,2426.1482092614297,2302.7042690641747,2219.7376322433424,2136.7709954225097,2053.8043586016774,1970.8377217808447,1887.8710849600122,1852.369499038475,1816.867913116936,1781.3663271953985,1745.8647412738608,1710.3631553523228,1674.8615694307853,1639.3599835092475,1603.8583975877098,1568.356811666172,1532.855225744634,1497.3536398230965,1461.8520539015585,1426.350467980021,1390.8488820584828,1355.3472961369453,1319.8457102154073,1284.3441242938695,1248.8425383723318,1213.3409524507938,1177.8393665292554
-Commercial Battery Storage 8Hr/Moderate,3573.042910545124,3291.2254588321116,3030.616242115337,2894.6080137628246,2767.092360258799,2648.0339761271375,2537.905087664117,2438.2398024951576,2344.7523950020495,2315.4429900645246,2286.1335851269982,2256.8241801894733,2227.514775251948,2198.2053703144215,2168.895965376896,2139.586560439371,2110.2771555018458,2080.9677505643203,2051.658345626795,2022.3489406892688,1993.0395357517432,1963.7301308142175,1934.4207258766928,1905.111320939167,1875.8019160016413,1846.4925110641161,1817.1831061265905,1787.8737011890641,1758.5642962515374
-Commercial Battery Storage 8Hr/Conservative,3573.042910545124,3705.377833157905,3731.8448176804613,3678.910848635348,3541.2825291180557,3403.6542096007624,3266.0258900834683,3128.397570566175,2990.7692510488814,2982.2288111675907,2973.6883712863014,2965.147931405011,2956.6074915237205,2948.0670516424307,2939.5266117611413,2930.98617187985,2922.44573199856,2913.9052921172706,2905.36485223598,2896.82441235469,2888.2839724734004,2879.74353259211,2871.2030927108203,2862.66265282953,2854.1222129482408,2845.5817730669496,2837.04133318566,2828.500893304369,2819.9604534230775
+Commercial Battery Storage 1Hr/Advanced,1397.1792374382012,1618.0392442396117,1112.6432419456798,934.1682087029318,900.510046192762,866.8518836825924,833.1937211724224,799.5355586622528,765.8773961520828,751.47500268281,737.0726092135374,722.6702157442647,708.267822274992,693.8654288057191,679.4630353364465,665.0606418671738,650.6582483979013,636.2558549286285,621.853461459356,607.4510679900833,593.0486745208104,578.6462810515378,564.2438875822651,549.8414941129925,535.4391006437198,521.036707174447,506.6343137051744,492.2319202359017,477.8295267666288
+Commercial Battery Storage 1Hr/Moderate,1397.1792374382012,1618.0392442396117,1256.6306501998229,1203.5573672936573,1162.9642150808975,1123.6483982977559,1086.9559370842417,1053.6740985845277,1021.5005936799113,1008.7318362589127,995.9630788379138,983.1943214169153,970.4255639959163,957.6568065749171,944.8880491539182,932.1192917329197,919.3505343119205,906.5817768909218,893.8130194699231,881.0442620489242,868.2755046279253,855.5067472069263,842.7379897859277,829.9692323649288,817.2004749439301,804.4317175229313,791.6629601019323,778.8942026809332,766.1254452599337
+Commercial Battery Storage 1Hr/Conservative,1397.1792374382012,1618.0392442396117,1513.9463783192034,1492.471961605456,1436.6384781497127,1380.8049946939689,1324.971511238225,1269.138027782482,1213.304544326738,1209.8398321912614,1206.3751200557851,1202.9104079203091,1199.4456957848327,1195.980983649356,1192.51627151388,1189.0515593784035,1185.5868472429272,1182.122135107451,1178.6574229719743,1175.1927108364982,1171.7279987010215,1168.2632865655453,1164.798574430069,1161.3338622945926,1157.8691501591165,1154.4044380236398,1150.9397258881634,1147.4750137526873,1144.0103016172095
+Commercial Battery Storage 2Hr/Advanced,1672.340139583286,1956.770588760248,1364.6325991466642,1118.1435786298885,1077.8567674018739,1037.5699561738595,997.2831449458447,956.9963337178301,916.7095224898153,899.47071728906,882.2319120883046,864.9931068875494,847.7543016867943,830.5154964860387,813.2766912852836,796.0378860845285,778.7990808837733,761.5602756830181,744.321470482263,727.0826652815076,709.8438600807524,692.6050548799973,675.366249679242,658.1274444784867,640.8886392777315,623.6498340769763,606.411028876221,589.1722236754658,571.9334184747104
+Commercial Battery Storage 2Hr/Moderate,1672.340139583286,1956.770588760248,1493.3272065039885,1428.972215794099,1376.0284909910695,1325.446108593101,1278.3925627543063,1235.7487022906928,1194.9721860141583,1180.035033688982,1165.0978813638046,1150.160729038628,1135.223576713451,1120.2864243882736,1105.3492720630968,1090.41211973792,1075.474967412743,1060.5378150875663,1045.6006627623894,1030.6635104372124,1015.7263581120354,1000.7892057868584,985.8520534616815,970.9149011365046,955.9777488113277,941.0405964861509,926.103444160974,911.1662918357968,896.229139510619
+Commercial Battery Storage 2Hr/Conservative,1672.340139583286,1956.770588760248,1812.103436551341,1786.3998417066416,1719.5704951104221,1652.7411485142025,1585.911801917983,1519.082455321763,1452.2531087255436,1448.1060551328471,1443.9590015401516,1439.8119479474556,1435.664894354759,1431.5178407620629,1427.3707871693673,1423.2237335766706,1419.076679983975,1414.929626391279,1410.7825727985828,1406.635519205887,1402.4884656131906,1398.3414120204945,1394.1943584277988,1390.0473048351025,1385.9002512424067,1381.7531976497103,1377.6061440570145,1373.4590904643183,1369.312036871621
+Commercial Battery Storage 4Hr/Advanced,2222.661943873455,2634.2332778015207,1868.6113135486326,1486.0943184838018,1432.550209820098,1379.0061011563932,1325.4619924926892,1271.9178838289845,1218.3737751652802,1195.4621465015598,1172.5505178378394,1149.638889174119,1126.7272605103985,1103.8156318466781,1080.904003182958,1057.9923745192377,1035.0807458555175,1012.1691171917971,989.2574885280768,966.3458598643567,943.4342312006363,920.5226025369161,897.6109738731956,874.6993452094754,851.787716545755,828.8760878820349,805.9644592183145,783.0528305545942,760.1412018908735
+Commercial Battery Storage 4Hr/Moderate,2222.661943873455,2634.2332778015207,1966.7203191123194,1879.8019127949822,1802.157042811414,1729.041529183791,1661.2658140944363,1599.8979097030226,1541.9153706826526,1522.6414285491198,1503.3674864155864,1484.0935442820532,1464.8196021485205,1445.5456600149869,1426.271717881454,1406.9977757479212,1387.7238336143878,1368.4498914808546,1349.1759493473214,1329.9020072137887,1310.6280650802557,1291.354122946722,1272.0801808131891,1252.8062386796564,1233.532296546123,1214.25835441259,1194.984412279057,1175.7104701455237,1156.4365280119896
+Commercial Battery Storage 4Hr/Conservative,2222.661943873455,2634.2332778015207,2408.4175530156162,2374.2556019090125,2285.434529031841,2196.6134561546696,2107.792383277498,2018.9713104003258,1930.1502375231548,1924.6385010160188,1919.1267645088838,1913.6150280017478,1908.1032914946124,1902.5915549874767,1897.0798184803418,1891.5680819732058,1886.0563454660708,1880.5446089589354,1875.0328724518,1869.5211359446644,1864.0093994375288,1858.497662930393,1852.985926423258,1847.4741899161224,1841.9624534089874,1836.4507169018511,1830.938980394716,1825.4272438875805,1819.9155073804436
+Commercial Battery Storage 6Hr/Advanced,2772.9837481636246,3311.695966842793,2372.5900279506004,1854.045058337715,1787.2436522383214,1720.4422461389272,1653.6408400395333,1586.8394339401389,1520.0380278407454,1491.4535757140595,1462.869123587374,1434.2846714606887,1405.7002193340031,1377.1157672073177,1348.531315080632,1319.9468629539472,1291.3624108272613,1262.7779587005762,1234.1935065738905,1205.6090544472058,1177.0246023205202,1148.4401501938348,1119.8556980671492,1091.271245940464,1062.6867938137784,1034.1023416870933,1005.5178895604078,976.9334374337226,948.3489853070366
+Commercial Battery Storage 6Hr/Moderate,2772.9837481636246,3311.695966842793,2440.11343172065,2330.631609795866,2228.2855946317577,2132.6369497744813,2044.1390654345664,1964.0471171153529,1888.8585553511466,1865.2478234092578,1841.637091467368,1818.0263595254787,1794.4156275835896,1770.8048956417,1747.194163699811,1723.5834317579222,1699.9726998160327,1676.3619678741431,1652.751235932254,1629.1405039903648,1605.5297720484757,1581.919040106586,1558.3083081646973,1534.6975762228078,1511.0868442809183,1487.4761123390292,1463.8653803971401,1440.2546484552508,1416.64391651336
+Commercial Battery Storage 6Hr/Conservative,2772.9837481636246,3311.695966842793,3004.7316694798915,2962.1113621113836,2851.29856295326,2740.485763795137,2629.672964637013,2518.8601654788886,2408.0473663207654,2401.1709468991903,2394.2945274776157,2387.4181080560406,2380.541688634466,2373.6652692128905,2366.7888497913164,2359.9124303697413,2353.0360109481667,2346.159591526592,2339.283172105017,2332.4067526834415,2325.530333261867,2318.653913840292,2311.7774944187177,2304.9010749971426,2298.0246555755675,2291.1482361539925,2284.271816732418,2277.395397310843,2270.5189778892664
+Commercial Battery Storage 8Hr/Advanced,3323.305552453793,3989.158655884065,2876.56874235257,2221.9957981916286,2141.9370946565455,2061.878391121461,1981.8196875863775,1901.7609840512932,1821.70228051621,1787.4450049265595,1753.1877293369087,1718.9304537472578,1684.6731781576075,1650.4159025679573,1616.1586269783065,1581.9013513886564,1547.6440757990053,1513.3868002093552,1479.1295246197046,1444.8722490300545,1410.6149734404041,1376.3576978507535,1342.100422261103,1307.8431466714526,1273.5858710818018,1239.3285954921519,1205.0713199025013,1170.8140443128507,1136.5567687231996
+Commercial Battery Storage 8Hr/Moderate,3323.305552453793,3989.158655884065,2913.5065443289814,2781.4613067967493,2654.4141464521017,2536.2323703651714,2427.0123167746965,2328.196324527683,2235.8017400196404,2207.854218269396,2179.90669651915,2151.9591747689046,2124.0116530186588,2096.0641312684133,2068.116609518168,2040.1690877679232,2012.2215660176773,1984.2740442674317,1956.3265225171863,1928.379000766941,1900.4314790166957,1872.48395726645,1844.536435516205,1816.5889137659592,1788.6413920157138,1760.6938702654681,1732.7463485152236,1704.7988267649778,1676.8513050147305
+Commercial Battery Storage 8Hr/Conservative,3323.305552453793,3989.158655884065,3601.0457859441667,3549.9671223137548,3417.1625968746785,3284.358071435604,3151.553545996528,3018.749020557452,2885.944495118377,2877.703392782362,2869.462290446348,2861.221188110333,2852.980085774319,2844.7389834383043,2836.4978811022906,2828.2567787662765,2820.0156764302624,2811.7745740942482,2803.5334717582336,2795.292369422219,2787.0512670862054,2778.810164750191,2770.569062414177,2762.3279600781616,2754.086857742149,2745.845755406134,2737.6046530701196,2729.3635507341055,2721.1224483980895
diff --git a/tests/data/Commercial_Battery_Storage/R&D/30/df_capex.csv b/tests/data/Commercial_Battery_Storage/R&D/30/df_capex.csv
index 06d3842..99a1130 100644
--- a/tests/data/Commercial_Battery_Storage/R&D/30/df_capex.csv
+++ b/tests/data/Commercial_Battery_Storage/R&D/30/df_capex.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1708.6543909919249,1229.202267834563,1160.201233161033,1101.1694678729955,1061.4942353446183,1021.8190028162413,982.1437702878638,942.4685377594872,902.7933052311091,885.8161957502836,868.8390862694572,851.8619767886321,834.8848673078062,817.9077578269802,800.9306483461546,783.953538865329,766.9764293845036,749.9993199036779,733.0222104228524,716.0451009420265,699.0679914612008,682.090881980375,665.1137724995492,648.1366630187232,631.1595535378978,614.1824440570718,597.2053345762464,580.2282250954207,563.2511156145947
-Commercial Battery Storage 1Hr/Moderate,1708.6543909919249,1590.624987004306,1487.3121448901431,1425.1790892978179,1379.3391876603653,1334.6853757167942,1292.9572915743656,1255.0914656195782,1218.3219152841134,1203.0928913430623,1187.8638674020106,1172.63484346096,1157.4058195199086,1142.1767955788566,1126.947771637805,1111.7187476967542,1096.4897237557022,1081.2606998146514,1066.0316758736005,1050.8026519325483,1035.573627991497,1020.3446040504459,1005.1155801093947,989.8865561683439,974.6575322272922,959.4285082862408,944.1994843451894,928.9704604041373,913.7414364630855
-Commercial Battery Storage 1Hr/Conservative,1708.6543909919249,1771.9378869545883,1784.5945861471214,1759.2811877620552,1693.466351960886,1627.651516159715,1561.8366803585438,1496.0218445573746,1430.207008756204,1426.1229100007417,1422.0388112452806,1417.954712489819,1413.8706137343568,1409.7865149788954,1405.7024162234334,1401.6183174679713,1397.5342187125088,1393.450119957048,1389.3660212015861,1385.2819224461239,1381.1978236906623,1377.1137249352007,1373.029626179739,1368.945527424277,1364.8614286688157,1360.777329913353,1356.693231157892,1352.6091324024303,1348.5250336469667
-Commercial Battery Storage 2Hr/Advanced,1994.1302219816112,1434.5729622912497,1354.043482885758,1285.1489025432334,1238.8448748439548,1192.5408471446756,1146.2368194453961,1099.9327917461178,1053.628764046838,1033.8151801669806,1014.0015962871227,994.1880124072657,974.3744285274082,954.5608446475507,934.7472607676935,914.9336768878362,895.120093007979,875.3065091281218,855.4929252482646,835.679341368407,815.8657574885497,796.0521736086923,776.2385897288349,756.4250058489774,736.6114219691202,716.7978380892628,696.9842542094057,677.1706703295481,657.3570864496904
-Commercial Battery Storage 2Hr/Moderate,1994.1302219816112,1851.1933165698713,1724.0139307570337,1650.5989181034563,1592.4081710027563,1536.487544521381,1484.3981468363497,1437.1700920735836,1391.7973402916673,1374.3998735380221,1357.0024067843756,1339.6049400307306,1322.207473277085,1304.8100065234382,1287.4125397697926,1270.0150730161472,1252.617606262501,1235.2201395088557,1217.82267275521,1200.4252060015635,1183.027739247918,1165.6302724942723,1148.2328057406269,1130.8353389869812,1113.4378722333354,1096.0404054796895,1078.6429387260437,1061.2454719723974,1043.8480052187508
-Commercial Battery Storage 2Hr/Conservative,1994.1302219816112,2067.986896869819,2082.75823184746,2053.2155618921765,1976.4046200084417,1899.5936781247049,1822.7827362409682,1745.9717943572332,1669.160852473497,1664.3943971851945,1659.6279418968936,1654.8614866085916,1650.095031320289,1645.3285760319875,1640.5621207436857,1635.795665455383,1631.0292101670807,1626.2627548787793,1621.496299590477,1616.7298443021753,1611.9633890138734,1607.1969337255719,1602.4304784372691,1597.6640231489675,1592.897567860666,1588.1311125723632,1583.3646572840619,1578.5982019957598,1573.831746707456
-Commercial Battery Storage 4Hr/Advanced,2565.0818839609838,1845.3143512046233,1741.7279823352078,1653.1077718837093,1593.5461538426268,1533.9845358015439,1474.422917760461,1414.8612997193786,1355.2996816782952,1329.8131490003748,1304.3266163224534,1278.8400836445333,1253.3535509666126,1227.8670182886915,1202.380485610771,1176.8939529328507,1151.40742025493,1125.9208875770094,1100.434354899089,1074.947822221168,1049.4612895432476,1023.974756865327,998.4882241874063,973.0016915094855,947.515158831565,922.0286261536444,896.5420934757237,871.0555607978032,845.5690281198819
-Commercial Battery Storage 4Hr/Moderate,2565.0818839609838,2372.3299757010022,2197.417502490815,2101.4385757147334,2018.5461376875394,1940.0918821305554,1867.2798573603184,1801.327344981595,1738.7481903067749,1717.0138379279408,1695.2794855491056,1673.5451331702714,1651.8107807914373,1630.0764284126017,1608.342076033767,1586.6077236549331,1564.873371276098,1543.139018897264,1521.4046665184292,1499.6703141395942,1477.9359617607597,1456.2016093819252,1434.467257003091,1412.7329046242564,1390.9985522454217,1369.264199866587,1347.5298474877525,1325.795495108917,1304.0611427300819
-Commercial Battery Storage 4Hr/Conservative,2565.0818839609838,2660.0849167002793,2679.085523248138,2641.084310152419,2542.281156103553,2443.4780020546855,2344.6748480058177,2245.871693956951,2147.068539908083,2140.9373715541,2134.806203200119,2128.6750348461364,2122.5438664921535,2116.4126981381714,2110.28152978419,2104.1503614302064,2098.019193076224,2091.8880247222423,2085.7568563682594,2079.6256880142773,2073.4945196602953,2067.3633513063132,2061.2321829523307,2055.1010145983487,2048.969846244366,2042.8386778903835,2036.7075095364014,2030.5763411824191,2024.4451728284348
-Commercial Battery Storage 6Hr/Advanced,3136.033545940357,2256.055740117997,2129.4124817846578,2021.0666412241858,1948.2474328412993,1875.4282244584126,1802.609016075526,1729.7898076926394,1656.9705993097525,1625.811117833769,1594.6516363577841,1563.4921548818006,1532.3326734058166,1501.1731919298325,1470.0137104538487,1438.8542289778648,1407.694747501881,1376.535266025897,1345.375784549913,1314.2163030739293,1283.0568215979456,1251.8973401219614,1220.7378586459774,1189.5783771699935,1158.4188956940097,1127.2594142180258,1096.0999327420418,1064.9404512660578,1033.7809697900732
-Commercial Battery Storage 6Hr/Moderate,3136.033545940357,2893.4666348321325,2670.821074224597,2552.2782333260106,2444.684104372322,2343.696219739729,2250.161567884287,2165.4845978896064,2085.699040321883,2059.6278023178597,2033.5565643138357,2007.4853263098128,1981.4140883057896,1955.3428503017649,1929.2716122977417,1903.2003742937188,1877.1291362896952,1851.057898285672,1824.9866602816487,1798.9154222776247,1772.844184273601,1746.772946269578,1720.701708265555,1694.6304702615314,1668.559232257508,1642.4879942534842,1616.416756249461,1590.345518245437,1564.2742802414125
-Commercial Battery Storage 6Hr/Conservative,3136.033545940357,3252.1829365307394,3275.412814648816,3228.9530584126624,3108.157692198665,2987.362325984666,2866.5669597706665,2745.771593556668,2624.976227342669,2617.480345923006,2609.984464503344,2602.4885830836815,2594.992701664018,2587.496820244356,2580.0009388246935,2572.5050574050297,2565.0091759853676,2557.513294565705,2550.017413146042,2542.5215317263796,2535.025650306717,2527.529768887054,2520.0338874673917,2512.5380060477296,2505.0421246280666,2497.5462432084037,2490.050361788741,2482.554480369078,2475.058598949414
-Commercial Battery Storage 8Hr/Advanced,3706.98520791973,2666.7971290313712,2517.0969812341077,2389.0255105646615,2302.9487118399716,2216.8719131152807,2130.7951143905907,2044.7183156659,1958.6415169412098,1921.809086667163,1884.9766563931148,1848.1442261190678,1811.3117958450207,1774.4793655709734,1737.6469352969264,1700.8145050228793,1663.982074748832,1627.149644474785,1590.3172142007375,1553.4847839266906,1516.6523536526431,1479.8199233785963,1442.9874931045488,1406.1550628305017,1369.3226325564544,1332.4902022824072,1295.65777200836,1258.8253417343126,1221.9929114602648
-Commercial Battery Storage 8Hr/Moderate,3706.98520791973,3414.603293963263,3144.2246459583776,3003.1178909372875,2870.8220710571054,2747.300557348903,2633.0432784082554,2529.6418507976173,2432.6498903369907,2402.241766707779,2371.8336430785657,2341.425519449354,2311.0173958201417,2280.6092721909286,2250.2011485617163,2219.793024932505,2189.3849013032927,2158.9767776740805,2128.5686540448683,2098.1605304156556,2067.752406786443,2037.3442831572306,2006.936159528019,1976.5280358988066,1946.1199122695941,1915.711788640382,1885.3036650111699,1854.8955413819567,1824.487417752743
-Commercial Battery Storage 8Hr/Conservative,3706.98520791973,3844.2809563612,3871.740106049494,3816.821806672905,3674.0342282937763,3531.2466499146462,3388.4590715355152,3245.6714931563856,3102.883914777255,3094.0233202919117,3085.162725806569,3076.302131321226,3067.4415368358823,3058.5809423505398,3049.7203478651977,3040.8597533798534,3031.9991588945104,3023.138564409168,3014.2779699238245,3005.4173754384815,2996.556780953139,2987.696186467796,2978.835591982453,2969.97499749711,2961.1144030117675,2952.2538085264237,2943.3932140410807,2934.5326195557373,2925.6720250703925
+Commercial Battery Storage 1Hr/Advanced,1449.5551538746543,1678.6945173616073,1154.3527863636048,969.1872776423813,934.2673750062493,899.3474723701173,864.427569733985,829.5076670978531,794.5877644617208,779.6454699284909,764.7031753952613,749.7608808620316,734.8185863288019,719.8762917955719,704.9339972623422,689.9917027291125,675.049408195883,660.1071136626532,645.1648191294237,630.2225245961939,615.280230062964,600.3379355297344,585.3956409965047,570.453346463275,555.5110519300454,540.5687573968155,525.626462863586,510.6841683303562,495.7418737971263
+Commercial Battery Storage 1Hr/Moderate,1449.5551538746543,1678.6945173616073,1303.7378359944178,1248.67500031219,1206.5601367175132,1165.7704918962165,1127.702544108846,1093.1730727032002,1059.7934828817756,1046.5460643457536,1033.2986458097316,1020.0512272737096,1006.8038087376874,993.556390201665,980.3089716656427,967.0615531296208,953.8141345935983,940.5667160575764,927.3192975215544,914.0718789855322,900.82446044951,887.5770419134877,874.3296233774657,861.0822048414435,847.8347863054215,834.5873677693995,821.3399492333772,808.0925306973547,794.8451121613319
+Commercial Battery Storage 1Hr/Conservative,1449.5551538746543,1678.6945173616073,1570.6995327287318,1548.4201067325798,1490.4935991425843,1432.5670915525884,1374.6405839625925,1316.7140763725972,1258.7875687826013,1255.192975334533,1251.5983818864654,1248.0037884383978,1244.4091949903298,1240.8146015422617,1237.220008094194,1233.625414646126,1230.0308211980584,1226.4362277499906,1222.8416343019223,1219.247040853855,1215.6524474057867,1212.0578539577189,1208.4632605096513,1204.8686670615832,1201.2740736135156,1197.6794801654476,1194.0848867173795,1190.490293269312,1186.8956998212425
+Commercial Battery Storage 2Hr/Advanced,1735.0309848643408,2030.1238494557992,1415.7884430528595,1160.0593136115042,1118.2622747750129,1076.4652359385218,1034.6681971020303,992.871158265539,951.0741194290474,933.1890848852948,915.3040503415423,897.4190157977898,879.5339812540375,861.6489467102847,843.7639121665324,825.87887762278,807.9938430790276,790.1088085352751,772.2237739915228,754.3387394477702,736.4537049040177,718.5686703602654,700.6836358165128,682.7986012727605,664.913566729008,647.0285321852556,629.1434976415031,611.2584630977507,593.373428553998
+Commercial Battery Storage 2Hr/Moderate,1735.0309848643408,2030.1238494557992,1549.3074121099241,1482.539952387204,1427.611531539591,1375.1329725003989,1326.315535158743,1282.0730886209008,1239.767987212379,1224.270887372225,1208.7737875320697,1193.2766876919154,1177.7795878517607,1162.2824880116057,1146.785388171451,1131.2882883312964,1115.7911884911416,1100.294088650987,1084.7969888108325,1069.2998889706778,1053.802789130523,1038.3056892903683,1022.8085894502136,1007.311489610059,991.8143897699043,976.3172899297498,960.8201900895951,945.32309024944,929.8259904092845
+Commercial Battery Storage 2Hr/Conservative,1735.0309848643408,2030.1238494557992,1880.0335743774986,1853.3664314785274,1784.0318599412014,1714.697288403875,1645.3627168665491,1576.0281453292228,1506.6935737918968,1502.3910600215736,1498.0885462512513,1493.7860324809285,1489.4835187106053,1485.1810049402823,1480.87849116996,1476.5759773996365,1472.2734636293142,1467.9709498589914,1463.6684360886686,1459.365922318346,1455.0634085480228,1450.7608947777,1446.4583810073775,1442.1558672370545,1437.853353466732,1433.5508396964087,1429.2483259260862,1424.9458121557632,1420.6432983854393
+Commercial Battery Storage 4Hr/Advanced,2305.9826468437136,2732.982513644183,1938.6597564313684,1541.8033855497501,1486.2520743125408,1430.7007630753303,1375.1494518381207,1319.5981406009105,1264.0468293637007,1240.2763147989026,1216.5058002341045,1192.7352856693064,1168.9647711045084,1145.1942565397103,1121.4237419749124,1097.6532274101148,1073.882712845317,1050.112198280519,1026.3416837157208,1002.5711691509232,978.8006545861251,955.0301400213274,931.2596254565292,907.4891108917313,883.7185963269334,859.9480817621356,836.1775671973376,812.4070526325396,788.6365380677414
+Commercial Battery Storage 4Hr/Moderate,2305.9826468437136,2732.982513644183,2040.4465643409367,1950.269856537232,1869.7143211837465,1793.8579337087638,1723.5415172585374,1659.8731204563014,1599.716995873586,1579.7205334251666,1559.7240709767466,1539.7276085283268,1519.7311460799074,1499.734683631487,1479.7382211830675,1459.741758734648,1439.745296286228,1419.7488338378082,1399.7523713893884,1379.755908940969,1359.7594464925494,1339.7629840441289,1319.7665215957093,1299.7700591472899,1279.7735966988698,1259.7771342504502,1239.7806718020306,1219.7842093536105,1199.7877469051898
+Commercial Battery Storage 4Hr/Conservative,2305.9826468437136,2732.982513644183,2498.7016576750316,2463.259080970422,2371.1083815384354,2278.9576821064484,2186.806982674462,2094.6562832424743,2002.505583810488,1996.7872293956545,1991.0688749808223,1985.350520565989,1979.6321661511565,1973.9138117363236,1968.1954573214914,1962.4771029066583,1956.758748491826,1951.0403940769934,1945.3220396621607,1939.603685247328,1933.8853308324951,1928.1669764176622,1922.44862200283,1916.730267587997,1911.0119131731649,1905.2935587583313,1899.575204343499,1893.8568499286664,1888.1384955138321
+Commercial Battery Storage 6Hr/Advanced,2876.9343088230867,3435.841177832567,2461.5310698098765,1923.547457487996,1854.2418738500678,1784.9362902121393,1715.6307065742108,1646.325122936282,1577.0195392983542,1547.3635447125102,1517.7075501266665,1488.0515555408233,1458.3955609549796,1428.7395663691364,1399.0835717832927,1369.4275771974496,1339.7715826116057,1310.1155880257627,1280.459593439919,1250.8035988540762,1221.1476042682325,1191.4916096823893,1161.8356150965456,1132.1796205107023,1102.5236259248586,1072.8676313390156,1043.211636753172,1013.5556421673288,983.8996475814847
+Commercial Battery Storage 6Hr/Moderate,2876.9343088230867,3435.841177832567,2531.585716571949,2417.9997606872607,2311.8171108279016,2212.5828949171287,2120.767499358332,2037.6731522917025,1959.666004534793,1935.1701794781086,1910.6743544214232,1886.1785293647383,1861.6827043080536,1837.1868792513685,1812.6910541946838,1788.1952291379996,1763.6994040813145,1739.2035790246293,1714.7077539679447,1690.2119289112597,1665.716103854575,1641.2202787978897,1616.7244537412057,1592.2286286845206,1567.7328036278354,1543.2369785711508,1518.741153514466,1494.2453284577812,1469.7495034010947
+Commercial Battery Storage 6Hr/Conservative,2876.9343088230867,3435.841177832567,3117.369740972565,3073.151730462317,2958.184903135669,2843.218075809022,2728.251248482374,2613.2844211557253,2498.3175938290783,2491.1833987697355,2484.049203710393,2476.9150086510504,2469.780813591708,2462.6466185323648,2455.512423473023,2448.37822841368,2441.244033354338,2434.109838294996,2426.975643235653,2419.8414481763098,2412.7072531169674,2405.5730580576246,2398.4388629982827,2391.30466793894,2384.170472879597,2377.0362778202543,2369.902082760912,2362.7678877015696,2355.6336926422255
+Commercial Battery Storage 8Hr/Advanced,3447.8859708024584,4138.69984202095,2984.402383188387,2305.291529426242,2222.2316733875955,2139.171817348948,2056.111961310301,1973.0521052716535,1889.992249233007,1854.4507746261181,1818.9093000192288,1783.3678254123395,1747.8263508054508,1712.2848761985622,1676.7434015916729,1641.2019269847844,1605.660452377895,1570.1189777710063,1534.5775031641174,1499.0360285572287,1463.4945539503399,1427.953079343451,1392.411604736562,1356.870130129673,1321.328655522784,1285.7871809158955,1250.2457063090064,1214.7042317021176,1179.162757095228
+Commercial Battery Storage 8Hr/Moderate,3447.8859708024584,4138.69984202095,3022.7248688029617,2885.729664837289,2753.9199004720567,2631.307856125494,2517.9934814581266,2415.473184127103,2319.6150131959994,2290.6198255310505,2261.6246378661003,2232.6294502011506,2203.6342625362,2174.63907487125,2145.6438872063004,2116.648699541351,2087.6535118764004,2058.6583242114507,2029.6631365465005,2000.667948881551,1971.672761216601,1942.6775735516508,1913.6823858867015,1884.687198221751,1855.6920105568013,1826.696822891851,1797.701635226902,1768.7064475619518,1739.711259897
+Commercial Battery Storage 8Hr/Conservative,3447.8859708024584,4138.69984202095,3736.037824270098,3683.044379954212,3545.261424732903,3407.4784695115954,3269.6955142902866,3131.9125590689773,2994.1296038476694,2985.5795681438162,2977.0295324399644,2968.4794967361113,2959.929461032259,2951.379425328406,2942.829389624554,2934.279353920702,2925.7293182168496,2917.1792825129974,2908.6292468091447,2900.079211105292,2891.52917540144,2882.9791396975875,2874.429103993735,2865.8790682898816,2857.3290325860307,2848.7789968821776,2840.2289611783253,2831.678925474473,2823.128889770619
diff --git a/tests/data/Commercial_Battery_Storage/R&D/30/df_fom.csv b/tests/data/Commercial_Battery_Storage/R&D/30/df_fom.csv
index 97d9ec5..16afd60 100644
--- a/tests/data/Commercial_Battery_Storage/R&D/30/df_fom.csv
+++ b/tests/data/Commercial_Battery_Storage/R&D/30/df_fom.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,41.17291488823829,29.61970578766454,27.957009257113175,26.534539118786462,25.578497346574345,24.62245557436223,23.666413802150103,22.710372029938,21.75433025772586,21.34523811633819,20.9361459749505,20.52705383356284,20.117961692175157,19.708869550787476,19.299777409399805,18.89068526801213,18.481593126624464,18.07250098523679,17.66340884384912,17.254316702461438,16.845224561073763,16.436132419686086,16.02704027829841,15.61794813691073,15.208855995523061,14.799763854135382,14.390671712747713,13.981579571360038,13.572487429972355
-Commercial Battery Storage 1Hr/Moderate,41.17291488823829,38.328796949401884,35.839299437409984,34.34209846854473,33.237508576900005,32.161499520720575,31.155990819895443,30.243549756665427,29.3575253070036,28.990556240666066,28.62358717432851,28.256618107990985,27.889649041653442,27.52267997531588,27.155710908978335,26.788741842640803,26.421772776303243,26.05480370996571,25.68783464362818,25.32086557729062,24.953896510953076,24.58692744461554,24.219958378277997,23.852989311940465,23.486020245602916,23.11905117926537,22.752082112927823,22.385113046590263,22.01814398025271
-Commercial Battery Storage 1Hr/Conservative,41.17291488823829,42.69783766187673,43.00282221660443,42.39285310714903,40.806933422565066,39.22101373798106,37.635094053397054,36.049174368813084,34.46325468422909,34.36484142327924,34.266428162329404,34.16801490137956,34.0696016404297,33.97118837947987,33.87277511853002,33.77436185758017,33.675948596630306,33.57753533568048,33.47912207473063,33.38070881378078,33.28229555283093,33.1838822918811,33.08546903093124,32.9870557699814,32.88864250903156,32.7902292480817,32.69181598713187,32.59340272618203,32.49498946523214
-Commercial Battery Storage 2Hr/Advanced,48.0519374418654,34.568459712379976,32.62796582488783,30.96783449133187,29.85206069793281,28.736286904533735,27.62051311113465,26.50473931773559,25.3889655243365,24.911523739141572,24.43408195394663,23.95664016875171,23.47919838355678,23.001756598361847,22.524314813166924,22.046873027971998,21.569431242777075,21.091989457582148,20.614547672387225,20.13710588719229,19.659664101997365,19.182222316802434,18.704780531607508,18.227338746412578,17.74989696121765,17.27245517602272,16.7950133908278,16.317571605632867,15.840129820437932
-Commercial Battery Storage 2Hr/Moderate,48.0519374418654,44.60763116674487,41.543028953906195,39.773970165048425,38.37176578112428,37.02426378964313,35.76908173013936,34.631041943195925,33.53770881672469,33.118487456515645,32.69926609630657,32.28004473609754,31.860823375888483,31.4416020156794,31.022380655470347,30.6031592952613,30.183937935052235,29.764716574843188,29.345495214634134,28.92627385442506,28.507052494216005,28.08783113400695,27.668609773797904,27.24938841358885,26.830167053379792,26.41094569317073,25.991724332961674,25.572502972752602,25.153281612543527
-Commercial Battery Storage 2Hr/Conservative,48.0519374418654,49.83163882860114,50.187579105948295,49.47569855125398,47.62480910904883,45.773919666843625,43.92303022463843,42.07214078243327,40.221251340228086,40.10639554555217,39.991539750876285,39.87668395620038,39.76182816152447,39.64697236684857,39.53211657217267,39.41726077749675,39.30240498282083,39.18754918814495,39.07269339346904,38.957837598793134,38.84298180411724,38.72812600944134,38.61327021476542,38.498414420089524,38.38355862541363,38.2687028307377,38.15384703606181,38.038991241385915,37.92413544670996
-Commercial Battery Storage 4Hr/Advanced,61.80998254911963,44.46596756181086,41.969878960437136,39.8344252364227,38.39918740064972,36.963949564876735,35.52871172910374,34.093473893330774,32.65823605755777,32.04409498474834,31.42995391193889,30.815812839129467,30.201671766320032,29.587530693510587,28.97338962070116,28.35924854789173,27.745107475082296,27.13096640227286,26.516825329463433,25.902684256653995,25.288543183844567,24.674402111035135,24.0602610382257,23.44611996541626,22.83197889260683,22.217837819797396,21.603696746987964,20.989555674178533,20.375414601369084
-Commercial Battery Storage 4Hr/Moderate,61.80998254911963,57.16529960143086,52.9504879868986,50.63771355805582,48.64028018957285,46.749792327488244,44.99526355062722,43.406026316256934,41.89807583616687,41.3743498882148,40.8506239402627,40.32689799231063,39.803172044358554,39.279446096406446,38.755720148454365,38.23199420050229,37.7082682525502,37.184542304598125,36.660816356646045,36.13709040869394,35.61336446074187,35.08963851278978,34.56591256483771,34.04218661688562,33.51846066893354,32.99473472098145,32.471008773029375,31.94728282507727,31.42355687712517
-Commercial Battery Storage 4Hr/Conservative,61.80998254911963,64.09924116204998,64.55709288463605,63.64138943946389,61.260560482016345,58.879731524568776,56.4989025671212,54.118073609673644,51.73724465222606,51.58950379009803,51.44176292797004,51.294022065842015,51.14628120371398,50.998540341585965,50.85079947945796,50.703058617329916,50.55531775520189,50.40757689307389,50.25983603094585,50.11209516881784,49.96435430668983,49.81661344456181,49.668872582433785,49.521131720305775,49.37339085817776,49.225649996049725,49.07790913392171,48.93016827179369,48.78242740966562
-Commercial Battery Storage 6Hr/Advanced,75.56802765637387,54.36347541124174,51.31179209598644,48.70101598151354,46.946314103366646,45.19161222521975,43.436910347072846,41.68220846892595,39.92750659077904,39.17666623035511,38.425825869931145,37.674985509507216,36.92414514908327,36.17330478865933,35.42246442823539,34.67162406781146,33.92078370738752,33.16994334696358,32.41910298653964,31.668262626115705,30.91742226569177,30.166581905267822,29.415741544843883,28.664901184419946,27.914060823996007,27.163220463572067,26.412380103148127,25.661539742724187,24.910699382300233
-Commercial Battery Storage 6Hr/Moderate,75.56802765637387,69.72296803611682,64.35794701989103,61.501456951063226,58.90879459802141,56.47532086533334,54.22144537111508,52.181010689317944,50.25844285560906,49.630212319913966,49.00198178421883,48.37375124852373,47.74552071282863,47.11729017713349,46.48905964143839,45.860829105743285,45.23259857004817,44.604368034353065,43.976137498657955,43.34790696296283,42.71967642726772,42.09144589157262,41.463215355877516,40.8349848201824,40.20675428448729,39.57852374879217,38.95029321309707,38.32206267740194,37.69383214170681
-Commercial Battery Storage 6Hr/Conservative,75.56802765637387,78.36684349549881,78.9266066633238,77.8070803276738,74.89631185498388,71.98554338229393,69.07477490960395,66.16400643691401,63.25323796422405,63.07261203464391,62.89198610506378,62.711360175483655,62.5307342459035,62.35010831632337,62.16948238674325,61.98885645716308,61.80823052758296,61.627604598002826,61.44697866842269,61.26635273884255,61.08572680926242,60.90510087968228,60.72447495010214,60.543849020522025,60.36322309094189,60.182597161361734,60.0019712317816,59.821345302201465,59.64071937262128
-Commercial Battery Storage 8Hr/Advanced,89.3260727636281,64.26098326067262,60.653705231535746,57.56760672660437,55.49344080608356,53.41927488556274,51.34510896504194,49.27094304452112,47.196777124000306,46.30923747596188,45.4216978279234,44.53415817988497,43.64661853184652,42.75907888380807,41.87153923576963,40.98399958773119,40.09645993969275,39.2089202916543,38.32138064361585,37.43384099557741,36.546301347538964,35.65876169950052,34.77122205146207,33.883682403423634,32.996142755385186,32.10860310734674,31.221063459308297,30.333523811269846,29.445984163231387
-Commercial Battery Storage 8Hr/Moderate,89.3260727636281,82.28063647080279,75.76540605288343,72.36520034407062,69.17730900646998,66.20084940317844,63.44762719160293,60.955995062378946,58.61880987505124,57.886074751613116,57.15333962817496,56.420604504736836,55.6878693812987,54.95513425786054,54.2223991344224,53.489664010984285,52.756928887546145,52.02419376410801,51.29145864066987,50.558723517231726,49.82598839379358,49.09325327035544,48.36051814691732,47.627783023479175,46.895047900041035,46.1623127766029,45.42957765316476,44.69684252972661,43.964107406288434
-Commercial Battery Storage 8Hr/Conservative,89.3260727636281,92.63444582894763,93.29612044201154,91.97277121588371,88.5320632279514,85.09135524001907,81.65064725208671,78.20993926415439,74.76923127622204,74.55572027918977,74.34220928215754,74.12869828512528,73.91518728809301,73.70167629106076,73.48816529402853,73.27465429699626,73.061143299964,72.84763230293177,72.6341213058995,72.42061030886725,72.20709931183501,71.99358831480275,71.7800773177705,71.56656632073826,71.35305532370602,71.13954432667374,70.9260333296415,70.71252233260923,70.49901133557694
+Commercial Battery Storage 1Hr/Advanced,34.929480935955034,40.450981105990294,27.816081048641998,23.354205217573295,22.512751154819053,21.671297092064812,20.829843029310563,19.98838896655632,19.146934903802073,18.786875067070252,18.426815230338434,18.06675539360662,17.706695556874802,17.34663572014298,16.986575883411163,16.626516046679345,16.26645620994753,15.906396373215713,15.546336536483901,15.186276699752083,14.826216863020262,14.466157026288446,14.106097189556628,13.746037352824812,13.385977516092996,13.025917679361175,12.66585784262936,12.305798005897543,11.945738169165722
+Commercial Battery Storage 1Hr/Moderate,34.929480935955034,40.450981105990294,31.415766254995575,30.088934182341433,29.074105377022438,28.091209957443898,27.173898427106042,26.341852464613194,25.537514841997783,25.218295906472818,24.899076970947846,24.579858035422884,24.260639099897908,23.94142016437293,23.622201228847956,23.302982293322994,22.98376335779801,22.664544422273046,22.34532548674808,22.02610655122311,21.706887615698136,21.38766868017316,21.06844974464819,20.74923080912322,20.430011873598254,20.110792938073285,19.79157400254831,19.47235506702333,19.153136131498343
+Commercial Battery Storage 1Hr/Conservative,34.929480935955034,40.450981105990294,37.848659457980084,37.3117990401364,35.915961953742816,34.520124867349224,33.124287780955626,31.72845069456205,30.332613608168455,30.245995804781536,30.15937800139463,30.072760198007728,29.986142394620817,29.8995245912339,29.812906787846998,29.726288984460087,29.639671181073183,29.553053377686275,29.466435574299357,29.379817770912457,29.29319996752554,29.206582164138634,29.119964360751727,29.033346557364816,28.946728753977915,28.860110950590997,28.773493147204086,28.686875343817185,28.60025754043024
+Commercial Battery Storage 2Hr/Advanced,41.80850348958215,48.91926471900621,34.115814978666606,27.953589465747214,26.94641918504685,25.93924890434649,24.93207862364612,23.924908342945756,22.917738062245384,22.4867679322265,22.055797802207618,21.624827672188736,21.19385754216986,20.76288741215097,20.331917282132093,19.900947152113215,19.469977022094334,19.039006892075452,18.608036762056575,18.17706663203769,17.746096502018812,17.315126371999934,16.88415624198105,16.453186111962168,16.022215981943287,15.591245851924407,15.160275721905528,14.729305591886646,14.29833546186776
+Commercial Battery Storage 2Hr/Moderate,41.80850348958215,48.91926471900621,37.33318016259971,35.72430539485247,34.40071227477674,33.136152714827524,31.959814068857657,30.893717557267323,29.87430465035396,29.50087584222455,29.127447034095116,28.7540182259657,28.380589417836276,28.007160609706844,27.633731801577422,27.260302993448,26.886874185318575,26.513445377189157,26.14001656905974,25.76658776093031,25.39315895280089,25.01973014467146,24.646301336542038,24.272872528412616,23.899443720283195,23.526014912153773,23.15258610402435,22.77915729589492,22.405728487765476
+Commercial Battery Storage 2Hr/Conservative,41.80850348958215,48.91926471900621,45.30258591378353,44.659996042666045,42.989262377760554,41.31852871285506,39.64779504794958,37.97706138304408,36.30632771813859,36.20265137832118,36.09897503850379,35.99529869868639,35.89162235886898,35.787946019051574,35.684269679234184,35.580593339416765,35.476916999599375,35.37324065978198,35.26956431996457,35.165887980147176,35.062211640329764,34.95853530051237,34.85485896069497,34.751182620877564,34.64750628106017,34.543829941242755,34.440153601425365,34.33647726160796,34.23280092179053
+Commercial Battery Storage 4Hr/Advanced,55.566548596836384,65.85583194503802,46.715282838715815,37.152357962095046,35.81375524550245,34.47515252890983,33.136549812317234,31.797947095724613,30.459344379132006,29.886553662538997,29.313762945945985,28.740972229352977,28.168181512759965,27.595390796166953,27.022600079573948,26.449809362980943,25.87701864638794,25.30422792979493,24.73143721320192,24.15864649660892,23.58585578001591,23.013065063422903,22.44027434682989,21.867483630236887,21.294692913643875,20.721902197050873,20.14911148045786,19.576320763864857,19.003530047271838
+Commercial Battery Storage 4Hr/Moderate,55.566548596836384,65.85583194503802,49.16800797780799,46.99504781987456,45.05392607028535,43.22603822959478,41.53164535236091,39.99744774257557,38.547884267066316,38.066035713728,37.58418716038966,37.10233860705133,36.62049005371301,36.138641500374675,35.65679294703635,35.174944393698034,34.693095840359696,34.211247287021365,33.729398733683034,33.24755018034472,32.76570162700639,32.283853073668055,31.80200452032973,31.32015596699141,30.838307413653077,30.356458860314753,29.87461030697643,29.392761753638094,28.910913200299742
+Commercial Battery Storage 4Hr/Conservative,55.566548596836384,65.85583194503802,60.21043882539041,59.35639004772531,57.13586322579603,54.915336403866746,52.694809581937456,50.47428276000815,48.253755938078875,48.11596252540048,47.9781691127221,47.840375700043694,47.70258228736532,47.56478887468692,47.42699546200855,47.28920204933015,47.15140863665177,47.01361522397339,46.875821811295,46.73802839861661,46.60023498593822,46.46244157325983,46.324648160581454,46.18685474790306,46.049061335224685,45.91126792254628,45.7734745098679,45.63568109718952,45.49788768451109
+Commercial Battery Storage 6Hr/Advanced,69.32459370409062,82.79239917106983,59.31475069876501,46.35112645844288,44.681091305958034,43.011056153473184,41.341021000988334,39.67098584850348,38.000950696018634,37.28633939285149,36.57172808968435,35.85711678651722,35.14250548335008,34.427894180182946,33.71328287701581,32.99867157384868,32.284060270681536,31.569448967514404,30.854837664347265,30.140226361180147,29.42561505801301,28.711003754845873,27.99639245167873,27.2817811485116,26.567169845344463,25.852558542177334,25.137947239010195,24.423335935843067,23.708724632675917
+Commercial Battery Storage 6Hr/Moderate,69.32459370409062,82.79239917106983,61.00283579301626,58.26579024489666,55.70713986579395,53.31592374436204,51.10347663586416,49.101177927883825,47.22146388377867,46.631195585231445,46.0409272866842,45.45065898813697,44.86039068958974,44.270122391042506,43.679854092495276,43.08958579394806,42.49931749540082,41.90904919685358,41.31878089830636,40.72851259975912,40.1382443012119,39.547976002664655,38.95770770411744,38.367439405570195,37.77717110702296,37.18690280847573,36.596634509928506,36.00636621138127,35.416097912834
+Commercial Battery Storage 6Hr/Conservative,69.32459370409062,82.79239917106983,75.11829173699729,74.05278405278459,71.2824640738315,68.51214409487842,65.74182411592533,62.971504136972214,60.20118415801914,60.02927367247976,59.8573631869404,59.68545270140102,59.513542215861655,59.34163173032226,59.16972124478291,58.997810759243535,58.82590027370417,58.65398978816481,58.48207930262543,58.31016881708604,58.13825833154667,57.966347846007295,57.794437360467946,57.62252687492857,57.45061638938919,57.27870590384981,57.10679541831045,56.93488493277107,56.76297444723166
+Commercial Battery Storage 8Hr/Advanced,83.08263881134484,99.72896639710163,71.91421855881426,55.549894954790716,53.54842736641364,51.54695977803652,49.54549218965944,47.54402460128233,45.542557012905256,44.68612512316399,43.82969323342272,42.97326134368145,42.11682945394019,41.26039756419894,40.403965674457666,39.547533784716414,38.691101894975134,37.83467000523388,36.978238115492616,36.121806225751364,35.265374336010105,34.40894244626884,33.55251055652757,32.69607866678631,31.839646777045047,30.9832148873038,30.126782997562533,29.27035110782127,28.413919218079993
+Commercial Battery Storage 8Hr/Moderate,83.08263881134484,99.72896639710163,72.83766360822453,69.53653266991874,66.36035366130254,63.405809259129285,60.67530791936741,58.204908113192076,55.89504350049101,55.1963554567349,54.49766741297876,53.79897936922262,53.10029132546647,52.40160328171034,51.7029152379542,51.00422719419808,50.30553915044194,49.606851106685795,48.90816306292966,48.20947501917353,47.510786975417396,46.812098931661254,46.11341088790513,45.41472284414898,44.71603480039285,44.017346756636705,43.31865871288059,42.61997066912445,41.92128262536826
+Commercial Battery Storage 8Hr/Conservative,83.08263881134484,99.72896639710163,90.02614464860417,88.74917805784388,85.42906492186697,82.1089517858901,78.7888386499132,75.46872551393629,72.14861237795942,71.94258481955904,71.73655726115871,71.53052970275833,71.32450214435798,71.11847458595761,70.91244702755726,70.70641946915691,70.50039191075656,70.29436435235621,70.08833679395585,69.88230923555548,69.67628167715513,69.47025411875477,69.26422656035443,69.05819900195404,68.85217144355373,68.64614388515335,68.440116326753,68.23408876835263,68.02806120995224
diff --git a/tests/data/Commercial_Battery_Storage/R&D/30/df_occ.csv b/tests/data/Commercial_Battery_Storage/R&D/30/df_occ.csv
index ed451d5..4a2c2f7 100644
--- a/tests/data/Commercial_Battery_Storage/R&D/30/df_occ.csv
+++ b/tests/data/Commercial_Battery_Storage/R&D/30/df_occ.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1646.9165955295314,1184.7882315065815,1118.280370284527,1061.3815647514584,1023.1398938629737,984.8982229744892,946.6565520860041,908.4148811975199,870.1732103090344,853.8095246535275,837.4458389980199,821.0821533425135,804.7184676870063,788.354782031499,771.9910963759921,755.6274107204853,739.2637250649785,722.9000394094716,706.5363537539647,690.1726680984575,673.8089824429505,657.4452967874435,641.0816111319365,624.7179254764292,608.3542398209224,591.9905541654152,575.6268685099085,559.2631828544015,542.8994971988942
-Commercial Battery Storage 1Hr/Moderate,1646.9165955295314,1533.1518779760752,1433.5719774963993,1373.683938741789,1329.500343076,1286.459980828823,1246.2396327958177,1209.741990266617,1174.3010122801438,1159.6222496266425,1144.9434869731404,1130.2647243196393,1115.5859616661376,1100.9071990126351,1086.2284363591334,1071.5496737056321,1056.8709110521297,1042.1921483986284,1027.5133857451272,1012.8346230916246,998.155860438123,983.4770977846215,968.7983351311199,954.1195724776186,939.4408098241166,924.7620471706148,910.0832845171129,895.4045218636105,880.7257592101083
-Commercial Battery Storage 1Hr/Conservative,1646.9165955295314,1707.9135064750692,1720.112888664177,1695.7141242859611,1632.2773369026027,1568.8405495192424,1505.403762135882,1441.9669747525234,1378.5301873691635,1374.5936569311693,1370.657126493176,1366.7205960551823,1362.7840656171882,1358.8475351791947,1354.9110047412007,1350.9744743032065,1347.0379438652121,1343.101413427219,1339.1648829892251,1335.228352551231,1331.2918221132372,1327.3552916752437,1323.4187612372498,1319.482230799256,1315.5457003612626,1311.609169923268,1307.6726394852747,1303.736109047281,1299.7995786092854
-Commercial Battery Storage 2Hr/Advanced,1922.0774976746159,1382.738388495199,1305.118632995513,1238.7133796532748,1194.0824279173123,1149.4514761813493,1104.820524445386,1060.1895727094236,1015.5586209734599,996.4609495656629,977.3632781578651,958.2656067500684,939.1679353422712,920.0702639344738,900.972592526677,881.8749211188799,862.777249711083,843.6795783032859,824.5819068954889,805.4842354876916,786.3865640798945,767.2888926720974,748.1912212643002,729.093549856503,709.995878448706,690.8982070409088,671.800535633112,652.7028642253147,633.6051928175173
-Commercial Battery Storage 2Hr/Moderate,1922.0774976746159,1784.3052466697948,1661.7211581562476,1590.9588066019369,1534.870631244971,1480.9705515857252,1430.7632692055745,1385.241677727837,1341.5083526689875,1324.7394982606259,1307.9706438522628,1291.2017894439014,1274.4329350355392,1257.664080627176,1240.8952262188138,1224.126371810452,1207.3575174020893,1190.5886629937274,1173.8198085853653,1157.0509541770023,1140.2820997686401,1123.513245360278,1106.744390951916,1089.975536543554,1073.2066821351916,1056.4378277268293,1039.668973318467,1022.900118910104,1006.131264501741
-Commercial Battery Storage 2Hr/Conservative,1922.0774976746159,1993.2655531440457,2007.5031642379317,1979.027942050159,1904.9923643619532,1830.956786673745,1756.921208985537,1682.8856312973307,1608.8500536091233,1604.2558218220865,1599.6615900350514,1595.0673582480151,1590.4731264609786,1585.8788946739428,1581.2846628869067,1576.6904310998698,1572.0961993128333,1567.501967525798,1562.9077357387614,1558.3135039517254,1553.7192721646893,1549.1250403776535,1544.5308085906167,1539.936576803581,1535.342345016545,1530.7481132295081,1526.1538814424725,1521.5596496554365,1516.9654178683984
-Commercial Battery Storage 4Hr/Advanced,2472.399301964785,1778.638702472434,1678.7951584174853,1593.3770094569081,1535.9674960259888,1478.5579825950692,1421.1484691641497,1363.7389557332308,1306.3294423023108,1281.7637993899336,1257.1981564775556,1232.6325135651787,1208.0668706528013,1183.5012277404235,1158.9355848280463,1134.3699419156692,1109.8042990032918,1085.2386560909144,1060.6730131785373,1036.1073702661597,1011.5417273537827,986.9760844414053,962.4104415290279,937.8447986166503,913.2791557042732,888.7135127918958,864.1478698795185,839.5822269671412,815.0165840547633
-Commercial Battery Storage 4Hr/Moderate,2472.399301964785,2286.611984057234,2118.019519475944,2025.5085423222329,1945.6112075829137,1869.9916930995296,1799.8105420250888,1736.2410526502772,1675.9230334466747,1654.973995528592,1634.024957610508,1613.075919692425,1592.126881774342,1571.1778438562578,1550.2288059381744,1529.2797680200918,1508.330730102008,1487.381692183925,1466.4326542658416,1445.4836163477578,1424.5345784296746,1403.5855405115913,1382.6365025935083,1361.687464675425,1340.7384267573416,1319.789388839258,1298.8403509211748,1277.8913130030908,1256.9422750850067
-Commercial Battery Storage 4Hr/Conservative,2472.399301964785,2563.969646481999,2582.2837153854416,2545.6555775785555,2450.4224192806537,2355.189260982751,2259.956102684848,2164.7229443869455,2069.4897860890424,2063.580151603921,2057.6705171188014,2051.7608826336805,2045.851248148559,2039.9416136634384,2034.0319791783184,2028.1223446931965,2022.2127102080756,2016.3030757229553,2010.393441237834,2004.4838067527135,1998.574172267593,1992.6645377824723,1986.7549032973513,1980.8452688122309,1974.9356343271102,1969.0259998419888,1963.1163653568683,1957.2067308717474,1951.2970963866248
-Commercial Battery Storage 6Hr/Advanced,3022.7211062549545,2174.5390164496694,2052.4716838394575,1948.0406392605416,1877.8525641346657,1807.6644890087898,1737.4764138829137,1667.2883387570378,1597.1002636311614,1567.0666492142043,1537.0330347972458,1506.9994203802887,1476.965805963331,1446.9321915463731,1416.8985771294158,1386.8649627124582,1356.8313482955007,1326.797733878543,1296.7641194615856,1266.7305050446282,1236.6968906276707,1206.6632762107129,1176.6296617937553,1146.5960473767977,1116.5624329598402,1086.5288185428826,1056.495204125925,1026.4615897089675,996.4279752920093
-Commercial Battery Storage 6Hr/Moderate,3022.7211062549545,2788.918721444673,2574.317880795641,2460.058278042529,2356.351783920856,2259.0128346133333,2168.857814844603,2087.2404275727176,2010.3377142243623,1985.2084927965584,1960.079271368753,1934.9500499409492,1909.820828513145,1884.6916070853395,1859.5623856575353,1834.4331642297313,1809.3039428019267,1784.1747213741226,1759.0454999463182,1733.916278518513,1708.7870570907087,1683.6578356629045,1658.5286142351006,1633.399392807296,1608.2701713794916,1583.1409499516867,1558.0117285238825,1532.8825070960775,1507.7532856682722
-Commercial Battery Storage 6Hr/Conservative,3022.7211062549545,3134.673739819952,3157.0642665329515,3112.2832131069517,2995.852474199355,2879.4217352917567,2762.990996384158,2646.5602574765603,2530.129518568962,2522.9044813857563,2515.679444202551,2508.454407019346,2501.22936983614,2494.004332652935,2486.7792954697297,2479.5542582865232,2472.329221103318,2465.104183920113,2457.8791467369074,2450.654109553702,2443.4290723704967,2436.204035187291,2428.9789980040855,2421.753960820881,2414.5289236376752,2407.303886454469,2400.078849271264,2392.8538120880585,2385.628774904851
-Commercial Battery Storage 8Hr/Advanced,3573.042910545124,2570.4393304269047,2426.1482092614297,2302.7042690641747,2219.7376322433424,2136.7709954225097,2053.8043586016774,1970.8377217808447,1887.8710849600122,1852.369499038475,1816.867913116936,1781.3663271953985,1745.8647412738608,1710.3631553523228,1674.8615694307853,1639.3599835092475,1603.8583975877098,1568.356811666172,1532.855225744634,1497.3536398230965,1461.8520539015585,1426.350467980021,1390.8488820584828,1355.3472961369453,1319.8457102154073,1284.3441242938695,1248.8425383723318,1213.3409524507938,1177.8393665292554
-Commercial Battery Storage 8Hr/Moderate,3573.042910545124,3291.2254588321116,3030.616242115337,2894.6080137628246,2767.092360258799,2648.0339761271375,2537.905087664117,2438.2398024951576,2344.7523950020495,2315.4429900645246,2286.1335851269982,2256.8241801894733,2227.514775251948,2198.2053703144215,2168.895965376896,2139.586560439371,2110.2771555018458,2080.9677505643203,2051.658345626795,2022.3489406892688,1993.0395357517432,1963.7301308142175,1934.4207258766928,1905.111320939167,1875.8019160016413,1846.4925110641161,1817.1831061265905,1787.8737011890641,1758.5642962515374
-Commercial Battery Storage 8Hr/Conservative,3573.042910545124,3705.377833157905,3731.8448176804613,3678.910848635348,3541.2825291180557,3403.6542096007624,3266.0258900834683,3128.397570566175,2990.7692510488814,2982.2288111675907,2973.6883712863014,2965.147931405011,2956.6074915237205,2948.0670516424307,2939.5266117611413,2930.98617187985,2922.44573199856,2913.9052921172706,2905.36485223598,2896.82441235469,2888.2839724734004,2879.74353259211,2871.2030927108203,2862.66265282953,2854.1222129482408,2845.5817730669496,2837.04133318566,2828.500893304369,2819.9604534230775
+Commercial Battery Storage 1Hr/Advanced,1397.1792374382012,1618.0392442396117,1112.6432419456798,934.1682087029318,900.510046192762,866.8518836825924,833.1937211724224,799.5355586622528,765.8773961520828,751.47500268281,737.0726092135374,722.6702157442647,708.267822274992,693.8654288057191,679.4630353364465,665.0606418671738,650.6582483979013,636.2558549286285,621.853461459356,607.4510679900833,593.0486745208104,578.6462810515378,564.2438875822651,549.8414941129925,535.4391006437198,521.036707174447,506.6343137051744,492.2319202359017,477.8295267666288
+Commercial Battery Storage 1Hr/Moderate,1397.1792374382012,1618.0392442396117,1256.6306501998229,1203.5573672936573,1162.9642150808975,1123.6483982977559,1086.9559370842417,1053.6740985845277,1021.5005936799113,1008.7318362589127,995.9630788379138,983.1943214169153,970.4255639959163,957.6568065749171,944.8880491539182,932.1192917329197,919.3505343119205,906.5817768909218,893.8130194699231,881.0442620489242,868.2755046279253,855.5067472069263,842.7379897859277,829.9692323649288,817.2004749439301,804.4317175229313,791.6629601019323,778.8942026809332,766.1254452599337
+Commercial Battery Storage 1Hr/Conservative,1397.1792374382012,1618.0392442396117,1513.9463783192034,1492.471961605456,1436.6384781497127,1380.8049946939689,1324.971511238225,1269.138027782482,1213.304544326738,1209.8398321912614,1206.3751200557851,1202.9104079203091,1199.4456957848327,1195.980983649356,1192.51627151388,1189.0515593784035,1185.5868472429272,1182.122135107451,1178.6574229719743,1175.1927108364982,1171.7279987010215,1168.2632865655453,1164.798574430069,1161.3338622945926,1157.8691501591165,1154.4044380236398,1150.9397258881634,1147.4750137526873,1144.0103016172095
+Commercial Battery Storage 2Hr/Advanced,1672.340139583286,1956.770588760248,1364.6325991466642,1118.1435786298885,1077.8567674018739,1037.5699561738595,997.2831449458447,956.9963337178301,916.7095224898153,899.47071728906,882.2319120883046,864.9931068875494,847.7543016867943,830.5154964860387,813.2766912852836,796.0378860845285,778.7990808837733,761.5602756830181,744.321470482263,727.0826652815076,709.8438600807524,692.6050548799973,675.366249679242,658.1274444784867,640.8886392777315,623.6498340769763,606.411028876221,589.1722236754658,571.9334184747104
+Commercial Battery Storage 2Hr/Moderate,1672.340139583286,1956.770588760248,1493.3272065039885,1428.972215794099,1376.0284909910695,1325.446108593101,1278.3925627543063,1235.7487022906928,1194.9721860141583,1180.035033688982,1165.0978813638046,1150.160729038628,1135.223576713451,1120.2864243882736,1105.3492720630968,1090.41211973792,1075.474967412743,1060.5378150875663,1045.6006627623894,1030.6635104372124,1015.7263581120354,1000.7892057868584,985.8520534616815,970.9149011365046,955.9777488113277,941.0405964861509,926.103444160974,911.1662918357968,896.229139510619
+Commercial Battery Storage 2Hr/Conservative,1672.340139583286,1956.770588760248,1812.103436551341,1786.3998417066416,1719.5704951104221,1652.7411485142025,1585.911801917983,1519.082455321763,1452.2531087255436,1448.1060551328471,1443.9590015401516,1439.8119479474556,1435.664894354759,1431.5178407620629,1427.3707871693673,1423.2237335766706,1419.076679983975,1414.929626391279,1410.7825727985828,1406.635519205887,1402.4884656131906,1398.3414120204945,1394.1943584277988,1390.0473048351025,1385.9002512424067,1381.7531976497103,1377.6061440570145,1373.4590904643183,1369.312036871621
+Commercial Battery Storage 4Hr/Advanced,2222.661943873455,2634.2332778015207,1868.6113135486326,1486.0943184838018,1432.550209820098,1379.0061011563932,1325.4619924926892,1271.9178838289845,1218.3737751652802,1195.4621465015598,1172.5505178378394,1149.638889174119,1126.7272605103985,1103.8156318466781,1080.904003182958,1057.9923745192377,1035.0807458555175,1012.1691171917971,989.2574885280768,966.3458598643567,943.4342312006363,920.5226025369161,897.6109738731956,874.6993452094754,851.787716545755,828.8760878820349,805.9644592183145,783.0528305545942,760.1412018908735
+Commercial Battery Storage 4Hr/Moderate,2222.661943873455,2634.2332778015207,1966.7203191123194,1879.8019127949822,1802.157042811414,1729.041529183791,1661.2658140944363,1599.8979097030226,1541.9153706826526,1522.6414285491198,1503.3674864155864,1484.0935442820532,1464.8196021485205,1445.5456600149869,1426.271717881454,1406.9977757479212,1387.7238336143878,1368.4498914808546,1349.1759493473214,1329.9020072137887,1310.6280650802557,1291.354122946722,1272.0801808131891,1252.8062386796564,1233.532296546123,1214.25835441259,1194.984412279057,1175.7104701455237,1156.4365280119896
+Commercial Battery Storage 4Hr/Conservative,2222.661943873455,2634.2332778015207,2408.4175530156162,2374.2556019090125,2285.434529031841,2196.6134561546696,2107.792383277498,2018.9713104003258,1930.1502375231548,1924.6385010160188,1919.1267645088838,1913.6150280017478,1908.1032914946124,1902.5915549874767,1897.0798184803418,1891.5680819732058,1886.0563454660708,1880.5446089589354,1875.0328724518,1869.5211359446644,1864.0093994375288,1858.497662930393,1852.985926423258,1847.4741899161224,1841.9624534089874,1836.4507169018511,1830.938980394716,1825.4272438875805,1819.9155073804436
+Commercial Battery Storage 6Hr/Advanced,2772.9837481636246,3311.695966842793,2372.5900279506004,1854.045058337715,1787.2436522383214,1720.4422461389272,1653.6408400395333,1586.8394339401389,1520.0380278407454,1491.4535757140595,1462.869123587374,1434.2846714606887,1405.7002193340031,1377.1157672073177,1348.531315080632,1319.9468629539472,1291.3624108272613,1262.7779587005762,1234.1935065738905,1205.6090544472058,1177.0246023205202,1148.4401501938348,1119.8556980671492,1091.271245940464,1062.6867938137784,1034.1023416870933,1005.5178895604078,976.9334374337226,948.3489853070366
+Commercial Battery Storage 6Hr/Moderate,2772.9837481636246,3311.695966842793,2440.11343172065,2330.631609795866,2228.2855946317577,2132.6369497744813,2044.1390654345664,1964.0471171153529,1888.8585553511466,1865.2478234092578,1841.637091467368,1818.0263595254787,1794.4156275835896,1770.8048956417,1747.194163699811,1723.5834317579222,1699.9726998160327,1676.3619678741431,1652.751235932254,1629.1405039903648,1605.5297720484757,1581.919040106586,1558.3083081646973,1534.6975762228078,1511.0868442809183,1487.4761123390292,1463.8653803971401,1440.2546484552508,1416.64391651336
+Commercial Battery Storage 6Hr/Conservative,2772.9837481636246,3311.695966842793,3004.7316694798915,2962.1113621113836,2851.29856295326,2740.485763795137,2629.672964637013,2518.8601654788886,2408.0473663207654,2401.1709468991903,2394.2945274776157,2387.4181080560406,2380.541688634466,2373.6652692128905,2366.7888497913164,2359.9124303697413,2353.0360109481667,2346.159591526592,2339.283172105017,2332.4067526834415,2325.530333261867,2318.653913840292,2311.7774944187177,2304.9010749971426,2298.0246555755675,2291.1482361539925,2284.271816732418,2277.395397310843,2270.5189778892664
+Commercial Battery Storage 8Hr/Advanced,3323.305552453793,3989.158655884065,2876.56874235257,2221.9957981916286,2141.9370946565455,2061.878391121461,1981.8196875863775,1901.7609840512932,1821.70228051621,1787.4450049265595,1753.1877293369087,1718.9304537472578,1684.6731781576075,1650.4159025679573,1616.1586269783065,1581.9013513886564,1547.6440757990053,1513.3868002093552,1479.1295246197046,1444.8722490300545,1410.6149734404041,1376.3576978507535,1342.100422261103,1307.8431466714526,1273.5858710818018,1239.3285954921519,1205.0713199025013,1170.8140443128507,1136.5567687231996
+Commercial Battery Storage 8Hr/Moderate,3323.305552453793,3989.158655884065,2913.5065443289814,2781.4613067967493,2654.4141464521017,2536.2323703651714,2427.0123167746965,2328.196324527683,2235.8017400196404,2207.854218269396,2179.90669651915,2151.9591747689046,2124.0116530186588,2096.0641312684133,2068.116609518168,2040.1690877679232,2012.2215660176773,1984.2740442674317,1956.3265225171863,1928.379000766941,1900.4314790166957,1872.48395726645,1844.536435516205,1816.5889137659592,1788.6413920157138,1760.6938702654681,1732.7463485152236,1704.7988267649778,1676.8513050147305
+Commercial Battery Storage 8Hr/Conservative,3323.305552453793,3989.158655884065,3601.0457859441667,3549.9671223137548,3417.1625968746785,3284.358071435604,3151.553545996528,3018.749020557452,2885.944495118377,2877.703392782362,2869.462290446348,2861.221188110333,2852.980085774319,2844.7389834383043,2836.4978811022906,2828.2567787662765,2820.0156764302624,2811.7745740942482,2803.5334717582336,2795.292369422219,2787.0512670862054,2778.810164750191,2770.569062414177,2762.3279600781616,2754.086857742149,2745.845755406134,2737.6046530701196,2729.3635507341055,2721.1224483980895
diff --git a/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_capex.csv b/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_capex.csv
index 06d3842..99a1130 100644
--- a/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_capex.csv
+++ b/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_capex.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1708.6543909919249,1229.202267834563,1160.201233161033,1101.1694678729955,1061.4942353446183,1021.8190028162413,982.1437702878638,942.4685377594872,902.7933052311091,885.8161957502836,868.8390862694572,851.8619767886321,834.8848673078062,817.9077578269802,800.9306483461546,783.953538865329,766.9764293845036,749.9993199036779,733.0222104228524,716.0451009420265,699.0679914612008,682.090881980375,665.1137724995492,648.1366630187232,631.1595535378978,614.1824440570718,597.2053345762464,580.2282250954207,563.2511156145947
-Commercial Battery Storage 1Hr/Moderate,1708.6543909919249,1590.624987004306,1487.3121448901431,1425.1790892978179,1379.3391876603653,1334.6853757167942,1292.9572915743656,1255.0914656195782,1218.3219152841134,1203.0928913430623,1187.8638674020106,1172.63484346096,1157.4058195199086,1142.1767955788566,1126.947771637805,1111.7187476967542,1096.4897237557022,1081.2606998146514,1066.0316758736005,1050.8026519325483,1035.573627991497,1020.3446040504459,1005.1155801093947,989.8865561683439,974.6575322272922,959.4285082862408,944.1994843451894,928.9704604041373,913.7414364630855
-Commercial Battery Storage 1Hr/Conservative,1708.6543909919249,1771.9378869545883,1784.5945861471214,1759.2811877620552,1693.466351960886,1627.651516159715,1561.8366803585438,1496.0218445573746,1430.207008756204,1426.1229100007417,1422.0388112452806,1417.954712489819,1413.8706137343568,1409.7865149788954,1405.7024162234334,1401.6183174679713,1397.5342187125088,1393.450119957048,1389.3660212015861,1385.2819224461239,1381.1978236906623,1377.1137249352007,1373.029626179739,1368.945527424277,1364.8614286688157,1360.777329913353,1356.693231157892,1352.6091324024303,1348.5250336469667
-Commercial Battery Storage 2Hr/Advanced,1994.1302219816112,1434.5729622912497,1354.043482885758,1285.1489025432334,1238.8448748439548,1192.5408471446756,1146.2368194453961,1099.9327917461178,1053.628764046838,1033.8151801669806,1014.0015962871227,994.1880124072657,974.3744285274082,954.5608446475507,934.7472607676935,914.9336768878362,895.120093007979,875.3065091281218,855.4929252482646,835.679341368407,815.8657574885497,796.0521736086923,776.2385897288349,756.4250058489774,736.6114219691202,716.7978380892628,696.9842542094057,677.1706703295481,657.3570864496904
-Commercial Battery Storage 2Hr/Moderate,1994.1302219816112,1851.1933165698713,1724.0139307570337,1650.5989181034563,1592.4081710027563,1536.487544521381,1484.3981468363497,1437.1700920735836,1391.7973402916673,1374.3998735380221,1357.0024067843756,1339.6049400307306,1322.207473277085,1304.8100065234382,1287.4125397697926,1270.0150730161472,1252.617606262501,1235.2201395088557,1217.82267275521,1200.4252060015635,1183.027739247918,1165.6302724942723,1148.2328057406269,1130.8353389869812,1113.4378722333354,1096.0404054796895,1078.6429387260437,1061.2454719723974,1043.8480052187508
-Commercial Battery Storage 2Hr/Conservative,1994.1302219816112,2067.986896869819,2082.75823184746,2053.2155618921765,1976.4046200084417,1899.5936781247049,1822.7827362409682,1745.9717943572332,1669.160852473497,1664.3943971851945,1659.6279418968936,1654.8614866085916,1650.095031320289,1645.3285760319875,1640.5621207436857,1635.795665455383,1631.0292101670807,1626.2627548787793,1621.496299590477,1616.7298443021753,1611.9633890138734,1607.1969337255719,1602.4304784372691,1597.6640231489675,1592.897567860666,1588.1311125723632,1583.3646572840619,1578.5982019957598,1573.831746707456
-Commercial Battery Storage 4Hr/Advanced,2565.0818839609838,1845.3143512046233,1741.7279823352078,1653.1077718837093,1593.5461538426268,1533.9845358015439,1474.422917760461,1414.8612997193786,1355.2996816782952,1329.8131490003748,1304.3266163224534,1278.8400836445333,1253.3535509666126,1227.8670182886915,1202.380485610771,1176.8939529328507,1151.40742025493,1125.9208875770094,1100.434354899089,1074.947822221168,1049.4612895432476,1023.974756865327,998.4882241874063,973.0016915094855,947.515158831565,922.0286261536444,896.5420934757237,871.0555607978032,845.5690281198819
-Commercial Battery Storage 4Hr/Moderate,2565.0818839609838,2372.3299757010022,2197.417502490815,2101.4385757147334,2018.5461376875394,1940.0918821305554,1867.2798573603184,1801.327344981595,1738.7481903067749,1717.0138379279408,1695.2794855491056,1673.5451331702714,1651.8107807914373,1630.0764284126017,1608.342076033767,1586.6077236549331,1564.873371276098,1543.139018897264,1521.4046665184292,1499.6703141395942,1477.9359617607597,1456.2016093819252,1434.467257003091,1412.7329046242564,1390.9985522454217,1369.264199866587,1347.5298474877525,1325.795495108917,1304.0611427300819
-Commercial Battery Storage 4Hr/Conservative,2565.0818839609838,2660.0849167002793,2679.085523248138,2641.084310152419,2542.281156103553,2443.4780020546855,2344.6748480058177,2245.871693956951,2147.068539908083,2140.9373715541,2134.806203200119,2128.6750348461364,2122.5438664921535,2116.4126981381714,2110.28152978419,2104.1503614302064,2098.019193076224,2091.8880247222423,2085.7568563682594,2079.6256880142773,2073.4945196602953,2067.3633513063132,2061.2321829523307,2055.1010145983487,2048.969846244366,2042.8386778903835,2036.7075095364014,2030.5763411824191,2024.4451728284348
-Commercial Battery Storage 6Hr/Advanced,3136.033545940357,2256.055740117997,2129.4124817846578,2021.0666412241858,1948.2474328412993,1875.4282244584126,1802.609016075526,1729.7898076926394,1656.9705993097525,1625.811117833769,1594.6516363577841,1563.4921548818006,1532.3326734058166,1501.1731919298325,1470.0137104538487,1438.8542289778648,1407.694747501881,1376.535266025897,1345.375784549913,1314.2163030739293,1283.0568215979456,1251.8973401219614,1220.7378586459774,1189.5783771699935,1158.4188956940097,1127.2594142180258,1096.0999327420418,1064.9404512660578,1033.7809697900732
-Commercial Battery Storage 6Hr/Moderate,3136.033545940357,2893.4666348321325,2670.821074224597,2552.2782333260106,2444.684104372322,2343.696219739729,2250.161567884287,2165.4845978896064,2085.699040321883,2059.6278023178597,2033.5565643138357,2007.4853263098128,1981.4140883057896,1955.3428503017649,1929.2716122977417,1903.2003742937188,1877.1291362896952,1851.057898285672,1824.9866602816487,1798.9154222776247,1772.844184273601,1746.772946269578,1720.701708265555,1694.6304702615314,1668.559232257508,1642.4879942534842,1616.416756249461,1590.345518245437,1564.2742802414125
-Commercial Battery Storage 6Hr/Conservative,3136.033545940357,3252.1829365307394,3275.412814648816,3228.9530584126624,3108.157692198665,2987.362325984666,2866.5669597706665,2745.771593556668,2624.976227342669,2617.480345923006,2609.984464503344,2602.4885830836815,2594.992701664018,2587.496820244356,2580.0009388246935,2572.5050574050297,2565.0091759853676,2557.513294565705,2550.017413146042,2542.5215317263796,2535.025650306717,2527.529768887054,2520.0338874673917,2512.5380060477296,2505.0421246280666,2497.5462432084037,2490.050361788741,2482.554480369078,2475.058598949414
-Commercial Battery Storage 8Hr/Advanced,3706.98520791973,2666.7971290313712,2517.0969812341077,2389.0255105646615,2302.9487118399716,2216.8719131152807,2130.7951143905907,2044.7183156659,1958.6415169412098,1921.809086667163,1884.9766563931148,1848.1442261190678,1811.3117958450207,1774.4793655709734,1737.6469352969264,1700.8145050228793,1663.982074748832,1627.149644474785,1590.3172142007375,1553.4847839266906,1516.6523536526431,1479.8199233785963,1442.9874931045488,1406.1550628305017,1369.3226325564544,1332.4902022824072,1295.65777200836,1258.8253417343126,1221.9929114602648
-Commercial Battery Storage 8Hr/Moderate,3706.98520791973,3414.603293963263,3144.2246459583776,3003.1178909372875,2870.8220710571054,2747.300557348903,2633.0432784082554,2529.6418507976173,2432.6498903369907,2402.241766707779,2371.8336430785657,2341.425519449354,2311.0173958201417,2280.6092721909286,2250.2011485617163,2219.793024932505,2189.3849013032927,2158.9767776740805,2128.5686540448683,2098.1605304156556,2067.752406786443,2037.3442831572306,2006.936159528019,1976.5280358988066,1946.1199122695941,1915.711788640382,1885.3036650111699,1854.8955413819567,1824.487417752743
-Commercial Battery Storage 8Hr/Conservative,3706.98520791973,3844.2809563612,3871.740106049494,3816.821806672905,3674.0342282937763,3531.2466499146462,3388.4590715355152,3245.6714931563856,3102.883914777255,3094.0233202919117,3085.162725806569,3076.302131321226,3067.4415368358823,3058.5809423505398,3049.7203478651977,3040.8597533798534,3031.9991588945104,3023.138564409168,3014.2779699238245,3005.4173754384815,2996.556780953139,2987.696186467796,2978.835591982453,2969.97499749711,2961.1144030117675,2952.2538085264237,2943.3932140410807,2934.5326195557373,2925.6720250703925
+Commercial Battery Storage 1Hr/Advanced,1449.5551538746543,1678.6945173616073,1154.3527863636048,969.1872776423813,934.2673750062493,899.3474723701173,864.427569733985,829.5076670978531,794.5877644617208,779.6454699284909,764.7031753952613,749.7608808620316,734.8185863288019,719.8762917955719,704.9339972623422,689.9917027291125,675.049408195883,660.1071136626532,645.1648191294237,630.2225245961939,615.280230062964,600.3379355297344,585.3956409965047,570.453346463275,555.5110519300454,540.5687573968155,525.626462863586,510.6841683303562,495.7418737971263
+Commercial Battery Storage 1Hr/Moderate,1449.5551538746543,1678.6945173616073,1303.7378359944178,1248.67500031219,1206.5601367175132,1165.7704918962165,1127.702544108846,1093.1730727032002,1059.7934828817756,1046.5460643457536,1033.2986458097316,1020.0512272737096,1006.8038087376874,993.556390201665,980.3089716656427,967.0615531296208,953.8141345935983,940.5667160575764,927.3192975215544,914.0718789855322,900.82446044951,887.5770419134877,874.3296233774657,861.0822048414435,847.8347863054215,834.5873677693995,821.3399492333772,808.0925306973547,794.8451121613319
+Commercial Battery Storage 1Hr/Conservative,1449.5551538746543,1678.6945173616073,1570.6995327287318,1548.4201067325798,1490.4935991425843,1432.5670915525884,1374.6405839625925,1316.7140763725972,1258.7875687826013,1255.192975334533,1251.5983818864654,1248.0037884383978,1244.4091949903298,1240.8146015422617,1237.220008094194,1233.625414646126,1230.0308211980584,1226.4362277499906,1222.8416343019223,1219.247040853855,1215.6524474057867,1212.0578539577189,1208.4632605096513,1204.8686670615832,1201.2740736135156,1197.6794801654476,1194.0848867173795,1190.490293269312,1186.8956998212425
+Commercial Battery Storage 2Hr/Advanced,1735.0309848643408,2030.1238494557992,1415.7884430528595,1160.0593136115042,1118.2622747750129,1076.4652359385218,1034.6681971020303,992.871158265539,951.0741194290474,933.1890848852948,915.3040503415423,897.4190157977898,879.5339812540375,861.6489467102847,843.7639121665324,825.87887762278,807.9938430790276,790.1088085352751,772.2237739915228,754.3387394477702,736.4537049040177,718.5686703602654,700.6836358165128,682.7986012727605,664.913566729008,647.0285321852556,629.1434976415031,611.2584630977507,593.373428553998
+Commercial Battery Storage 2Hr/Moderate,1735.0309848643408,2030.1238494557992,1549.3074121099241,1482.539952387204,1427.611531539591,1375.1329725003989,1326.315535158743,1282.0730886209008,1239.767987212379,1224.270887372225,1208.7737875320697,1193.2766876919154,1177.7795878517607,1162.2824880116057,1146.785388171451,1131.2882883312964,1115.7911884911416,1100.294088650987,1084.7969888108325,1069.2998889706778,1053.802789130523,1038.3056892903683,1022.8085894502136,1007.311489610059,991.8143897699043,976.3172899297498,960.8201900895951,945.32309024944,929.8259904092845
+Commercial Battery Storage 2Hr/Conservative,1735.0309848643408,2030.1238494557992,1880.0335743774986,1853.3664314785274,1784.0318599412014,1714.697288403875,1645.3627168665491,1576.0281453292228,1506.6935737918968,1502.3910600215736,1498.0885462512513,1493.7860324809285,1489.4835187106053,1485.1810049402823,1480.87849116996,1476.5759773996365,1472.2734636293142,1467.9709498589914,1463.6684360886686,1459.365922318346,1455.0634085480228,1450.7608947777,1446.4583810073775,1442.1558672370545,1437.853353466732,1433.5508396964087,1429.2483259260862,1424.9458121557632,1420.6432983854393
+Commercial Battery Storage 4Hr/Advanced,2305.9826468437136,2732.982513644183,1938.6597564313684,1541.8033855497501,1486.2520743125408,1430.7007630753303,1375.1494518381207,1319.5981406009105,1264.0468293637007,1240.2763147989026,1216.5058002341045,1192.7352856693064,1168.9647711045084,1145.1942565397103,1121.4237419749124,1097.6532274101148,1073.882712845317,1050.112198280519,1026.3416837157208,1002.5711691509232,978.8006545861251,955.0301400213274,931.2596254565292,907.4891108917313,883.7185963269334,859.9480817621356,836.1775671973376,812.4070526325396,788.6365380677414
+Commercial Battery Storage 4Hr/Moderate,2305.9826468437136,2732.982513644183,2040.4465643409367,1950.269856537232,1869.7143211837465,1793.8579337087638,1723.5415172585374,1659.8731204563014,1599.716995873586,1579.7205334251666,1559.7240709767466,1539.7276085283268,1519.7311460799074,1499.734683631487,1479.7382211830675,1459.741758734648,1439.745296286228,1419.7488338378082,1399.7523713893884,1379.755908940969,1359.7594464925494,1339.7629840441289,1319.7665215957093,1299.7700591472899,1279.7735966988698,1259.7771342504502,1239.7806718020306,1219.7842093536105,1199.7877469051898
+Commercial Battery Storage 4Hr/Conservative,2305.9826468437136,2732.982513644183,2498.7016576750316,2463.259080970422,2371.1083815384354,2278.9576821064484,2186.806982674462,2094.6562832424743,2002.505583810488,1996.7872293956545,1991.0688749808223,1985.350520565989,1979.6321661511565,1973.9138117363236,1968.1954573214914,1962.4771029066583,1956.758748491826,1951.0403940769934,1945.3220396621607,1939.603685247328,1933.8853308324951,1928.1669764176622,1922.44862200283,1916.730267587997,1911.0119131731649,1905.2935587583313,1899.575204343499,1893.8568499286664,1888.1384955138321
+Commercial Battery Storage 6Hr/Advanced,2876.9343088230867,3435.841177832567,2461.5310698098765,1923.547457487996,1854.2418738500678,1784.9362902121393,1715.6307065742108,1646.325122936282,1577.0195392983542,1547.3635447125102,1517.7075501266665,1488.0515555408233,1458.3955609549796,1428.7395663691364,1399.0835717832927,1369.4275771974496,1339.7715826116057,1310.1155880257627,1280.459593439919,1250.8035988540762,1221.1476042682325,1191.4916096823893,1161.8356150965456,1132.1796205107023,1102.5236259248586,1072.8676313390156,1043.211636753172,1013.5556421673288,983.8996475814847
+Commercial Battery Storage 6Hr/Moderate,2876.9343088230867,3435.841177832567,2531.585716571949,2417.9997606872607,2311.8171108279016,2212.5828949171287,2120.767499358332,2037.6731522917025,1959.666004534793,1935.1701794781086,1910.6743544214232,1886.1785293647383,1861.6827043080536,1837.1868792513685,1812.6910541946838,1788.1952291379996,1763.6994040813145,1739.2035790246293,1714.7077539679447,1690.2119289112597,1665.716103854575,1641.2202787978897,1616.7244537412057,1592.2286286845206,1567.7328036278354,1543.2369785711508,1518.741153514466,1494.2453284577812,1469.7495034010947
+Commercial Battery Storage 6Hr/Conservative,2876.9343088230867,3435.841177832567,3117.369740972565,3073.151730462317,2958.184903135669,2843.218075809022,2728.251248482374,2613.2844211557253,2498.3175938290783,2491.1833987697355,2484.049203710393,2476.9150086510504,2469.780813591708,2462.6466185323648,2455.512423473023,2448.37822841368,2441.244033354338,2434.109838294996,2426.975643235653,2419.8414481763098,2412.7072531169674,2405.5730580576246,2398.4388629982827,2391.30466793894,2384.170472879597,2377.0362778202543,2369.902082760912,2362.7678877015696,2355.6336926422255
+Commercial Battery Storage 8Hr/Advanced,3447.8859708024584,4138.69984202095,2984.402383188387,2305.291529426242,2222.2316733875955,2139.171817348948,2056.111961310301,1973.0521052716535,1889.992249233007,1854.4507746261181,1818.9093000192288,1783.3678254123395,1747.8263508054508,1712.2848761985622,1676.7434015916729,1641.2019269847844,1605.660452377895,1570.1189777710063,1534.5775031641174,1499.0360285572287,1463.4945539503399,1427.953079343451,1392.411604736562,1356.870130129673,1321.328655522784,1285.7871809158955,1250.2457063090064,1214.7042317021176,1179.162757095228
+Commercial Battery Storage 8Hr/Moderate,3447.8859708024584,4138.69984202095,3022.7248688029617,2885.729664837289,2753.9199004720567,2631.307856125494,2517.9934814581266,2415.473184127103,2319.6150131959994,2290.6198255310505,2261.6246378661003,2232.6294502011506,2203.6342625362,2174.63907487125,2145.6438872063004,2116.648699541351,2087.6535118764004,2058.6583242114507,2029.6631365465005,2000.667948881551,1971.672761216601,1942.6775735516508,1913.6823858867015,1884.687198221751,1855.6920105568013,1826.696822891851,1797.701635226902,1768.7064475619518,1739.711259897
+Commercial Battery Storage 8Hr/Conservative,3447.8859708024584,4138.69984202095,3736.037824270098,3683.044379954212,3545.261424732903,3407.4784695115954,3269.6955142902866,3131.9125590689773,2994.1296038476694,2985.5795681438162,2977.0295324399644,2968.4794967361113,2959.929461032259,2951.379425328406,2942.829389624554,2934.279353920702,2925.7293182168496,2917.1792825129974,2908.6292468091447,2900.079211105292,2891.52917540144,2882.9791396975875,2874.429103993735,2865.8790682898816,2857.3290325860307,2848.7789968821776,2840.2289611783253,2831.678925474473,2823.128889770619
diff --git a/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_fom.csv b/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_fom.csv
index 97d9ec5..16afd60 100644
--- a/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_fom.csv
+++ b/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_fom.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,41.17291488823829,29.61970578766454,27.957009257113175,26.534539118786462,25.578497346574345,24.62245557436223,23.666413802150103,22.710372029938,21.75433025772586,21.34523811633819,20.9361459749505,20.52705383356284,20.117961692175157,19.708869550787476,19.299777409399805,18.89068526801213,18.481593126624464,18.07250098523679,17.66340884384912,17.254316702461438,16.845224561073763,16.436132419686086,16.02704027829841,15.61794813691073,15.208855995523061,14.799763854135382,14.390671712747713,13.981579571360038,13.572487429972355
-Commercial Battery Storage 1Hr/Moderate,41.17291488823829,38.328796949401884,35.839299437409984,34.34209846854473,33.237508576900005,32.161499520720575,31.155990819895443,30.243549756665427,29.3575253070036,28.990556240666066,28.62358717432851,28.256618107990985,27.889649041653442,27.52267997531588,27.155710908978335,26.788741842640803,26.421772776303243,26.05480370996571,25.68783464362818,25.32086557729062,24.953896510953076,24.58692744461554,24.219958378277997,23.852989311940465,23.486020245602916,23.11905117926537,22.752082112927823,22.385113046590263,22.01814398025271
-Commercial Battery Storage 1Hr/Conservative,41.17291488823829,42.69783766187673,43.00282221660443,42.39285310714903,40.806933422565066,39.22101373798106,37.635094053397054,36.049174368813084,34.46325468422909,34.36484142327924,34.266428162329404,34.16801490137956,34.0696016404297,33.97118837947987,33.87277511853002,33.77436185758017,33.675948596630306,33.57753533568048,33.47912207473063,33.38070881378078,33.28229555283093,33.1838822918811,33.08546903093124,32.9870557699814,32.88864250903156,32.7902292480817,32.69181598713187,32.59340272618203,32.49498946523214
-Commercial Battery Storage 2Hr/Advanced,48.0519374418654,34.568459712379976,32.62796582488783,30.96783449133187,29.85206069793281,28.736286904533735,27.62051311113465,26.50473931773559,25.3889655243365,24.911523739141572,24.43408195394663,23.95664016875171,23.47919838355678,23.001756598361847,22.524314813166924,22.046873027971998,21.569431242777075,21.091989457582148,20.614547672387225,20.13710588719229,19.659664101997365,19.182222316802434,18.704780531607508,18.227338746412578,17.74989696121765,17.27245517602272,16.7950133908278,16.317571605632867,15.840129820437932
-Commercial Battery Storage 2Hr/Moderate,48.0519374418654,44.60763116674487,41.543028953906195,39.773970165048425,38.37176578112428,37.02426378964313,35.76908173013936,34.631041943195925,33.53770881672469,33.118487456515645,32.69926609630657,32.28004473609754,31.860823375888483,31.4416020156794,31.022380655470347,30.6031592952613,30.183937935052235,29.764716574843188,29.345495214634134,28.92627385442506,28.507052494216005,28.08783113400695,27.668609773797904,27.24938841358885,26.830167053379792,26.41094569317073,25.991724332961674,25.572502972752602,25.153281612543527
-Commercial Battery Storage 2Hr/Conservative,48.0519374418654,49.83163882860114,50.187579105948295,49.47569855125398,47.62480910904883,45.773919666843625,43.92303022463843,42.07214078243327,40.221251340228086,40.10639554555217,39.991539750876285,39.87668395620038,39.76182816152447,39.64697236684857,39.53211657217267,39.41726077749675,39.30240498282083,39.18754918814495,39.07269339346904,38.957837598793134,38.84298180411724,38.72812600944134,38.61327021476542,38.498414420089524,38.38355862541363,38.2687028307377,38.15384703606181,38.038991241385915,37.92413544670996
-Commercial Battery Storage 4Hr/Advanced,61.80998254911963,44.46596756181086,41.969878960437136,39.8344252364227,38.39918740064972,36.963949564876735,35.52871172910374,34.093473893330774,32.65823605755777,32.04409498474834,31.42995391193889,30.815812839129467,30.201671766320032,29.587530693510587,28.97338962070116,28.35924854789173,27.745107475082296,27.13096640227286,26.516825329463433,25.902684256653995,25.288543183844567,24.674402111035135,24.0602610382257,23.44611996541626,22.83197889260683,22.217837819797396,21.603696746987964,20.989555674178533,20.375414601369084
-Commercial Battery Storage 4Hr/Moderate,61.80998254911963,57.16529960143086,52.9504879868986,50.63771355805582,48.64028018957285,46.749792327488244,44.99526355062722,43.406026316256934,41.89807583616687,41.3743498882148,40.8506239402627,40.32689799231063,39.803172044358554,39.279446096406446,38.755720148454365,38.23199420050229,37.7082682525502,37.184542304598125,36.660816356646045,36.13709040869394,35.61336446074187,35.08963851278978,34.56591256483771,34.04218661688562,33.51846066893354,32.99473472098145,32.471008773029375,31.94728282507727,31.42355687712517
-Commercial Battery Storage 4Hr/Conservative,61.80998254911963,64.09924116204998,64.55709288463605,63.64138943946389,61.260560482016345,58.879731524568776,56.4989025671212,54.118073609673644,51.73724465222606,51.58950379009803,51.44176292797004,51.294022065842015,51.14628120371398,50.998540341585965,50.85079947945796,50.703058617329916,50.55531775520189,50.40757689307389,50.25983603094585,50.11209516881784,49.96435430668983,49.81661344456181,49.668872582433785,49.521131720305775,49.37339085817776,49.225649996049725,49.07790913392171,48.93016827179369,48.78242740966562
-Commercial Battery Storage 6Hr/Advanced,75.56802765637387,54.36347541124174,51.31179209598644,48.70101598151354,46.946314103366646,45.19161222521975,43.436910347072846,41.68220846892595,39.92750659077904,39.17666623035511,38.425825869931145,37.674985509507216,36.92414514908327,36.17330478865933,35.42246442823539,34.67162406781146,33.92078370738752,33.16994334696358,32.41910298653964,31.668262626115705,30.91742226569177,30.166581905267822,29.415741544843883,28.664901184419946,27.914060823996007,27.163220463572067,26.412380103148127,25.661539742724187,24.910699382300233
-Commercial Battery Storage 6Hr/Moderate,75.56802765637387,69.72296803611682,64.35794701989103,61.501456951063226,58.90879459802141,56.47532086533334,54.22144537111508,52.181010689317944,50.25844285560906,49.630212319913966,49.00198178421883,48.37375124852373,47.74552071282863,47.11729017713349,46.48905964143839,45.860829105743285,45.23259857004817,44.604368034353065,43.976137498657955,43.34790696296283,42.71967642726772,42.09144589157262,41.463215355877516,40.8349848201824,40.20675428448729,39.57852374879217,38.95029321309707,38.32206267740194,37.69383214170681
-Commercial Battery Storage 6Hr/Conservative,75.56802765637387,78.36684349549881,78.9266066633238,77.8070803276738,74.89631185498388,71.98554338229393,69.07477490960395,66.16400643691401,63.25323796422405,63.07261203464391,62.89198610506378,62.711360175483655,62.5307342459035,62.35010831632337,62.16948238674325,61.98885645716308,61.80823052758296,61.627604598002826,61.44697866842269,61.26635273884255,61.08572680926242,60.90510087968228,60.72447495010214,60.543849020522025,60.36322309094189,60.182597161361734,60.0019712317816,59.821345302201465,59.64071937262128
-Commercial Battery Storage 8Hr/Advanced,89.3260727636281,64.26098326067262,60.653705231535746,57.56760672660437,55.49344080608356,53.41927488556274,51.34510896504194,49.27094304452112,47.196777124000306,46.30923747596188,45.4216978279234,44.53415817988497,43.64661853184652,42.75907888380807,41.87153923576963,40.98399958773119,40.09645993969275,39.2089202916543,38.32138064361585,37.43384099557741,36.546301347538964,35.65876169950052,34.77122205146207,33.883682403423634,32.996142755385186,32.10860310734674,31.221063459308297,30.333523811269846,29.445984163231387
-Commercial Battery Storage 8Hr/Moderate,89.3260727636281,82.28063647080279,75.76540605288343,72.36520034407062,69.17730900646998,66.20084940317844,63.44762719160293,60.955995062378946,58.61880987505124,57.886074751613116,57.15333962817496,56.420604504736836,55.6878693812987,54.95513425786054,54.2223991344224,53.489664010984285,52.756928887546145,52.02419376410801,51.29145864066987,50.558723517231726,49.82598839379358,49.09325327035544,48.36051814691732,47.627783023479175,46.895047900041035,46.1623127766029,45.42957765316476,44.69684252972661,43.964107406288434
-Commercial Battery Storage 8Hr/Conservative,89.3260727636281,92.63444582894763,93.29612044201154,91.97277121588371,88.5320632279514,85.09135524001907,81.65064725208671,78.20993926415439,74.76923127622204,74.55572027918977,74.34220928215754,74.12869828512528,73.91518728809301,73.70167629106076,73.48816529402853,73.27465429699626,73.061143299964,72.84763230293177,72.6341213058995,72.42061030886725,72.20709931183501,71.99358831480275,71.7800773177705,71.56656632073826,71.35305532370602,71.13954432667374,70.9260333296415,70.71252233260923,70.49901133557694
+Commercial Battery Storage 1Hr/Advanced,34.929480935955034,40.450981105990294,27.816081048641998,23.354205217573295,22.512751154819053,21.671297092064812,20.829843029310563,19.98838896655632,19.146934903802073,18.786875067070252,18.426815230338434,18.06675539360662,17.706695556874802,17.34663572014298,16.986575883411163,16.626516046679345,16.26645620994753,15.906396373215713,15.546336536483901,15.186276699752083,14.826216863020262,14.466157026288446,14.106097189556628,13.746037352824812,13.385977516092996,13.025917679361175,12.66585784262936,12.305798005897543,11.945738169165722
+Commercial Battery Storage 1Hr/Moderate,34.929480935955034,40.450981105990294,31.415766254995575,30.088934182341433,29.074105377022438,28.091209957443898,27.173898427106042,26.341852464613194,25.537514841997783,25.218295906472818,24.899076970947846,24.579858035422884,24.260639099897908,23.94142016437293,23.622201228847956,23.302982293322994,22.98376335779801,22.664544422273046,22.34532548674808,22.02610655122311,21.706887615698136,21.38766868017316,21.06844974464819,20.74923080912322,20.430011873598254,20.110792938073285,19.79157400254831,19.47235506702333,19.153136131498343
+Commercial Battery Storage 1Hr/Conservative,34.929480935955034,40.450981105990294,37.848659457980084,37.3117990401364,35.915961953742816,34.520124867349224,33.124287780955626,31.72845069456205,30.332613608168455,30.245995804781536,30.15937800139463,30.072760198007728,29.986142394620817,29.8995245912339,29.812906787846998,29.726288984460087,29.639671181073183,29.553053377686275,29.466435574299357,29.379817770912457,29.29319996752554,29.206582164138634,29.119964360751727,29.033346557364816,28.946728753977915,28.860110950590997,28.773493147204086,28.686875343817185,28.60025754043024
+Commercial Battery Storage 2Hr/Advanced,41.80850348958215,48.91926471900621,34.115814978666606,27.953589465747214,26.94641918504685,25.93924890434649,24.93207862364612,23.924908342945756,22.917738062245384,22.4867679322265,22.055797802207618,21.624827672188736,21.19385754216986,20.76288741215097,20.331917282132093,19.900947152113215,19.469977022094334,19.039006892075452,18.608036762056575,18.17706663203769,17.746096502018812,17.315126371999934,16.88415624198105,16.453186111962168,16.022215981943287,15.591245851924407,15.160275721905528,14.729305591886646,14.29833546186776
+Commercial Battery Storage 2Hr/Moderate,41.80850348958215,48.91926471900621,37.33318016259971,35.72430539485247,34.40071227477674,33.136152714827524,31.959814068857657,30.893717557267323,29.87430465035396,29.50087584222455,29.127447034095116,28.7540182259657,28.380589417836276,28.007160609706844,27.633731801577422,27.260302993448,26.886874185318575,26.513445377189157,26.14001656905974,25.76658776093031,25.39315895280089,25.01973014467146,24.646301336542038,24.272872528412616,23.899443720283195,23.526014912153773,23.15258610402435,22.77915729589492,22.405728487765476
+Commercial Battery Storage 2Hr/Conservative,41.80850348958215,48.91926471900621,45.30258591378353,44.659996042666045,42.989262377760554,41.31852871285506,39.64779504794958,37.97706138304408,36.30632771813859,36.20265137832118,36.09897503850379,35.99529869868639,35.89162235886898,35.787946019051574,35.684269679234184,35.580593339416765,35.476916999599375,35.37324065978198,35.26956431996457,35.165887980147176,35.062211640329764,34.95853530051237,34.85485896069497,34.751182620877564,34.64750628106017,34.543829941242755,34.440153601425365,34.33647726160796,34.23280092179053
+Commercial Battery Storage 4Hr/Advanced,55.566548596836384,65.85583194503802,46.715282838715815,37.152357962095046,35.81375524550245,34.47515252890983,33.136549812317234,31.797947095724613,30.459344379132006,29.886553662538997,29.313762945945985,28.740972229352977,28.168181512759965,27.595390796166953,27.022600079573948,26.449809362980943,25.87701864638794,25.30422792979493,24.73143721320192,24.15864649660892,23.58585578001591,23.013065063422903,22.44027434682989,21.867483630236887,21.294692913643875,20.721902197050873,20.14911148045786,19.576320763864857,19.003530047271838
+Commercial Battery Storage 4Hr/Moderate,55.566548596836384,65.85583194503802,49.16800797780799,46.99504781987456,45.05392607028535,43.22603822959478,41.53164535236091,39.99744774257557,38.547884267066316,38.066035713728,37.58418716038966,37.10233860705133,36.62049005371301,36.138641500374675,35.65679294703635,35.174944393698034,34.693095840359696,34.211247287021365,33.729398733683034,33.24755018034472,32.76570162700639,32.283853073668055,31.80200452032973,31.32015596699141,30.838307413653077,30.356458860314753,29.87461030697643,29.392761753638094,28.910913200299742
+Commercial Battery Storage 4Hr/Conservative,55.566548596836384,65.85583194503802,60.21043882539041,59.35639004772531,57.13586322579603,54.915336403866746,52.694809581937456,50.47428276000815,48.253755938078875,48.11596252540048,47.9781691127221,47.840375700043694,47.70258228736532,47.56478887468692,47.42699546200855,47.28920204933015,47.15140863665177,47.01361522397339,46.875821811295,46.73802839861661,46.60023498593822,46.46244157325983,46.324648160581454,46.18685474790306,46.049061335224685,45.91126792254628,45.7734745098679,45.63568109718952,45.49788768451109
+Commercial Battery Storage 6Hr/Advanced,69.32459370409062,82.79239917106983,59.31475069876501,46.35112645844288,44.681091305958034,43.011056153473184,41.341021000988334,39.67098584850348,38.000950696018634,37.28633939285149,36.57172808968435,35.85711678651722,35.14250548335008,34.427894180182946,33.71328287701581,32.99867157384868,32.284060270681536,31.569448967514404,30.854837664347265,30.140226361180147,29.42561505801301,28.711003754845873,27.99639245167873,27.2817811485116,26.567169845344463,25.852558542177334,25.137947239010195,24.423335935843067,23.708724632675917
+Commercial Battery Storage 6Hr/Moderate,69.32459370409062,82.79239917106983,61.00283579301626,58.26579024489666,55.70713986579395,53.31592374436204,51.10347663586416,49.101177927883825,47.22146388377867,46.631195585231445,46.0409272866842,45.45065898813697,44.86039068958974,44.270122391042506,43.679854092495276,43.08958579394806,42.49931749540082,41.90904919685358,41.31878089830636,40.72851259975912,40.1382443012119,39.547976002664655,38.95770770411744,38.367439405570195,37.77717110702296,37.18690280847573,36.596634509928506,36.00636621138127,35.416097912834
+Commercial Battery Storage 6Hr/Conservative,69.32459370409062,82.79239917106983,75.11829173699729,74.05278405278459,71.2824640738315,68.51214409487842,65.74182411592533,62.971504136972214,60.20118415801914,60.02927367247976,59.8573631869404,59.68545270140102,59.513542215861655,59.34163173032226,59.16972124478291,58.997810759243535,58.82590027370417,58.65398978816481,58.48207930262543,58.31016881708604,58.13825833154667,57.966347846007295,57.794437360467946,57.62252687492857,57.45061638938919,57.27870590384981,57.10679541831045,56.93488493277107,56.76297444723166
+Commercial Battery Storage 8Hr/Advanced,83.08263881134484,99.72896639710163,71.91421855881426,55.549894954790716,53.54842736641364,51.54695977803652,49.54549218965944,47.54402460128233,45.542557012905256,44.68612512316399,43.82969323342272,42.97326134368145,42.11682945394019,41.26039756419894,40.403965674457666,39.547533784716414,38.691101894975134,37.83467000523388,36.978238115492616,36.121806225751364,35.265374336010105,34.40894244626884,33.55251055652757,32.69607866678631,31.839646777045047,30.9832148873038,30.126782997562533,29.27035110782127,28.413919218079993
+Commercial Battery Storage 8Hr/Moderate,83.08263881134484,99.72896639710163,72.83766360822453,69.53653266991874,66.36035366130254,63.405809259129285,60.67530791936741,58.204908113192076,55.89504350049101,55.1963554567349,54.49766741297876,53.79897936922262,53.10029132546647,52.40160328171034,51.7029152379542,51.00422719419808,50.30553915044194,49.606851106685795,48.90816306292966,48.20947501917353,47.510786975417396,46.812098931661254,46.11341088790513,45.41472284414898,44.71603480039285,44.017346756636705,43.31865871288059,42.61997066912445,41.92128262536826
+Commercial Battery Storage 8Hr/Conservative,83.08263881134484,99.72896639710163,90.02614464860417,88.74917805784388,85.42906492186697,82.1089517858901,78.7888386499132,75.46872551393629,72.14861237795942,71.94258481955904,71.73655726115871,71.53052970275833,71.32450214435798,71.11847458595761,70.91244702755726,70.70641946915691,70.50039191075656,70.29436435235621,70.08833679395585,69.88230923555548,69.67628167715513,69.47025411875477,69.26422656035443,69.05819900195404,68.85217144355373,68.64614388515335,68.440116326753,68.23408876835263,68.02806120995224
diff --git a/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_occ.csv b/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_occ.csv
index ed451d5..4a2c2f7 100644
--- a/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_occ.csv
+++ b/tests/data/Commercial_Battery_Storage/R&D/TechLife/df_occ.csv
@@ -1,16 +1,16 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Commercial Battery Storage 1Hr/Advanced,1646.9165955295314,1184.7882315065815,1118.280370284527,1061.3815647514584,1023.1398938629737,984.8982229744892,946.6565520860041,908.4148811975199,870.1732103090344,853.8095246535275,837.4458389980199,821.0821533425135,804.7184676870063,788.354782031499,771.9910963759921,755.6274107204853,739.2637250649785,722.9000394094716,706.5363537539647,690.1726680984575,673.8089824429505,657.4452967874435,641.0816111319365,624.7179254764292,608.3542398209224,591.9905541654152,575.6268685099085,559.2631828544015,542.8994971988942
-Commercial Battery Storage 1Hr/Moderate,1646.9165955295314,1533.1518779760752,1433.5719774963993,1373.683938741789,1329.500343076,1286.459980828823,1246.2396327958177,1209.741990266617,1174.3010122801438,1159.6222496266425,1144.9434869731404,1130.2647243196393,1115.5859616661376,1100.9071990126351,1086.2284363591334,1071.5496737056321,1056.8709110521297,1042.1921483986284,1027.5133857451272,1012.8346230916246,998.155860438123,983.4770977846215,968.7983351311199,954.1195724776186,939.4408098241166,924.7620471706148,910.0832845171129,895.4045218636105,880.7257592101083
-Commercial Battery Storage 1Hr/Conservative,1646.9165955295314,1707.9135064750692,1720.112888664177,1695.7141242859611,1632.2773369026027,1568.8405495192424,1505.403762135882,1441.9669747525234,1378.5301873691635,1374.5936569311693,1370.657126493176,1366.7205960551823,1362.7840656171882,1358.8475351791947,1354.9110047412007,1350.9744743032065,1347.0379438652121,1343.101413427219,1339.1648829892251,1335.228352551231,1331.2918221132372,1327.3552916752437,1323.4187612372498,1319.482230799256,1315.5457003612626,1311.609169923268,1307.6726394852747,1303.736109047281,1299.7995786092854
-Commercial Battery Storage 2Hr/Advanced,1922.0774976746159,1382.738388495199,1305.118632995513,1238.7133796532748,1194.0824279173123,1149.4514761813493,1104.820524445386,1060.1895727094236,1015.5586209734599,996.4609495656629,977.3632781578651,958.2656067500684,939.1679353422712,920.0702639344738,900.972592526677,881.8749211188799,862.777249711083,843.6795783032859,824.5819068954889,805.4842354876916,786.3865640798945,767.2888926720974,748.1912212643002,729.093549856503,709.995878448706,690.8982070409088,671.800535633112,652.7028642253147,633.6051928175173
-Commercial Battery Storage 2Hr/Moderate,1922.0774976746159,1784.3052466697948,1661.7211581562476,1590.9588066019369,1534.870631244971,1480.9705515857252,1430.7632692055745,1385.241677727837,1341.5083526689875,1324.7394982606259,1307.9706438522628,1291.2017894439014,1274.4329350355392,1257.664080627176,1240.8952262188138,1224.126371810452,1207.3575174020893,1190.5886629937274,1173.8198085853653,1157.0509541770023,1140.2820997686401,1123.513245360278,1106.744390951916,1089.975536543554,1073.2066821351916,1056.4378277268293,1039.668973318467,1022.900118910104,1006.131264501741
-Commercial Battery Storage 2Hr/Conservative,1922.0774976746159,1993.2655531440457,2007.5031642379317,1979.027942050159,1904.9923643619532,1830.956786673745,1756.921208985537,1682.8856312973307,1608.8500536091233,1604.2558218220865,1599.6615900350514,1595.0673582480151,1590.4731264609786,1585.8788946739428,1581.2846628869067,1576.6904310998698,1572.0961993128333,1567.501967525798,1562.9077357387614,1558.3135039517254,1553.7192721646893,1549.1250403776535,1544.5308085906167,1539.936576803581,1535.342345016545,1530.7481132295081,1526.1538814424725,1521.5596496554365,1516.9654178683984
-Commercial Battery Storage 4Hr/Advanced,2472.399301964785,1778.638702472434,1678.7951584174853,1593.3770094569081,1535.9674960259888,1478.5579825950692,1421.1484691641497,1363.7389557332308,1306.3294423023108,1281.7637993899336,1257.1981564775556,1232.6325135651787,1208.0668706528013,1183.5012277404235,1158.9355848280463,1134.3699419156692,1109.8042990032918,1085.2386560909144,1060.6730131785373,1036.1073702661597,1011.5417273537827,986.9760844414053,962.4104415290279,937.8447986166503,913.2791557042732,888.7135127918958,864.1478698795185,839.5822269671412,815.0165840547633
-Commercial Battery Storage 4Hr/Moderate,2472.399301964785,2286.611984057234,2118.019519475944,2025.5085423222329,1945.6112075829137,1869.9916930995296,1799.8105420250888,1736.2410526502772,1675.9230334466747,1654.973995528592,1634.024957610508,1613.075919692425,1592.126881774342,1571.1778438562578,1550.2288059381744,1529.2797680200918,1508.330730102008,1487.381692183925,1466.4326542658416,1445.4836163477578,1424.5345784296746,1403.5855405115913,1382.6365025935083,1361.687464675425,1340.7384267573416,1319.789388839258,1298.8403509211748,1277.8913130030908,1256.9422750850067
-Commercial Battery Storage 4Hr/Conservative,2472.399301964785,2563.969646481999,2582.2837153854416,2545.6555775785555,2450.4224192806537,2355.189260982751,2259.956102684848,2164.7229443869455,2069.4897860890424,2063.580151603921,2057.6705171188014,2051.7608826336805,2045.851248148559,2039.9416136634384,2034.0319791783184,2028.1223446931965,2022.2127102080756,2016.3030757229553,2010.393441237834,2004.4838067527135,1998.574172267593,1992.6645377824723,1986.7549032973513,1980.8452688122309,1974.9356343271102,1969.0259998419888,1963.1163653568683,1957.2067308717474,1951.2970963866248
-Commercial Battery Storage 6Hr/Advanced,3022.7211062549545,2174.5390164496694,2052.4716838394575,1948.0406392605416,1877.8525641346657,1807.6644890087898,1737.4764138829137,1667.2883387570378,1597.1002636311614,1567.0666492142043,1537.0330347972458,1506.9994203802887,1476.965805963331,1446.9321915463731,1416.8985771294158,1386.8649627124582,1356.8313482955007,1326.797733878543,1296.7641194615856,1266.7305050446282,1236.6968906276707,1206.6632762107129,1176.6296617937553,1146.5960473767977,1116.5624329598402,1086.5288185428826,1056.495204125925,1026.4615897089675,996.4279752920093
-Commercial Battery Storage 6Hr/Moderate,3022.7211062549545,2788.918721444673,2574.317880795641,2460.058278042529,2356.351783920856,2259.0128346133333,2168.857814844603,2087.2404275727176,2010.3377142243623,1985.2084927965584,1960.079271368753,1934.9500499409492,1909.820828513145,1884.6916070853395,1859.5623856575353,1834.4331642297313,1809.3039428019267,1784.1747213741226,1759.0454999463182,1733.916278518513,1708.7870570907087,1683.6578356629045,1658.5286142351006,1633.399392807296,1608.2701713794916,1583.1409499516867,1558.0117285238825,1532.8825070960775,1507.7532856682722
-Commercial Battery Storage 6Hr/Conservative,3022.7211062549545,3134.673739819952,3157.0642665329515,3112.2832131069517,2995.852474199355,2879.4217352917567,2762.990996384158,2646.5602574765603,2530.129518568962,2522.9044813857563,2515.679444202551,2508.454407019346,2501.22936983614,2494.004332652935,2486.7792954697297,2479.5542582865232,2472.329221103318,2465.104183920113,2457.8791467369074,2450.654109553702,2443.4290723704967,2436.204035187291,2428.9789980040855,2421.753960820881,2414.5289236376752,2407.303886454469,2400.078849271264,2392.8538120880585,2385.628774904851
-Commercial Battery Storage 8Hr/Advanced,3573.042910545124,2570.4393304269047,2426.1482092614297,2302.7042690641747,2219.7376322433424,2136.7709954225097,2053.8043586016774,1970.8377217808447,1887.8710849600122,1852.369499038475,1816.867913116936,1781.3663271953985,1745.8647412738608,1710.3631553523228,1674.8615694307853,1639.3599835092475,1603.8583975877098,1568.356811666172,1532.855225744634,1497.3536398230965,1461.8520539015585,1426.350467980021,1390.8488820584828,1355.3472961369453,1319.8457102154073,1284.3441242938695,1248.8425383723318,1213.3409524507938,1177.8393665292554
-Commercial Battery Storage 8Hr/Moderate,3573.042910545124,3291.2254588321116,3030.616242115337,2894.6080137628246,2767.092360258799,2648.0339761271375,2537.905087664117,2438.2398024951576,2344.7523950020495,2315.4429900645246,2286.1335851269982,2256.8241801894733,2227.514775251948,2198.2053703144215,2168.895965376896,2139.586560439371,2110.2771555018458,2080.9677505643203,2051.658345626795,2022.3489406892688,1993.0395357517432,1963.7301308142175,1934.4207258766928,1905.111320939167,1875.8019160016413,1846.4925110641161,1817.1831061265905,1787.8737011890641,1758.5642962515374
-Commercial Battery Storage 8Hr/Conservative,3573.042910545124,3705.377833157905,3731.8448176804613,3678.910848635348,3541.2825291180557,3403.6542096007624,3266.0258900834683,3128.397570566175,2990.7692510488814,2982.2288111675907,2973.6883712863014,2965.147931405011,2956.6074915237205,2948.0670516424307,2939.5266117611413,2930.98617187985,2922.44573199856,2913.9052921172706,2905.36485223598,2896.82441235469,2888.2839724734004,2879.74353259211,2871.2030927108203,2862.66265282953,2854.1222129482408,2845.5817730669496,2837.04133318566,2828.500893304369,2819.9604534230775
+Commercial Battery Storage 1Hr/Advanced,1397.1792374382012,1618.0392442396117,1112.6432419456798,934.1682087029318,900.510046192762,866.8518836825924,833.1937211724224,799.5355586622528,765.8773961520828,751.47500268281,737.0726092135374,722.6702157442647,708.267822274992,693.8654288057191,679.4630353364465,665.0606418671738,650.6582483979013,636.2558549286285,621.853461459356,607.4510679900833,593.0486745208104,578.6462810515378,564.2438875822651,549.8414941129925,535.4391006437198,521.036707174447,506.6343137051744,492.2319202359017,477.8295267666288
+Commercial Battery Storage 1Hr/Moderate,1397.1792374382012,1618.0392442396117,1256.6306501998229,1203.5573672936573,1162.9642150808975,1123.6483982977559,1086.9559370842417,1053.6740985845277,1021.5005936799113,1008.7318362589127,995.9630788379138,983.1943214169153,970.4255639959163,957.6568065749171,944.8880491539182,932.1192917329197,919.3505343119205,906.5817768909218,893.8130194699231,881.0442620489242,868.2755046279253,855.5067472069263,842.7379897859277,829.9692323649288,817.2004749439301,804.4317175229313,791.6629601019323,778.8942026809332,766.1254452599337
+Commercial Battery Storage 1Hr/Conservative,1397.1792374382012,1618.0392442396117,1513.9463783192034,1492.471961605456,1436.6384781497127,1380.8049946939689,1324.971511238225,1269.138027782482,1213.304544326738,1209.8398321912614,1206.3751200557851,1202.9104079203091,1199.4456957848327,1195.980983649356,1192.51627151388,1189.0515593784035,1185.5868472429272,1182.122135107451,1178.6574229719743,1175.1927108364982,1171.7279987010215,1168.2632865655453,1164.798574430069,1161.3338622945926,1157.8691501591165,1154.4044380236398,1150.9397258881634,1147.4750137526873,1144.0103016172095
+Commercial Battery Storage 2Hr/Advanced,1672.340139583286,1956.770588760248,1364.6325991466642,1118.1435786298885,1077.8567674018739,1037.5699561738595,997.2831449458447,956.9963337178301,916.7095224898153,899.47071728906,882.2319120883046,864.9931068875494,847.7543016867943,830.5154964860387,813.2766912852836,796.0378860845285,778.7990808837733,761.5602756830181,744.321470482263,727.0826652815076,709.8438600807524,692.6050548799973,675.366249679242,658.1274444784867,640.8886392777315,623.6498340769763,606.411028876221,589.1722236754658,571.9334184747104
+Commercial Battery Storage 2Hr/Moderate,1672.340139583286,1956.770588760248,1493.3272065039885,1428.972215794099,1376.0284909910695,1325.446108593101,1278.3925627543063,1235.7487022906928,1194.9721860141583,1180.035033688982,1165.0978813638046,1150.160729038628,1135.223576713451,1120.2864243882736,1105.3492720630968,1090.41211973792,1075.474967412743,1060.5378150875663,1045.6006627623894,1030.6635104372124,1015.7263581120354,1000.7892057868584,985.8520534616815,970.9149011365046,955.9777488113277,941.0405964861509,926.103444160974,911.1662918357968,896.229139510619
+Commercial Battery Storage 2Hr/Conservative,1672.340139583286,1956.770588760248,1812.103436551341,1786.3998417066416,1719.5704951104221,1652.7411485142025,1585.911801917983,1519.082455321763,1452.2531087255436,1448.1060551328471,1443.9590015401516,1439.8119479474556,1435.664894354759,1431.5178407620629,1427.3707871693673,1423.2237335766706,1419.076679983975,1414.929626391279,1410.7825727985828,1406.635519205887,1402.4884656131906,1398.3414120204945,1394.1943584277988,1390.0473048351025,1385.9002512424067,1381.7531976497103,1377.6061440570145,1373.4590904643183,1369.312036871621
+Commercial Battery Storage 4Hr/Advanced,2222.661943873455,2634.2332778015207,1868.6113135486326,1486.0943184838018,1432.550209820098,1379.0061011563932,1325.4619924926892,1271.9178838289845,1218.3737751652802,1195.4621465015598,1172.5505178378394,1149.638889174119,1126.7272605103985,1103.8156318466781,1080.904003182958,1057.9923745192377,1035.0807458555175,1012.1691171917971,989.2574885280768,966.3458598643567,943.4342312006363,920.5226025369161,897.6109738731956,874.6993452094754,851.787716545755,828.8760878820349,805.9644592183145,783.0528305545942,760.1412018908735
+Commercial Battery Storage 4Hr/Moderate,2222.661943873455,2634.2332778015207,1966.7203191123194,1879.8019127949822,1802.157042811414,1729.041529183791,1661.2658140944363,1599.8979097030226,1541.9153706826526,1522.6414285491198,1503.3674864155864,1484.0935442820532,1464.8196021485205,1445.5456600149869,1426.271717881454,1406.9977757479212,1387.7238336143878,1368.4498914808546,1349.1759493473214,1329.9020072137887,1310.6280650802557,1291.354122946722,1272.0801808131891,1252.8062386796564,1233.532296546123,1214.25835441259,1194.984412279057,1175.7104701455237,1156.4365280119896
+Commercial Battery Storage 4Hr/Conservative,2222.661943873455,2634.2332778015207,2408.4175530156162,2374.2556019090125,2285.434529031841,2196.6134561546696,2107.792383277498,2018.9713104003258,1930.1502375231548,1924.6385010160188,1919.1267645088838,1913.6150280017478,1908.1032914946124,1902.5915549874767,1897.0798184803418,1891.5680819732058,1886.0563454660708,1880.5446089589354,1875.0328724518,1869.5211359446644,1864.0093994375288,1858.497662930393,1852.985926423258,1847.4741899161224,1841.9624534089874,1836.4507169018511,1830.938980394716,1825.4272438875805,1819.9155073804436
+Commercial Battery Storage 6Hr/Advanced,2772.9837481636246,3311.695966842793,2372.5900279506004,1854.045058337715,1787.2436522383214,1720.4422461389272,1653.6408400395333,1586.8394339401389,1520.0380278407454,1491.4535757140595,1462.869123587374,1434.2846714606887,1405.7002193340031,1377.1157672073177,1348.531315080632,1319.9468629539472,1291.3624108272613,1262.7779587005762,1234.1935065738905,1205.6090544472058,1177.0246023205202,1148.4401501938348,1119.8556980671492,1091.271245940464,1062.6867938137784,1034.1023416870933,1005.5178895604078,976.9334374337226,948.3489853070366
+Commercial Battery Storage 6Hr/Moderate,2772.9837481636246,3311.695966842793,2440.11343172065,2330.631609795866,2228.2855946317577,2132.6369497744813,2044.1390654345664,1964.0471171153529,1888.8585553511466,1865.2478234092578,1841.637091467368,1818.0263595254787,1794.4156275835896,1770.8048956417,1747.194163699811,1723.5834317579222,1699.9726998160327,1676.3619678741431,1652.751235932254,1629.1405039903648,1605.5297720484757,1581.919040106586,1558.3083081646973,1534.6975762228078,1511.0868442809183,1487.4761123390292,1463.8653803971401,1440.2546484552508,1416.64391651336
+Commercial Battery Storage 6Hr/Conservative,2772.9837481636246,3311.695966842793,3004.7316694798915,2962.1113621113836,2851.29856295326,2740.485763795137,2629.672964637013,2518.8601654788886,2408.0473663207654,2401.1709468991903,2394.2945274776157,2387.4181080560406,2380.541688634466,2373.6652692128905,2366.7888497913164,2359.9124303697413,2353.0360109481667,2346.159591526592,2339.283172105017,2332.4067526834415,2325.530333261867,2318.653913840292,2311.7774944187177,2304.9010749971426,2298.0246555755675,2291.1482361539925,2284.271816732418,2277.395397310843,2270.5189778892664
+Commercial Battery Storage 8Hr/Advanced,3323.305552453793,3989.158655884065,2876.56874235257,2221.9957981916286,2141.9370946565455,2061.878391121461,1981.8196875863775,1901.7609840512932,1821.70228051621,1787.4450049265595,1753.1877293369087,1718.9304537472578,1684.6731781576075,1650.4159025679573,1616.1586269783065,1581.9013513886564,1547.6440757990053,1513.3868002093552,1479.1295246197046,1444.8722490300545,1410.6149734404041,1376.3576978507535,1342.100422261103,1307.8431466714526,1273.5858710818018,1239.3285954921519,1205.0713199025013,1170.8140443128507,1136.5567687231996
+Commercial Battery Storage 8Hr/Moderate,3323.305552453793,3989.158655884065,2913.5065443289814,2781.4613067967493,2654.4141464521017,2536.2323703651714,2427.0123167746965,2328.196324527683,2235.8017400196404,2207.854218269396,2179.90669651915,2151.9591747689046,2124.0116530186588,2096.0641312684133,2068.116609518168,2040.1690877679232,2012.2215660176773,1984.2740442674317,1956.3265225171863,1928.379000766941,1900.4314790166957,1872.48395726645,1844.536435516205,1816.5889137659592,1788.6413920157138,1760.6938702654681,1732.7463485152236,1704.7988267649778,1676.8513050147305
+Commercial Battery Storage 8Hr/Conservative,3323.305552453793,3989.158655884065,3601.0457859441667,3549.9671223137548,3417.1625968746785,3284.358071435604,3151.553545996528,3018.749020557452,2885.944495118377,2877.703392782362,2869.462290446348,2861.221188110333,2852.980085774319,2844.7389834383043,2836.4978811022906,2828.2567787662765,2820.0156764302624,2811.7745740942482,2803.5334717582336,2795.292369422219,2787.0512670862054,2778.810164750191,2770.569062414177,2762.3279600781616,2754.086857742149,2745.845755406134,2737.6046530701196,2729.3635507341055,2721.1224483980895
diff --git a/tests/data/Fixed_Offshore_Wind/Market/20/df_capex.csv b/tests/data/Fixed_Offshore_Wind/Market/20/df_capex.csv
new file mode 100644
index 0000000..b019daf
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/20/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,5462.550832369848,5094.404759063653,4875.5549262092645,4722.020175198692,4263.651146110876,3829.295613124674,3410.728337949633,3343.7774992451323,3285.5174365197136,3207.2812724221576,3141.08145831941,3083.8665548677945,3033.5990170228683,2988.8537384617885,2958.8949081013798,2931.03615273454,2905.0183721997228,2880.626813817036,2857.6815376796812,2836.0305427943017,2815.5436693022525,2796.109383287182,2777.6312289765,2760.02494615507,2743.21658539724,2727.1416211172086,2711.7421798514206,2696.967261995978,2682.7713005134847
+Offshore Wind - Class 1/Moderate,6217.537549003377,6050.594891259246,5931.2557072685795,5838.925802633735,5763.930885101322,5700.97021105834,5291.544282275952,4888.852075107402,4491.460278945741,4072.51283498425,3663.0000960065295,3615.862270810396,3574.2345093406543,3537.008235424742,3511.991599288189,3488.66149787881,3466.8138219123107,3446.2791640087826,3426.9151687521285,3408.6011001235547,3391.233850228222,3374.724391496717,3358.9956701796727,3343.980167236275,3329.6190113846337,3315.8598725964,3302.656518621953,3289.967817172063,3277.756959836958
+Offshore Wind - Class 1/Conservative,7549.867055466588,7524.346964544596,7501.037928189001,7479.5964751544225,7459.752640146307,7441.2903400603145,7424.034734950038,7407.84169550011,6874.463003342234,6313.370793819921,5758.409845373221,5208.082210940681,4661.376657071959,4117.577748019326,4100.26493465772,4084.0740017131716,4068.8719067407287,4054.548002773674,4041.008827494427,4028.175109779539,4015.978997982083,4004.3617316888726,3993.272200427305,3982.66605671573,3972.5038312954784,3962.750933130862,3953.3765407221345,3944.3531586306726,3935.6561740041584
+Offshore Wind - Class 2/Advanced,5358.739142998236,4997.589328397251,4782.898624109471,4632.281715654107,4182.623529780819,3756.522615291665,3345.909947900305,3280.231438444361,3223.078621467056,3146.329206691839,3081.3876415122254,3025.26002744198,2975.9477343518092,2932.0528187513814,2902.663410055368,2875.334052750732,2849.810635767615,2825.882619436882,2803.3735007815626,2782.133828788493,2762.0364370540406,2742.9714546924165,2724.8444215677036,2707.5726296266243,2691.083792474087,2675.3142714739247,2660.2075235870307,2645.713436159141,2631.787107365084
+Offshore Wind - Class 2/Moderate,6099.377897155915,5935.607747380369,5818.536715338725,5727.961307946685,5654.391607605821,5592.627539486479,5190.982487228406,4795.942992362201,4406.103572325649,3995.1177208761983,3593.3875214533555,3547.1455153865654,3506.308802120767,3469.790092274592,3445.2488611413337,3422.362012811054,3400.929540141509,3380.7851400765067,3361.7891180488486,3343.823177151232,3326.785983388085,3310.5901722205545,3295.16046379854,3280.4303368995647,3266.3420289287787,3252.8444294135797,3239.891971316572,3227.4444092981566,3215.4657110294934
+Offshore Wind - Class 2/Conservative,7406.3874307080805,7381.352390366644,7358.4863853527395,7337.4523748058255,7317.985493391741,7299.874203623014,7282.946548139545,7267.061169343569,6743.818981066585,6193.3899017697695,5648.975449671825,5109.10650357437,4572.7905668380645,4039.326284040601,4022.3425289928423,4006.4591458335417,3991.546085572757,3977.494364274333,3964.21240438866,3951.6227086915546,3939.658312485724,3928.26178578243,3917.383126796111,3906.9784315199345,3897.0093393822713,3887.441702822251,3878.245587289759,3869.393608214876,3860.8620396949195
+Offshore Wind - Class 3/Advanced,5563.666194857099,5188.705465783053,4965.804712217284,4809.427731107721,4342.574030961793,3900.178299552324,3473.8631867267977,3405.6729467788646,3346.3344641684057,3266.6501330575466,3199.2249980367915,3140.950965854653,3089.752906975992,3044.179439195086,3013.6660435766357,2985.291526998198,2958.792132812655,2933.9490061980596,2910.5791029239003,2888.527317673103,2867.6611623442363,2847.867218252979,2829.0469231213624,2811.114797178504,2793.9954497055987,2777.6226920862823,2761.9383182508886,2746.889887302366,2732.431056122389
+Offshore Wind - Class 3/Moderate,6332.62824425191,6162.59523224895,6041.0472110659675,5947.008043619602,5870.624939042819,5806.498813182058,5389.494232391682,4979.34787876988,4574.600276695524,4147.897677749075,3730.8046237328062,3682.7941509664915,3640.395852003069,3602.4805290910094,3577.0010161147275,3553.2388593653677,3530.9867343662136,3510.0719076762357,3490.3494738991394,3471.696590510754,3454.00771050475,3437.1928084933766,3421.172724221887,3405.879495174652,3391.252365301811,3377.238561100198,3363.790852501856,3350.8673311366247,3338.4304125138055
+Offshore Wind - Class 3/Conservative,7689.620050473284,7663.627437134304,7639.887121519657,7618.048758524303,7597.837393762009,7579.033507198603,7561.458489351737,7544.965660925851,7001.713778059379,6430.2353883344795,5865.001678369514,5304.48731653311,4747.661667351704,4193.796766914002,4176.163542997469,4159.672821076962,4144.189452202149,4129.6002394261195,4115.8105008755465,4102.73930239642,4090.317351048657,4078.4849994694414,4067.19036110524,4056.387758049952,4046.037499307501,4036.103996023863,4026.5560940931773,4017.3657437332995,4008.5077777483943
+Offshore Wind - Class 4/Advanced,5975.833019742907,5573.094469456032,5333.680820228931,5165.719279093875,4664.280086695629,4189.110790265383,3731.213396644922,3657.97153506216,3594.2372192017824,3508.6496839396987,3436.2295811919234,3373.638432539796,3318.6475552929614,3269.697913733989,3236.9240161071007,3206.4475397671245,3177.98499343761,3151.3015572032164,3126.2003282454148,3102.5147817706065,3080.1028949688057,3058.8426013967687,3038.628132310759,3019.367466686351,3000.9797812382362,2983.394230864478,2966.5477312724283,2950.3845155039116,2934.854692642071
+Offshore Wind - Class 4/Moderate,6801.761183217273,6619.1318233949605,6488.579378668923,6387.573443592643,6305.531822094643,6236.6551939994615,5788.758157491227,5348.227348553873,4913.495194579753,4455.1817107127035,4007.1895488563277,3955.6225189303327,3910.0833095790017,3869.359017179189,3841.99196451515,3816.4694344816667,3792.568802720853,3770.1046967594084,3748.921124330627,3728.886373414007,3709.887136193929,3691.8264025542844,3674.6196905425268,3658.1932724704134,3642.4826227521417,3627.430754873791,3612.986669231462,3599.105907474802,3585.7475590519857
+Offshore Wind - Class 4/Conservative,8259.281523874955,8231.363342882703,8205.864317014495,8182.408047019821,8160.699511276999,8140.502559446241,8121.625610406816,8103.9108979927505,7520.413786396996,6906.599295051689,6299.492027699934,5697.453566632146,5099.377331312438,4504.481143033195,4485.541553175938,4467.829169004659,4451.198641648249,4435.528791613096,4420.717508822699,4406.677872213025,4393.335821489715,4380.626831066969,4368.49535572402,4356.89261323105,4345.775475662155,4335.106247657932,4324.850892526213,4314.979697454295,4305.465499609663
+Offshore Wind - Class 5/Advanced,6282.856400383134,5859.426312976391,5607.712002763843,5431.121106911791,4903.919131998218,4404.336990394094,3922.9139229701746,3845.90906670065,3778.9002436638907,3688.91532299003,3612.774466531764,3546.9676819851466,3489.1514266823465,3437.686839438965,3403.2291788025045,3371.186903754147,3341.2619992172013,3313.2076714562813,3286.816817732078,3261.9142654920715,3238.350896329211,3215.9983242841176,3194.745237177849,3174.494957500406,3155.162670693132,3136.673651249446,3118.961710552984,3101.9679773218536,3085.640232396413
+Offshore Wind - Class 5/Moderate,7151.218784281058,6959.206384291097,6821.946382965393,6715.751127323762,6629.494388563569,6557.079053170072,6086.1701084333035,5623.006007892007,5165.9382447845255,4684.077800322827,4213.068962883639,4158.852503535129,4110.973631920612,4068.157136205224,4039.3838248980423,4012.5501615695575,3987.42165891054,3963.8032988704326,3941.531439241944,3920.467161538803,3900.4918362475946,3881.503242423113,3863.4124633646497,3846.142223585428,3829.624449701114,3813.7990508740713,3798.613031863727,3784.018940864715,3769.9743151633556
+Offshore Wind - Class 5/Conservative,8683.622841160915,8654.270351743377,8627.461190398502,8602.799777589971,8579.97601355234,8558.741330650955,8538.894502187832,8520.269668581588,7906.793991996092,7261.443230368062,6623.144272666011,5990.174662702622,5361.370722559387,4735.910139057796,4715.997565453123,4697.375170958373,4679.8902893679615,4663.415310803441,4647.842914359215,4633.082076829197,4619.054414039568,4605.692628686925,4592.937849489374,4580.738965974315,4569.05063284176,4557.833048226926,4547.050955881901,4536.672536488602,4526.66962939618
+Offshore Wind - Class 6/Advanced,6054.327951395894,5646.2993008916155,5403.740750003257,5233.573032524783,4725.547130414371,4244.13636941661,3780.224348597275,3706.0204792688073,3641.448993823569,3554.7372499016396,3481.3657828037544,3417.9525427105277,3362.2392449876024,3312.6466758134006,3279.4423858770924,3248.565562646515,3219.729167046685,3192.6951639698427,3167.264211485968,3143.2674565586763,3120.561324216123,3099.0217523783913,3078.5416418772934,3059.0279738700683,3040.3988163843655,3022.5823264999117,3005.514532974426,2989.1391145062103,2973.405182360072
+Offshore Wind - Class 6/Moderate,6891.104950175169,6706.076724201667,6573.809362360196,6471.476883239043,6388.357507068228,6318.576079478668,5864.795684317246,5418.478415974113,4978.035969393947,4513.70231489282,4059.8255748275124,4007.5811371193035,3961.443680240505,3920.184668080688,3892.4579573404626,3866.600271214404,3842.385770152208,3819.626420831674,3798.1647896929426,3777.866725604021,3758.618033799659,3740.320041133183,3722.8872678337116,3706.2450992633676,3690.3282337554206,3675.0784652402026,3660.4447941138183,3646.3815424701647,3632.8477997574205
+Offshore Wind - Class 6/Conservative,8367.770320398857,8339.48560747076,8313.651536378682,8289.887273123944,8267.893472205405,8247.43121156567,8228.306249235115,8210.358934279791,7619.19746916776,6997.320273052247,6382.238330681363,5772.292048423035,5166.359656728911,4563.649220445412,4544.460841216094,4526.515965372261,4509.6670266687215,4493.791293450005,4478.785325215162,4464.561424819229,4451.0439798059915,4438.168131983535,4425.877338312755,4414.122151351611,4402.8589996993815,4392.049522784438,4381.65957304591,4371.658772458867,4362.019625584684
+Offshore Wind - Class 7/Advanced,6421.601266263206,5988.820290613011,5731.547467050367,5551.056875399363,5012.212688734152,4501.598224119789,4009.5438457884584,3930.838485335038,3862.3498977043,3770.377877246376,3692.5556968900287,3625.295534501015,3566.202626070197,3513.6015237408124,3478.382860319226,3445.6330212011326,3415.0473391875917,3386.373366239308,3359.3996757375103,3333.9474364624434,3309.863649602413,3287.0173792178434,3265.2949848870057,3244.5975717258207,3224.838329538955,3205.9409806579697,3187.8378951733484,3170.469093116158,3153.780581427489
+Offshore Wind - Class 7/Moderate,7309.139612095586,7112.887038516299,6972.595886819772,6864.055647217157,6775.89396238266,6701.87945680084,6220.5713602231,5747.179178251301,5280.018150057534,4787.51663824246,4306.1064315882195,4250.69281197255,4201.756474658073,4157.994601502596,4128.585901652064,4101.1595342313185,4075.476022839443,4051.3361364151237,4028.5724632151287,4007.0432021668807,3986.6267303019517,3967.2187201697593,3948.7284811703275,3931.0768530489104,3914.194321128019,3898.019464145569,3882.498067305242,3867.5817918520374,3853.2269555165312
+Offshore Wind - Class 7/Conservative,8875.383790929918,8845.383273936757,8817.98185197444,8792.775962959942,8769.448078924646,8747.744532273511,8727.459439822973,8708.423394193125,8081.400338044277,7421.798180581692,6769.403486705676,6122.456104869517,5479.766192140526,4840.493585478835,4820.141306593594,4801.107589206534,4783.23655191965,4766.397813136889,4750.481612841166,4735.394710452311,4721.057391372057,4707.4003626603235,4694.364087822995,4681.8955716195005,4669.949247012442,4658.484092581294,4647.463854259805,4636.856269255077,4626.632400835331
diff --git a/tests/data/Fixed_Offshore_Wind/Market/20/df_fin_assump.csv b/tests/data/Fixed_Offshore_Wind/Market/20/df_fin_assump.csv
new file mode 100644
index 0000000..e9d9b87
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/20/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),20
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Fixed_Offshore_Wind/Market/20/df_fom.csv b/tests/data/Fixed_Offshore_Wind/Market/20/df_fom.csv
new file mode 100644
index 0000000..c78b3e0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/20/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,90.662,84.9785,81.599875,79.229625,77.420125,75.96575,74.755,73.721375,72.822,71.614125,70.592125,69.708875,68.932875,68.242125,67.779625,67.3495,66.94787500000001,66.57124999999999,66.217,65.88275,65.5665,65.26650000000001,64.98125,64.709375,64.44987499999999,64.20175,63.964,63.735875,63.51675
+Offshore Wind - Class 1/Moderate,90.662,87.639125,85.47825,83.806375,82.4485,81.30850000000001,80.32825000000001,79.469875,78.7075,77.55475,76.57300000000001,75.719375,74.96562499999999,74.29162500000001,73.83862500000001,73.41624999999999,73.020625,72.64875,72.298125,71.9665,71.652125,71.353125,71.068375,70.7965,70.53637499999999,70.28725,70.04825,69.8185,69.597375
+Offshore Wind - Class 1/Conservative,90.662,90.167625,89.716125,89.30075000000001,88.916375,88.55874999999999,88.2245,87.910875,87.615375,86.78312500000001,86.06975,85.44600000000001,84.892375,84.395125,84.05975,83.74612499999999,83.45174999999999,83.17425,82.912,82.663375,82.42712499999999,82.20212500000001,81.98724999999999,81.781875,81.58500000000001,81.396125,81.21449999999999,81.03975,80.87125
+Offshore Wind - Class 2/Advanced,90.45362499999999,84.78325,81.41237500000001,79.0475,77.242375,75.79125,74.58325,73.55199999999999,72.65475,71.449625,70.43,69.54875,68.77449999999999,68.08525,67.623875,67.19475,66.794,66.418375,66.064875,65.731375,65.415875,65.1165,64.831875,64.56075,64.301875,64.05425,63.817125,63.5895,63.370875
+Offshore Wind - Class 2/Moderate,90.45362499999999,87.43775,85.281875,83.613875,82.259125,81.12175,80.14362500000001,79.28725,78.526625,77.376625,76.397,75.5455,74.7935,74.121,73.669,73.2475,72.852875,72.481875,72.132125,71.80125000000001,71.4875,71.18925,70.905125,70.633875,70.374375,70.12587500000001,69.88725,69.658125,69.4375
+Offshore Wind - Class 2/Conservative,90.45362499999999,89.9605,89.51,89.095625,88.712125,88.35525000000001,88.02187500000001,87.708875,87.41412499999998,86.583875,85.87199999999999,85.24974999999999,84.69737500000001,84.20125,83.86675,83.55375000000001,83.26,82.983125,82.72149999999999,82.4735,82.23775,82.01325,81.799,81.594,81.397625,81.209125,81.027875,80.8535,80.6855
+Offshore Wind - Class 3/Advanced,90.520875,84.84625,81.47287499999999,79.10624999999999,77.29974999999999,75.8475,74.638625,73.60674999999999,72.708625,71.50274999999999,70.482375,69.600375,68.825625,68.135875,67.674125,67.244625,66.843625,66.467625,66.114,65.78025,65.4645,65.164875,64.88012499999999,64.60875,64.349625,64.101875,63.8645,63.63675,63.417874999999995
+Offshore Wind - Class 3/Moderate,90.520875,87.50275,85.34525000000001,83.67599999999999,82.32025,81.182,80.20325,79.346125,78.58500000000001,77.434125,76.45375,75.601625,74.84899999999999,74.176,73.72375,73.30199999999999,72.907,72.53575,72.185625,71.854625,71.540625,71.242125,70.95775,70.68625,70.426625,70.177875,69.93925,69.709875,69.489
+Offshore Wind - Class 3/Conservative,90.520875,90.02725,89.5765,89.16175000000001,88.778,88.421,88.08725000000001,87.774,87.479125,86.648125,85.93575,85.313,84.76037500000001,84.26387500000001,83.92899999999999,83.615875,83.321875,83.04475,82.783,82.53475,82.29887500000001,82.07412500000001,81.85974999999999,81.65462500000001,81.458,81.269375,81.088125,80.91362500000001,80.745375
+Offshore Wind - Class 4/Advanced,90.50575,84.832,81.45925,79.093,77.28675,75.83487500000001,74.62625,73.594375,72.6965,71.49074999999999,70.4705,69.58875,68.81412499999999,68.1245,67.66275,67.23349999999999,66.8325,66.4565,66.102875,65.76925,65.4535,65.154,64.86925000000001,64.597875,64.338875,64.091125,63.85375,63.626125,63.40725
+Offshore Wind - Class 4/Moderate,90.50575,87.488125,85.33099999999999,83.66199999999999,82.3065,81.16837500000001,80.18974999999999,79.332875,78.571875,77.421125,76.441,75.589,74.8365,74.163625,73.711375,73.28975,72.89475,72.52362500000001,72.173625,71.8425,71.528625,71.23025,70.945875,70.6745,70.414875,70.166125,69.9275,69.698125,69.4775
+Offshore Wind - Class 4/Conservative,90.50575,90.01225,89.5615,89.146875,88.76312499999999,88.406125,88.07249999999999,87.75937499999999,87.46449999999999,86.633625,85.921375,85.29875000000001,84.74612499999999,84.24975,83.915,83.601875,83.307875,83.03087500000001,82.769125,82.521,82.28512500000001,82.06049999999999,81.846,81.64087500000001,81.44437500000001,81.255875,81.0745,80.9,80.731875
+Offshore Wind - Class 5/Advanced,91.497125,85.76124999999999,82.35150000000002,79.959375,78.133375,76.6655,75.443625,74.40050000000001,73.49275,72.273875,71.2425,70.351,69.567875,68.870625,68.403875,67.969875,67.5645,67.1845,66.827,66.48962499999999,66.1705,65.867625,65.57975,65.3055,65.043625,64.793125,64.55325,64.323,64.101875
+Offshore Wind - Class 5/Moderate,91.497125,88.44637499999999,86.265625,84.578375,83.208,82.0575,81.06812500000001,80.201875,79.4325,78.269125,77.27825,76.416875,75.65625,74.976,74.51875,74.0925,73.69325,73.318,72.964125,72.62950000000001,72.312125,72.010375,71.723,71.448625,71.186125,70.93475,70.6935,70.461625,70.2385
+Offshore Wind - Class 5/Conservative,91.497125,90.998125,90.54249999999999,90.123375,89.735375,89.3745,89.03712499999999,88.720625,88.4225,87.58262500000001,86.8625,86.233125,85.674375,85.172625,84.834125,84.517625,84.220375,83.94037499999999,83.67575000000001,83.42487500000001,83.186375,82.95925,82.7425,82.535125,82.3365,82.145875,81.962625,81.78625,81.61612500000001
+Offshore Wind - Class 6/Advanced,90.82724999999999,85.133375,81.748625,79.374,77.56125,76.104125,74.89125,73.85575,72.95474999999999,71.74475,70.720875,69.836,69.0585,68.3665,67.903125,67.47225,67.069875,66.692625,66.33775,66.002875,65.686,65.3855,65.099625,64.827375,64.567375,64.31875,64.080625,63.852125,63.6325
+Offshore Wind - Class 6/Moderate,90.82724999999999,87.798875,85.634,83.95925,82.59875,81.456625,80.474625,79.61475,78.851,77.696125,76.71249999999999,75.8575,75.102375,74.427,73.97325000000001,73.55000000000001,73.15375,72.78125,72.43,72.09774999999999,71.782625,71.48325,71.197875,70.9255,70.66499999999999,70.415375,70.175875,69.94575,69.72425
+Offshore Wind - Class 6/Conservative,90.82724999999999,90.33200000000001,89.879625,89.46350000000001,89.07849999999999,88.720125,88.38525000000001,88.07112500000001,87.775125,86.941375,86.22662500000001,85.60175,85.047125,84.549,84.21300000000001,83.898875,83.60374999999999,83.32587500000001,83.06312500000001,82.814,82.57737499999999,82.351875,82.13675,81.93087500000001,81.73375,81.544375,81.36250000000001,81.187375,81.01862499999999
+Offshore Wind - Class 7/Advanced,91.0155,85.309875,81.91812499999999,79.538625,77.722125,76.262,75.046625,74.009,73.106,71.8935,70.8675,69.98075,69.20175,68.50825,68.043875,67.612125,67.209,66.830875,66.47525,66.13974999999999,65.82225,65.521,65.234625,64.96175,64.70125,64.452125,64.21350000000001,63.984500000000004,63.7645
+Offshore Wind - Class 7/Moderate,91.0155,87.981,85.81162499999999,84.13325,82.770125,81.625625,80.6415,79.779875,79.0145,77.85725000000001,76.87162500000001,76.01474999999999,75.25812499999999,74.58137500000001,74.12662499999999,73.7025,73.305375,72.932125,72.58012500000001,72.24725000000001,71.9315,71.6315,71.3455,71.072625,70.8115,70.561375,70.321375,70.09075,69.868875
+Offshore Wind - Class 7/Conservative,91.0155,90.51925,90.066,89.649125,89.263125,88.904125,88.568625,88.25375,87.957125,87.121625,86.405375,85.77925,85.2235,84.724375,84.38762499999999,84.07287500000001,83.77725,83.498625,83.235375,82.98575,82.74862499999999,82.52274999999999,82.30712499999998,82.100875,81.90325,81.71350000000001,81.53125,81.35575,81.18662499999999
diff --git a/tests/data/Fixed_Offshore_Wind/Market/20/df_gcc.csv b/tests/data/Fixed_Offshore_Wind/Market/20/df_gcc.csv
new file mode 100644
index 0000000..d9068d0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/20/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,1084.6748,1011.5737,968.1176,937.6309,846.6146,760.3665,677.2534,663.9593,652.3908,636.8558,623.7108,612.3499,602.3685,593.4836,587.5348,582.003,576.8368,571.9935,567.4373,563.1382,559.0702,555.2112,551.5421,548.0461,544.7085,541.5166,538.4588,535.525,532.7062
+Offshore Wind - Class 1/Moderate,1234.5893,1201.4402,1177.7435,1159.41,1144.5186,1132.0167,1050.7188,970.758,891.8496,808.6611,727.3459,717.986,709.7201,702.3283,697.3608,692.7283,688.3901,684.3126,680.4676,676.831,673.3825,670.1043,666.9811,663.9995,661.1479,658.4158,655.7941,653.2745,650.8499
+Offshore Wind - Class 1/Conservative,1499.1441,1494.0767,1489.4483,1485.1908,1481.2505,1477.5845,1474.1581,1470.9427,1365.0321,1253.6184,1143.4223,1034.1461,925.5892,817.6094,814.1717,810.9567,807.9381,805.0939,802.4055,799.8571,797.4354,795.1286,792.9266,790.8206,788.8027,786.8661,785.0047,783.213,781.486
+Offshore Wind - Class 2/Advanced,998.0205,930.7594,890.775,862.7239,778.9788,699.621,623.1478,610.9158,600.2715,585.9776,573.8828,563.4295,554.2455,546.0704,540.5969,535.507,530.7535,526.2971,522.105,518.1492,514.4063,510.8556,507.4796,504.2628,501.1919,498.255,495.4415,492.7421,490.1484
+Offshore Wind - Class 2/Moderate,1135.9583,1105.4575,1083.654,1066.7851,1053.0833,1041.5803,966.7772,893.2044,820.6001,744.0574,669.2385,660.6263,653.0208,646.2195,641.6489,637.3864,633.3948,629.6431,626.1052,622.7592,619.5862,616.5698,613.6962,610.9528,608.329,605.8152,603.4029,601.0846,598.8537
+Offshore Wind - Class 2/Conservative,1379.3779,1374.7154,1370.4568,1366.5394,1362.9138,1359.5407,1356.3881,1353.4296,1255.9801,1153.4673,1052.0746,951.5285,851.6441,752.2909,749.1278,746.1696,743.3922,740.7752,738.3015,735.9568,733.7285,731.606,729.58,727.6422,725.7855,724.0036,722.2909,720.6423,719.0534
+Offshore Wind - Class 3/Advanced,1099.023,1024.9548,980.924,950.0339,857.8136,770.4247,686.2122,672.7422,661.0207,645.2802,631.9613,620.4501,610.3367,601.3343,595.3068,589.7018,584.4672,579.5598,574.9434,570.5874,566.4656,562.5556,558.8379,555.2957,551.914,548.6798,545.5816,542.609,539.7528
+Offshore Wind - Class 3/Moderate,1250.9205,1217.3329,1193.3228,1174.7467,1159.6583,1146.9911,1064.6178,983.5992,903.6471,819.3581,736.9673,727.4835,719.1083,711.6187,706.5856,701.8917,697.4961,693.3647,689.4688,685.7842,682.29,678.9685,675.8039,672.783,669.8936,667.1254,664.469,661.9161,659.4594
+Offshore Wind - Class 3/Conservative,1518.9749,1513.8404,1509.1509,1504.837,1500.8445,1497.1301,1493.6584,1490.4005,1383.0888,1270.2014,1158.5475,1047.8259,937.8329,828.4248,824.9416,821.6841,818.6256,815.7437,813.0197,810.4377,807.9839,805.6466,803.4155,801.2816,799.2371,797.2748,795.3888,793.5734,791.8236
+Offshore Wind - Class 4/Advanced,1214.6721,1132.8098,1084.1456,1050.0051,948.0805,851.4957,758.4216,743.5341,730.5792,713.1824,698.462,685.7394,674.5618,664.6121,657.9503,651.7555,645.9701,640.5463,635.4442,630.6297,626.0742,621.7528,617.6439,613.7289,609.9913,606.4168,602.9925,599.7071,596.5505
+Offshore Wind - Class 4/Moderate,1382.5536,1345.4316,1318.895,1298.3641,1281.688,1267.6878,1176.6465,1087.1024,998.737,905.5783,814.5176,804.0359,794.7794,786.5016,780.9389,775.7511,770.8929,766.3268,762.0209,757.9486,754.0867,750.4156,746.9181,743.5792,740.3858,737.3263,734.3903,731.5689,728.8536
+Offshore Wind - Class 4/Conservative,1678.8151,1673.1403,1667.9573,1663.1895,1658.7769,1654.6716,1650.8346,1647.2338,1528.6298,1403.8634,1280.4603,1158.0875,1036.5201,915.5991,911.7494,908.1491,904.7687,901.5836,898.573,895.7192,893.0073,890.424,887.9581,885.5997,883.34,881.1713,879.0867,877.0803,875.1464
+Offshore Wind - Class 5/Advanced,1403.7543,1309.149,1252.9094,1213.4544,1095.6637,984.044,876.4815,859.2766,844.3051,824.2001,807.1882,792.4853,779.5676,768.0691,760.3703,753.2113,746.5253,740.2572,734.3608,728.7969,723.5322,718.5381,713.7896,709.2651,704.9458,700.8149,696.8576,693.0607,689.4127
+Offshore Wind - Class 5/Moderate,1597.7692,1554.8686,1524.2011,1500.4743,1481.2023,1465.0228,1359.8095,1256.3265,1154.2056,1046.5454,941.3097,929.1963,918.499,908.9326,902.5039,896.5086,890.8942,885.6173,880.6411,875.9348,871.4718,867.2293,863.1873,859.3287,855.6382,852.1024,848.7094,845.4487,842.3108
+Offshore Wind - Class 5/Conservative,1940.1483,1933.5902,1927.6003,1922.0903,1916.9909,1912.2465,1907.8122,1903.6509,1766.5844,1622.3962,1479.7835,1338.3616,1197.8703,1058.1261,1053.6771,1049.5164,1045.6098,1041.9289,1038.4496,1035.1516,1032.0175,1029.0321,1026.1824,1023.4568,1020.8453,1018.339,1015.93,1013.6112,1011.3763
+Offshore Wind - Class 6/Advanced,1342.4978,1252.0208,1198.2354,1160.5021,1047.8515,941.1026,838.2339,821.7798,807.4616,788.234,771.9645,757.9031,745.5491,734.5524,727.1896,720.3429,713.9487,707.9541,702.315,696.9939,691.959,687.1828,682.6415,678.3145,674.1836,670.233,666.4483,662.8172,659.3283
+Offshore Wind - Class 6/Moderate,1528.0463,1487.0178,1457.6886,1434.9972,1416.5662,1401.0927,1300.4706,1201.5034,1103.8389,1000.8767,900.2332,888.6484,878.4178,869.269,863.1208,857.3871,852.0177,846.971,842.2121,837.7111,833.4429,829.3855,825.5199,821.8296,818.3002,814.9187,811.6738,808.5554,805.5544
+Offshore Wind - Class 6/Conservative,1855.4848,1849.2129,1843.4844,1838.2149,1833.3379,1828.8006,1824.5598,1820.5801,1689.4949,1551.5987,1415.2093,1279.9587,1145.5981,1011.952,1007.6971,1003.718,999.9819,996.4616,993.1341,989.9801,986.9827,984.1276,981.4022,978.7956,976.2981,973.9012,971.5973,969.3797,967.2423
+Offshore Wind - Class 7/Advanced,1477.7456,1378.1536,1318.9497,1277.415,1153.4156,1035.9125,922.6804,904.5687,888.808,867.6433,849.7348,834.2568,820.6583,808.5537,800.4491,792.9127,785.8743,779.2758,773.0686,767.2115,761.6693,756.4119,751.4131,746.6502,742.1032,737.7545,733.5886,729.5917,725.7513
+Offshore Wind - Class 7/Moderate,1681.9869,1636.825,1604.5411,1579.5637,1559.2758,1542.2435,1431.4844,1322.5469,1215.0433,1101.7083,990.9257,978.1739,966.9126,956.8421,950.0745,943.7631,937.8528,932.2977,927.0593,922.105,917.4067,912.9405,908.6855,904.6235,900.7385,897.0163,893.4445,890.012,886.7086
+Offshore Wind - Class 7/Conservative,2042.4126,2035.5089,2029.2032,2023.4028,2018.0346,2013.0401,2008.3721,2003.9915,1859.7003,1707.912,1557.7822,1408.906,1261.0095,1113.8995,1109.216,1104.8359,1100.7234,1096.8485,1093.1858,1089.714,1086.4147,1083.2719,1080.272,1077.4027,1074.6536,1072.0152,1069.4793,1067.0382,1064.6855
diff --git a/tests/data/Fixed_Offshore_Wind/Market/20/df_lcoe.csv b/tests/data/Fixed_Offshore_Wind/Market/20/df_lcoe.csv
new file mode 100644
index 0000000..d82b793
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/20/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,96.47448684002595,88.63776577054529,83.79358136210021,80.29333743939435,73.21827447254525,66.76021301180648,60.732085709395115,59.344050121050344,58.155651864718486,56.56641325738564,55.24107838843273,54.10382870673899,53.1066331058712,52.234224246129365,51.6502528398843,51.10188856434309,50.60411827785484,50.133623349246584,49.687469937277626,49.28181760929901,48.88623507599278,48.51748302688417,48.16464357371294,47.83533988645317,47.5102853721531,47.21527163810956,46.922492514254195,46.640073136436015,46.37598253690053
+Offshore Wind - Class 1/Moderate,106.75646100812075,103.98298918390489,101.43679324907673,99.22630001764014,97.43828480559368,95.93922339348784,89.91548669744007,84.06479990142155,78.35689966655774,72.21282712023664,66.32130707594126,65.31246146505755,64.43105308895363,63.64301536692487,63.12038008188745,62.62837629892692,62.175809776284424,61.73456229887382,61.33930489679162,60.95068104435532,60.591397875368855,60.247516709726206,59.92970127986604,59.61270482829897,59.31934114881788,59.036763181141126,58.76414651064316,58.50073550385327,58.257469349223705
+Offshore Wind - Class 1/Conservative,124.90112139357592,125.91771907896955,125.8098687548868,125.29340764842762,124.81918263912826,124.34494578500943,123.91867285116497,123.51253719215863,116.00285566353493,107.83134125141501,99.82811942831175,91.9621139467172,84.22437086494932,76.55940323360707,76.17818643426637,75.81813601797921,75.47678551833519,75.16774068110226,74.87342061841197,74.59233005130602,74.3232224438583,74.06500775596231,73.81670270245216,73.5928820147776,73.36200774203832,73.15411727474721,72.95325985917972,72.75896467471577,72.57074137342144
+Offshore Wind - Class 2/Advanced,98.93615578660794,90.88951297447821,85.93637156958678,82.34325472180565,75.09458664137405,68.49895198949586,62.3330284340936,60.90972791295629,59.6809403475057,58.06152412520321,56.70297722078445,55.5274340040988,54.518597678980235,53.617053479480084,53.013634684368256,52.45724407374141,51.94311025199255,51.46725126127002,51.016166026881486,50.58733644509506,50.18846397195761,49.80755386275924,49.44301370642973,49.10307566884895,48.776683317238,48.472246372135835,48.169775998773694,47.88729479776184,47.61459602571331
+Offshore Wind - Class 2/Moderate,109.43954771558255,106.59101231191588,103.99115592729987,101.72218030454988,99.86937453326946,98.35852082875984,92.16716509554405,86.19512748153691,80.36893495609232,74.09016831295091,68.0713478780315,67.02840852299535,66.11754948509544,65.31692867984945,64.7769642634361,64.2684779620968,63.80109071459175,63.35806328958136,62.949981905500785,62.56125188285767,62.1900201612747,61.834660553321314,61.49377679461076,61.17883783412219,60.8758913599321,60.58403891935303,60.31487423152995,60.042667248342674,59.779243904446055
+Offshore Wind - Class 2/Conservative,127.97494477486475,129.00406536295017,128.91326773954285,128.37782226750807,127.85862457656916,127.39492727451615,126.95333335226195,126.56029806955019,118.8570044941885,110.52082055766272,102.33326539839642,94.309180928281,86.39672771384753,78.55970074040385,78.16589995182024,77.79379242252477,77.45780348073586,77.12187690271755,76.81797186452823,76.54432406447842,76.26622883470003,75.99933268504296,75.75911647935808,75.51170956492442,75.28926038155407,75.07463069017842,74.86723251454016,74.66657684728442,74.47219625498072
+Offshore Wind - Class 3/Advanced,101.36394437308094,93.11910712168084,88.05233470900545,84.35647607936392,76.90982693605667,70.11431593513902,63.745817235617714,62.2890703472235,61.03127993807673,59.3735788370192,57.971190658100326,56.779426081478256,55.73548511730471,54.81272574885912,54.2058346558302,53.63617743566142,53.10977713304174,52.61212812591654,52.15039852676686,51.71144358988635,51.303103118608,50.91317097808159,50.540036339493206,50.192011085873716,49.85786357805661,49.5461661230575,49.236529273195714,48.94733008947132,48.66812770813047
+Offshore Wind - Class 3/Moderate,112.215961491044,109.29155051841211,106.63594470988296,104.31479335598239,102.44125784384978,100.87337345930447,94.49001758141816,88.3310482455386,82.32146659976303,75.84896652862598,69.62782728300749,68.5756134264684,67.64377149142322,66.82465135864508,66.25840319233097,65.75205707641211,65.2738383736544,64.82058709025416,64.38962482636386,63.9920148160312,63.612281283704725,63.24879859197772,62.91314400978173,62.59088076638531,62.28092157018469,61.9822901594822,61.69414686678093,61.415696915603846,61.15883264454034
+Offshore Wind - Class 3/Conservative,131.36657929024452,132.43647969972452,132.34859880645374,131.80090917939168,131.26972280049492,130.7953163364079,130.34344677537055,129.94125440853352,121.98603931260406,113.35847091123509,104.93283348039029,96.64968601535816,88.46159459332368,80.37181159319331,79.9691124799782,79.60595873427577,79.24506445932094,78.91871841504539,78.60789177451228,78.31094833926804,78.02660579958827,77.77051268782373,77.50801809482476,77.27177008360847,77.02754998170539,76.80805755476818,76.59599374083139,76.39080079534104,76.19199318766235
+Offshore Wind - Class 4/Advanced,106.44727832424898,97.82072124420657,92.47076309080971,88.61232344284859,80.69839834047467,73.4717358679315,66.70997464719204,65.18224071805825,63.87600604943124,62.124343557991345,60.65337556198106,59.4032237238793,58.30810723368559,57.34007038789466,56.692126054338765,56.09466406128175,55.54246457953566,55.020476555983166,54.53610097986462,54.07568311874943,53.647283752003005,53.23825595386535,52.84684926169239,52.481704933994074,52.13117194295015,51.794057164519685,51.47927939939813,51.175862311385146,50.88292519556309
+Offshore Wind - Class 4/Moderate,118.0238882636173,114.98570715883156,112.20951071406445,109.75275234354318,107.78897572792849,106.14548416659994,99.36077779458888,92.81151717384763,86.41910342699751,79.52516929757907,72.92848698584713,71.8109989233771,70.8496433647666,69.9767570300308,69.39803611167589,68.85313693209393,68.35210681357803,67.87729613092655,67.42586151076854,67.00923089384334,66.61141301369803,66.23063800600691,65.8789111684481,65.54125595106619,65.20309852443249,64.8902823705219,64.60169639887343,64.30997487050952,64.04084041199523
+Offshore Wind - Class 4/Conservative,138.45320065261527,139.60721572807267,139.52470801295743,138.95101584194023,138.3942962490445,137.89705869872066,137.4234458908863,136.9720029322858,128.52269354471107,119.33917347271289,110.36753250712442,101.52350526072507,92.82335150812686,84.20441056909539,83.78274939845458,83.38439044944936,83.02451035446985,82.66495390930577,82.33952108790172,82.02866983003737,81.74856995290871,81.46282917111724,81.18801944045381,80.94062301093976,80.70234038190141,80.45522609406298,80.23314264938733,80.01829357553962,79.81016835694797
+Offshore Wind - Class 5/Advanced,113.90046061685987,104.6695730579165,98.96704822534443,94.80817494548842,86.31287249419455,78.53743051975191,71.26196055982255,69.61803875605472,68.21300051559584,66.34268035304875,64.77382417065081,63.42935474387183,62.25175877966866,61.22337206640281,60.52663320345593,59.89633962707962,59.30265038833629,58.74139357573838,58.22069897939707,57.73723158102905,57.276723874813804,56.83695402515625,56.416105026968864,56.02368264088416,55.64690054078788,55.29549122507218,54.957235287763076,54.6202780043519,54.30552695450597
+Offshore Wind - Class 5/Moderate,126.38998371846328,123.1469500461009,120.18421603329676,117.56386973326701,115.44907959725406,113.67943052520599,106.38727323816045,99.32549000853584,92.43324932309183,85.03938250444413,77.9103817998884,76.72617332366215,75.69364516238389,74.75584085662993,74.1342502264554,73.56452973722564,73.0263958170462,72.51630704385178,72.04652129888258,71.58388300441703,71.17164545736954,70.76250631880916,70.38487756779989,70.00752766583958,69.65881385533271,69.33743950613123,69.01314978184043,68.69975679994218,68.41086251612388
+Offshore Wind - Class 5/Conservative,148.43031644623548,149.67652700529388,149.5889535066959,148.97113293552766,148.4045957284669,147.86920377298017,147.35904910401302,146.8726627171265,137.7580033793179,127.85337282108793,118.17810746784268,108.6646364390098,99.25888573225856,89.98491698427499,89.53211657554073,89.10428515781122,88.71808149566824,88.35128950778406,88.00185297526639,87.66801848962399,87.34828207844458,87.04139727946917,86.76535744061935,86.49989705226783,86.22521048793735,85.97855626583372,85.7402116818537,85.50958453746924,85.28610469053802
+Offshore Wind - Class 6/Advanced,141.20954491689685,129.76250456383084,122.706923329596,117.55907401045701,107.0465160400425,97.46956657188169,88.4678660218802,86.44758499226305,84.69739641632412,82.38102673530253,80.43557443409108,78.76127651177495,77.32294153629027,76.04236332066577,75.1706435844064,74.38989376813811,73.6545208666901,72.95930874636738,72.31844144220517,71.70930643940356,71.12878341479087,70.5922175592432,70.07887338311342,69.58682847353795,69.13182238803151,68.67704600769106,68.25615535138513,67.8503399629842,67.45849752373954
+Offshore Wind - Class 6/Moderate,156.59772540444771,152.597057389956,148.91104920620188,145.67529515788007,143.02937350895078,140.877432665116,131.86775612853586,123.12565822113572,114.6363195472131,105.49083340845392,96.70947597409062,95.24479558218096,93.95362290778004,92.80553597237966,92.0462726776717,91.30682862795993,90.65641679298831,90.01607323746455,89.43114706132711,88.87386989618767,88.34156249554692,87.85570337692745,87.36658223501584,86.91981935433125,86.49015846069256,86.07623025849375,85.67687282945346,85.29102124372375,84.91769738294661
+Offshore Wind - Class 6/Conservative,183.75333946872976,185.31980362277528,185.2017316800758,184.43063814817188,183.73484381670812,183.02508272005886,182.39933165080984,181.8550414381373,170.5863569644079,158.363740811641,146.44475907813646,134.69444073128244,123.11605543400778,111.67994092492788,111.12215174349205,110.59531358320959,110.09570007470576,109.65140131975278,109.22849259292606,108.79412528805135,108.40807140239944,108.03782048277598,107.68206635915617,107.33951548927193,107.03931223476525,106.72005204802686,106.41124650007859,106.1419129198833,105.85164945321661
+Offshore Wind - Class 7/Advanced,192.93904535514824,177.3632741452648,167.6766216849722,160.65139843636325,146.15260503423318,132.96848332224744,120.55757069740199,117.78929313601567,115.4089157114977,112.24796353577109,109.5823626549916,107.30465016662794,105.33814380849388,103.56043018891067,102.40079764509156,101.31236558601572,100.32014048722937,99.38247830191274,98.49354893022308,97.68089917599877,96.87469633747165,96.13613195278361,95.42950256992168,94.78346988644739,94.13246522929961,93.53703617323949,92.96387488570129,92.41129345847695,91.87783366747416
+Offshore Wind - Class 7/Moderate,214.21299419812217,208.75138194140106,203.72198086400473,199.32757338311015,195.71592989474888,192.77422879044613,180.36271363864608,168.329757348717,156.60867360901662,143.9845805365934,131.88295589015766,129.86789979453445,128.10092648725754,126.53986605967687,125.4959868687307,124.51322980063941,123.584349063428,122.746641514706,121.90789412119659,121.15026437707246,120.4266635728636,119.77618453938352,119.1113816772782,118.51406477985277,117.89849678846313,117.34594105420956,116.81313647245506,116.2579176012289,115.76064416814789
+Offshore Wind - Class 7/Conservative,251.7552578001278,253.94249387795867,253.79976075359446,252.75322790980078,251.73694567676353,250.8676224281188,249.94744261654193,249.16080497862495,233.6209622965839,216.84262728732878,200.35139028297465,184.09602926730705,168.09526786119173,152.30420399318967,151.56001452225502,150.85789655263497,150.19280135412583,149.560622723719,148.95797154150287,148.3818120830603,147.829704150239,147.35354588125293,146.84295011669718,146.40433464718777,145.9821416370105,145.52167551132123,145.12882565018975,144.74894077969677,144.38115918235388
diff --git a/tests/data/Fixed_Offshore_Wind/Market/20/df_occ.csv b/tests/data/Fixed_Offshore_Wind/Market/20/df_occ.csv
new file mode 100644
index 0000000..045f8f4
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/20/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,3842.3701,3583.4153,3429.4759,3321.4792,2999.0614,2693.5348,2399.1137,2352.0203,2311.0401,2256.0086,2209.4435,2169.1984,2133.8401,2102.3662,2081.2931,2061.6972,2043.3962,2026.2391,2010.0994,1994.87,1980.4595,1966.7894,1953.7918,1941.4075,1929.5845,1918.2773,1907.4453,1897.0526,1887.0671
+Offshore Wind - Class 1/Moderate,4373.4293,4256.0015,4172.0581,4107.113,4054.3614,4010.0748,3722.0837,3438.8291,3159.3029,2864.6143,2576.5622,2543.4053,2514.1243,2487.9392,2470.3425,2453.932,2438.5643,2424.1202,2410.4995,2397.6174,2385.4012,2373.7884,2362.7248,2352.1629,2342.0612,2332.383,2323.0957,2314.1705,2305.5813
+Offshore Wind - Class 1/Conservative,5310.5928,5292.6419,5276.2463,5261.1643,5247.2061,5234.2197,5222.0821,5210.6919,4835.5121,4440.8387,4050.4779,3663.3763,3278.8224,2896.3131,2884.1352,2872.7465,2862.0533,2851.9778,2842.4543,2833.4271,2824.8483,2816.6767,2808.8763,2801.4159,2794.2678,2787.4076,2780.8136,2774.4665,2768.3491
+Offshore Wind - Class 2/Advanced,3835.3896,3576.9052,3423.2455,3315.445,2993.6129,2688.6414,2394.7552,2347.7473,2306.8416,2251.91,2205.4296,2165.2576,2129.9635,2098.5468,2077.512,2057.9517,2039.6839,2022.558,2006.4476,1991.2459,1976.8616,1963.2163,1950.2423,1937.8805,1926.079,1914.7923,1903.98,1893.6062,1883.6388
+Offshore Wind - Class 2/Moderate,4365.4841,4248.2695,4164.4787,4099.6515,4046.9958,4002.7896,3715.3218,3432.5817,3153.5634,2859.4101,2571.8813,2538.7847,2509.5568,2483.4194,2465.8546,2449.4739,2434.1341,2419.7162,2406.1203,2393.2616,2381.0676,2369.4759,2358.4324,2347.8897,2337.8063,2328.1457,2318.8753,2309.9663,2301.3928
+Offshore Wind - Class 2/Conservative,5300.945,5283.0267,5266.6609,5251.6063,5237.6734,5224.7107,5212.5951,5201.2255,4826.7274,4432.7709,4043.1193,3656.721,3272.8657,2891.0513,2878.8956,2867.5275,2856.8538,2846.7966,2837.2904,2828.2796,2819.7164,2811.5596,2803.7734,2796.3265,2789.1914,2782.3436,2775.7617,2769.4261,2763.3198
+Offshore Wind - Class 3/Advanced,3919.2247,3655.0904,3498.0719,3387.915,3059.0483,2747.4105,2447.1005,2399.0651,2357.2652,2301.133,2253.6366,2212.5865,2176.5209,2144.4175,2122.9229,2102.935,2084.268,2066.7677,2050.3052,2034.7712,2020.0724,2006.1289,1992.8713,1980.2393,1968.1799,1956.6464,1945.5978,1934.9972,1924.812
+Offshore Wind - Class 3/Moderate,4460.9062,4341.1295,4255.5072,4189.263,4135.4563,4090.2838,3796.5324,3507.6122,3222.495,2921.912,2628.0983,2594.2782,2564.4115,2537.7027,2519.7541,2503.0153,2487.3402,2472.6071,2458.714,2445.5743,2433.1137,2421.2687,2409.9837,2399.2106,2388.9068,2379.035,2369.562,2360.4583,2351.6973
+Offshore Wind - Class 3/Conservative,5416.8147,5398.5047,5381.7812,5366.3976,5352.1601,5338.914,5326.5336,5314.9155,4932.2315,4529.6638,4131.4951,3736.6508,3344.405,2954.2448,2941.8234,2930.2068,2919.2998,2909.0227,2899.3088,2890.101,2881.3506,2873.0155,2865.0592,2857.4495,2850.1584,2843.161,2836.4351,2829.9611,2823.7213
+Offshore Wind - Class 4/Advanced,4175.3368,3893.9419,3726.6627,3609.3073,3258.9499,2926.9473,2607.0127,2555.8384,2511.307,2451.5066,2400.9064,2357.1738,2318.7514,2284.5501,2261.6509,2240.3569,2220.47,2201.8262,2184.2878,2167.7387,2152.0794,2137.2247,2123.1008,2109.6433,2096.7958,2084.5087,2072.738,2061.4447,2050.5939
+Offshore Wind - Class 4/Moderate,4752.4159,4624.8121,4533.5946,4463.0214,4405.6986,4357.5743,4044.6269,3736.8264,3433.0774,3112.8521,2799.8383,2763.8082,2731.9898,2703.5356,2684.4141,2666.5814,2649.882,2634.1862,2619.3852,2605.3868,2592.112,2579.4929,2567.4705,2555.9933,2545.0162,2534.4994,2524.4073,2514.7087,2505.3752
+Offshore Wind - Class 4/Conservative,5770.7908,5751.2843,5733.468,5717.079,5701.9112,5687.7995,5674.6101,5662.2328,5254.5412,4825.6667,4401.4786,3980.8321,3562.954,3147.2978,3134.0646,3121.6889,3110.0691,3099.1205,3088.7718,3078.9623,3069.6401,3060.7603,3052.284,3044.1771,3036.4095,3028.9549,3021.7895,3014.8924,3008.2448
+Offshore Wind - Class 5/Advanced,4263.1798,3975.8648,3805.0662,3685.2419,3327.5134,2988.5261,2661.8605,2609.6095,2564.1412,2503.0827,2451.418,2406.7653,2367.5346,2332.6137,2309.2328,2287.4907,2267.1854,2248.1494,2230.2421,2213.3447,2197.356,2182.1888,2167.7677,2154.0271,2140.9093,2128.3637,2116.3454,2104.8145,2093.7354
+Offshore Wind - Class 5/Moderate,4852.3998,4722.1114,4628.9748,4556.9169,4498.3881,4449.2513,4129.7199,3815.4438,3505.3043,3178.3419,2858.7428,2821.9547,2789.4668,2760.4141,2740.8902,2722.6824,2705.6317,2689.6056,2674.4933,2660.2003,2646.6462,2633.7616,2621.4863,2609.7677,2598.5597,2587.8215,2577.5172,2567.6145,2558.0846
+Offshore Wind - Class 5/Conservative,5892.1998,5872.2829,5854.0918,5837.358,5821.8711,5807.4625,5793.9956,5781.3579,5365.0891,4927.1917,4494.0793,4064.583,3637.9134,3213.5123,3200.0008,3187.3647,3175.5005,3164.3215,3153.755,3143.7392,3134.2208,3125.1543,3116.4996,3108.2222,3100.2912,3092.6796,3085.3635,3078.3213,3071.5339
+Offshore Wind - Class 6/Advanced,4118.311,3840.7593,3675.7647,3560.0122,3214.4398,2886.9717,2571.4067,2520.9313,2477.0081,2418.0245,2368.1153,2324.98,2287.0824,2253.3482,2230.7618,2209.7586,2190.1433,2171.7541,2154.4553,2138.1321,2122.6868,2108.035,2094.1039,2080.8302,2068.1582,2056.0389,2044.429,2033.29,2022.5874
+Offshore Wind - Class 6/Moderate,4687.5084,4561.6474,4471.6757,4402.0665,4345.5265,4298.0594,3989.3862,3685.7896,3386.1892,3070.3374,2761.5987,2726.0607,2694.6768,2666.6113,2647.7509,2630.1618,2613.6905,2598.209,2583.6102,2569.803,2556.7095,2544.2627,2532.4045,2521.0841,2510.257,2499.8837,2489.9295,2480.3633,2471.1573
+Offshore Wind - Class 6/Conservative,5691.9745,5672.7345,5655.1615,5638.9964,5624.0357,5610.1167,5597.1074,5584.8992,5182.7758,4759.7588,4341.3641,3926.4628,3514.2919,3104.3126,3091.2602,3079.0536,3067.5925,3056.7934,3046.586,3036.9105,3027.7156,3018.9571,3010.5966,3002.6004,2994.9389,2987.586,2980.5185,2973.7157,2967.1589
+Offshore Wind - Class 7/Advanced,4314.3319,4023.5694,3850.7215,3729.4595,3367.4388,3024.3841,2693.799,2640.921,2594.9072,2533.1161,2480.8315,2435.643,2395.9416,2360.6017,2336.9402,2314.9373,2294.3884,2275.1239,2257.0017,2239.9017,2223.7211,2208.3719,2193.7778,2179.8723,2166.5971,2153.901,2141.7385,2130.0693,2118.8572
+Offshore Wind - Class 7/Moderate,4910.6216,4778.77,4684.5158,4611.5934,4552.3623,4502.6359,4179.2706,3861.2236,3547.363,3216.4775,2893.0436,2855.8141,2822.9364,2793.5351,2773.777,2755.3507,2738.0953,2721.877,2706.5833,2692.1189,2678.4022,2665.363,2652.9404,2641.0812,2629.7387,2618.8717,2608.4437,2598.4222,2588.778
+Offshore Wind - Class 7/Conservative,5962.8977,5942.7419,5924.3324,5907.3979,5891.7251,5877.1437,5863.5152,5850.7259,5429.4625,4986.3109,4548.0017,4113.3522,3681.5631,3252.0698,3238.3962,3225.6085,3213.6019,3202.2888,3191.5956,3181.4595,3171.827,3162.6516,3153.8932,3145.5163,3137.4902,3129.7874,3122.3834,3115.2568,3108.3879
diff --git a/tests/data/Fixed_Offshore_Wind/Market/20/df_tc.csv b/tests/data/Fixed_Offshore_Wind/Market/20/df_tc.csv
new file mode 100644
index 0000000..9af6a81
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/20/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.1289257935074173,0.1301075434952705,0.13045655173884727,0.1304674427433303,0.13046751432090797,0.13046757579216822,0.13046655668773655,0.1304653735022892,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Moderate,0.1289257935074173,0.1301075434952705,0.13045655173884727,0.1304674427433303,0.13046751432090797,0.13046757579216822,0.13046655668773655,0.1304653735022892,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Conservative,0.1289257935074173,0.1301075434952705,0.13045655173884727,0.1304674427433303,0.13046751432090797,0.13046757579216822,0.13046655668773655,0.1304653735022892,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.8156785835927624,0.8156731490891987,0.8156713774348975,0.8156710553166417,0.8156708229769672,0.8156706234423747,0.8156739314532538,0.815677772114679,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Moderate,0.8156785835927624,0.8156731490891987,0.8156713774348975,0.8156710553166417,0.8156708229769672,0.8156706234423747,0.8156739314532538,0.815677772114679,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Conservative,0.8156785835927624,0.8156731490891987,0.8156713774348975,0.8156710553166417,0.8156708229769672,0.8156706234423747,0.8156739314532538,0.815677772114679,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PFF/Advanced,0.7023130514762239,0.7023146526276195,0.7023151746047832,0.7023152695095135,0.702315337963051,0.7023153967513264,0.7023144221220573,0.7023132905595644,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Moderate,0.7023130514762239,0.7023146526276195,0.7023151746047832,0.7023152695095135,0.702315337963051,0.7023153967513264,0.7023144221220573,0.7023132905595644,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Conservative,0.7023130514762239,0.7023146526276195,0.7023151746047832,0.7023152695095135,0.702315337963051,0.7023153967513264,0.7023144221220573,0.7023132905595644,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+Year (Advanced)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9278050110194725,0.9278026706609483,0.9278019076983567,0.9278017689780282,0.9278016689208433,0.9278015829911608,0.9278030075854014,0.927804661558896,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608221384728436,0.8608177956855882,0.86081637992871,0.8608161225187586,0.8608159368523021,0.8608157774009039,0.8608184208845163,0.8608214900104174,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986750936716025,0.7986690497895593,0.7986670794758505,0.7986667212377113,0.7986664628452251,0.7986662409363253,0.79866991988157,0.7986741912017398,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410147540849595,0.7410072773689951,0.7410048399535692,0.7410043967882304,0.7410040771389065,0.7410038026223225,0.7410083537341122,0.7410136376637552,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875172020793876,0.6875085309221517,0.6875057041226371,0.687505190160617,0.6875048194466268,0.6875045010754605,0.6875097792404162,0.6875159073031466,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378819052513431,0.6378722510917576,0.6378691038384846,0.6378685316125962,0.6378681188737033,0.6378677644113605,0.6378736409236335,0.6378804636917533,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Moderate)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9278050110194725,0.9278026706609483,0.9278019076983567,0.9278017689780282,0.9278016689208433,0.9278015829911608,0.9278030075854014,0.927804661558896,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608221384728436,0.8608177956855882,0.86081637992871,0.8608161225187586,0.8608159368523021,0.8608157774009039,0.8608184208845163,0.8608214900104174,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986750936716025,0.7986690497895593,0.7986670794758505,0.7986667212377113,0.7986664628452251,0.7986662409363253,0.79866991988157,0.7986741912017398,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410147540849595,0.7410072773689951,0.7410048399535692,0.7410043967882304,0.7410040771389065,0.7410038026223225,0.7410083537341122,0.7410136376637552,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875172020793876,0.6875085309221517,0.6875057041226371,0.687505190160617,0.6875048194466268,0.6875045010754605,0.6875097792404162,0.6875159073031466,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378819052513431,0.6378722510917576,0.6378691038384846,0.6378685316125962,0.6378681188737033,0.6378677644113605,0.6378736409236335,0.6378804636917533,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Conservative)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9278050110194725,0.9278026706609483,0.9278019076983567,0.9278017689780282,0.9278016689208433,0.9278015829911608,0.9278030075854014,0.927804661558896,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608221384728436,0.8608177956855882,0.86081637992871,0.8608161225187586,0.8608159368523021,0.8608157774009039,0.8608184208845163,0.8608214900104174,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
diff --git a/tests/data/Fixed_Offshore_Wind/Market/20/df_vom.csv b/tests/data/Fixed_Offshore_Wind/Market/20/df_vom.csv
new file mode 100644
index 0000000..90cc094
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/20/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Fixed_Offshore_Wind/Market/30/df_capex.csv b/tests/data/Fixed_Offshore_Wind/Market/30/df_capex.csv
new file mode 100644
index 0000000..b019daf
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/30/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,5462.550832369848,5094.404759063653,4875.5549262092645,4722.020175198692,4263.651146110876,3829.295613124674,3410.728337949633,3343.7774992451323,3285.5174365197136,3207.2812724221576,3141.08145831941,3083.8665548677945,3033.5990170228683,2988.8537384617885,2958.8949081013798,2931.03615273454,2905.0183721997228,2880.626813817036,2857.6815376796812,2836.0305427943017,2815.5436693022525,2796.109383287182,2777.6312289765,2760.02494615507,2743.21658539724,2727.1416211172086,2711.7421798514206,2696.967261995978,2682.7713005134847
+Offshore Wind - Class 1/Moderate,6217.537549003377,6050.594891259246,5931.2557072685795,5838.925802633735,5763.930885101322,5700.97021105834,5291.544282275952,4888.852075107402,4491.460278945741,4072.51283498425,3663.0000960065295,3615.862270810396,3574.2345093406543,3537.008235424742,3511.991599288189,3488.66149787881,3466.8138219123107,3446.2791640087826,3426.9151687521285,3408.6011001235547,3391.233850228222,3374.724391496717,3358.9956701796727,3343.980167236275,3329.6190113846337,3315.8598725964,3302.656518621953,3289.967817172063,3277.756959836958
+Offshore Wind - Class 1/Conservative,7549.867055466588,7524.346964544596,7501.037928189001,7479.5964751544225,7459.752640146307,7441.2903400603145,7424.034734950038,7407.84169550011,6874.463003342234,6313.370793819921,5758.409845373221,5208.082210940681,4661.376657071959,4117.577748019326,4100.26493465772,4084.0740017131716,4068.8719067407287,4054.548002773674,4041.008827494427,4028.175109779539,4015.978997982083,4004.3617316888726,3993.272200427305,3982.66605671573,3972.5038312954784,3962.750933130862,3953.3765407221345,3944.3531586306726,3935.6561740041584
+Offshore Wind - Class 2/Advanced,5358.739142998236,4997.589328397251,4782.898624109471,4632.281715654107,4182.623529780819,3756.522615291665,3345.909947900305,3280.231438444361,3223.078621467056,3146.329206691839,3081.3876415122254,3025.26002744198,2975.9477343518092,2932.0528187513814,2902.663410055368,2875.334052750732,2849.810635767615,2825.882619436882,2803.3735007815626,2782.133828788493,2762.0364370540406,2742.9714546924165,2724.8444215677036,2707.5726296266243,2691.083792474087,2675.3142714739247,2660.2075235870307,2645.713436159141,2631.787107365084
+Offshore Wind - Class 2/Moderate,6099.377897155915,5935.607747380369,5818.536715338725,5727.961307946685,5654.391607605821,5592.627539486479,5190.982487228406,4795.942992362201,4406.103572325649,3995.1177208761983,3593.3875214533555,3547.1455153865654,3506.308802120767,3469.790092274592,3445.2488611413337,3422.362012811054,3400.929540141509,3380.7851400765067,3361.7891180488486,3343.823177151232,3326.785983388085,3310.5901722205545,3295.16046379854,3280.4303368995647,3266.3420289287787,3252.8444294135797,3239.891971316572,3227.4444092981566,3215.4657110294934
+Offshore Wind - Class 2/Conservative,7406.3874307080805,7381.352390366644,7358.4863853527395,7337.4523748058255,7317.985493391741,7299.874203623014,7282.946548139545,7267.061169343569,6743.818981066585,6193.3899017697695,5648.975449671825,5109.10650357437,4572.7905668380645,4039.326284040601,4022.3425289928423,4006.4591458335417,3991.546085572757,3977.494364274333,3964.21240438866,3951.6227086915546,3939.658312485724,3928.26178578243,3917.383126796111,3906.9784315199345,3897.0093393822713,3887.441702822251,3878.245587289759,3869.393608214876,3860.8620396949195
+Offshore Wind - Class 3/Advanced,5563.666194857099,5188.705465783053,4965.804712217284,4809.427731107721,4342.574030961793,3900.178299552324,3473.8631867267977,3405.6729467788646,3346.3344641684057,3266.6501330575466,3199.2249980367915,3140.950965854653,3089.752906975992,3044.179439195086,3013.6660435766357,2985.291526998198,2958.792132812655,2933.9490061980596,2910.5791029239003,2888.527317673103,2867.6611623442363,2847.867218252979,2829.0469231213624,2811.114797178504,2793.9954497055987,2777.6226920862823,2761.9383182508886,2746.889887302366,2732.431056122389
+Offshore Wind - Class 3/Moderate,6332.62824425191,6162.59523224895,6041.0472110659675,5947.008043619602,5870.624939042819,5806.498813182058,5389.494232391682,4979.34787876988,4574.600276695524,4147.897677749075,3730.8046237328062,3682.7941509664915,3640.395852003069,3602.4805290910094,3577.0010161147275,3553.2388593653677,3530.9867343662136,3510.0719076762357,3490.3494738991394,3471.696590510754,3454.00771050475,3437.1928084933766,3421.172724221887,3405.879495174652,3391.252365301811,3377.238561100198,3363.790852501856,3350.8673311366247,3338.4304125138055
+Offshore Wind - Class 3/Conservative,7689.620050473284,7663.627437134304,7639.887121519657,7618.048758524303,7597.837393762009,7579.033507198603,7561.458489351737,7544.965660925851,7001.713778059379,6430.2353883344795,5865.001678369514,5304.48731653311,4747.661667351704,4193.796766914002,4176.163542997469,4159.672821076962,4144.189452202149,4129.6002394261195,4115.8105008755465,4102.73930239642,4090.317351048657,4078.4849994694414,4067.19036110524,4056.387758049952,4046.037499307501,4036.103996023863,4026.5560940931773,4017.3657437332995,4008.5077777483943
+Offshore Wind - Class 4/Advanced,5975.833019742907,5573.094469456032,5333.680820228931,5165.719279093875,4664.280086695629,4189.110790265383,3731.213396644922,3657.97153506216,3594.2372192017824,3508.6496839396987,3436.2295811919234,3373.638432539796,3318.6475552929614,3269.697913733989,3236.9240161071007,3206.4475397671245,3177.98499343761,3151.3015572032164,3126.2003282454148,3102.5147817706065,3080.1028949688057,3058.8426013967687,3038.628132310759,3019.367466686351,3000.9797812382362,2983.394230864478,2966.5477312724283,2950.3845155039116,2934.854692642071
+Offshore Wind - Class 4/Moderate,6801.761183217273,6619.1318233949605,6488.579378668923,6387.573443592643,6305.531822094643,6236.6551939994615,5788.758157491227,5348.227348553873,4913.495194579753,4455.1817107127035,4007.1895488563277,3955.6225189303327,3910.0833095790017,3869.359017179189,3841.99196451515,3816.4694344816667,3792.568802720853,3770.1046967594084,3748.921124330627,3728.886373414007,3709.887136193929,3691.8264025542844,3674.6196905425268,3658.1932724704134,3642.4826227521417,3627.430754873791,3612.986669231462,3599.105907474802,3585.7475590519857
+Offshore Wind - Class 4/Conservative,8259.281523874955,8231.363342882703,8205.864317014495,8182.408047019821,8160.699511276999,8140.502559446241,8121.625610406816,8103.9108979927505,7520.413786396996,6906.599295051689,6299.492027699934,5697.453566632146,5099.377331312438,4504.481143033195,4485.541553175938,4467.829169004659,4451.198641648249,4435.528791613096,4420.717508822699,4406.677872213025,4393.335821489715,4380.626831066969,4368.49535572402,4356.89261323105,4345.775475662155,4335.106247657932,4324.850892526213,4314.979697454295,4305.465499609663
+Offshore Wind - Class 5/Advanced,6282.856400383134,5859.426312976391,5607.712002763843,5431.121106911791,4903.919131998218,4404.336990394094,3922.9139229701746,3845.90906670065,3778.9002436638907,3688.91532299003,3612.774466531764,3546.9676819851466,3489.1514266823465,3437.686839438965,3403.2291788025045,3371.186903754147,3341.2619992172013,3313.2076714562813,3286.816817732078,3261.9142654920715,3238.350896329211,3215.9983242841176,3194.745237177849,3174.494957500406,3155.162670693132,3136.673651249446,3118.961710552984,3101.9679773218536,3085.640232396413
+Offshore Wind - Class 5/Moderate,7151.218784281058,6959.206384291097,6821.946382965393,6715.751127323762,6629.494388563569,6557.079053170072,6086.1701084333035,5623.006007892007,5165.9382447845255,4684.077800322827,4213.068962883639,4158.852503535129,4110.973631920612,4068.157136205224,4039.3838248980423,4012.5501615695575,3987.42165891054,3963.8032988704326,3941.531439241944,3920.467161538803,3900.4918362475946,3881.503242423113,3863.4124633646497,3846.142223585428,3829.624449701114,3813.7990508740713,3798.613031863727,3784.018940864715,3769.9743151633556
+Offshore Wind - Class 5/Conservative,8683.622841160915,8654.270351743377,8627.461190398502,8602.799777589971,8579.97601355234,8558.741330650955,8538.894502187832,8520.269668581588,7906.793991996092,7261.443230368062,6623.144272666011,5990.174662702622,5361.370722559387,4735.910139057796,4715.997565453123,4697.375170958373,4679.8902893679615,4663.415310803441,4647.842914359215,4633.082076829197,4619.054414039568,4605.692628686925,4592.937849489374,4580.738965974315,4569.05063284176,4557.833048226926,4547.050955881901,4536.672536488602,4526.66962939618
+Offshore Wind - Class 6/Advanced,6054.327951395894,5646.2993008916155,5403.740750003257,5233.573032524783,4725.547130414371,4244.13636941661,3780.224348597275,3706.0204792688073,3641.448993823569,3554.7372499016396,3481.3657828037544,3417.9525427105277,3362.2392449876024,3312.6466758134006,3279.4423858770924,3248.565562646515,3219.729167046685,3192.6951639698427,3167.264211485968,3143.2674565586763,3120.561324216123,3099.0217523783913,3078.5416418772934,3059.0279738700683,3040.3988163843655,3022.5823264999117,3005.514532974426,2989.1391145062103,2973.405182360072
+Offshore Wind - Class 6/Moderate,6891.104950175169,6706.076724201667,6573.809362360196,6471.476883239043,6388.357507068228,6318.576079478668,5864.795684317246,5418.478415974113,4978.035969393947,4513.70231489282,4059.8255748275124,4007.5811371193035,3961.443680240505,3920.184668080688,3892.4579573404626,3866.600271214404,3842.385770152208,3819.626420831674,3798.1647896929426,3777.866725604021,3758.618033799659,3740.320041133183,3722.8872678337116,3706.2450992633676,3690.3282337554206,3675.0784652402026,3660.4447941138183,3646.3815424701647,3632.8477997574205
+Offshore Wind - Class 6/Conservative,8367.770320398857,8339.48560747076,8313.651536378682,8289.887273123944,8267.893472205405,8247.43121156567,8228.306249235115,8210.358934279791,7619.19746916776,6997.320273052247,6382.238330681363,5772.292048423035,5166.359656728911,4563.649220445412,4544.460841216094,4526.515965372261,4509.6670266687215,4493.791293450005,4478.785325215162,4464.561424819229,4451.0439798059915,4438.168131983535,4425.877338312755,4414.122151351611,4402.8589996993815,4392.049522784438,4381.65957304591,4371.658772458867,4362.019625584684
+Offshore Wind - Class 7/Advanced,6421.601266263206,5988.820290613011,5731.547467050367,5551.056875399363,5012.212688734152,4501.598224119789,4009.5438457884584,3930.838485335038,3862.3498977043,3770.377877246376,3692.5556968900287,3625.295534501015,3566.202626070197,3513.6015237408124,3478.382860319226,3445.6330212011326,3415.0473391875917,3386.373366239308,3359.3996757375103,3333.9474364624434,3309.863649602413,3287.0173792178434,3265.2949848870057,3244.5975717258207,3224.838329538955,3205.9409806579697,3187.8378951733484,3170.469093116158,3153.780581427489
+Offshore Wind - Class 7/Moderate,7309.139612095586,7112.887038516299,6972.595886819772,6864.055647217157,6775.89396238266,6701.87945680084,6220.5713602231,5747.179178251301,5280.018150057534,4787.51663824246,4306.1064315882195,4250.69281197255,4201.756474658073,4157.994601502596,4128.585901652064,4101.1595342313185,4075.476022839443,4051.3361364151237,4028.5724632151287,4007.0432021668807,3986.6267303019517,3967.2187201697593,3948.7284811703275,3931.0768530489104,3914.194321128019,3898.019464145569,3882.498067305242,3867.5817918520374,3853.2269555165312
+Offshore Wind - Class 7/Conservative,8875.383790929918,8845.383273936757,8817.98185197444,8792.775962959942,8769.448078924646,8747.744532273511,8727.459439822973,8708.423394193125,8081.400338044277,7421.798180581692,6769.403486705676,6122.456104869517,5479.766192140526,4840.493585478835,4820.141306593594,4801.107589206534,4783.23655191965,4766.397813136889,4750.481612841166,4735.394710452311,4721.057391372057,4707.4003626603235,4694.364087822995,4681.8955716195005,4669.949247012442,4658.484092581294,4647.463854259805,4636.856269255077,4626.632400835331
diff --git a/tests/data/Fixed_Offshore_Wind/Market/30/df_fin_assump.csv b/tests/data/Fixed_Offshore_Wind/Market/30/df_fin_assump.csv
new file mode 100644
index 0000000..ca9ad50
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/30/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),30
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Fixed_Offshore_Wind/Market/30/df_fom.csv b/tests/data/Fixed_Offshore_Wind/Market/30/df_fom.csv
new file mode 100644
index 0000000..c78b3e0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/30/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,90.662,84.9785,81.599875,79.229625,77.420125,75.96575,74.755,73.721375,72.822,71.614125,70.592125,69.708875,68.932875,68.242125,67.779625,67.3495,66.94787500000001,66.57124999999999,66.217,65.88275,65.5665,65.26650000000001,64.98125,64.709375,64.44987499999999,64.20175,63.964,63.735875,63.51675
+Offshore Wind - Class 1/Moderate,90.662,87.639125,85.47825,83.806375,82.4485,81.30850000000001,80.32825000000001,79.469875,78.7075,77.55475,76.57300000000001,75.719375,74.96562499999999,74.29162500000001,73.83862500000001,73.41624999999999,73.020625,72.64875,72.298125,71.9665,71.652125,71.353125,71.068375,70.7965,70.53637499999999,70.28725,70.04825,69.8185,69.597375
+Offshore Wind - Class 1/Conservative,90.662,90.167625,89.716125,89.30075000000001,88.916375,88.55874999999999,88.2245,87.910875,87.615375,86.78312500000001,86.06975,85.44600000000001,84.892375,84.395125,84.05975,83.74612499999999,83.45174999999999,83.17425,82.912,82.663375,82.42712499999999,82.20212500000001,81.98724999999999,81.781875,81.58500000000001,81.396125,81.21449999999999,81.03975,80.87125
+Offshore Wind - Class 2/Advanced,90.45362499999999,84.78325,81.41237500000001,79.0475,77.242375,75.79125,74.58325,73.55199999999999,72.65475,71.449625,70.43,69.54875,68.77449999999999,68.08525,67.623875,67.19475,66.794,66.418375,66.064875,65.731375,65.415875,65.1165,64.831875,64.56075,64.301875,64.05425,63.817125,63.5895,63.370875
+Offshore Wind - Class 2/Moderate,90.45362499999999,87.43775,85.281875,83.613875,82.259125,81.12175,80.14362500000001,79.28725,78.526625,77.376625,76.397,75.5455,74.7935,74.121,73.669,73.2475,72.852875,72.481875,72.132125,71.80125000000001,71.4875,71.18925,70.905125,70.633875,70.374375,70.12587500000001,69.88725,69.658125,69.4375
+Offshore Wind - Class 2/Conservative,90.45362499999999,89.9605,89.51,89.095625,88.712125,88.35525000000001,88.02187500000001,87.708875,87.41412499999998,86.583875,85.87199999999999,85.24974999999999,84.69737500000001,84.20125,83.86675,83.55375000000001,83.26,82.983125,82.72149999999999,82.4735,82.23775,82.01325,81.799,81.594,81.397625,81.209125,81.027875,80.8535,80.6855
+Offshore Wind - Class 3/Advanced,90.520875,84.84625,81.47287499999999,79.10624999999999,77.29974999999999,75.8475,74.638625,73.60674999999999,72.708625,71.50274999999999,70.482375,69.600375,68.825625,68.135875,67.674125,67.244625,66.843625,66.467625,66.114,65.78025,65.4645,65.164875,64.88012499999999,64.60875,64.349625,64.101875,63.8645,63.63675,63.417874999999995
+Offshore Wind - Class 3/Moderate,90.520875,87.50275,85.34525000000001,83.67599999999999,82.32025,81.182,80.20325,79.346125,78.58500000000001,77.434125,76.45375,75.601625,74.84899999999999,74.176,73.72375,73.30199999999999,72.907,72.53575,72.185625,71.854625,71.540625,71.242125,70.95775,70.68625,70.426625,70.177875,69.93925,69.709875,69.489
+Offshore Wind - Class 3/Conservative,90.520875,90.02725,89.5765,89.16175000000001,88.778,88.421,88.08725000000001,87.774,87.479125,86.648125,85.93575,85.313,84.76037500000001,84.26387500000001,83.92899999999999,83.615875,83.321875,83.04475,82.783,82.53475,82.29887500000001,82.07412500000001,81.85974999999999,81.65462500000001,81.458,81.269375,81.088125,80.91362500000001,80.745375
+Offshore Wind - Class 4/Advanced,90.50575,84.832,81.45925,79.093,77.28675,75.83487500000001,74.62625,73.594375,72.6965,71.49074999999999,70.4705,69.58875,68.81412499999999,68.1245,67.66275,67.23349999999999,66.8325,66.4565,66.102875,65.76925,65.4535,65.154,64.86925000000001,64.597875,64.338875,64.091125,63.85375,63.626125,63.40725
+Offshore Wind - Class 4/Moderate,90.50575,87.488125,85.33099999999999,83.66199999999999,82.3065,81.16837500000001,80.18974999999999,79.332875,78.571875,77.421125,76.441,75.589,74.8365,74.163625,73.711375,73.28975,72.89475,72.52362500000001,72.173625,71.8425,71.528625,71.23025,70.945875,70.6745,70.414875,70.166125,69.9275,69.698125,69.4775
+Offshore Wind - Class 4/Conservative,90.50575,90.01225,89.5615,89.146875,88.76312499999999,88.406125,88.07249999999999,87.75937499999999,87.46449999999999,86.633625,85.921375,85.29875000000001,84.74612499999999,84.24975,83.915,83.601875,83.307875,83.03087500000001,82.769125,82.521,82.28512500000001,82.06049999999999,81.846,81.64087500000001,81.44437500000001,81.255875,81.0745,80.9,80.731875
+Offshore Wind - Class 5/Advanced,91.497125,85.76124999999999,82.35150000000002,79.959375,78.133375,76.6655,75.443625,74.40050000000001,73.49275,72.273875,71.2425,70.351,69.567875,68.870625,68.403875,67.969875,67.5645,67.1845,66.827,66.48962499999999,66.1705,65.867625,65.57975,65.3055,65.043625,64.793125,64.55325,64.323,64.101875
+Offshore Wind - Class 5/Moderate,91.497125,88.44637499999999,86.265625,84.578375,83.208,82.0575,81.06812500000001,80.201875,79.4325,78.269125,77.27825,76.416875,75.65625,74.976,74.51875,74.0925,73.69325,73.318,72.964125,72.62950000000001,72.312125,72.010375,71.723,71.448625,71.186125,70.93475,70.6935,70.461625,70.2385
+Offshore Wind - Class 5/Conservative,91.497125,90.998125,90.54249999999999,90.123375,89.735375,89.3745,89.03712499999999,88.720625,88.4225,87.58262500000001,86.8625,86.233125,85.674375,85.172625,84.834125,84.517625,84.220375,83.94037499999999,83.67575000000001,83.42487500000001,83.186375,82.95925,82.7425,82.535125,82.3365,82.145875,81.962625,81.78625,81.61612500000001
+Offshore Wind - Class 6/Advanced,90.82724999999999,85.133375,81.748625,79.374,77.56125,76.104125,74.89125,73.85575,72.95474999999999,71.74475,70.720875,69.836,69.0585,68.3665,67.903125,67.47225,67.069875,66.692625,66.33775,66.002875,65.686,65.3855,65.099625,64.827375,64.567375,64.31875,64.080625,63.852125,63.6325
+Offshore Wind - Class 6/Moderate,90.82724999999999,87.798875,85.634,83.95925,82.59875,81.456625,80.474625,79.61475,78.851,77.696125,76.71249999999999,75.8575,75.102375,74.427,73.97325000000001,73.55000000000001,73.15375,72.78125,72.43,72.09774999999999,71.782625,71.48325,71.197875,70.9255,70.66499999999999,70.415375,70.175875,69.94575,69.72425
+Offshore Wind - Class 6/Conservative,90.82724999999999,90.33200000000001,89.879625,89.46350000000001,89.07849999999999,88.720125,88.38525000000001,88.07112500000001,87.775125,86.941375,86.22662500000001,85.60175,85.047125,84.549,84.21300000000001,83.898875,83.60374999999999,83.32587500000001,83.06312500000001,82.814,82.57737499999999,82.351875,82.13675,81.93087500000001,81.73375,81.544375,81.36250000000001,81.187375,81.01862499999999
+Offshore Wind - Class 7/Advanced,91.0155,85.309875,81.91812499999999,79.538625,77.722125,76.262,75.046625,74.009,73.106,71.8935,70.8675,69.98075,69.20175,68.50825,68.043875,67.612125,67.209,66.830875,66.47525,66.13974999999999,65.82225,65.521,65.234625,64.96175,64.70125,64.452125,64.21350000000001,63.984500000000004,63.7645
+Offshore Wind - Class 7/Moderate,91.0155,87.981,85.81162499999999,84.13325,82.770125,81.625625,80.6415,79.779875,79.0145,77.85725000000001,76.87162500000001,76.01474999999999,75.25812499999999,74.58137500000001,74.12662499999999,73.7025,73.305375,72.932125,72.58012500000001,72.24725000000001,71.9315,71.6315,71.3455,71.072625,70.8115,70.561375,70.321375,70.09075,69.868875
+Offshore Wind - Class 7/Conservative,91.0155,90.51925,90.066,89.649125,89.263125,88.904125,88.568625,88.25375,87.957125,87.121625,86.405375,85.77925,85.2235,84.724375,84.38762499999999,84.07287500000001,83.77725,83.498625,83.235375,82.98575,82.74862499999999,82.52274999999999,82.30712499999998,82.100875,81.90325,81.71350000000001,81.53125,81.35575,81.18662499999999
diff --git a/tests/data/Fixed_Offshore_Wind/Market/30/df_gcc.csv b/tests/data/Fixed_Offshore_Wind/Market/30/df_gcc.csv
new file mode 100644
index 0000000..d9068d0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/30/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,1084.6748,1011.5737,968.1176,937.6309,846.6146,760.3665,677.2534,663.9593,652.3908,636.8558,623.7108,612.3499,602.3685,593.4836,587.5348,582.003,576.8368,571.9935,567.4373,563.1382,559.0702,555.2112,551.5421,548.0461,544.7085,541.5166,538.4588,535.525,532.7062
+Offshore Wind - Class 1/Moderate,1234.5893,1201.4402,1177.7435,1159.41,1144.5186,1132.0167,1050.7188,970.758,891.8496,808.6611,727.3459,717.986,709.7201,702.3283,697.3608,692.7283,688.3901,684.3126,680.4676,676.831,673.3825,670.1043,666.9811,663.9995,661.1479,658.4158,655.7941,653.2745,650.8499
+Offshore Wind - Class 1/Conservative,1499.1441,1494.0767,1489.4483,1485.1908,1481.2505,1477.5845,1474.1581,1470.9427,1365.0321,1253.6184,1143.4223,1034.1461,925.5892,817.6094,814.1717,810.9567,807.9381,805.0939,802.4055,799.8571,797.4354,795.1286,792.9266,790.8206,788.8027,786.8661,785.0047,783.213,781.486
+Offshore Wind - Class 2/Advanced,998.0205,930.7594,890.775,862.7239,778.9788,699.621,623.1478,610.9158,600.2715,585.9776,573.8828,563.4295,554.2455,546.0704,540.5969,535.507,530.7535,526.2971,522.105,518.1492,514.4063,510.8556,507.4796,504.2628,501.1919,498.255,495.4415,492.7421,490.1484
+Offshore Wind - Class 2/Moderate,1135.9583,1105.4575,1083.654,1066.7851,1053.0833,1041.5803,966.7772,893.2044,820.6001,744.0574,669.2385,660.6263,653.0208,646.2195,641.6489,637.3864,633.3948,629.6431,626.1052,622.7592,619.5862,616.5698,613.6962,610.9528,608.329,605.8152,603.4029,601.0846,598.8537
+Offshore Wind - Class 2/Conservative,1379.3779,1374.7154,1370.4568,1366.5394,1362.9138,1359.5407,1356.3881,1353.4296,1255.9801,1153.4673,1052.0746,951.5285,851.6441,752.2909,749.1278,746.1696,743.3922,740.7752,738.3015,735.9568,733.7285,731.606,729.58,727.6422,725.7855,724.0036,722.2909,720.6423,719.0534
+Offshore Wind - Class 3/Advanced,1099.023,1024.9548,980.924,950.0339,857.8136,770.4247,686.2122,672.7422,661.0207,645.2802,631.9613,620.4501,610.3367,601.3343,595.3068,589.7018,584.4672,579.5598,574.9434,570.5874,566.4656,562.5556,558.8379,555.2957,551.914,548.6798,545.5816,542.609,539.7528
+Offshore Wind - Class 3/Moderate,1250.9205,1217.3329,1193.3228,1174.7467,1159.6583,1146.9911,1064.6178,983.5992,903.6471,819.3581,736.9673,727.4835,719.1083,711.6187,706.5856,701.8917,697.4961,693.3647,689.4688,685.7842,682.29,678.9685,675.8039,672.783,669.8936,667.1254,664.469,661.9161,659.4594
+Offshore Wind - Class 3/Conservative,1518.9749,1513.8404,1509.1509,1504.837,1500.8445,1497.1301,1493.6584,1490.4005,1383.0888,1270.2014,1158.5475,1047.8259,937.8329,828.4248,824.9416,821.6841,818.6256,815.7437,813.0197,810.4377,807.9839,805.6466,803.4155,801.2816,799.2371,797.2748,795.3888,793.5734,791.8236
+Offshore Wind - Class 4/Advanced,1214.6721,1132.8098,1084.1456,1050.0051,948.0805,851.4957,758.4216,743.5341,730.5792,713.1824,698.462,685.7394,674.5618,664.6121,657.9503,651.7555,645.9701,640.5463,635.4442,630.6297,626.0742,621.7528,617.6439,613.7289,609.9913,606.4168,602.9925,599.7071,596.5505
+Offshore Wind - Class 4/Moderate,1382.5536,1345.4316,1318.895,1298.3641,1281.688,1267.6878,1176.6465,1087.1024,998.737,905.5783,814.5176,804.0359,794.7794,786.5016,780.9389,775.7511,770.8929,766.3268,762.0209,757.9486,754.0867,750.4156,746.9181,743.5792,740.3858,737.3263,734.3903,731.5689,728.8536
+Offshore Wind - Class 4/Conservative,1678.8151,1673.1403,1667.9573,1663.1895,1658.7769,1654.6716,1650.8346,1647.2338,1528.6298,1403.8634,1280.4603,1158.0875,1036.5201,915.5991,911.7494,908.1491,904.7687,901.5836,898.573,895.7192,893.0073,890.424,887.9581,885.5997,883.34,881.1713,879.0867,877.0803,875.1464
+Offshore Wind - Class 5/Advanced,1403.7543,1309.149,1252.9094,1213.4544,1095.6637,984.044,876.4815,859.2766,844.3051,824.2001,807.1882,792.4853,779.5676,768.0691,760.3703,753.2113,746.5253,740.2572,734.3608,728.7969,723.5322,718.5381,713.7896,709.2651,704.9458,700.8149,696.8576,693.0607,689.4127
+Offshore Wind - Class 5/Moderate,1597.7692,1554.8686,1524.2011,1500.4743,1481.2023,1465.0228,1359.8095,1256.3265,1154.2056,1046.5454,941.3097,929.1963,918.499,908.9326,902.5039,896.5086,890.8942,885.6173,880.6411,875.9348,871.4718,867.2293,863.1873,859.3287,855.6382,852.1024,848.7094,845.4487,842.3108
+Offshore Wind - Class 5/Conservative,1940.1483,1933.5902,1927.6003,1922.0903,1916.9909,1912.2465,1907.8122,1903.6509,1766.5844,1622.3962,1479.7835,1338.3616,1197.8703,1058.1261,1053.6771,1049.5164,1045.6098,1041.9289,1038.4496,1035.1516,1032.0175,1029.0321,1026.1824,1023.4568,1020.8453,1018.339,1015.93,1013.6112,1011.3763
+Offshore Wind - Class 6/Advanced,1342.4978,1252.0208,1198.2354,1160.5021,1047.8515,941.1026,838.2339,821.7798,807.4616,788.234,771.9645,757.9031,745.5491,734.5524,727.1896,720.3429,713.9487,707.9541,702.315,696.9939,691.959,687.1828,682.6415,678.3145,674.1836,670.233,666.4483,662.8172,659.3283
+Offshore Wind - Class 6/Moderate,1528.0463,1487.0178,1457.6886,1434.9972,1416.5662,1401.0927,1300.4706,1201.5034,1103.8389,1000.8767,900.2332,888.6484,878.4178,869.269,863.1208,857.3871,852.0177,846.971,842.2121,837.7111,833.4429,829.3855,825.5199,821.8296,818.3002,814.9187,811.6738,808.5554,805.5544
+Offshore Wind - Class 6/Conservative,1855.4848,1849.2129,1843.4844,1838.2149,1833.3379,1828.8006,1824.5598,1820.5801,1689.4949,1551.5987,1415.2093,1279.9587,1145.5981,1011.952,1007.6971,1003.718,999.9819,996.4616,993.1341,989.9801,986.9827,984.1276,981.4022,978.7956,976.2981,973.9012,971.5973,969.3797,967.2423
+Offshore Wind - Class 7/Advanced,1477.7456,1378.1536,1318.9497,1277.415,1153.4156,1035.9125,922.6804,904.5687,888.808,867.6433,849.7348,834.2568,820.6583,808.5537,800.4491,792.9127,785.8743,779.2758,773.0686,767.2115,761.6693,756.4119,751.4131,746.6502,742.1032,737.7545,733.5886,729.5917,725.7513
+Offshore Wind - Class 7/Moderate,1681.9869,1636.825,1604.5411,1579.5637,1559.2758,1542.2435,1431.4844,1322.5469,1215.0433,1101.7083,990.9257,978.1739,966.9126,956.8421,950.0745,943.7631,937.8528,932.2977,927.0593,922.105,917.4067,912.9405,908.6855,904.6235,900.7385,897.0163,893.4445,890.012,886.7086
+Offshore Wind - Class 7/Conservative,2042.4126,2035.5089,2029.2032,2023.4028,2018.0346,2013.0401,2008.3721,2003.9915,1859.7003,1707.912,1557.7822,1408.906,1261.0095,1113.8995,1109.216,1104.8359,1100.7234,1096.8485,1093.1858,1089.714,1086.4147,1083.2719,1080.272,1077.4027,1074.6536,1072.0152,1069.4793,1067.0382,1064.6855
diff --git a/tests/data/Fixed_Offshore_Wind/Market/30/df_lcoe.csv b/tests/data/Fixed_Offshore_Wind/Market/30/df_lcoe.csv
new file mode 100644
index 0000000..5090108
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/30/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,82.22779319752487,75.82052317395632,71.75708226758825,68.76834216784437,62.90147854688552,57.55881814331176,52.58172726490057,51.39287547455876,50.37505838141601,49.013883691940144,47.878737770499605,46.90486823465521,46.050871664510225,45.30384201139406,44.80376459916592,44.33409314978956,43.90789472103861,43.50498462817298,43.122862813673606,42.775590182238275,42.43678633572738,42.121025141197094,41.81885213998757,41.53690468623583,41.25845794454658,41.00592485354712,40.75516896382581,40.51325942436239,40.28713225824105
+Offshore Wind - Class 1/Moderate,90.54071210442237,88.48359420715096,86.39206872513464,84.5001495899666,82.96761955461233,81.68281475969397,76.72374224168902,71.91193062736899,67.22153054436991,62.155183014368184,57.304357058234864,56.4368179673022,55.67888933438444,55.00123753887593,54.55183102556518,54.128740671656146,53.73959131062508,53.360098544179664,53.02024619286009,52.68602609479439,52.37707960813356,52.081358821709195,51.80809820490792,51.535474563654965,51.28321417257612,51.04022215949066,50.80578913783252,50.57926185979906,50.37010341748184
+Offshore Wind - Class 1/Conservative,105.21056907075561,106.46650908568148,106.4877857363127,106.04840917091926,105.6415569975356,105.23508447288943,104.86919184397634,104.52059425972377,98.38943450304623,91.68955664263193,85.13302477569218,78.69379895021201,72.3638422071149,66.09572792690474,65.76724955634592,65.45700299859946,65.16286640073263,64.89658301763197,64.64298410355993,64.40077877391694,64.16889550890797,63.946395867407716,63.732428466649566,63.53958636037599,63.34063384047416,63.16151192530633,62.98844505109032,62.821032896075685,62.658848233239844
+Offshore Wind - Class 2/Advanced,84.38266580470031,77.79726725684749,73.63955346252078,70.56956467941446,64.55672137324368,59.099194579573975,54.00715679519252,52.78731631073299,51.734132772304626,50.34631832145192,49.18198449403083,48.17457329207658,47.31019645488957,46.53764269700602,46.02052896531542,45.54374100868923,45.10320455415248,44.695517975898234,44.308994798739775,43.941491018073926,43.59972841391453,43.27331144510443,42.96088321053573,42.669619474136105,42.38992871569051,42.12913618068822,41.86988778617825,41.627854749059466,41.394183226558255
+Offshore Wind - Class 2/Moderate,92.87459973932,90.75765181216003,88.6203470833567,86.67709580972632,85.08810432199616,83.79219737424286,78.69326951364401,73.78114255355383,68.99313547121398,63.81482922306965,58.858519192194024,57.96102481438751,57.17721161415759,56.48830349926693,56.023662692726596,55.58608189377554,55.183904610920294,54.80266397522121,54.45153756171355,54.117042413874124,53.797589611012384,53.491780796635325,53.1984161683903,52.92742389424631,52.66673805941117,52.41559275600826,52.18401439569745,51.94975765469478,51.72304700198421
+Offshore Wind - Class 2/Conservative,107.86036513241766,109.13503175815455,109.17280053513247,108.71697494361973,108.27162787153799,107.87368049933534,107.4944484314838,107.15658692390274,100.86614321978415,94.03094056829813,87.32245129659799,80.75377124432097,74.28019895097138,67.87073209050408,67.53117386084394,67.21030746436594,66.92061163261774,66.63093190926797,66.36888965665223,66.13296067633006,65.89316167102024,65.66301759171735,65.4559054334186,65.24255826011088,65.05075838333812,64.8656971347232,64.68686652003983,64.51385068860016,64.34624564030116
+Offshore Wind - Class 3/Advanced,86.3274005126468,79.59336811524875,75.34733335817785,72.19383937110666,66.02110779044796,60.40128174723836,55.14399343434879,53.89724792084369,52.820714618481155,51.40208983896624,50.20175111671124,49.181993966301356,48.2886790698678,47.49905991526717,46.97982022393908,46.4923494869584,46.04193842189372,45.6160597965717,45.22097710570115,44.84532646608233,44.49594310957237,44.16226475193265,43.842924989297636,43.54514965130037,43.25921484978185,42.99257892156887,42.72756081352056,42.4801215722819,42.24121120100128
+Offshore Wind - Class 3/Moderate,95.10119597284354,92.935411793574,90.75703707172599,88.77193923977168,87.1673033222637,85.82449321825803,80.56952009029249,75.50541762305967,70.568300403636,65.23256770695973,60.11106480660063,59.20698575098178,58.40629739781592,57.70251050915372,57.21591463422232,56.78087984494776,56.36998646880633,55.98052446367767,55.61019314243246,55.268565544878626,54.94227857181429,54.62994020431595,54.34155922700815,54.064671786725405,53.798347265773614,53.54174561059704,53.294149067093834,53.054871095199815,52.83418647856886
+Offshore Wind - Class 3/Conservative,110.58436391113064,111.90782801530548,111.95267158908132,111.48713636294265,111.03214478166363,110.62558580108444,110.2380638949433,109.89281416974615,103.39731481470422,96.32417380397024,89.42289165487381,82.64343907372992,75.94473239134382,69.32960406977084,68.98289199795056,68.67025034690607,68.35951864617807,68.07855111643663,67.81094675315353,67.55528573097206,67.31047106121311,67.09000055700403,66.86399215393178,66.66060337965287,66.45031634147533,66.26134782701959,66.07877440972341,65.90211291781884,65.73094474120708
+Offshore Wind - Class 4/Advanced,90.40673867952141,83.38909832791518,78.91907811373294,75.63542123688138,69.08243543757956,63.11162014736213,57.534733067798484,56.23069748077276,55.11578930514931,53.62060351375994,52.364903922835204,51.29803101551627,50.363415170829285,49.537253533724105,48.98423724185801,48.47433850183968,48.00310482174354,47.55758419456216,47.144223088363525,46.751255945249106,46.38568082932122,46.03659492935502,45.70250821968557,45.39091318551059,45.09175720910511,44.80402072406832,44.53543453517311,44.27652196141242,44.026523737738486
+Offshore Wind - Class 4/Moderate,99.76636340425307,97.53621551827034,95.26830866723485,93.17301992914581,91.49557648107853,90.09175861624138,84.51043431975805,79.1289176266208,73.88041124907754,68.20130814516482,62.77517841069993,61.817636397490325,60.993957407587956,60.24600974283029,59.750143515902245,59.28323355567969,58.853940880575635,58.447096568805044,58.06026095746583,57.70328475848569,57.36241683715112,57.03613727697184,56.73478955517995,56.44549054371806,56.1556887204774,55.88764884870432,55.64042265781691,55.39044039830906,55.15986639409777
+Offshore Wind - Class 4/Conservative,116.28334880384627,117.70766058839537,117.76657751618357,117.28036477919427,116.80476801348564,116.37978229467248,115.97468847189951,115.58856052342033,108.69172703781794,101.16624434258175,93.82065694791608,86.5839397514537,79.46938725015704,72.42361957960958,72.0616221815562,71.71962004547605,71.41067452709545,71.10197286616986,70.82259267289363,70.55572561610434,70.31528049733903,70.0699621217748,69.83402173405361,69.62164232389738,69.41708563978467,69.20491840642109,69.01425984505047,68.82981263410446,68.65113797473046
+Offshore Wind - Class 5/Advanced,96.59499123193771,89.10104502785242,84.34465049607466,80.81009644357945,73.78035065280928,67.35953763641506,61.361882165147215,59.96056187076295,58.76293334429101,57.16874142270191,55.83140687393227,54.68558500981498,53.68193048650573,52.80556962275926,52.21171004622835,51.67463975438057,51.16868180298122,50.690293755922816,50.24653603568262,49.834572706000415,49.44212908599901,49.067307928600165,48.708573815299715,48.374154670006156,48.0530279819968,47.75361638901337,47.46538842317387,47.17811193860597,46.909863544020006
+Offshore Wind - Class 5/Moderate,106.69270116896725,104.32235545604225,101.90741842958636,99.67580751302711,97.87200930510788,96.3626446273923,90.36647507854559,84.56553174606292,78.90815986152235,72.8206931370035,66.95800095582743,65.94483643409463,65.06147693168417,64.25907971637675,63.72725978313574,63.239858661682604,62.77945245523933,62.34301778596567,61.94110745300059,61.54523233983788,61.19258711227948,60.84251232936051,60.51945035742595,60.19654978753546,59.89819840740686,59.62329475955903,59.3458226543251,59.07766344826315,58.830519984744754
+Offshore Wind - Class 5/Conservative,124.51218754888284,126.05082233444237,126.1164919770919,125.59371030298982,125.11012359021339,124.65322168206069,124.21752499740305,123.80213538490086,116.36280315613499,108.24810803458989,100.3278657714126,92.54545412268307,84.85419147490035,77.27478853718557,76.88664401327839,76.51989760507364,76.18885545891885,75.87444988689731,75.57491712948126,75.28875191177407,75.01466399964647,74.75159051214436,74.51498651180059,74.28744518978183,74.05196391094324,73.84053981937888,73.6362351297953,73.43854387947147,73.24697227885065
+Offshore Wind - Class 6/Advanced,119.88769529358116,110.58012816533143,104.68812156272475,100.30853608399339,91.60506940040622,83.69418391779698,76.27012129952917,74.54631297719509,73.05283389618332,71.07637400079682,69.41625650680851,67.98775267969431,66.76078485380677,65.66830591991432,64.92442927700014,64.25845657307427,63.631095410869335,63.037905829589,62.49120393263245,61.971502007364094,61.47614561335368,61.018439786356865,60.580485821526025,60.16066118628074,59.77259000426402,59.38447432498659,59.02543478262036,58.67922078338695,58.344892821451886
+Offshore Wind - Class 6/Moderate,132.32895359927244,129.39849273139478,126.38881369605029,123.63003529385907,121.37089920582919,119.5332693178234,112.12248864655572,104.93856346770937,97.96904618561356,90.43639879238155,83.21333404675605,81.95881958355227,80.85289574158828,79.86952942036798,79.21924451699483,78.58579055516624,78.02877290875816,77.48024390012782,76.97925864360161,76.5019302227274,76.04596590801181,75.62987762696586,75.21086857356522,74.82822969787745,74.46022481956997,74.10568021067947,73.76360543234526,73.43308918010477,73.11329097424452
+Offshore Wind - Class 6/Conservative,154.28411647877715,156.20507022626725,156.2765952628781,155.6233632867727,155.02873323034336,154.4228457769135,153.88777751984867,153.42178069391468,144.2227848704965,134.20699968366176,124.44887352857545,114.83461498367822,105.36619286575385,96.01856825678034,95.53988242513444,95.08775315165411,94.65897037277786,94.27770972720111,93.91479404211746,93.54198562451623,93.21068931142753,92.89294483921283,92.58764268064445,92.29366130939636,92.03607399942649,91.76207023002335,91.49704222662949,91.26593216144157,91.01680987453283
+Offshore Wind - Class 7/Advanced,163.46188006162265,150.8369170353339,142.76599110357023,136.80098806347877,124.80681259965272,113.92459622527039,103.69541067136244,101.33805401692688,99.3109932036698,96.61934713326661,94.34920678966702,92.40988548609174,90.73573215509465,89.22190815172218,88.23465458006869,87.30787259333925,86.46322544843143,85.66490336765449,84.9079725536947,84.21624731958975,83.52957422645343,82.90075930716463,82.29906837626488,81.74925487721687,81.1948026022254,80.68796377606775,80.2000367342503,79.72958346865133,79.27537074053367
+Offshore Wind - Class 7/Moderate,180.6617493347719,176.6842161682088,172.59026879158586,168.85129232478394,165.7738866839355,163.2669882279096,153.06382016431294,143.18113115909264,133.5624179396332,123.17038788302324,113.22187631997926,111.49957354653377,109.98932823710237,108.65511678848274,107.76293915789215,106.92295122709562,106.12897081371135,105.413055298138,104.69603770164727,104.04849988047714,103.43001407774304,102.87418598141187,102.3059047515806,101.7954684352512,101.26922933305674,100.79700864657154,100.34165419337207,99.86695267389237,99.44194289515985
+Offshore Wind - Class 7/Conservative,211.01446057511436,213.69073394978926,213.8090931556099,212.92448679496127,212.05843717941528,211.31689775236154,210.5323933032967,209.86081257792046,197.17755794948147,183.43567606748866,169.9372356312198,156.63949176188697,143.55727789423077,130.65285877045693,130.01562679912536,129.41441934386046,128.8448967576855,128.30354610330502,127.787477884486,127.29408095723609,126.82127828195263,126.41359087744783,125.97632132471558,125.60076826546678,125.23927194450869,124.84490655372161,124.50853124786423,124.183249337647,123.86832945908374
diff --git a/tests/data/Fixed_Offshore_Wind/Market/30/df_occ.csv b/tests/data/Fixed_Offshore_Wind/Market/30/df_occ.csv
new file mode 100644
index 0000000..045f8f4
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/30/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,3842.3701,3583.4153,3429.4759,3321.4792,2999.0614,2693.5348,2399.1137,2352.0203,2311.0401,2256.0086,2209.4435,2169.1984,2133.8401,2102.3662,2081.2931,2061.6972,2043.3962,2026.2391,2010.0994,1994.87,1980.4595,1966.7894,1953.7918,1941.4075,1929.5845,1918.2773,1907.4453,1897.0526,1887.0671
+Offshore Wind - Class 1/Moderate,4373.4293,4256.0015,4172.0581,4107.113,4054.3614,4010.0748,3722.0837,3438.8291,3159.3029,2864.6143,2576.5622,2543.4053,2514.1243,2487.9392,2470.3425,2453.932,2438.5643,2424.1202,2410.4995,2397.6174,2385.4012,2373.7884,2362.7248,2352.1629,2342.0612,2332.383,2323.0957,2314.1705,2305.5813
+Offshore Wind - Class 1/Conservative,5310.5928,5292.6419,5276.2463,5261.1643,5247.2061,5234.2197,5222.0821,5210.6919,4835.5121,4440.8387,4050.4779,3663.3763,3278.8224,2896.3131,2884.1352,2872.7465,2862.0533,2851.9778,2842.4543,2833.4271,2824.8483,2816.6767,2808.8763,2801.4159,2794.2678,2787.4076,2780.8136,2774.4665,2768.3491
+Offshore Wind - Class 2/Advanced,3835.3896,3576.9052,3423.2455,3315.445,2993.6129,2688.6414,2394.7552,2347.7473,2306.8416,2251.91,2205.4296,2165.2576,2129.9635,2098.5468,2077.512,2057.9517,2039.6839,2022.558,2006.4476,1991.2459,1976.8616,1963.2163,1950.2423,1937.8805,1926.079,1914.7923,1903.98,1893.6062,1883.6388
+Offshore Wind - Class 2/Moderate,4365.4841,4248.2695,4164.4787,4099.6515,4046.9958,4002.7896,3715.3218,3432.5817,3153.5634,2859.4101,2571.8813,2538.7847,2509.5568,2483.4194,2465.8546,2449.4739,2434.1341,2419.7162,2406.1203,2393.2616,2381.0676,2369.4759,2358.4324,2347.8897,2337.8063,2328.1457,2318.8753,2309.9663,2301.3928
+Offshore Wind - Class 2/Conservative,5300.945,5283.0267,5266.6609,5251.6063,5237.6734,5224.7107,5212.5951,5201.2255,4826.7274,4432.7709,4043.1193,3656.721,3272.8657,2891.0513,2878.8956,2867.5275,2856.8538,2846.7966,2837.2904,2828.2796,2819.7164,2811.5596,2803.7734,2796.3265,2789.1914,2782.3436,2775.7617,2769.4261,2763.3198
+Offshore Wind - Class 3/Advanced,3919.2247,3655.0904,3498.0719,3387.915,3059.0483,2747.4105,2447.1005,2399.0651,2357.2652,2301.133,2253.6366,2212.5865,2176.5209,2144.4175,2122.9229,2102.935,2084.268,2066.7677,2050.3052,2034.7712,2020.0724,2006.1289,1992.8713,1980.2393,1968.1799,1956.6464,1945.5978,1934.9972,1924.812
+Offshore Wind - Class 3/Moderate,4460.9062,4341.1295,4255.5072,4189.263,4135.4563,4090.2838,3796.5324,3507.6122,3222.495,2921.912,2628.0983,2594.2782,2564.4115,2537.7027,2519.7541,2503.0153,2487.3402,2472.6071,2458.714,2445.5743,2433.1137,2421.2687,2409.9837,2399.2106,2388.9068,2379.035,2369.562,2360.4583,2351.6973
+Offshore Wind - Class 3/Conservative,5416.8147,5398.5047,5381.7812,5366.3976,5352.1601,5338.914,5326.5336,5314.9155,4932.2315,4529.6638,4131.4951,3736.6508,3344.405,2954.2448,2941.8234,2930.2068,2919.2998,2909.0227,2899.3088,2890.101,2881.3506,2873.0155,2865.0592,2857.4495,2850.1584,2843.161,2836.4351,2829.9611,2823.7213
+Offshore Wind - Class 4/Advanced,4175.3368,3893.9419,3726.6627,3609.3073,3258.9499,2926.9473,2607.0127,2555.8384,2511.307,2451.5066,2400.9064,2357.1738,2318.7514,2284.5501,2261.6509,2240.3569,2220.47,2201.8262,2184.2878,2167.7387,2152.0794,2137.2247,2123.1008,2109.6433,2096.7958,2084.5087,2072.738,2061.4447,2050.5939
+Offshore Wind - Class 4/Moderate,4752.4159,4624.8121,4533.5946,4463.0214,4405.6986,4357.5743,4044.6269,3736.8264,3433.0774,3112.8521,2799.8383,2763.8082,2731.9898,2703.5356,2684.4141,2666.5814,2649.882,2634.1862,2619.3852,2605.3868,2592.112,2579.4929,2567.4705,2555.9933,2545.0162,2534.4994,2524.4073,2514.7087,2505.3752
+Offshore Wind - Class 4/Conservative,5770.7908,5751.2843,5733.468,5717.079,5701.9112,5687.7995,5674.6101,5662.2328,5254.5412,4825.6667,4401.4786,3980.8321,3562.954,3147.2978,3134.0646,3121.6889,3110.0691,3099.1205,3088.7718,3078.9623,3069.6401,3060.7603,3052.284,3044.1771,3036.4095,3028.9549,3021.7895,3014.8924,3008.2448
+Offshore Wind - Class 5/Advanced,4263.1798,3975.8648,3805.0662,3685.2419,3327.5134,2988.5261,2661.8605,2609.6095,2564.1412,2503.0827,2451.418,2406.7653,2367.5346,2332.6137,2309.2328,2287.4907,2267.1854,2248.1494,2230.2421,2213.3447,2197.356,2182.1888,2167.7677,2154.0271,2140.9093,2128.3637,2116.3454,2104.8145,2093.7354
+Offshore Wind - Class 5/Moderate,4852.3998,4722.1114,4628.9748,4556.9169,4498.3881,4449.2513,4129.7199,3815.4438,3505.3043,3178.3419,2858.7428,2821.9547,2789.4668,2760.4141,2740.8902,2722.6824,2705.6317,2689.6056,2674.4933,2660.2003,2646.6462,2633.7616,2621.4863,2609.7677,2598.5597,2587.8215,2577.5172,2567.6145,2558.0846
+Offshore Wind - Class 5/Conservative,5892.1998,5872.2829,5854.0918,5837.358,5821.8711,5807.4625,5793.9956,5781.3579,5365.0891,4927.1917,4494.0793,4064.583,3637.9134,3213.5123,3200.0008,3187.3647,3175.5005,3164.3215,3153.755,3143.7392,3134.2208,3125.1543,3116.4996,3108.2222,3100.2912,3092.6796,3085.3635,3078.3213,3071.5339
+Offshore Wind - Class 6/Advanced,4118.311,3840.7593,3675.7647,3560.0122,3214.4398,2886.9717,2571.4067,2520.9313,2477.0081,2418.0245,2368.1153,2324.98,2287.0824,2253.3482,2230.7618,2209.7586,2190.1433,2171.7541,2154.4553,2138.1321,2122.6868,2108.035,2094.1039,2080.8302,2068.1582,2056.0389,2044.429,2033.29,2022.5874
+Offshore Wind - Class 6/Moderate,4687.5084,4561.6474,4471.6757,4402.0665,4345.5265,4298.0594,3989.3862,3685.7896,3386.1892,3070.3374,2761.5987,2726.0607,2694.6768,2666.6113,2647.7509,2630.1618,2613.6905,2598.209,2583.6102,2569.803,2556.7095,2544.2627,2532.4045,2521.0841,2510.257,2499.8837,2489.9295,2480.3633,2471.1573
+Offshore Wind - Class 6/Conservative,5691.9745,5672.7345,5655.1615,5638.9964,5624.0357,5610.1167,5597.1074,5584.8992,5182.7758,4759.7588,4341.3641,3926.4628,3514.2919,3104.3126,3091.2602,3079.0536,3067.5925,3056.7934,3046.586,3036.9105,3027.7156,3018.9571,3010.5966,3002.6004,2994.9389,2987.586,2980.5185,2973.7157,2967.1589
+Offshore Wind - Class 7/Advanced,4314.3319,4023.5694,3850.7215,3729.4595,3367.4388,3024.3841,2693.799,2640.921,2594.9072,2533.1161,2480.8315,2435.643,2395.9416,2360.6017,2336.9402,2314.9373,2294.3884,2275.1239,2257.0017,2239.9017,2223.7211,2208.3719,2193.7778,2179.8723,2166.5971,2153.901,2141.7385,2130.0693,2118.8572
+Offshore Wind - Class 7/Moderate,4910.6216,4778.77,4684.5158,4611.5934,4552.3623,4502.6359,4179.2706,3861.2236,3547.363,3216.4775,2893.0436,2855.8141,2822.9364,2793.5351,2773.777,2755.3507,2738.0953,2721.877,2706.5833,2692.1189,2678.4022,2665.363,2652.9404,2641.0812,2629.7387,2618.8717,2608.4437,2598.4222,2588.778
+Offshore Wind - Class 7/Conservative,5962.8977,5942.7419,5924.3324,5907.3979,5891.7251,5877.1437,5863.5152,5850.7259,5429.4625,4986.3109,4548.0017,4113.3522,3681.5631,3252.0698,3238.3962,3225.6085,3213.6019,3202.2888,3191.5956,3181.4595,3171.827,3162.6516,3153.8932,3145.5163,3137.4902,3129.7874,3122.3834,3115.2568,3108.3879
diff --git a/tests/data/Fixed_Offshore_Wind/Market/30/df_tc.csv b/tests/data/Fixed_Offshore_Wind/Market/30/df_tc.csv
new file mode 100644
index 0000000..9af6a81
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/30/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.1289257935074173,0.1301075434952705,0.13045655173884727,0.1304674427433303,0.13046751432090797,0.13046757579216822,0.13046655668773655,0.1304653735022892,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Moderate,0.1289257935074173,0.1301075434952705,0.13045655173884727,0.1304674427433303,0.13046751432090797,0.13046757579216822,0.13046655668773655,0.1304653735022892,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Conservative,0.1289257935074173,0.1301075434952705,0.13045655173884727,0.1304674427433303,0.13046751432090797,0.13046757579216822,0.13046655668773655,0.1304653735022892,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.8156785835927624,0.8156731490891987,0.8156713774348975,0.8156710553166417,0.8156708229769672,0.8156706234423747,0.8156739314532538,0.815677772114679,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Moderate,0.8156785835927624,0.8156731490891987,0.8156713774348975,0.8156710553166417,0.8156708229769672,0.8156706234423747,0.8156739314532538,0.815677772114679,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Conservative,0.8156785835927624,0.8156731490891987,0.8156713774348975,0.8156710553166417,0.8156708229769672,0.8156706234423747,0.8156739314532538,0.815677772114679,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PFF/Advanced,0.7023130514762239,0.7023146526276195,0.7023151746047832,0.7023152695095135,0.702315337963051,0.7023153967513264,0.7023144221220573,0.7023132905595644,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Moderate,0.7023130514762239,0.7023146526276195,0.7023151746047832,0.7023152695095135,0.702315337963051,0.7023153967513264,0.7023144221220573,0.7023132905595644,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Conservative,0.7023130514762239,0.7023146526276195,0.7023151746047832,0.7023152695095135,0.702315337963051,0.7023153967513264,0.7023144221220573,0.7023132905595644,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+Year (Advanced)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9278050110194725,0.9278026706609483,0.9278019076983567,0.9278017689780282,0.9278016689208433,0.9278015829911608,0.9278030075854014,0.927804661558896,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608221384728436,0.8608177956855882,0.86081637992871,0.8608161225187586,0.8608159368523021,0.8608157774009039,0.8608184208845163,0.8608214900104174,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986750936716025,0.7986690497895593,0.7986670794758505,0.7986667212377113,0.7986664628452251,0.7986662409363253,0.79866991988157,0.7986741912017398,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410147540849595,0.7410072773689951,0.7410048399535692,0.7410043967882304,0.7410040771389065,0.7410038026223225,0.7410083537341122,0.7410136376637552,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875172020793876,0.6875085309221517,0.6875057041226371,0.687505190160617,0.6875048194466268,0.6875045010754605,0.6875097792404162,0.6875159073031466,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378819052513431,0.6378722510917576,0.6378691038384846,0.6378685316125962,0.6378681188737033,0.6378677644113605,0.6378736409236335,0.6378804636917533,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Moderate)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9278050110194725,0.9278026706609483,0.9278019076983567,0.9278017689780282,0.9278016689208433,0.9278015829911608,0.9278030075854014,0.927804661558896,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608221384728436,0.8608177956855882,0.86081637992871,0.8608161225187586,0.8608159368523021,0.8608157774009039,0.8608184208845163,0.8608214900104174,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986750936716025,0.7986690497895593,0.7986670794758505,0.7986667212377113,0.7986664628452251,0.7986662409363253,0.79866991988157,0.7986741912017398,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410147540849595,0.7410072773689951,0.7410048399535692,0.7410043967882304,0.7410040771389065,0.7410038026223225,0.7410083537341122,0.7410136376637552,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875172020793876,0.6875085309221517,0.6875057041226371,0.687505190160617,0.6875048194466268,0.6875045010754605,0.6875097792404162,0.6875159073031466,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378819052513431,0.6378722510917576,0.6378691038384846,0.6378685316125962,0.6378681188737033,0.6378677644113605,0.6378736409236335,0.6378804636917533,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Conservative)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9278050110194725,0.9278026706609483,0.9278019076983567,0.9278017689780282,0.9278016689208433,0.9278015829911608,0.9278030075854014,0.927804661558896,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608221384728436,0.8608177956855882,0.86081637992871,0.8608161225187586,0.8608159368523021,0.8608157774009039,0.8608184208845163,0.8608214900104174,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
diff --git a/tests/data/Fixed_Offshore_Wind/Market/30/df_vom.csv b/tests/data/Fixed_Offshore_Wind/Market/30/df_vom.csv
new file mode 100644
index 0000000..90cc094
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/30/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_capex.csv b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_capex.csv
new file mode 100644
index 0000000..b019daf
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,5462.550832369848,5094.404759063653,4875.5549262092645,4722.020175198692,4263.651146110876,3829.295613124674,3410.728337949633,3343.7774992451323,3285.5174365197136,3207.2812724221576,3141.08145831941,3083.8665548677945,3033.5990170228683,2988.8537384617885,2958.8949081013798,2931.03615273454,2905.0183721997228,2880.626813817036,2857.6815376796812,2836.0305427943017,2815.5436693022525,2796.109383287182,2777.6312289765,2760.02494615507,2743.21658539724,2727.1416211172086,2711.7421798514206,2696.967261995978,2682.7713005134847
+Offshore Wind - Class 1/Moderate,6217.537549003377,6050.594891259246,5931.2557072685795,5838.925802633735,5763.930885101322,5700.97021105834,5291.544282275952,4888.852075107402,4491.460278945741,4072.51283498425,3663.0000960065295,3615.862270810396,3574.2345093406543,3537.008235424742,3511.991599288189,3488.66149787881,3466.8138219123107,3446.2791640087826,3426.9151687521285,3408.6011001235547,3391.233850228222,3374.724391496717,3358.9956701796727,3343.980167236275,3329.6190113846337,3315.8598725964,3302.656518621953,3289.967817172063,3277.756959836958
+Offshore Wind - Class 1/Conservative,7549.867055466588,7524.346964544596,7501.037928189001,7479.5964751544225,7459.752640146307,7441.2903400603145,7424.034734950038,7407.84169550011,6874.463003342234,6313.370793819921,5758.409845373221,5208.082210940681,4661.376657071959,4117.577748019326,4100.26493465772,4084.0740017131716,4068.8719067407287,4054.548002773674,4041.008827494427,4028.175109779539,4015.978997982083,4004.3617316888726,3993.272200427305,3982.66605671573,3972.5038312954784,3962.750933130862,3953.3765407221345,3944.3531586306726,3935.6561740041584
+Offshore Wind - Class 2/Advanced,5358.739142998236,4997.589328397251,4782.898624109471,4632.281715654107,4182.623529780819,3756.522615291665,3345.909947900305,3280.231438444361,3223.078621467056,3146.329206691839,3081.3876415122254,3025.26002744198,2975.9477343518092,2932.0528187513814,2902.663410055368,2875.334052750732,2849.810635767615,2825.882619436882,2803.3735007815626,2782.133828788493,2762.0364370540406,2742.9714546924165,2724.8444215677036,2707.5726296266243,2691.083792474087,2675.3142714739247,2660.2075235870307,2645.713436159141,2631.787107365084
+Offshore Wind - Class 2/Moderate,6099.377897155915,5935.607747380369,5818.536715338725,5727.961307946685,5654.391607605821,5592.627539486479,5190.982487228406,4795.942992362201,4406.103572325649,3995.1177208761983,3593.3875214533555,3547.1455153865654,3506.308802120767,3469.790092274592,3445.2488611413337,3422.362012811054,3400.929540141509,3380.7851400765067,3361.7891180488486,3343.823177151232,3326.785983388085,3310.5901722205545,3295.16046379854,3280.4303368995647,3266.3420289287787,3252.8444294135797,3239.891971316572,3227.4444092981566,3215.4657110294934
+Offshore Wind - Class 2/Conservative,7406.3874307080805,7381.352390366644,7358.4863853527395,7337.4523748058255,7317.985493391741,7299.874203623014,7282.946548139545,7267.061169343569,6743.818981066585,6193.3899017697695,5648.975449671825,5109.10650357437,4572.7905668380645,4039.326284040601,4022.3425289928423,4006.4591458335417,3991.546085572757,3977.494364274333,3964.21240438866,3951.6227086915546,3939.658312485724,3928.26178578243,3917.383126796111,3906.9784315199345,3897.0093393822713,3887.441702822251,3878.245587289759,3869.393608214876,3860.8620396949195
+Offshore Wind - Class 3/Advanced,5563.666194857099,5188.705465783053,4965.804712217284,4809.427731107721,4342.574030961793,3900.178299552324,3473.8631867267977,3405.6729467788646,3346.3344641684057,3266.6501330575466,3199.2249980367915,3140.950965854653,3089.752906975992,3044.179439195086,3013.6660435766357,2985.291526998198,2958.792132812655,2933.9490061980596,2910.5791029239003,2888.527317673103,2867.6611623442363,2847.867218252979,2829.0469231213624,2811.114797178504,2793.9954497055987,2777.6226920862823,2761.9383182508886,2746.889887302366,2732.431056122389
+Offshore Wind - Class 3/Moderate,6332.62824425191,6162.59523224895,6041.0472110659675,5947.008043619602,5870.624939042819,5806.498813182058,5389.494232391682,4979.34787876988,4574.600276695524,4147.897677749075,3730.8046237328062,3682.7941509664915,3640.395852003069,3602.4805290910094,3577.0010161147275,3553.2388593653677,3530.9867343662136,3510.0719076762357,3490.3494738991394,3471.696590510754,3454.00771050475,3437.1928084933766,3421.172724221887,3405.879495174652,3391.252365301811,3377.238561100198,3363.790852501856,3350.8673311366247,3338.4304125138055
+Offshore Wind - Class 3/Conservative,7689.620050473284,7663.627437134304,7639.887121519657,7618.048758524303,7597.837393762009,7579.033507198603,7561.458489351737,7544.965660925851,7001.713778059379,6430.2353883344795,5865.001678369514,5304.48731653311,4747.661667351704,4193.796766914002,4176.163542997469,4159.672821076962,4144.189452202149,4129.6002394261195,4115.8105008755465,4102.73930239642,4090.317351048657,4078.4849994694414,4067.19036110524,4056.387758049952,4046.037499307501,4036.103996023863,4026.5560940931773,4017.3657437332995,4008.5077777483943
+Offshore Wind - Class 4/Advanced,5975.833019742907,5573.094469456032,5333.680820228931,5165.719279093875,4664.280086695629,4189.110790265383,3731.213396644922,3657.97153506216,3594.2372192017824,3508.6496839396987,3436.2295811919234,3373.638432539796,3318.6475552929614,3269.697913733989,3236.9240161071007,3206.4475397671245,3177.98499343761,3151.3015572032164,3126.2003282454148,3102.5147817706065,3080.1028949688057,3058.8426013967687,3038.628132310759,3019.367466686351,3000.9797812382362,2983.394230864478,2966.5477312724283,2950.3845155039116,2934.854692642071
+Offshore Wind - Class 4/Moderate,6801.761183217273,6619.1318233949605,6488.579378668923,6387.573443592643,6305.531822094643,6236.6551939994615,5788.758157491227,5348.227348553873,4913.495194579753,4455.1817107127035,4007.1895488563277,3955.6225189303327,3910.0833095790017,3869.359017179189,3841.99196451515,3816.4694344816667,3792.568802720853,3770.1046967594084,3748.921124330627,3728.886373414007,3709.887136193929,3691.8264025542844,3674.6196905425268,3658.1932724704134,3642.4826227521417,3627.430754873791,3612.986669231462,3599.105907474802,3585.7475590519857
+Offshore Wind - Class 4/Conservative,8259.281523874955,8231.363342882703,8205.864317014495,8182.408047019821,8160.699511276999,8140.502559446241,8121.625610406816,8103.9108979927505,7520.413786396996,6906.599295051689,6299.492027699934,5697.453566632146,5099.377331312438,4504.481143033195,4485.541553175938,4467.829169004659,4451.198641648249,4435.528791613096,4420.717508822699,4406.677872213025,4393.335821489715,4380.626831066969,4368.49535572402,4356.89261323105,4345.775475662155,4335.106247657932,4324.850892526213,4314.979697454295,4305.465499609663
+Offshore Wind - Class 5/Advanced,6282.856400383134,5859.426312976391,5607.712002763843,5431.121106911791,4903.919131998218,4404.336990394094,3922.9139229701746,3845.90906670065,3778.9002436638907,3688.91532299003,3612.774466531764,3546.9676819851466,3489.1514266823465,3437.686839438965,3403.2291788025045,3371.186903754147,3341.2619992172013,3313.2076714562813,3286.816817732078,3261.9142654920715,3238.350896329211,3215.9983242841176,3194.745237177849,3174.494957500406,3155.162670693132,3136.673651249446,3118.961710552984,3101.9679773218536,3085.640232396413
+Offshore Wind - Class 5/Moderate,7151.218784281058,6959.206384291097,6821.946382965393,6715.751127323762,6629.494388563569,6557.079053170072,6086.1701084333035,5623.006007892007,5165.9382447845255,4684.077800322827,4213.068962883639,4158.852503535129,4110.973631920612,4068.157136205224,4039.3838248980423,4012.5501615695575,3987.42165891054,3963.8032988704326,3941.531439241944,3920.467161538803,3900.4918362475946,3881.503242423113,3863.4124633646497,3846.142223585428,3829.624449701114,3813.7990508740713,3798.613031863727,3784.018940864715,3769.9743151633556
+Offshore Wind - Class 5/Conservative,8683.622841160915,8654.270351743377,8627.461190398502,8602.799777589971,8579.97601355234,8558.741330650955,8538.894502187832,8520.269668581588,7906.793991996092,7261.443230368062,6623.144272666011,5990.174662702622,5361.370722559387,4735.910139057796,4715.997565453123,4697.375170958373,4679.8902893679615,4663.415310803441,4647.842914359215,4633.082076829197,4619.054414039568,4605.692628686925,4592.937849489374,4580.738965974315,4569.05063284176,4557.833048226926,4547.050955881901,4536.672536488602,4526.66962939618
+Offshore Wind - Class 6/Advanced,6054.327951395894,5646.2993008916155,5403.740750003257,5233.573032524783,4725.547130414371,4244.13636941661,3780.224348597275,3706.0204792688073,3641.448993823569,3554.7372499016396,3481.3657828037544,3417.9525427105277,3362.2392449876024,3312.6466758134006,3279.4423858770924,3248.565562646515,3219.729167046685,3192.6951639698427,3167.264211485968,3143.2674565586763,3120.561324216123,3099.0217523783913,3078.5416418772934,3059.0279738700683,3040.3988163843655,3022.5823264999117,3005.514532974426,2989.1391145062103,2973.405182360072
+Offshore Wind - Class 6/Moderate,6891.104950175169,6706.076724201667,6573.809362360196,6471.476883239043,6388.357507068228,6318.576079478668,5864.795684317246,5418.478415974113,4978.035969393947,4513.70231489282,4059.8255748275124,4007.5811371193035,3961.443680240505,3920.184668080688,3892.4579573404626,3866.600271214404,3842.385770152208,3819.626420831674,3798.1647896929426,3777.866725604021,3758.618033799659,3740.320041133183,3722.8872678337116,3706.2450992633676,3690.3282337554206,3675.0784652402026,3660.4447941138183,3646.3815424701647,3632.8477997574205
+Offshore Wind - Class 6/Conservative,8367.770320398857,8339.48560747076,8313.651536378682,8289.887273123944,8267.893472205405,8247.43121156567,8228.306249235115,8210.358934279791,7619.19746916776,6997.320273052247,6382.238330681363,5772.292048423035,5166.359656728911,4563.649220445412,4544.460841216094,4526.515965372261,4509.6670266687215,4493.791293450005,4478.785325215162,4464.561424819229,4451.0439798059915,4438.168131983535,4425.877338312755,4414.122151351611,4402.8589996993815,4392.049522784438,4381.65957304591,4371.658772458867,4362.019625584684
+Offshore Wind - Class 7/Advanced,6421.601266263206,5988.820290613011,5731.547467050367,5551.056875399363,5012.212688734152,4501.598224119789,4009.5438457884584,3930.838485335038,3862.3498977043,3770.377877246376,3692.5556968900287,3625.295534501015,3566.202626070197,3513.6015237408124,3478.382860319226,3445.6330212011326,3415.0473391875917,3386.373366239308,3359.3996757375103,3333.9474364624434,3309.863649602413,3287.0173792178434,3265.2949848870057,3244.5975717258207,3224.838329538955,3205.9409806579697,3187.8378951733484,3170.469093116158,3153.780581427489
+Offshore Wind - Class 7/Moderate,7309.139612095586,7112.887038516299,6972.595886819772,6864.055647217157,6775.89396238266,6701.87945680084,6220.5713602231,5747.179178251301,5280.018150057534,4787.51663824246,4306.1064315882195,4250.69281197255,4201.756474658073,4157.994601502596,4128.585901652064,4101.1595342313185,4075.476022839443,4051.3361364151237,4028.5724632151287,4007.0432021668807,3986.6267303019517,3967.2187201697593,3948.7284811703275,3931.0768530489104,3914.194321128019,3898.019464145569,3882.498067305242,3867.5817918520374,3853.2269555165312
+Offshore Wind - Class 7/Conservative,8875.383790929918,8845.383273936757,8817.98185197444,8792.775962959942,8769.448078924646,8747.744532273511,8727.459439822973,8708.423394193125,8081.400338044277,7421.798180581692,6769.403486705676,6122.456104869517,5479.766192140526,4840.493585478835,4820.141306593594,4801.107589206534,4783.23655191965,4766.397813136889,4750.481612841166,4735.394710452311,4721.057391372057,4707.4003626603235,4694.364087822995,4681.8955716195005,4669.949247012442,4658.484092581294,4647.463854259805,4636.856269255077,4626.632400835331
diff --git a/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_fin_assump.csv b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_fin_assump.csv
new file mode 100644
index 0000000..ca9ad50
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),30
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_fom.csv b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_fom.csv
new file mode 100644
index 0000000..c78b3e0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,90.662,84.9785,81.599875,79.229625,77.420125,75.96575,74.755,73.721375,72.822,71.614125,70.592125,69.708875,68.932875,68.242125,67.779625,67.3495,66.94787500000001,66.57124999999999,66.217,65.88275,65.5665,65.26650000000001,64.98125,64.709375,64.44987499999999,64.20175,63.964,63.735875,63.51675
+Offshore Wind - Class 1/Moderate,90.662,87.639125,85.47825,83.806375,82.4485,81.30850000000001,80.32825000000001,79.469875,78.7075,77.55475,76.57300000000001,75.719375,74.96562499999999,74.29162500000001,73.83862500000001,73.41624999999999,73.020625,72.64875,72.298125,71.9665,71.652125,71.353125,71.068375,70.7965,70.53637499999999,70.28725,70.04825,69.8185,69.597375
+Offshore Wind - Class 1/Conservative,90.662,90.167625,89.716125,89.30075000000001,88.916375,88.55874999999999,88.2245,87.910875,87.615375,86.78312500000001,86.06975,85.44600000000001,84.892375,84.395125,84.05975,83.74612499999999,83.45174999999999,83.17425,82.912,82.663375,82.42712499999999,82.20212500000001,81.98724999999999,81.781875,81.58500000000001,81.396125,81.21449999999999,81.03975,80.87125
+Offshore Wind - Class 2/Advanced,90.45362499999999,84.78325,81.41237500000001,79.0475,77.242375,75.79125,74.58325,73.55199999999999,72.65475,71.449625,70.43,69.54875,68.77449999999999,68.08525,67.623875,67.19475,66.794,66.418375,66.064875,65.731375,65.415875,65.1165,64.831875,64.56075,64.301875,64.05425,63.817125,63.5895,63.370875
+Offshore Wind - Class 2/Moderate,90.45362499999999,87.43775,85.281875,83.613875,82.259125,81.12175,80.14362500000001,79.28725,78.526625,77.376625,76.397,75.5455,74.7935,74.121,73.669,73.2475,72.852875,72.481875,72.132125,71.80125000000001,71.4875,71.18925,70.905125,70.633875,70.374375,70.12587500000001,69.88725,69.658125,69.4375
+Offshore Wind - Class 2/Conservative,90.45362499999999,89.9605,89.51,89.095625,88.712125,88.35525000000001,88.02187500000001,87.708875,87.41412499999998,86.583875,85.87199999999999,85.24974999999999,84.69737500000001,84.20125,83.86675,83.55375000000001,83.26,82.983125,82.72149999999999,82.4735,82.23775,82.01325,81.799,81.594,81.397625,81.209125,81.027875,80.8535,80.6855
+Offshore Wind - Class 3/Advanced,90.520875,84.84625,81.47287499999999,79.10624999999999,77.29974999999999,75.8475,74.638625,73.60674999999999,72.708625,71.50274999999999,70.482375,69.600375,68.825625,68.135875,67.674125,67.244625,66.843625,66.467625,66.114,65.78025,65.4645,65.164875,64.88012499999999,64.60875,64.349625,64.101875,63.8645,63.63675,63.417874999999995
+Offshore Wind - Class 3/Moderate,90.520875,87.50275,85.34525000000001,83.67599999999999,82.32025,81.182,80.20325,79.346125,78.58500000000001,77.434125,76.45375,75.601625,74.84899999999999,74.176,73.72375,73.30199999999999,72.907,72.53575,72.185625,71.854625,71.540625,71.242125,70.95775,70.68625,70.426625,70.177875,69.93925,69.709875,69.489
+Offshore Wind - Class 3/Conservative,90.520875,90.02725,89.5765,89.16175000000001,88.778,88.421,88.08725000000001,87.774,87.479125,86.648125,85.93575,85.313,84.76037500000001,84.26387500000001,83.92899999999999,83.615875,83.321875,83.04475,82.783,82.53475,82.29887500000001,82.07412500000001,81.85974999999999,81.65462500000001,81.458,81.269375,81.088125,80.91362500000001,80.745375
+Offshore Wind - Class 4/Advanced,90.50575,84.832,81.45925,79.093,77.28675,75.83487500000001,74.62625,73.594375,72.6965,71.49074999999999,70.4705,69.58875,68.81412499999999,68.1245,67.66275,67.23349999999999,66.8325,66.4565,66.102875,65.76925,65.4535,65.154,64.86925000000001,64.597875,64.338875,64.091125,63.85375,63.626125,63.40725
+Offshore Wind - Class 4/Moderate,90.50575,87.488125,85.33099999999999,83.66199999999999,82.3065,81.16837500000001,80.18974999999999,79.332875,78.571875,77.421125,76.441,75.589,74.8365,74.163625,73.711375,73.28975,72.89475,72.52362500000001,72.173625,71.8425,71.528625,71.23025,70.945875,70.6745,70.414875,70.166125,69.9275,69.698125,69.4775
+Offshore Wind - Class 4/Conservative,90.50575,90.01225,89.5615,89.146875,88.76312499999999,88.406125,88.07249999999999,87.75937499999999,87.46449999999999,86.633625,85.921375,85.29875000000001,84.74612499999999,84.24975,83.915,83.601875,83.307875,83.03087500000001,82.769125,82.521,82.28512500000001,82.06049999999999,81.846,81.64087500000001,81.44437500000001,81.255875,81.0745,80.9,80.731875
+Offshore Wind - Class 5/Advanced,91.497125,85.76124999999999,82.35150000000002,79.959375,78.133375,76.6655,75.443625,74.40050000000001,73.49275,72.273875,71.2425,70.351,69.567875,68.870625,68.403875,67.969875,67.5645,67.1845,66.827,66.48962499999999,66.1705,65.867625,65.57975,65.3055,65.043625,64.793125,64.55325,64.323,64.101875
+Offshore Wind - Class 5/Moderate,91.497125,88.44637499999999,86.265625,84.578375,83.208,82.0575,81.06812500000001,80.201875,79.4325,78.269125,77.27825,76.416875,75.65625,74.976,74.51875,74.0925,73.69325,73.318,72.964125,72.62950000000001,72.312125,72.010375,71.723,71.448625,71.186125,70.93475,70.6935,70.461625,70.2385
+Offshore Wind - Class 5/Conservative,91.497125,90.998125,90.54249999999999,90.123375,89.735375,89.3745,89.03712499999999,88.720625,88.4225,87.58262500000001,86.8625,86.233125,85.674375,85.172625,84.834125,84.517625,84.220375,83.94037499999999,83.67575000000001,83.42487500000001,83.186375,82.95925,82.7425,82.535125,82.3365,82.145875,81.962625,81.78625,81.61612500000001
+Offshore Wind - Class 6/Advanced,90.82724999999999,85.133375,81.748625,79.374,77.56125,76.104125,74.89125,73.85575,72.95474999999999,71.74475,70.720875,69.836,69.0585,68.3665,67.903125,67.47225,67.069875,66.692625,66.33775,66.002875,65.686,65.3855,65.099625,64.827375,64.567375,64.31875,64.080625,63.852125,63.6325
+Offshore Wind - Class 6/Moderate,90.82724999999999,87.798875,85.634,83.95925,82.59875,81.456625,80.474625,79.61475,78.851,77.696125,76.71249999999999,75.8575,75.102375,74.427,73.97325000000001,73.55000000000001,73.15375,72.78125,72.43,72.09774999999999,71.782625,71.48325,71.197875,70.9255,70.66499999999999,70.415375,70.175875,69.94575,69.72425
+Offshore Wind - Class 6/Conservative,90.82724999999999,90.33200000000001,89.879625,89.46350000000001,89.07849999999999,88.720125,88.38525000000001,88.07112500000001,87.775125,86.941375,86.22662500000001,85.60175,85.047125,84.549,84.21300000000001,83.898875,83.60374999999999,83.32587500000001,83.06312500000001,82.814,82.57737499999999,82.351875,82.13675,81.93087500000001,81.73375,81.544375,81.36250000000001,81.187375,81.01862499999999
+Offshore Wind - Class 7/Advanced,91.0155,85.309875,81.91812499999999,79.538625,77.722125,76.262,75.046625,74.009,73.106,71.8935,70.8675,69.98075,69.20175,68.50825,68.043875,67.612125,67.209,66.830875,66.47525,66.13974999999999,65.82225,65.521,65.234625,64.96175,64.70125,64.452125,64.21350000000001,63.984500000000004,63.7645
+Offshore Wind - Class 7/Moderate,91.0155,87.981,85.81162499999999,84.13325,82.770125,81.625625,80.6415,79.779875,79.0145,77.85725000000001,76.87162500000001,76.01474999999999,75.25812499999999,74.58137500000001,74.12662499999999,73.7025,73.305375,72.932125,72.58012500000001,72.24725000000001,71.9315,71.6315,71.3455,71.072625,70.8115,70.561375,70.321375,70.09075,69.868875
+Offshore Wind - Class 7/Conservative,91.0155,90.51925,90.066,89.649125,89.263125,88.904125,88.568625,88.25375,87.957125,87.121625,86.405375,85.77925,85.2235,84.724375,84.38762499999999,84.07287500000001,83.77725,83.498625,83.235375,82.98575,82.74862499999999,82.52274999999999,82.30712499999998,82.100875,81.90325,81.71350000000001,81.53125,81.35575,81.18662499999999
diff --git a/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_gcc.csv b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_gcc.csv
new file mode 100644
index 0000000..d9068d0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,1084.6748,1011.5737,968.1176,937.6309,846.6146,760.3665,677.2534,663.9593,652.3908,636.8558,623.7108,612.3499,602.3685,593.4836,587.5348,582.003,576.8368,571.9935,567.4373,563.1382,559.0702,555.2112,551.5421,548.0461,544.7085,541.5166,538.4588,535.525,532.7062
+Offshore Wind - Class 1/Moderate,1234.5893,1201.4402,1177.7435,1159.41,1144.5186,1132.0167,1050.7188,970.758,891.8496,808.6611,727.3459,717.986,709.7201,702.3283,697.3608,692.7283,688.3901,684.3126,680.4676,676.831,673.3825,670.1043,666.9811,663.9995,661.1479,658.4158,655.7941,653.2745,650.8499
+Offshore Wind - Class 1/Conservative,1499.1441,1494.0767,1489.4483,1485.1908,1481.2505,1477.5845,1474.1581,1470.9427,1365.0321,1253.6184,1143.4223,1034.1461,925.5892,817.6094,814.1717,810.9567,807.9381,805.0939,802.4055,799.8571,797.4354,795.1286,792.9266,790.8206,788.8027,786.8661,785.0047,783.213,781.486
+Offshore Wind - Class 2/Advanced,998.0205,930.7594,890.775,862.7239,778.9788,699.621,623.1478,610.9158,600.2715,585.9776,573.8828,563.4295,554.2455,546.0704,540.5969,535.507,530.7535,526.2971,522.105,518.1492,514.4063,510.8556,507.4796,504.2628,501.1919,498.255,495.4415,492.7421,490.1484
+Offshore Wind - Class 2/Moderate,1135.9583,1105.4575,1083.654,1066.7851,1053.0833,1041.5803,966.7772,893.2044,820.6001,744.0574,669.2385,660.6263,653.0208,646.2195,641.6489,637.3864,633.3948,629.6431,626.1052,622.7592,619.5862,616.5698,613.6962,610.9528,608.329,605.8152,603.4029,601.0846,598.8537
+Offshore Wind - Class 2/Conservative,1379.3779,1374.7154,1370.4568,1366.5394,1362.9138,1359.5407,1356.3881,1353.4296,1255.9801,1153.4673,1052.0746,951.5285,851.6441,752.2909,749.1278,746.1696,743.3922,740.7752,738.3015,735.9568,733.7285,731.606,729.58,727.6422,725.7855,724.0036,722.2909,720.6423,719.0534
+Offshore Wind - Class 3/Advanced,1099.023,1024.9548,980.924,950.0339,857.8136,770.4247,686.2122,672.7422,661.0207,645.2802,631.9613,620.4501,610.3367,601.3343,595.3068,589.7018,584.4672,579.5598,574.9434,570.5874,566.4656,562.5556,558.8379,555.2957,551.914,548.6798,545.5816,542.609,539.7528
+Offshore Wind - Class 3/Moderate,1250.9205,1217.3329,1193.3228,1174.7467,1159.6583,1146.9911,1064.6178,983.5992,903.6471,819.3581,736.9673,727.4835,719.1083,711.6187,706.5856,701.8917,697.4961,693.3647,689.4688,685.7842,682.29,678.9685,675.8039,672.783,669.8936,667.1254,664.469,661.9161,659.4594
+Offshore Wind - Class 3/Conservative,1518.9749,1513.8404,1509.1509,1504.837,1500.8445,1497.1301,1493.6584,1490.4005,1383.0888,1270.2014,1158.5475,1047.8259,937.8329,828.4248,824.9416,821.6841,818.6256,815.7437,813.0197,810.4377,807.9839,805.6466,803.4155,801.2816,799.2371,797.2748,795.3888,793.5734,791.8236
+Offshore Wind - Class 4/Advanced,1214.6721,1132.8098,1084.1456,1050.0051,948.0805,851.4957,758.4216,743.5341,730.5792,713.1824,698.462,685.7394,674.5618,664.6121,657.9503,651.7555,645.9701,640.5463,635.4442,630.6297,626.0742,621.7528,617.6439,613.7289,609.9913,606.4168,602.9925,599.7071,596.5505
+Offshore Wind - Class 4/Moderate,1382.5536,1345.4316,1318.895,1298.3641,1281.688,1267.6878,1176.6465,1087.1024,998.737,905.5783,814.5176,804.0359,794.7794,786.5016,780.9389,775.7511,770.8929,766.3268,762.0209,757.9486,754.0867,750.4156,746.9181,743.5792,740.3858,737.3263,734.3903,731.5689,728.8536
+Offshore Wind - Class 4/Conservative,1678.8151,1673.1403,1667.9573,1663.1895,1658.7769,1654.6716,1650.8346,1647.2338,1528.6298,1403.8634,1280.4603,1158.0875,1036.5201,915.5991,911.7494,908.1491,904.7687,901.5836,898.573,895.7192,893.0073,890.424,887.9581,885.5997,883.34,881.1713,879.0867,877.0803,875.1464
+Offshore Wind - Class 5/Advanced,1403.7543,1309.149,1252.9094,1213.4544,1095.6637,984.044,876.4815,859.2766,844.3051,824.2001,807.1882,792.4853,779.5676,768.0691,760.3703,753.2113,746.5253,740.2572,734.3608,728.7969,723.5322,718.5381,713.7896,709.2651,704.9458,700.8149,696.8576,693.0607,689.4127
+Offshore Wind - Class 5/Moderate,1597.7692,1554.8686,1524.2011,1500.4743,1481.2023,1465.0228,1359.8095,1256.3265,1154.2056,1046.5454,941.3097,929.1963,918.499,908.9326,902.5039,896.5086,890.8942,885.6173,880.6411,875.9348,871.4718,867.2293,863.1873,859.3287,855.6382,852.1024,848.7094,845.4487,842.3108
+Offshore Wind - Class 5/Conservative,1940.1483,1933.5902,1927.6003,1922.0903,1916.9909,1912.2465,1907.8122,1903.6509,1766.5844,1622.3962,1479.7835,1338.3616,1197.8703,1058.1261,1053.6771,1049.5164,1045.6098,1041.9289,1038.4496,1035.1516,1032.0175,1029.0321,1026.1824,1023.4568,1020.8453,1018.339,1015.93,1013.6112,1011.3763
+Offshore Wind - Class 6/Advanced,1342.4978,1252.0208,1198.2354,1160.5021,1047.8515,941.1026,838.2339,821.7798,807.4616,788.234,771.9645,757.9031,745.5491,734.5524,727.1896,720.3429,713.9487,707.9541,702.315,696.9939,691.959,687.1828,682.6415,678.3145,674.1836,670.233,666.4483,662.8172,659.3283
+Offshore Wind - Class 6/Moderate,1528.0463,1487.0178,1457.6886,1434.9972,1416.5662,1401.0927,1300.4706,1201.5034,1103.8389,1000.8767,900.2332,888.6484,878.4178,869.269,863.1208,857.3871,852.0177,846.971,842.2121,837.7111,833.4429,829.3855,825.5199,821.8296,818.3002,814.9187,811.6738,808.5554,805.5544
+Offshore Wind - Class 6/Conservative,1855.4848,1849.2129,1843.4844,1838.2149,1833.3379,1828.8006,1824.5598,1820.5801,1689.4949,1551.5987,1415.2093,1279.9587,1145.5981,1011.952,1007.6971,1003.718,999.9819,996.4616,993.1341,989.9801,986.9827,984.1276,981.4022,978.7956,976.2981,973.9012,971.5973,969.3797,967.2423
+Offshore Wind - Class 7/Advanced,1477.7456,1378.1536,1318.9497,1277.415,1153.4156,1035.9125,922.6804,904.5687,888.808,867.6433,849.7348,834.2568,820.6583,808.5537,800.4491,792.9127,785.8743,779.2758,773.0686,767.2115,761.6693,756.4119,751.4131,746.6502,742.1032,737.7545,733.5886,729.5917,725.7513
+Offshore Wind - Class 7/Moderate,1681.9869,1636.825,1604.5411,1579.5637,1559.2758,1542.2435,1431.4844,1322.5469,1215.0433,1101.7083,990.9257,978.1739,966.9126,956.8421,950.0745,943.7631,937.8528,932.2977,927.0593,922.105,917.4067,912.9405,908.6855,904.6235,900.7385,897.0163,893.4445,890.012,886.7086
+Offshore Wind - Class 7/Conservative,2042.4126,2035.5089,2029.2032,2023.4028,2018.0346,2013.0401,2008.3721,2003.9915,1859.7003,1707.912,1557.7822,1408.906,1261.0095,1113.8995,1109.216,1104.8359,1100.7234,1096.8485,1093.1858,1089.714,1086.4147,1083.2719,1080.272,1077.4027,1074.6536,1072.0152,1069.4793,1067.0382,1064.6855
diff --git a/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_lcoe.csv b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_lcoe.csv
new file mode 100644
index 0000000..5090108
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,82.22779319752487,75.82052317395632,71.75708226758825,68.76834216784437,62.90147854688552,57.55881814331176,52.58172726490057,51.39287547455876,50.37505838141601,49.013883691940144,47.878737770499605,46.90486823465521,46.050871664510225,45.30384201139406,44.80376459916592,44.33409314978956,43.90789472103861,43.50498462817298,43.122862813673606,42.775590182238275,42.43678633572738,42.121025141197094,41.81885213998757,41.53690468623583,41.25845794454658,41.00592485354712,40.75516896382581,40.51325942436239,40.28713225824105
+Offshore Wind - Class 1/Moderate,90.54071210442237,88.48359420715096,86.39206872513464,84.5001495899666,82.96761955461233,81.68281475969397,76.72374224168902,71.91193062736899,67.22153054436991,62.155183014368184,57.304357058234864,56.4368179673022,55.67888933438444,55.00123753887593,54.55183102556518,54.128740671656146,53.73959131062508,53.360098544179664,53.02024619286009,52.68602609479439,52.37707960813356,52.081358821709195,51.80809820490792,51.535474563654965,51.28321417257612,51.04022215949066,50.80578913783252,50.57926185979906,50.37010341748184
+Offshore Wind - Class 1/Conservative,105.21056907075561,106.46650908568148,106.4877857363127,106.04840917091926,105.6415569975356,105.23508447288943,104.86919184397634,104.52059425972377,98.38943450304623,91.68955664263193,85.13302477569218,78.69379895021201,72.3638422071149,66.09572792690474,65.76724955634592,65.45700299859946,65.16286640073263,64.89658301763197,64.64298410355993,64.40077877391694,64.16889550890797,63.946395867407716,63.732428466649566,63.53958636037599,63.34063384047416,63.16151192530633,62.98844505109032,62.821032896075685,62.658848233239844
+Offshore Wind - Class 2/Advanced,84.38266580470031,77.79726725684749,73.63955346252078,70.56956467941446,64.55672137324368,59.099194579573975,54.00715679519252,52.78731631073299,51.734132772304626,50.34631832145192,49.18198449403083,48.17457329207658,47.31019645488957,46.53764269700602,46.02052896531542,45.54374100868923,45.10320455415248,44.695517975898234,44.308994798739775,43.941491018073926,43.59972841391453,43.27331144510443,42.96088321053573,42.669619474136105,42.38992871569051,42.12913618068822,41.86988778617825,41.627854749059466,41.394183226558255
+Offshore Wind - Class 2/Moderate,92.87459973932,90.75765181216003,88.6203470833567,86.67709580972632,85.08810432199616,83.79219737424286,78.69326951364401,73.78114255355383,68.99313547121398,63.81482922306965,58.858519192194024,57.96102481438751,57.17721161415759,56.48830349926693,56.023662692726596,55.58608189377554,55.183904610920294,54.80266397522121,54.45153756171355,54.117042413874124,53.797589611012384,53.491780796635325,53.1984161683903,52.92742389424631,52.66673805941117,52.41559275600826,52.18401439569745,51.94975765469478,51.72304700198421
+Offshore Wind - Class 2/Conservative,107.86036513241766,109.13503175815455,109.17280053513247,108.71697494361973,108.27162787153799,107.87368049933534,107.4944484314838,107.15658692390274,100.86614321978415,94.03094056829813,87.32245129659799,80.75377124432097,74.28019895097138,67.87073209050408,67.53117386084394,67.21030746436594,66.92061163261774,66.63093190926797,66.36888965665223,66.13296067633006,65.89316167102024,65.66301759171735,65.4559054334186,65.24255826011088,65.05075838333812,64.8656971347232,64.68686652003983,64.51385068860016,64.34624564030116
+Offshore Wind - Class 3/Advanced,86.3274005126468,79.59336811524875,75.34733335817785,72.19383937110666,66.02110779044796,60.40128174723836,55.14399343434879,53.89724792084369,52.820714618481155,51.40208983896624,50.20175111671124,49.181993966301356,48.2886790698678,47.49905991526717,46.97982022393908,46.4923494869584,46.04193842189372,45.6160597965717,45.22097710570115,44.84532646608233,44.49594310957237,44.16226475193265,43.842924989297636,43.54514965130037,43.25921484978185,42.99257892156887,42.72756081352056,42.4801215722819,42.24121120100128
+Offshore Wind - Class 3/Moderate,95.10119597284354,92.935411793574,90.75703707172599,88.77193923977168,87.1673033222637,85.82449321825803,80.56952009029249,75.50541762305967,70.568300403636,65.23256770695973,60.11106480660063,59.20698575098178,58.40629739781592,57.70251050915372,57.21591463422232,56.78087984494776,56.36998646880633,55.98052446367767,55.61019314243246,55.268565544878626,54.94227857181429,54.62994020431595,54.34155922700815,54.064671786725405,53.798347265773614,53.54174561059704,53.294149067093834,53.054871095199815,52.83418647856886
+Offshore Wind - Class 3/Conservative,110.58436391113064,111.90782801530548,111.95267158908132,111.48713636294265,111.03214478166363,110.62558580108444,110.2380638949433,109.89281416974615,103.39731481470422,96.32417380397024,89.42289165487381,82.64343907372992,75.94473239134382,69.32960406977084,68.98289199795056,68.67025034690607,68.35951864617807,68.07855111643663,67.81094675315353,67.55528573097206,67.31047106121311,67.09000055700403,66.86399215393178,66.66060337965287,66.45031634147533,66.26134782701959,66.07877440972341,65.90211291781884,65.73094474120708
+Offshore Wind - Class 4/Advanced,90.40673867952141,83.38909832791518,78.91907811373294,75.63542123688138,69.08243543757956,63.11162014736213,57.534733067798484,56.23069748077276,55.11578930514931,53.62060351375994,52.364903922835204,51.29803101551627,50.363415170829285,49.537253533724105,48.98423724185801,48.47433850183968,48.00310482174354,47.55758419456216,47.144223088363525,46.751255945249106,46.38568082932122,46.03659492935502,45.70250821968557,45.39091318551059,45.09175720910511,44.80402072406832,44.53543453517311,44.27652196141242,44.026523737738486
+Offshore Wind - Class 4/Moderate,99.76636340425307,97.53621551827034,95.26830866723485,93.17301992914581,91.49557648107853,90.09175861624138,84.51043431975805,79.1289176266208,73.88041124907754,68.20130814516482,62.77517841069993,61.817636397490325,60.993957407587956,60.24600974283029,59.750143515902245,59.28323355567969,58.853940880575635,58.447096568805044,58.06026095746583,57.70328475848569,57.36241683715112,57.03613727697184,56.73478955517995,56.44549054371806,56.1556887204774,55.88764884870432,55.64042265781691,55.39044039830906,55.15986639409777
+Offshore Wind - Class 4/Conservative,116.28334880384627,117.70766058839537,117.76657751618357,117.28036477919427,116.80476801348564,116.37978229467248,115.97468847189951,115.58856052342033,108.69172703781794,101.16624434258175,93.82065694791608,86.5839397514537,79.46938725015704,72.42361957960958,72.0616221815562,71.71962004547605,71.41067452709545,71.10197286616986,70.82259267289363,70.55572561610434,70.31528049733903,70.0699621217748,69.83402173405361,69.62164232389738,69.41708563978467,69.20491840642109,69.01425984505047,68.82981263410446,68.65113797473046
+Offshore Wind - Class 5/Advanced,96.59499123193771,89.10104502785242,84.34465049607466,80.81009644357945,73.78035065280928,67.35953763641506,61.361882165147215,59.96056187076295,58.76293334429101,57.16874142270191,55.83140687393227,54.68558500981498,53.68193048650573,52.80556962275926,52.21171004622835,51.67463975438057,51.16868180298122,50.690293755922816,50.24653603568262,49.834572706000415,49.44212908599901,49.067307928600165,48.708573815299715,48.374154670006156,48.0530279819968,47.75361638901337,47.46538842317387,47.17811193860597,46.909863544020006
+Offshore Wind - Class 5/Moderate,106.69270116896725,104.32235545604225,101.90741842958636,99.67580751302711,97.87200930510788,96.3626446273923,90.36647507854559,84.56553174606292,78.90815986152235,72.8206931370035,66.95800095582743,65.94483643409463,65.06147693168417,64.25907971637675,63.72725978313574,63.239858661682604,62.77945245523933,62.34301778596567,61.94110745300059,61.54523233983788,61.19258711227948,60.84251232936051,60.51945035742595,60.19654978753546,59.89819840740686,59.62329475955903,59.3458226543251,59.07766344826315,58.830519984744754
+Offshore Wind - Class 5/Conservative,124.51218754888284,126.05082233444237,126.1164919770919,125.59371030298982,125.11012359021339,124.65322168206069,124.21752499740305,123.80213538490086,116.36280315613499,108.24810803458989,100.3278657714126,92.54545412268307,84.85419147490035,77.27478853718557,76.88664401327839,76.51989760507364,76.18885545891885,75.87444988689731,75.57491712948126,75.28875191177407,75.01466399964647,74.75159051214436,74.51498651180059,74.28744518978183,74.05196391094324,73.84053981937888,73.6362351297953,73.43854387947147,73.24697227885065
+Offshore Wind - Class 6/Advanced,119.88769529358116,110.58012816533143,104.68812156272475,100.30853608399339,91.60506940040622,83.69418391779698,76.27012129952917,74.54631297719509,73.05283389618332,71.07637400079682,69.41625650680851,67.98775267969431,66.76078485380677,65.66830591991432,64.92442927700014,64.25845657307427,63.631095410869335,63.037905829589,62.49120393263245,61.971502007364094,61.47614561335368,61.018439786356865,60.580485821526025,60.16066118628074,59.77259000426402,59.38447432498659,59.02543478262036,58.67922078338695,58.344892821451886
+Offshore Wind - Class 6/Moderate,132.32895359927244,129.39849273139478,126.38881369605029,123.63003529385907,121.37089920582919,119.5332693178234,112.12248864655572,104.93856346770937,97.96904618561356,90.43639879238155,83.21333404675605,81.95881958355227,80.85289574158828,79.86952942036798,79.21924451699483,78.58579055516624,78.02877290875816,77.48024390012782,76.97925864360161,76.5019302227274,76.04596590801181,75.62987762696586,75.21086857356522,74.82822969787745,74.46022481956997,74.10568021067947,73.76360543234526,73.43308918010477,73.11329097424452
+Offshore Wind - Class 6/Conservative,154.28411647877715,156.20507022626725,156.2765952628781,155.6233632867727,155.02873323034336,154.4228457769135,153.88777751984867,153.42178069391468,144.2227848704965,134.20699968366176,124.44887352857545,114.83461498367822,105.36619286575385,96.01856825678034,95.53988242513444,95.08775315165411,94.65897037277786,94.27770972720111,93.91479404211746,93.54198562451623,93.21068931142753,92.89294483921283,92.58764268064445,92.29366130939636,92.03607399942649,91.76207023002335,91.49704222662949,91.26593216144157,91.01680987453283
+Offshore Wind - Class 7/Advanced,163.46188006162265,150.8369170353339,142.76599110357023,136.80098806347877,124.80681259965272,113.92459622527039,103.69541067136244,101.33805401692688,99.3109932036698,96.61934713326661,94.34920678966702,92.40988548609174,90.73573215509465,89.22190815172218,88.23465458006869,87.30787259333925,86.46322544843143,85.66490336765449,84.9079725536947,84.21624731958975,83.52957422645343,82.90075930716463,82.29906837626488,81.74925487721687,81.1948026022254,80.68796377606775,80.2000367342503,79.72958346865133,79.27537074053367
+Offshore Wind - Class 7/Moderate,180.6617493347719,176.6842161682088,172.59026879158586,168.85129232478394,165.7738866839355,163.2669882279096,153.06382016431294,143.18113115909264,133.5624179396332,123.17038788302324,113.22187631997926,111.49957354653377,109.98932823710237,108.65511678848274,107.76293915789215,106.92295122709562,106.12897081371135,105.413055298138,104.69603770164727,104.04849988047714,103.43001407774304,102.87418598141187,102.3059047515806,101.7954684352512,101.26922933305674,100.79700864657154,100.34165419337207,99.86695267389237,99.44194289515985
+Offshore Wind - Class 7/Conservative,211.01446057511436,213.69073394978926,213.8090931556099,212.92448679496127,212.05843717941528,211.31689775236154,210.5323933032967,209.86081257792046,197.17755794948147,183.43567606748866,169.9372356312198,156.63949176188697,143.55727789423077,130.65285877045693,130.01562679912536,129.41441934386046,128.8448967576855,128.30354610330502,127.787477884486,127.29408095723609,126.82127828195263,126.41359087744783,125.97632132471558,125.60076826546678,125.23927194450869,124.84490655372161,124.50853124786423,124.183249337647,123.86832945908374
diff --git a/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_occ.csv b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_occ.csv
new file mode 100644
index 0000000..045f8f4
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,3842.3701,3583.4153,3429.4759,3321.4792,2999.0614,2693.5348,2399.1137,2352.0203,2311.0401,2256.0086,2209.4435,2169.1984,2133.8401,2102.3662,2081.2931,2061.6972,2043.3962,2026.2391,2010.0994,1994.87,1980.4595,1966.7894,1953.7918,1941.4075,1929.5845,1918.2773,1907.4453,1897.0526,1887.0671
+Offshore Wind - Class 1/Moderate,4373.4293,4256.0015,4172.0581,4107.113,4054.3614,4010.0748,3722.0837,3438.8291,3159.3029,2864.6143,2576.5622,2543.4053,2514.1243,2487.9392,2470.3425,2453.932,2438.5643,2424.1202,2410.4995,2397.6174,2385.4012,2373.7884,2362.7248,2352.1629,2342.0612,2332.383,2323.0957,2314.1705,2305.5813
+Offshore Wind - Class 1/Conservative,5310.5928,5292.6419,5276.2463,5261.1643,5247.2061,5234.2197,5222.0821,5210.6919,4835.5121,4440.8387,4050.4779,3663.3763,3278.8224,2896.3131,2884.1352,2872.7465,2862.0533,2851.9778,2842.4543,2833.4271,2824.8483,2816.6767,2808.8763,2801.4159,2794.2678,2787.4076,2780.8136,2774.4665,2768.3491
+Offshore Wind - Class 2/Advanced,3835.3896,3576.9052,3423.2455,3315.445,2993.6129,2688.6414,2394.7552,2347.7473,2306.8416,2251.91,2205.4296,2165.2576,2129.9635,2098.5468,2077.512,2057.9517,2039.6839,2022.558,2006.4476,1991.2459,1976.8616,1963.2163,1950.2423,1937.8805,1926.079,1914.7923,1903.98,1893.6062,1883.6388
+Offshore Wind - Class 2/Moderate,4365.4841,4248.2695,4164.4787,4099.6515,4046.9958,4002.7896,3715.3218,3432.5817,3153.5634,2859.4101,2571.8813,2538.7847,2509.5568,2483.4194,2465.8546,2449.4739,2434.1341,2419.7162,2406.1203,2393.2616,2381.0676,2369.4759,2358.4324,2347.8897,2337.8063,2328.1457,2318.8753,2309.9663,2301.3928
+Offshore Wind - Class 2/Conservative,5300.945,5283.0267,5266.6609,5251.6063,5237.6734,5224.7107,5212.5951,5201.2255,4826.7274,4432.7709,4043.1193,3656.721,3272.8657,2891.0513,2878.8956,2867.5275,2856.8538,2846.7966,2837.2904,2828.2796,2819.7164,2811.5596,2803.7734,2796.3265,2789.1914,2782.3436,2775.7617,2769.4261,2763.3198
+Offshore Wind - Class 3/Advanced,3919.2247,3655.0904,3498.0719,3387.915,3059.0483,2747.4105,2447.1005,2399.0651,2357.2652,2301.133,2253.6366,2212.5865,2176.5209,2144.4175,2122.9229,2102.935,2084.268,2066.7677,2050.3052,2034.7712,2020.0724,2006.1289,1992.8713,1980.2393,1968.1799,1956.6464,1945.5978,1934.9972,1924.812
+Offshore Wind - Class 3/Moderate,4460.9062,4341.1295,4255.5072,4189.263,4135.4563,4090.2838,3796.5324,3507.6122,3222.495,2921.912,2628.0983,2594.2782,2564.4115,2537.7027,2519.7541,2503.0153,2487.3402,2472.6071,2458.714,2445.5743,2433.1137,2421.2687,2409.9837,2399.2106,2388.9068,2379.035,2369.562,2360.4583,2351.6973
+Offshore Wind - Class 3/Conservative,5416.8147,5398.5047,5381.7812,5366.3976,5352.1601,5338.914,5326.5336,5314.9155,4932.2315,4529.6638,4131.4951,3736.6508,3344.405,2954.2448,2941.8234,2930.2068,2919.2998,2909.0227,2899.3088,2890.101,2881.3506,2873.0155,2865.0592,2857.4495,2850.1584,2843.161,2836.4351,2829.9611,2823.7213
+Offshore Wind - Class 4/Advanced,4175.3368,3893.9419,3726.6627,3609.3073,3258.9499,2926.9473,2607.0127,2555.8384,2511.307,2451.5066,2400.9064,2357.1738,2318.7514,2284.5501,2261.6509,2240.3569,2220.47,2201.8262,2184.2878,2167.7387,2152.0794,2137.2247,2123.1008,2109.6433,2096.7958,2084.5087,2072.738,2061.4447,2050.5939
+Offshore Wind - Class 4/Moderate,4752.4159,4624.8121,4533.5946,4463.0214,4405.6986,4357.5743,4044.6269,3736.8264,3433.0774,3112.8521,2799.8383,2763.8082,2731.9898,2703.5356,2684.4141,2666.5814,2649.882,2634.1862,2619.3852,2605.3868,2592.112,2579.4929,2567.4705,2555.9933,2545.0162,2534.4994,2524.4073,2514.7087,2505.3752
+Offshore Wind - Class 4/Conservative,5770.7908,5751.2843,5733.468,5717.079,5701.9112,5687.7995,5674.6101,5662.2328,5254.5412,4825.6667,4401.4786,3980.8321,3562.954,3147.2978,3134.0646,3121.6889,3110.0691,3099.1205,3088.7718,3078.9623,3069.6401,3060.7603,3052.284,3044.1771,3036.4095,3028.9549,3021.7895,3014.8924,3008.2448
+Offshore Wind - Class 5/Advanced,4263.1798,3975.8648,3805.0662,3685.2419,3327.5134,2988.5261,2661.8605,2609.6095,2564.1412,2503.0827,2451.418,2406.7653,2367.5346,2332.6137,2309.2328,2287.4907,2267.1854,2248.1494,2230.2421,2213.3447,2197.356,2182.1888,2167.7677,2154.0271,2140.9093,2128.3637,2116.3454,2104.8145,2093.7354
+Offshore Wind - Class 5/Moderate,4852.3998,4722.1114,4628.9748,4556.9169,4498.3881,4449.2513,4129.7199,3815.4438,3505.3043,3178.3419,2858.7428,2821.9547,2789.4668,2760.4141,2740.8902,2722.6824,2705.6317,2689.6056,2674.4933,2660.2003,2646.6462,2633.7616,2621.4863,2609.7677,2598.5597,2587.8215,2577.5172,2567.6145,2558.0846
+Offshore Wind - Class 5/Conservative,5892.1998,5872.2829,5854.0918,5837.358,5821.8711,5807.4625,5793.9956,5781.3579,5365.0891,4927.1917,4494.0793,4064.583,3637.9134,3213.5123,3200.0008,3187.3647,3175.5005,3164.3215,3153.755,3143.7392,3134.2208,3125.1543,3116.4996,3108.2222,3100.2912,3092.6796,3085.3635,3078.3213,3071.5339
+Offshore Wind - Class 6/Advanced,4118.311,3840.7593,3675.7647,3560.0122,3214.4398,2886.9717,2571.4067,2520.9313,2477.0081,2418.0245,2368.1153,2324.98,2287.0824,2253.3482,2230.7618,2209.7586,2190.1433,2171.7541,2154.4553,2138.1321,2122.6868,2108.035,2094.1039,2080.8302,2068.1582,2056.0389,2044.429,2033.29,2022.5874
+Offshore Wind - Class 6/Moderate,4687.5084,4561.6474,4471.6757,4402.0665,4345.5265,4298.0594,3989.3862,3685.7896,3386.1892,3070.3374,2761.5987,2726.0607,2694.6768,2666.6113,2647.7509,2630.1618,2613.6905,2598.209,2583.6102,2569.803,2556.7095,2544.2627,2532.4045,2521.0841,2510.257,2499.8837,2489.9295,2480.3633,2471.1573
+Offshore Wind - Class 6/Conservative,5691.9745,5672.7345,5655.1615,5638.9964,5624.0357,5610.1167,5597.1074,5584.8992,5182.7758,4759.7588,4341.3641,3926.4628,3514.2919,3104.3126,3091.2602,3079.0536,3067.5925,3056.7934,3046.586,3036.9105,3027.7156,3018.9571,3010.5966,3002.6004,2994.9389,2987.586,2980.5185,2973.7157,2967.1589
+Offshore Wind - Class 7/Advanced,4314.3319,4023.5694,3850.7215,3729.4595,3367.4388,3024.3841,2693.799,2640.921,2594.9072,2533.1161,2480.8315,2435.643,2395.9416,2360.6017,2336.9402,2314.9373,2294.3884,2275.1239,2257.0017,2239.9017,2223.7211,2208.3719,2193.7778,2179.8723,2166.5971,2153.901,2141.7385,2130.0693,2118.8572
+Offshore Wind - Class 7/Moderate,4910.6216,4778.77,4684.5158,4611.5934,4552.3623,4502.6359,4179.2706,3861.2236,3547.363,3216.4775,2893.0436,2855.8141,2822.9364,2793.5351,2773.777,2755.3507,2738.0953,2721.877,2706.5833,2692.1189,2678.4022,2665.363,2652.9404,2641.0812,2629.7387,2618.8717,2608.4437,2598.4222,2588.778
+Offshore Wind - Class 7/Conservative,5962.8977,5942.7419,5924.3324,5907.3979,5891.7251,5877.1437,5863.5152,5850.7259,5429.4625,4986.3109,4548.0017,4113.3522,3681.5631,3252.0698,3238.3962,3225.6085,3213.6019,3202.2888,3191.5956,3181.4595,3171.827,3162.6516,3153.8932,3145.5163,3137.4902,3129.7874,3122.3834,3115.2568,3108.3879
diff --git a/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_tc.csv b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_tc.csv
new file mode 100644
index 0000000..9af6a81
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.1289257935074173,0.1301075434952705,0.13045655173884727,0.1304674427433303,0.13046751432090797,0.13046757579216822,0.13046655668773655,0.1304653735022892,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Moderate,0.1289257935074173,0.1301075434952705,0.13045655173884727,0.1304674427433303,0.13046751432090797,0.13046757579216822,0.13046655668773655,0.1304653735022892,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Conservative,0.1289257935074173,0.1301075434952705,0.13045655173884727,0.1304674427433303,0.13046751432090797,0.13046757579216822,0.13046655668773655,0.1304653735022892,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.8156785835927624,0.8156731490891987,0.8156713774348975,0.8156710553166417,0.8156708229769672,0.8156706234423747,0.8156739314532538,0.815677772114679,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Moderate,0.8156785835927624,0.8156731490891987,0.8156713774348975,0.8156710553166417,0.8156708229769672,0.8156706234423747,0.8156739314532538,0.815677772114679,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Conservative,0.8156785835927624,0.8156731490891987,0.8156713774348975,0.8156710553166417,0.8156708229769672,0.8156706234423747,0.8156739314532538,0.815677772114679,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PFF/Advanced,0.7023130514762239,0.7023146526276195,0.7023151746047832,0.7023152695095135,0.702315337963051,0.7023153967513264,0.7023144221220573,0.7023132905595644,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Moderate,0.7023130514762239,0.7023146526276195,0.7023151746047832,0.7023152695095135,0.702315337963051,0.7023153967513264,0.7023144221220573,0.7023132905595644,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Conservative,0.7023130514762239,0.7023146526276195,0.7023151746047832,0.7023152695095135,0.702315337963051,0.7023153967513264,0.7023144221220573,0.7023132905595644,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+Year (Advanced)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9278050110194725,0.9278026706609483,0.9278019076983567,0.9278017689780282,0.9278016689208433,0.9278015829911608,0.9278030075854014,0.927804661558896,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608221384728436,0.8608177956855882,0.86081637992871,0.8608161225187586,0.8608159368523021,0.8608157774009039,0.8608184208845163,0.8608214900104174,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986750936716025,0.7986690497895593,0.7986670794758505,0.7986667212377113,0.7986664628452251,0.7986662409363253,0.79866991988157,0.7986741912017398,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410147540849595,0.7410072773689951,0.7410048399535692,0.7410043967882304,0.7410040771389065,0.7410038026223225,0.7410083537341122,0.7410136376637552,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875172020793876,0.6875085309221517,0.6875057041226371,0.687505190160617,0.6875048194466268,0.6875045010754605,0.6875097792404162,0.6875159073031466,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378819052513431,0.6378722510917576,0.6378691038384846,0.6378685316125962,0.6378681188737033,0.6378677644113605,0.6378736409236335,0.6378804636917533,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Moderate)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9278050110194725,0.9278026706609483,0.9278019076983567,0.9278017689780282,0.9278016689208433,0.9278015829911608,0.9278030075854014,0.927804661558896,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608221384728436,0.8608177956855882,0.86081637992871,0.8608161225187586,0.8608159368523021,0.8608157774009039,0.8608184208845163,0.8608214900104174,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986750936716025,0.7986690497895593,0.7986670794758505,0.7986667212377113,0.7986664628452251,0.7986662409363253,0.79866991988157,0.7986741912017398,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410147540849595,0.7410072773689951,0.7410048399535692,0.7410043967882304,0.7410040771389065,0.7410038026223225,0.7410083537341122,0.7410136376637552,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875172020793876,0.6875085309221517,0.6875057041226371,0.687505190160617,0.6875048194466268,0.6875045010754605,0.6875097792404162,0.6875159073031466,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378819052513431,0.6378722510917576,0.6378691038384846,0.6378685316125962,0.6378681188737033,0.6378677644113605,0.6378736409236335,0.6378804636917533,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Conservative)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9278050110194725,0.9278026706609483,0.9278019076983567,0.9278017689780282,0.9278016689208433,0.9278015829911608,0.9278030075854014,0.927804661558896,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608221384728436,0.8608177956855882,0.86081637992871,0.8608161225187586,0.8608159368523021,0.8608157774009039,0.8608184208845163,0.8608214900104174,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
diff --git a/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_vom.csv b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_vom.csv
new file mode 100644
index 0000000..90cc094
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/TechLife/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Fixed_Offshore_Wind/Market/df_cff.csv b/tests/data/Fixed_Offshore_Wind/Market/df_cff.csv
new file mode 100644
index 0000000..131c998
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/df_cff.csv
@@ -0,0 +1,4 @@
+Construction Finance Factor,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+CFF/Advanced,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
+CFF/Moderate,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
+CFF/Conservative,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
diff --git a/tests/data/Fixed_Offshore_Wind/Market/df_just_wacc.csv b/tests/data/Fixed_Offshore_Wind/Market/df_just_wacc.csv
new file mode 100644
index 0000000..e98f041
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/df_just_wacc.csv
@@ -0,0 +1,7 @@
+WACC Type,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+WACC Nominal - Advanced,0.07781267413203512,0.07781539288695907,0.07781627921066543,0.07781644036042085,0.07781655659569249,0.07781665641922816,0.07781500148667397,0.07781308009360681,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Nominal - Moderate,0.07781267413203512,0.07781539288695907,0.07781627921066543,0.07781644036042085,0.07781655659569249,0.07781665641922816,0.07781500148667397,0.07781308009360681,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Nominal - Conservative,0.07781267413203512,0.07781539288695907,0.07781627921066543,0.07781644036042085,0.07781655659569249,0.07781665641922816,0.07781500148667397,0.07781308009360681,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Real - Advanced,0.04907869471815807,0.05095766149524428,0.051510979539189705,0.051528234497971726,0.05152834789823668,0.051528445287051916,0.05152683071870645,0.05152495618888464,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
+WACC Real - Moderate,0.04907869471815807,0.05095766149524428,0.051510979539189705,0.051528234497971726,0.05152834789823668,0.051528445287051916,0.05152683071870645,0.05152495618888464,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
+WACC Real - Conservative,0.04907869471815807,0.05095766149524428,0.051510979539189705,0.051528234497971726,0.05152834789823668,0.051528445287051916,0.05152683071870645,0.05152495618888464,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
diff --git a/tests/data/Fixed_Offshore_Wind/Market/df_wacc.csv b/tests/data/Fixed_Offshore_Wind/Market/df_wacc.csv
new file mode 100644
index 0000000..2ffab98
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/Market/df_wacc.csv
@@ -0,0 +1,25 @@
+WACC,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Inflation Rate,0.027389727347,0.02555548370379,0.02501666666667,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025
+Interest Rate Nominal - Advanced,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Interest Rate Nominal - Moderate,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Interest Rate Nominal - Conservative,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Calculated Interest Rate Real - Advanced,0.04147430280720377,0.04333701784295374,0.043885465276984004,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Calculated Interest Rate Real - Moderate,0.04147430280720377,0.04333701784295374,0.043885465276984004,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Calculated Interest Rate Real - Conservative,0.04147430280720377,0.04333701784295374,0.043885465276984004,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Interest During Construction  - Nominal,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Rate of Return on Equity Nominal - Advanced,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Rate of Return on Equity Nominal - Moderate,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Rate of Return on Equity Nominal - Conservative,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Calculated Rate of Return on Equity Real - Advanced,0.07554121925416823,0.07746486422099408,0.07803125152436197,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Calculated Rate of Return on Equity Real - Moderate,0.07554121925416823,0.07746486422099408,0.07803125152436197,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Calculated Rate of Return on Equity Real - Conservative,0.07554121925416823,0.07746486422099408,0.07803125152436197,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Debt Fraction - Advanced,0.512794256063316,0.512742976216397,0.512726258805209,0.512723219276079,0.512721026902326,0.512719144078838,0.512750358620205,0.512786599011528,0.512828946704104,0.512878740897547,0.512938849658125,0.512939285019844,0.512939677084028,0.512940035269274,0.512940279979148,0.512940511234675,0.512940729831368,0.512940937706514,0.512941135367327,0.512941325615257,0.512941506630955,0.512941680129883,0.512941846997314,0.512942007354996,0.512942162459432,0.512942312089244,0.512942457545326,0.512942597759742,0.512942732169002
+Debt Fraction - Moderate,0.512794256063316,0.512742976216397,0.512726258805209,0.512723219276079,0.512721026902326,0.512719144078838,0.512750358620205,0.512786599011528,0.512828946704104,0.512878740897547,0.512938849658125,0.512939285019844,0.512939677084028,0.512940035269274,0.512940279979148,0.512940511234675,0.512940729831368,0.512940937706514,0.512941135367327,0.512941325615257,0.512941506630955,0.512941680129883,0.512941846997314,0.512942007354996,0.512942162459432,0.512942312089244,0.512942457545326,0.512942597759742,0.512942732169002
+Debt Fraction - Conservative,0.512794256063316,0.512742976216397,0.512726258805209,0.512723219276079,0.512721026902326,0.512719144078838,0.512750358620205,0.512786599011528,0.512828946704104,0.512878740897547,0.512938849658125,0.512939285019844,0.512939677084028,0.512940035269274,0.512940279979148,0.512940511234675,0.512940729831368,0.512940937706514,0.512941135367327,0.512941325615257,0.512941506630955,0.512941680129883,0.512941846997314,0.512942007354996,0.512942162459432,0.512942312089244,0.512942457545326,0.512942597759742,0.512942732169002
+Tax Rate (Federal and State),0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996
+WACC Nominal - Advanced,0.07781267413203512,0.07781539288695907,0.07781627921066543,0.07781644036042085,0.07781655659569249,0.07781665641922816,0.07781500148667397,0.07781308009360681,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Nominal - Moderate,0.07781267413203512,0.07781539288695907,0.07781627921066543,0.07781644036042085,0.07781655659569249,0.07781665641922816,0.07781500148667397,0.07781308009360681,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Nominal - Conservative,0.07781267413203512,0.07781539288695907,0.07781627921066543,0.07781644036042085,0.07781655659569249,0.07781665641922816,0.07781500148667397,0.07781308009360681,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Real - Advanced,0.04907869471815807,0.05095766149524428,0.051510979539189705,0.051528234497971726,0.05152834789823668,0.051528445287051916,0.05152683071870645,0.05152495618888464,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
+WACC Real - Moderate,0.04907869471815807,0.05095766149524428,0.051510979539189705,0.051528234497971726,0.05152834789823668,0.051528445287051916,0.05152683071870645,0.05152495618888464,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
+WACC Real - Conservative,0.04907869471815807,0.05095766149524428,0.051510979539189705,0.051528234497971726,0.05152834789823668,0.051528445287051916,0.05152683071870645,0.05152495618888464,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/20/df_capex.csv b/tests/data/Fixed_Offshore_Wind/R&D/20/df_capex.csv
new file mode 100644
index 0000000..b019daf
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/20/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,5462.550832369848,5094.404759063653,4875.5549262092645,4722.020175198692,4263.651146110876,3829.295613124674,3410.728337949633,3343.7774992451323,3285.5174365197136,3207.2812724221576,3141.08145831941,3083.8665548677945,3033.5990170228683,2988.8537384617885,2958.8949081013798,2931.03615273454,2905.0183721997228,2880.626813817036,2857.6815376796812,2836.0305427943017,2815.5436693022525,2796.109383287182,2777.6312289765,2760.02494615507,2743.21658539724,2727.1416211172086,2711.7421798514206,2696.967261995978,2682.7713005134847
+Offshore Wind - Class 1/Moderate,6217.537549003377,6050.594891259246,5931.2557072685795,5838.925802633735,5763.930885101322,5700.97021105834,5291.544282275952,4888.852075107402,4491.460278945741,4072.51283498425,3663.0000960065295,3615.862270810396,3574.2345093406543,3537.008235424742,3511.991599288189,3488.66149787881,3466.8138219123107,3446.2791640087826,3426.9151687521285,3408.6011001235547,3391.233850228222,3374.724391496717,3358.9956701796727,3343.980167236275,3329.6190113846337,3315.8598725964,3302.656518621953,3289.967817172063,3277.756959836958
+Offshore Wind - Class 1/Conservative,7549.867055466588,7524.346964544596,7501.037928189001,7479.5964751544225,7459.752640146307,7441.2903400603145,7424.034734950038,7407.84169550011,6874.463003342234,6313.370793819921,5758.409845373221,5208.082210940681,4661.376657071959,4117.577748019326,4100.26493465772,4084.0740017131716,4068.8719067407287,4054.548002773674,4041.008827494427,4028.175109779539,4015.978997982083,4004.3617316888726,3993.272200427305,3982.66605671573,3972.5038312954784,3962.750933130862,3953.3765407221345,3944.3531586306726,3935.6561740041584
+Offshore Wind - Class 2/Advanced,5358.739142998236,4997.589328397251,4782.898624109471,4632.281715654107,4182.623529780819,3756.522615291665,3345.909947900305,3280.231438444361,3223.078621467056,3146.329206691839,3081.3876415122254,3025.26002744198,2975.9477343518092,2932.0528187513814,2902.663410055368,2875.334052750732,2849.810635767615,2825.882619436882,2803.3735007815626,2782.133828788493,2762.0364370540406,2742.9714546924165,2724.8444215677036,2707.5726296266243,2691.083792474087,2675.3142714739247,2660.2075235870307,2645.713436159141,2631.787107365084
+Offshore Wind - Class 2/Moderate,6099.377897155915,5935.607747380369,5818.536715338725,5727.961307946685,5654.391607605821,5592.627539486479,5190.982487228406,4795.942992362201,4406.103572325649,3995.1177208761983,3593.3875214533555,3547.1455153865654,3506.308802120767,3469.790092274592,3445.2488611413337,3422.362012811054,3400.929540141509,3380.7851400765067,3361.7891180488486,3343.823177151232,3326.785983388085,3310.5901722205545,3295.16046379854,3280.4303368995647,3266.3420289287787,3252.8444294135797,3239.891971316572,3227.4444092981566,3215.4657110294934
+Offshore Wind - Class 2/Conservative,7406.3874307080805,7381.352390366644,7358.4863853527395,7337.4523748058255,7317.985493391741,7299.874203623014,7282.946548139545,7267.061169343569,6743.818981066585,6193.3899017697695,5648.975449671825,5109.10650357437,4572.7905668380645,4039.326284040601,4022.3425289928423,4006.4591458335417,3991.546085572757,3977.494364274333,3964.21240438866,3951.6227086915546,3939.658312485724,3928.26178578243,3917.383126796111,3906.9784315199345,3897.0093393822713,3887.441702822251,3878.245587289759,3869.393608214876,3860.8620396949195
+Offshore Wind - Class 3/Advanced,5563.666194857099,5188.705465783053,4965.804712217284,4809.427731107721,4342.574030961793,3900.178299552324,3473.8631867267977,3405.6729467788646,3346.3344641684057,3266.6501330575466,3199.2249980367915,3140.950965854653,3089.752906975992,3044.179439195086,3013.6660435766357,2985.291526998198,2958.792132812655,2933.9490061980596,2910.5791029239003,2888.527317673103,2867.6611623442363,2847.867218252979,2829.0469231213624,2811.114797178504,2793.9954497055987,2777.6226920862823,2761.9383182508886,2746.889887302366,2732.431056122389
+Offshore Wind - Class 3/Moderate,6332.62824425191,6162.59523224895,6041.0472110659675,5947.008043619602,5870.624939042819,5806.498813182058,5389.494232391682,4979.34787876988,4574.600276695524,4147.897677749075,3730.8046237328062,3682.7941509664915,3640.395852003069,3602.4805290910094,3577.0010161147275,3553.2388593653677,3530.9867343662136,3510.0719076762357,3490.3494738991394,3471.696590510754,3454.00771050475,3437.1928084933766,3421.172724221887,3405.879495174652,3391.252365301811,3377.238561100198,3363.790852501856,3350.8673311366247,3338.4304125138055
+Offshore Wind - Class 3/Conservative,7689.620050473284,7663.627437134304,7639.887121519657,7618.048758524303,7597.837393762009,7579.033507198603,7561.458489351737,7544.965660925851,7001.713778059379,6430.2353883344795,5865.001678369514,5304.48731653311,4747.661667351704,4193.796766914002,4176.163542997469,4159.672821076962,4144.189452202149,4129.6002394261195,4115.8105008755465,4102.73930239642,4090.317351048657,4078.4849994694414,4067.19036110524,4056.387758049952,4046.037499307501,4036.103996023863,4026.5560940931773,4017.3657437332995,4008.5077777483943
+Offshore Wind - Class 4/Advanced,5975.833019742907,5573.094469456032,5333.680820228931,5165.719279093875,4664.280086695629,4189.110790265383,3731.213396644922,3657.97153506216,3594.2372192017824,3508.6496839396987,3436.2295811919234,3373.638432539796,3318.6475552929614,3269.697913733989,3236.9240161071007,3206.4475397671245,3177.98499343761,3151.3015572032164,3126.2003282454148,3102.5147817706065,3080.1028949688057,3058.8426013967687,3038.628132310759,3019.367466686351,3000.9797812382362,2983.394230864478,2966.5477312724283,2950.3845155039116,2934.854692642071
+Offshore Wind - Class 4/Moderate,6801.761183217273,6619.1318233949605,6488.579378668923,6387.573443592643,6305.531822094643,6236.6551939994615,5788.758157491227,5348.227348553873,4913.495194579753,4455.1817107127035,4007.1895488563277,3955.6225189303327,3910.0833095790017,3869.359017179189,3841.99196451515,3816.4694344816667,3792.568802720853,3770.1046967594084,3748.921124330627,3728.886373414007,3709.887136193929,3691.8264025542844,3674.6196905425268,3658.1932724704134,3642.4826227521417,3627.430754873791,3612.986669231462,3599.105907474802,3585.7475590519857
+Offshore Wind - Class 4/Conservative,8259.281523874955,8231.363342882703,8205.864317014495,8182.408047019821,8160.699511276999,8140.502559446241,8121.625610406816,8103.9108979927505,7520.413786396996,6906.599295051689,6299.492027699934,5697.453566632146,5099.377331312438,4504.481143033195,4485.541553175938,4467.829169004659,4451.198641648249,4435.528791613096,4420.717508822699,4406.677872213025,4393.335821489715,4380.626831066969,4368.49535572402,4356.89261323105,4345.775475662155,4335.106247657932,4324.850892526213,4314.979697454295,4305.465499609663
+Offshore Wind - Class 5/Advanced,6282.856400383134,5859.426312976391,5607.712002763843,5431.121106911791,4903.919131998218,4404.336990394094,3922.9139229701746,3845.90906670065,3778.9002436638907,3688.91532299003,3612.774466531764,3546.9676819851466,3489.1514266823465,3437.686839438965,3403.2291788025045,3371.186903754147,3341.2619992172013,3313.2076714562813,3286.816817732078,3261.9142654920715,3238.350896329211,3215.9983242841176,3194.745237177849,3174.494957500406,3155.162670693132,3136.673651249446,3118.961710552984,3101.9679773218536,3085.640232396413
+Offshore Wind - Class 5/Moderate,7151.218784281058,6959.206384291097,6821.946382965393,6715.751127323762,6629.494388563569,6557.079053170072,6086.1701084333035,5623.006007892007,5165.9382447845255,4684.077800322827,4213.068962883639,4158.852503535129,4110.973631920612,4068.157136205224,4039.3838248980423,4012.5501615695575,3987.42165891054,3963.8032988704326,3941.531439241944,3920.467161538803,3900.4918362475946,3881.503242423113,3863.4124633646497,3846.142223585428,3829.624449701114,3813.7990508740713,3798.613031863727,3784.018940864715,3769.9743151633556
+Offshore Wind - Class 5/Conservative,8683.622841160915,8654.270351743377,8627.461190398502,8602.799777589971,8579.97601355234,8558.741330650955,8538.894502187832,8520.269668581588,7906.793991996092,7261.443230368062,6623.144272666011,5990.174662702622,5361.370722559387,4735.910139057796,4715.997565453123,4697.375170958373,4679.8902893679615,4663.415310803441,4647.842914359215,4633.082076829197,4619.054414039568,4605.692628686925,4592.937849489374,4580.738965974315,4569.05063284176,4557.833048226926,4547.050955881901,4536.672536488602,4526.66962939618
+Offshore Wind - Class 6/Advanced,6054.327951395894,5646.2993008916155,5403.740750003257,5233.573032524783,4725.547130414371,4244.13636941661,3780.224348597275,3706.0204792688073,3641.448993823569,3554.7372499016396,3481.3657828037544,3417.9525427105277,3362.2392449876024,3312.6466758134006,3279.4423858770924,3248.565562646515,3219.729167046685,3192.6951639698427,3167.264211485968,3143.2674565586763,3120.561324216123,3099.0217523783913,3078.5416418772934,3059.0279738700683,3040.3988163843655,3022.5823264999117,3005.514532974426,2989.1391145062103,2973.405182360072
+Offshore Wind - Class 6/Moderate,6891.104950175169,6706.076724201667,6573.809362360196,6471.476883239043,6388.357507068228,6318.576079478668,5864.795684317246,5418.478415974113,4978.035969393947,4513.70231489282,4059.8255748275124,4007.5811371193035,3961.443680240505,3920.184668080688,3892.4579573404626,3866.600271214404,3842.385770152208,3819.626420831674,3798.1647896929426,3777.866725604021,3758.618033799659,3740.320041133183,3722.8872678337116,3706.2450992633676,3690.3282337554206,3675.0784652402026,3660.4447941138183,3646.3815424701647,3632.8477997574205
+Offshore Wind - Class 6/Conservative,8367.770320398857,8339.48560747076,8313.651536378682,8289.887273123944,8267.893472205405,8247.43121156567,8228.306249235115,8210.358934279791,7619.19746916776,6997.320273052247,6382.238330681363,5772.292048423035,5166.359656728911,4563.649220445412,4544.460841216094,4526.515965372261,4509.6670266687215,4493.791293450005,4478.785325215162,4464.561424819229,4451.0439798059915,4438.168131983535,4425.877338312755,4414.122151351611,4402.8589996993815,4392.049522784438,4381.65957304591,4371.658772458867,4362.019625584684
+Offshore Wind - Class 7/Advanced,6421.601266263206,5988.820290613011,5731.547467050367,5551.056875399363,5012.212688734152,4501.598224119789,4009.5438457884584,3930.838485335038,3862.3498977043,3770.377877246376,3692.5556968900287,3625.295534501015,3566.202626070197,3513.6015237408124,3478.382860319226,3445.6330212011326,3415.0473391875917,3386.373366239308,3359.3996757375103,3333.9474364624434,3309.863649602413,3287.0173792178434,3265.2949848870057,3244.5975717258207,3224.838329538955,3205.9409806579697,3187.8378951733484,3170.469093116158,3153.780581427489
+Offshore Wind - Class 7/Moderate,7309.139612095586,7112.887038516299,6972.595886819772,6864.055647217157,6775.89396238266,6701.87945680084,6220.5713602231,5747.179178251301,5280.018150057534,4787.51663824246,4306.1064315882195,4250.69281197255,4201.756474658073,4157.994601502596,4128.585901652064,4101.1595342313185,4075.476022839443,4051.3361364151237,4028.5724632151287,4007.0432021668807,3986.6267303019517,3967.2187201697593,3948.7284811703275,3931.0768530489104,3914.194321128019,3898.019464145569,3882.498067305242,3867.5817918520374,3853.2269555165312
+Offshore Wind - Class 7/Conservative,8875.383790929918,8845.383273936757,8817.98185197444,8792.775962959942,8769.448078924646,8747.744532273511,8727.459439822973,8708.423394193125,8081.400338044277,7421.798180581692,6769.403486705676,6122.456104869517,5479.766192140526,4840.493585478835,4820.141306593594,4801.107589206534,4783.23655191965,4766.397813136889,4750.481612841166,4735.394710452311,4721.057391372057,4707.4003626603235,4694.364087822995,4681.8955716195005,4669.949247012442,4658.484092581294,4647.463854259805,4636.856269255077,4626.632400835331
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/20/df_fin_assump.csv b/tests/data/Fixed_Offshore_Wind/R&D/20/df_fin_assump.csv
new file mode 100644
index 0000000..e9d9b87
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/20/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),20
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/20/df_fom.csv b/tests/data/Fixed_Offshore_Wind/R&D/20/df_fom.csv
new file mode 100644
index 0000000..c78b3e0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/20/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,90.662,84.9785,81.599875,79.229625,77.420125,75.96575,74.755,73.721375,72.822,71.614125,70.592125,69.708875,68.932875,68.242125,67.779625,67.3495,66.94787500000001,66.57124999999999,66.217,65.88275,65.5665,65.26650000000001,64.98125,64.709375,64.44987499999999,64.20175,63.964,63.735875,63.51675
+Offshore Wind - Class 1/Moderate,90.662,87.639125,85.47825,83.806375,82.4485,81.30850000000001,80.32825000000001,79.469875,78.7075,77.55475,76.57300000000001,75.719375,74.96562499999999,74.29162500000001,73.83862500000001,73.41624999999999,73.020625,72.64875,72.298125,71.9665,71.652125,71.353125,71.068375,70.7965,70.53637499999999,70.28725,70.04825,69.8185,69.597375
+Offshore Wind - Class 1/Conservative,90.662,90.167625,89.716125,89.30075000000001,88.916375,88.55874999999999,88.2245,87.910875,87.615375,86.78312500000001,86.06975,85.44600000000001,84.892375,84.395125,84.05975,83.74612499999999,83.45174999999999,83.17425,82.912,82.663375,82.42712499999999,82.20212500000001,81.98724999999999,81.781875,81.58500000000001,81.396125,81.21449999999999,81.03975,80.87125
+Offshore Wind - Class 2/Advanced,90.45362499999999,84.78325,81.41237500000001,79.0475,77.242375,75.79125,74.58325,73.55199999999999,72.65475,71.449625,70.43,69.54875,68.77449999999999,68.08525,67.623875,67.19475,66.794,66.418375,66.064875,65.731375,65.415875,65.1165,64.831875,64.56075,64.301875,64.05425,63.817125,63.5895,63.370875
+Offshore Wind - Class 2/Moderate,90.45362499999999,87.43775,85.281875,83.613875,82.259125,81.12175,80.14362500000001,79.28725,78.526625,77.376625,76.397,75.5455,74.7935,74.121,73.669,73.2475,72.852875,72.481875,72.132125,71.80125000000001,71.4875,71.18925,70.905125,70.633875,70.374375,70.12587500000001,69.88725,69.658125,69.4375
+Offshore Wind - Class 2/Conservative,90.45362499999999,89.9605,89.51,89.095625,88.712125,88.35525000000001,88.02187500000001,87.708875,87.41412499999998,86.583875,85.87199999999999,85.24974999999999,84.69737500000001,84.20125,83.86675,83.55375000000001,83.26,82.983125,82.72149999999999,82.4735,82.23775,82.01325,81.799,81.594,81.397625,81.209125,81.027875,80.8535,80.6855
+Offshore Wind - Class 3/Advanced,90.520875,84.84625,81.47287499999999,79.10624999999999,77.29974999999999,75.8475,74.638625,73.60674999999999,72.708625,71.50274999999999,70.482375,69.600375,68.825625,68.135875,67.674125,67.244625,66.843625,66.467625,66.114,65.78025,65.4645,65.164875,64.88012499999999,64.60875,64.349625,64.101875,63.8645,63.63675,63.417874999999995
+Offshore Wind - Class 3/Moderate,90.520875,87.50275,85.34525000000001,83.67599999999999,82.32025,81.182,80.20325,79.346125,78.58500000000001,77.434125,76.45375,75.601625,74.84899999999999,74.176,73.72375,73.30199999999999,72.907,72.53575,72.185625,71.854625,71.540625,71.242125,70.95775,70.68625,70.426625,70.177875,69.93925,69.709875,69.489
+Offshore Wind - Class 3/Conservative,90.520875,90.02725,89.5765,89.16175000000001,88.778,88.421,88.08725000000001,87.774,87.479125,86.648125,85.93575,85.313,84.76037500000001,84.26387500000001,83.92899999999999,83.615875,83.321875,83.04475,82.783,82.53475,82.29887500000001,82.07412500000001,81.85974999999999,81.65462500000001,81.458,81.269375,81.088125,80.91362500000001,80.745375
+Offshore Wind - Class 4/Advanced,90.50575,84.832,81.45925,79.093,77.28675,75.83487500000001,74.62625,73.594375,72.6965,71.49074999999999,70.4705,69.58875,68.81412499999999,68.1245,67.66275,67.23349999999999,66.8325,66.4565,66.102875,65.76925,65.4535,65.154,64.86925000000001,64.597875,64.338875,64.091125,63.85375,63.626125,63.40725
+Offshore Wind - Class 4/Moderate,90.50575,87.488125,85.33099999999999,83.66199999999999,82.3065,81.16837500000001,80.18974999999999,79.332875,78.571875,77.421125,76.441,75.589,74.8365,74.163625,73.711375,73.28975,72.89475,72.52362500000001,72.173625,71.8425,71.528625,71.23025,70.945875,70.6745,70.414875,70.166125,69.9275,69.698125,69.4775
+Offshore Wind - Class 4/Conservative,90.50575,90.01225,89.5615,89.146875,88.76312499999999,88.406125,88.07249999999999,87.75937499999999,87.46449999999999,86.633625,85.921375,85.29875000000001,84.74612499999999,84.24975,83.915,83.601875,83.307875,83.03087500000001,82.769125,82.521,82.28512500000001,82.06049999999999,81.846,81.64087500000001,81.44437500000001,81.255875,81.0745,80.9,80.731875
+Offshore Wind - Class 5/Advanced,91.497125,85.76124999999999,82.35150000000002,79.959375,78.133375,76.6655,75.443625,74.40050000000001,73.49275,72.273875,71.2425,70.351,69.567875,68.870625,68.403875,67.969875,67.5645,67.1845,66.827,66.48962499999999,66.1705,65.867625,65.57975,65.3055,65.043625,64.793125,64.55325,64.323,64.101875
+Offshore Wind - Class 5/Moderate,91.497125,88.44637499999999,86.265625,84.578375,83.208,82.0575,81.06812500000001,80.201875,79.4325,78.269125,77.27825,76.416875,75.65625,74.976,74.51875,74.0925,73.69325,73.318,72.964125,72.62950000000001,72.312125,72.010375,71.723,71.448625,71.186125,70.93475,70.6935,70.461625,70.2385
+Offshore Wind - Class 5/Conservative,91.497125,90.998125,90.54249999999999,90.123375,89.735375,89.3745,89.03712499999999,88.720625,88.4225,87.58262500000001,86.8625,86.233125,85.674375,85.172625,84.834125,84.517625,84.220375,83.94037499999999,83.67575000000001,83.42487500000001,83.186375,82.95925,82.7425,82.535125,82.3365,82.145875,81.962625,81.78625,81.61612500000001
+Offshore Wind - Class 6/Advanced,90.82724999999999,85.133375,81.748625,79.374,77.56125,76.104125,74.89125,73.85575,72.95474999999999,71.74475,70.720875,69.836,69.0585,68.3665,67.903125,67.47225,67.069875,66.692625,66.33775,66.002875,65.686,65.3855,65.099625,64.827375,64.567375,64.31875,64.080625,63.852125,63.6325
+Offshore Wind - Class 6/Moderate,90.82724999999999,87.798875,85.634,83.95925,82.59875,81.456625,80.474625,79.61475,78.851,77.696125,76.71249999999999,75.8575,75.102375,74.427,73.97325000000001,73.55000000000001,73.15375,72.78125,72.43,72.09774999999999,71.782625,71.48325,71.197875,70.9255,70.66499999999999,70.415375,70.175875,69.94575,69.72425
+Offshore Wind - Class 6/Conservative,90.82724999999999,90.33200000000001,89.879625,89.46350000000001,89.07849999999999,88.720125,88.38525000000001,88.07112500000001,87.775125,86.941375,86.22662500000001,85.60175,85.047125,84.549,84.21300000000001,83.898875,83.60374999999999,83.32587500000001,83.06312500000001,82.814,82.57737499999999,82.351875,82.13675,81.93087500000001,81.73375,81.544375,81.36250000000001,81.187375,81.01862499999999
+Offshore Wind - Class 7/Advanced,91.0155,85.309875,81.91812499999999,79.538625,77.722125,76.262,75.046625,74.009,73.106,71.8935,70.8675,69.98075,69.20175,68.50825,68.043875,67.612125,67.209,66.830875,66.47525,66.13974999999999,65.82225,65.521,65.234625,64.96175,64.70125,64.452125,64.21350000000001,63.984500000000004,63.7645
+Offshore Wind - Class 7/Moderate,91.0155,87.981,85.81162499999999,84.13325,82.770125,81.625625,80.6415,79.779875,79.0145,77.85725000000001,76.87162500000001,76.01474999999999,75.25812499999999,74.58137500000001,74.12662499999999,73.7025,73.305375,72.932125,72.58012500000001,72.24725000000001,71.9315,71.6315,71.3455,71.072625,70.8115,70.561375,70.321375,70.09075,69.868875
+Offshore Wind - Class 7/Conservative,91.0155,90.51925,90.066,89.649125,89.263125,88.904125,88.568625,88.25375,87.957125,87.121625,86.405375,85.77925,85.2235,84.724375,84.38762499999999,84.07287500000001,83.77725,83.498625,83.235375,82.98575,82.74862499999999,82.52274999999999,82.30712499999998,82.100875,81.90325,81.71350000000001,81.53125,81.35575,81.18662499999999
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/20/df_gcc.csv b/tests/data/Fixed_Offshore_Wind/R&D/20/df_gcc.csv
new file mode 100644
index 0000000..d9068d0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/20/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,1084.6748,1011.5737,968.1176,937.6309,846.6146,760.3665,677.2534,663.9593,652.3908,636.8558,623.7108,612.3499,602.3685,593.4836,587.5348,582.003,576.8368,571.9935,567.4373,563.1382,559.0702,555.2112,551.5421,548.0461,544.7085,541.5166,538.4588,535.525,532.7062
+Offshore Wind - Class 1/Moderate,1234.5893,1201.4402,1177.7435,1159.41,1144.5186,1132.0167,1050.7188,970.758,891.8496,808.6611,727.3459,717.986,709.7201,702.3283,697.3608,692.7283,688.3901,684.3126,680.4676,676.831,673.3825,670.1043,666.9811,663.9995,661.1479,658.4158,655.7941,653.2745,650.8499
+Offshore Wind - Class 1/Conservative,1499.1441,1494.0767,1489.4483,1485.1908,1481.2505,1477.5845,1474.1581,1470.9427,1365.0321,1253.6184,1143.4223,1034.1461,925.5892,817.6094,814.1717,810.9567,807.9381,805.0939,802.4055,799.8571,797.4354,795.1286,792.9266,790.8206,788.8027,786.8661,785.0047,783.213,781.486
+Offshore Wind - Class 2/Advanced,998.0205,930.7594,890.775,862.7239,778.9788,699.621,623.1478,610.9158,600.2715,585.9776,573.8828,563.4295,554.2455,546.0704,540.5969,535.507,530.7535,526.2971,522.105,518.1492,514.4063,510.8556,507.4796,504.2628,501.1919,498.255,495.4415,492.7421,490.1484
+Offshore Wind - Class 2/Moderate,1135.9583,1105.4575,1083.654,1066.7851,1053.0833,1041.5803,966.7772,893.2044,820.6001,744.0574,669.2385,660.6263,653.0208,646.2195,641.6489,637.3864,633.3948,629.6431,626.1052,622.7592,619.5862,616.5698,613.6962,610.9528,608.329,605.8152,603.4029,601.0846,598.8537
+Offshore Wind - Class 2/Conservative,1379.3779,1374.7154,1370.4568,1366.5394,1362.9138,1359.5407,1356.3881,1353.4296,1255.9801,1153.4673,1052.0746,951.5285,851.6441,752.2909,749.1278,746.1696,743.3922,740.7752,738.3015,735.9568,733.7285,731.606,729.58,727.6422,725.7855,724.0036,722.2909,720.6423,719.0534
+Offshore Wind - Class 3/Advanced,1099.023,1024.9548,980.924,950.0339,857.8136,770.4247,686.2122,672.7422,661.0207,645.2802,631.9613,620.4501,610.3367,601.3343,595.3068,589.7018,584.4672,579.5598,574.9434,570.5874,566.4656,562.5556,558.8379,555.2957,551.914,548.6798,545.5816,542.609,539.7528
+Offshore Wind - Class 3/Moderate,1250.9205,1217.3329,1193.3228,1174.7467,1159.6583,1146.9911,1064.6178,983.5992,903.6471,819.3581,736.9673,727.4835,719.1083,711.6187,706.5856,701.8917,697.4961,693.3647,689.4688,685.7842,682.29,678.9685,675.8039,672.783,669.8936,667.1254,664.469,661.9161,659.4594
+Offshore Wind - Class 3/Conservative,1518.9749,1513.8404,1509.1509,1504.837,1500.8445,1497.1301,1493.6584,1490.4005,1383.0888,1270.2014,1158.5475,1047.8259,937.8329,828.4248,824.9416,821.6841,818.6256,815.7437,813.0197,810.4377,807.9839,805.6466,803.4155,801.2816,799.2371,797.2748,795.3888,793.5734,791.8236
+Offshore Wind - Class 4/Advanced,1214.6721,1132.8098,1084.1456,1050.0051,948.0805,851.4957,758.4216,743.5341,730.5792,713.1824,698.462,685.7394,674.5618,664.6121,657.9503,651.7555,645.9701,640.5463,635.4442,630.6297,626.0742,621.7528,617.6439,613.7289,609.9913,606.4168,602.9925,599.7071,596.5505
+Offshore Wind - Class 4/Moderate,1382.5536,1345.4316,1318.895,1298.3641,1281.688,1267.6878,1176.6465,1087.1024,998.737,905.5783,814.5176,804.0359,794.7794,786.5016,780.9389,775.7511,770.8929,766.3268,762.0209,757.9486,754.0867,750.4156,746.9181,743.5792,740.3858,737.3263,734.3903,731.5689,728.8536
+Offshore Wind - Class 4/Conservative,1678.8151,1673.1403,1667.9573,1663.1895,1658.7769,1654.6716,1650.8346,1647.2338,1528.6298,1403.8634,1280.4603,1158.0875,1036.5201,915.5991,911.7494,908.1491,904.7687,901.5836,898.573,895.7192,893.0073,890.424,887.9581,885.5997,883.34,881.1713,879.0867,877.0803,875.1464
+Offshore Wind - Class 5/Advanced,1403.7543,1309.149,1252.9094,1213.4544,1095.6637,984.044,876.4815,859.2766,844.3051,824.2001,807.1882,792.4853,779.5676,768.0691,760.3703,753.2113,746.5253,740.2572,734.3608,728.7969,723.5322,718.5381,713.7896,709.2651,704.9458,700.8149,696.8576,693.0607,689.4127
+Offshore Wind - Class 5/Moderate,1597.7692,1554.8686,1524.2011,1500.4743,1481.2023,1465.0228,1359.8095,1256.3265,1154.2056,1046.5454,941.3097,929.1963,918.499,908.9326,902.5039,896.5086,890.8942,885.6173,880.6411,875.9348,871.4718,867.2293,863.1873,859.3287,855.6382,852.1024,848.7094,845.4487,842.3108
+Offshore Wind - Class 5/Conservative,1940.1483,1933.5902,1927.6003,1922.0903,1916.9909,1912.2465,1907.8122,1903.6509,1766.5844,1622.3962,1479.7835,1338.3616,1197.8703,1058.1261,1053.6771,1049.5164,1045.6098,1041.9289,1038.4496,1035.1516,1032.0175,1029.0321,1026.1824,1023.4568,1020.8453,1018.339,1015.93,1013.6112,1011.3763
+Offshore Wind - Class 6/Advanced,1342.4978,1252.0208,1198.2354,1160.5021,1047.8515,941.1026,838.2339,821.7798,807.4616,788.234,771.9645,757.9031,745.5491,734.5524,727.1896,720.3429,713.9487,707.9541,702.315,696.9939,691.959,687.1828,682.6415,678.3145,674.1836,670.233,666.4483,662.8172,659.3283
+Offshore Wind - Class 6/Moderate,1528.0463,1487.0178,1457.6886,1434.9972,1416.5662,1401.0927,1300.4706,1201.5034,1103.8389,1000.8767,900.2332,888.6484,878.4178,869.269,863.1208,857.3871,852.0177,846.971,842.2121,837.7111,833.4429,829.3855,825.5199,821.8296,818.3002,814.9187,811.6738,808.5554,805.5544
+Offshore Wind - Class 6/Conservative,1855.4848,1849.2129,1843.4844,1838.2149,1833.3379,1828.8006,1824.5598,1820.5801,1689.4949,1551.5987,1415.2093,1279.9587,1145.5981,1011.952,1007.6971,1003.718,999.9819,996.4616,993.1341,989.9801,986.9827,984.1276,981.4022,978.7956,976.2981,973.9012,971.5973,969.3797,967.2423
+Offshore Wind - Class 7/Advanced,1477.7456,1378.1536,1318.9497,1277.415,1153.4156,1035.9125,922.6804,904.5687,888.808,867.6433,849.7348,834.2568,820.6583,808.5537,800.4491,792.9127,785.8743,779.2758,773.0686,767.2115,761.6693,756.4119,751.4131,746.6502,742.1032,737.7545,733.5886,729.5917,725.7513
+Offshore Wind - Class 7/Moderate,1681.9869,1636.825,1604.5411,1579.5637,1559.2758,1542.2435,1431.4844,1322.5469,1215.0433,1101.7083,990.9257,978.1739,966.9126,956.8421,950.0745,943.7631,937.8528,932.2977,927.0593,922.105,917.4067,912.9405,908.6855,904.6235,900.7385,897.0163,893.4445,890.012,886.7086
+Offshore Wind - Class 7/Conservative,2042.4126,2035.5089,2029.2032,2023.4028,2018.0346,2013.0401,2008.3721,2003.9915,1859.7003,1707.912,1557.7822,1408.906,1261.0095,1113.8995,1109.216,1104.8359,1100.7234,1096.8485,1093.1858,1089.714,1086.4147,1083.2719,1080.272,1077.4027,1074.6536,1072.0152,1069.4793,1067.0382,1064.6855
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/20/df_lcoe.csv b/tests/data/Fixed_Offshore_Wind/R&D/20/df_lcoe.csv
new file mode 100644
index 0000000..2cd8458
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/20/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,125.51707372031491,113.88167398542491,107.25220541605562,102.74763889057168,93.31857409879848,84.68732839648472,76.61203596473993,74.83656525000306,73.31653973547718,71.28375445024555,69.58880268223221,68.13316494936372,66.85690927093337,65.74016686119869,64.99270644943994,64.29098892256042,63.65374248036965,63.0515410899169,62.48060556831923,61.96118541720119,61.45495493279951,60.982936526928874,60.53136039065275,60.10977086480369,59.69388900933748,59.31609080442288,58.94141852491957,58.580055208967565,58.24198302052843
+Offshore Wind - Class 1/Moderate,139.81306404755654,134.50946952714733,130.7583205329859,127.91745460185327,125.6316027147426,123.71504284280094,115.61794471387876,107.74413276219836,100.05474097176133,91.81179440924338,83.89353302130121,82.60931807130488,81.48728006988757,80.48412910129093,79.81879016681968,79.19249214901416,78.61634222462362,78.05475087114266,77.55152358986767,77.05688100211219,76.5995048118513,76.16177163742285,75.75713058896825,75.35366305490668,74.98019983219623,74.62047918482335,74.27345255695887,73.9381647685382,73.62843162901954
+Offshore Wind - Class 1/Conservative,165.0412823955915,164.22740667664277,163.46778555552146,162.78869394222443,162.18311077086355,161.57676700600408,161.03419517382184,160.51750517368598,150.32351562446047,139.28625307804643,128.46590970298442,117.8194100356274,107.33818301183513,96.9510343801158,96.46704656836201,96.0099436668299,95.57658765275492,95.18421395431677,94.81054091136393,94.45367499010243,94.11202854491515,93.78421614221874,93.46899746835825,93.18480916688131,92.89172908039997,92.62777763376353,92.37276508038543,92.12608318872783,91.88711858954129
+Offshore Wind - Class 2/Advanced,128.6041621196736,116.67504732259735,109.90234629101212,105.28209150008938,95.62559751304282,86.81253792771362,78.55494411529223,76.73589074118071,75.1657049527606,73.09586661972915,71.35988263430039,69.85669107866723,68.56633843149362,67.41342322332719,66.64181680673913,65.93029994592922,65.27274272022085,64.66403226308994,64.08713122047389,63.53879249367857,63.02862671681524,62.54152264219201,62.075428914269345,61.640636428626195,61.22323394491724,60.83374461693314,60.447045009151445,60.08574010356783,59.73698660934076
+Offshore Wind - Class 2/Moderate,143.20801026838677,137.77524684417853,133.9482076616934,131.03471837032632,128.66784667947567,126.73814859517367,118.41935916080185,110.38323274372361,102.53526722889366,94.1133499433816,86.02530203609271,84.69892850740855,83.5404904045162,82.52217090462516,81.83542051594954,81.18875791746169,80.59429353733485,80.03085980663035,79.51178813332567,79.01736856560655,78.54523325807848,78.09331206358023,77.65982587300543,77.2592463259506,76.87394491604601,76.50276488552822,76.16035436094093,75.8141922209977,75.47922534032723
+Offshore Wind - Class 2/Conservative,168.97950635843975,168.13666793780527,167.38659749776488,166.68331239520936,166.02013376861856,165.4282524815122,164.8665278050981,164.36757835793057,153.91312599249963,142.65405326199257,131.5863295168213,120.72596722683943,110.00943316542673,99.39038400001704,98.8908810706506,98.41892020825424,97.99272030378208,97.56667260661274,97.18118985888587,96.83403991901568,96.4813170518004,96.14280231469107,95.83807662814735,95.52429759517393,95.24212242537095,94.96987299531196,94.7068054911994,94.4522883147519,94.20573040215848
+Offshore Wind - Class 3/Advanced,132.01667983607706,119.7584183029842,112.81384118641235,108.05310281573516,98.12440934613375,89.0382603055761,80.50539106290881,78.64016835228873,77.02999011784225,74.90733112264222,73.11226905179319,71.58530397699617,70.24782946892469,69.06561219994224,68.28790986719002,67.55809114402629,66.88360626552087,66.24609416169832,65.65448588724085,65.09216619769964,64.5689325901833,64.06937541953121,63.591407539501425,63.145457347973085,62.71735491515025,62.317843461653375,61.92125542432429,61.55067619780767,61.19295438175021
+Offshore Wind - Class 3/Moderate,147.10525419087983,141.50541099644764,137.58325935229797,134.5971425903114,132.19963094475162,130.19316859331965,121.6123594016174,113.32122709223131,105.22311738106576,96.53675892242133,88.17408740149067,86.83319774034872,85.64577182977483,84.60189749989138,83.880427777718,83.23511464382874,82.62569652582714,82.04813661251774,81.49902043545495,80.99231538998264,80.50842847891776,80.04527882758978,79.61750039905587,79.20681159698539,78.81181983067557,78.43128339419782,78.0641250621325,77.70933910852045,77.38197016816432
+Offshore Wind - Class 3/Conservative,173.73214921534,172.86821803903175,172.0993922113509,171.37850272142649,170.6987649972536,170.09208511465775,169.51626134299372,169.00476106265648,158.2071281508639,146.55258956191471,135.15859736087924,123.94506409158467,112.85447032015013,101.8908874686276,101.3790867575975,100.9175006137864,100.4588547241598,100.04407994868049,99.64902637074526,99.27163619673105,98.91026592290132,98.58475546136076,98.25116037706472,97.95087992075977,97.64053454385167,97.3615604662788,97.09202900555265,96.83123706569864,96.578568689437
+Offshore Wind - Class 4/Advanced,139.14670865726043,126.2441954466506,118.88241989223192,113.89539446974435,103.32987583388095,93.65639184408018,84.58678102985623,82.62393017866044,80.94574039149956,78.69527420604064,76.80594334807004,75.198625609727,73.79073243559158,72.54621531596703,71.71327927804553,70.94517776765684,70.2351955990371,69.564191138862,68.94142557180372,68.3495625913209,67.7987339801043,67.27289390950554,66.76978439639963,66.30028544358073,65.84963105719326,65.41628988344856,65.01149592253842,64.62135028642054,64.24473560164941
+Offshore Wind - Class 4/Moderate,155.24275218059523,149.3529559684831,145.22719191173744,142.05526534602063,139.5335414973546,137.42302354061837,128.2948077837108,119.47146239116809,110.85139211594682,101.59156794673446,92.71524770040082,91.28606669375611,90.05641570728389,88.94005660158624,88.19987361772826,87.50299383801473,86.86216625038415,86.25490688142773,85.67758562594767,85.14470420360904,84.63590573877873,84.14893330978386,83.6990308039526,83.26714200668687,82.83475203230385,82.43467859251221,82.0654933238127,81.69243281655929,81.34815413603361
+Offshore Wind - Class 4/Conservative,183.6475358856129,182.73898574230594,181.9303775878792,181.17223330372673,180.4573543390916,179.81925662331534,179.21365710331995,178.63670277315947,167.16435503557267,154.75210316258514,142.61407212919107,130.63773483054234,118.84757270260606,107.16283936493481,106.62491178077943,106.11673061190925,105.65759478049182,105.19893776896127,104.78376253175308,104.38719958615405,104.02982498664115,103.66531326056185,103.31475900346607,102.99912528521735,102.69512126313012,102.37990571286,102.09658491005554,101.82249199540358,101.55697667908714
+Offshore Wind - Class 5/Advanced,149.1785125443912,135.33221283164676,127.46547857497583,122.08081732088405,110.73008941886664,100.31536509826597,90.551020483028,88.43520897365418,86.62694401010658,84.21960332970315,82.20080080100409,80.46921572141957,78.95265019974828,77.62800212836676,76.73077649439485,75.91881343043758,75.15415719860358,74.431409214041,73.76078327723062,73.13797181954499,72.54482368579997,71.97848451895393,71.4365885786132,70.93113188990776,70.44589081986263,69.99315053329644,69.5574021855219,69.1236289436339,68.71825539901228
+Offshore Wind - Class 5/Moderate,166.54386461913455,160.22250154890438,155.80491608312795,152.41541908376524,149.69463238027666,147.4177955577524,137.60178724489768,128.08462143888008,118.78758401605414,108.84950053071972,99.25437399830872,97.73684576106407,96.41362706944263,95.21194974104324,94.41541953881399,93.68528023865075,92.99567536117344,92.3420539755133,91.73999685712717,91.14725448169445,90.6188872024066,90.09464701387952,89.61068192380658,89.12722437927282,88.68036735301706,88.26843386223821,87.85290879828347,87.45136693832008,87.0811112343587
+Offshore Wind - Class 5/Conservative,197.18860057491474,196.20799551175324,195.33578124458614,194.5176761292052,193.7894102569525,193.10099695876954,192.44740370197084,191.82457355021734,179.4476549788034,166.05744319763775,152.96464611483637,140.07770358236368,127.33077078082053,114.75444045675717,114.17564550610238,113.62877802632178,113.13508160635175,112.66620463111826,112.21952095752042,111.79279369803358,111.38410230063639,110.99184259161964,110.63895457367795,110.29960169276967,109.94851587171836,109.6332090260012,109.32853122184497,109.03372217678917,108.74806293908178
+Offshore Wind - Class 6/Advanced,184.67518583488962,167.54271707817165,157.82480048247248,151.16852630689064,137.13121543276046,124.30820113080382,112.23364034180243,109.63669162678767,107.38742733115878,104.40999463523866,101.91001357390337,99.75672286049483,97.9064848561437,96.25934691469342,95.1384919562293,94.13406949356342,93.18820792336484,92.29417856564633,91.46980571599003,90.68638730837449,89.93989507586197,89.24965012277472,88.58938864641392,87.95660383517568,87.37115785154718,86.78647577926964,86.24505225844044,85.72308813772504,85.21916379992645
+Offshore Wind - Class 6/Moderate,206.070812375803,198.28726201427355,192.80592690599647,188.62636792562577,185.2267597979901,182.46235371078038,170.338931050189,158.56241481954362,147.11336170200246,134.82686563321076,123.01074800865528,121.1365094371191,119.48433536105186,118.01525114277287,117.04361761787673,116.09762644699357,115.2652139536877,114.44594775694499,113.69744272703055,112.9843663975138,112.3032862342301,111.68146211862287,111.05571071157465,110.48398695131755,109.93417462432822,109.40452331019374,108.89353694968916,108.39985120176544,107.9222197055808
+Offshore Wind - Class 6/Conservative,243.82780239022318,242.66206363100324,241.5755905232835,240.55623460039374,239.6631987098379,238.75093833955108,237.9505156123041,237.25600316140867,221.9571375155597,205.43710851014814,189.31032559299678,173.3972748715049,157.70700840680476,142.2008549762571,141.48891762432768,140.81649467906246,140.1788536338344,139.61171319067216,139.07189660547633,138.51756960650792,138.0248100960102,137.55224025582473,137.0981707326778,136.66097276723787,136.2777245310558,135.87027337608524,135.47615872737413,135.13233957788646,134.76190435505976
+Offshore Wind - Class 7/Advanced,253.02969905376776,229.60765659429663,216.22637964761074,207.11946993041875,187.7407906285354,170.0717667091219,153.41137267859546,149.84381115052844,146.77654834994655,142.702883039872,139.26872624808357,136.33157186849522,133.79534075015133,131.50337031255464,130.007813099713,128.60436426983617,127.32454563114372,126.11534338307513,124.96918074463453,123.92087851989469,122.88174097387308,121.92930142536046,121.01817232881572,120.18463182620341,119.34546978918921,118.57739982624157,117.83813761896447,117.12550822710489,116.43761496314784
+Offshore Wind - Class 7/Moderate,282.6088598169912,271.90853788890774,264.39636167261074,258.7049167893802,254.05226263761875,250.2633066757197,233.55118054480948,217.33075267801047,201.51549193774574,184.54444492137327,168.24965482356552,165.66409928010268,163.39683038083564,161.39370083533927,160.05419512369355,158.79321836775443,157.6014520676556,156.5264038940586,155.45043665136106,154.4782666099139,153.5498241113433,152.71489543962528,151.8619969920508,151.09537273387193,150.30572584260347,149.59661820405753,148.91288366093082,148.20075715553511,147.56266069598513
+Offshore Wind - Class 7/Conservative,334.8073801150125,333.2194308210493,331.7398685442023,330.3520935354723,329.04291501709764,327.9244616294922,326.74271814569266,325.7351168137064,304.63281609936416,281.9415448162419,259.6224737899564,237.60333747041457,215.91493146310594,194.4983884137337,193.54577183832626,192.64701037949413,191.7956735000401,190.9864989472401,190.21512396978582,189.47768556365634,188.77103572831072,188.16144926431778,187.5079628089197,186.94645845075667,186.40598659396576,185.81670988137932,185.31380876534885,184.82751973883765,184.3567270280603
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/20/df_occ.csv b/tests/data/Fixed_Offshore_Wind/R&D/20/df_occ.csv
new file mode 100644
index 0000000..045f8f4
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/20/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,3842.3701,3583.4153,3429.4759,3321.4792,2999.0614,2693.5348,2399.1137,2352.0203,2311.0401,2256.0086,2209.4435,2169.1984,2133.8401,2102.3662,2081.2931,2061.6972,2043.3962,2026.2391,2010.0994,1994.87,1980.4595,1966.7894,1953.7918,1941.4075,1929.5845,1918.2773,1907.4453,1897.0526,1887.0671
+Offshore Wind - Class 1/Moderate,4373.4293,4256.0015,4172.0581,4107.113,4054.3614,4010.0748,3722.0837,3438.8291,3159.3029,2864.6143,2576.5622,2543.4053,2514.1243,2487.9392,2470.3425,2453.932,2438.5643,2424.1202,2410.4995,2397.6174,2385.4012,2373.7884,2362.7248,2352.1629,2342.0612,2332.383,2323.0957,2314.1705,2305.5813
+Offshore Wind - Class 1/Conservative,5310.5928,5292.6419,5276.2463,5261.1643,5247.2061,5234.2197,5222.0821,5210.6919,4835.5121,4440.8387,4050.4779,3663.3763,3278.8224,2896.3131,2884.1352,2872.7465,2862.0533,2851.9778,2842.4543,2833.4271,2824.8483,2816.6767,2808.8763,2801.4159,2794.2678,2787.4076,2780.8136,2774.4665,2768.3491
+Offshore Wind - Class 2/Advanced,3835.3896,3576.9052,3423.2455,3315.445,2993.6129,2688.6414,2394.7552,2347.7473,2306.8416,2251.91,2205.4296,2165.2576,2129.9635,2098.5468,2077.512,2057.9517,2039.6839,2022.558,2006.4476,1991.2459,1976.8616,1963.2163,1950.2423,1937.8805,1926.079,1914.7923,1903.98,1893.6062,1883.6388
+Offshore Wind - Class 2/Moderate,4365.4841,4248.2695,4164.4787,4099.6515,4046.9958,4002.7896,3715.3218,3432.5817,3153.5634,2859.4101,2571.8813,2538.7847,2509.5568,2483.4194,2465.8546,2449.4739,2434.1341,2419.7162,2406.1203,2393.2616,2381.0676,2369.4759,2358.4324,2347.8897,2337.8063,2328.1457,2318.8753,2309.9663,2301.3928
+Offshore Wind - Class 2/Conservative,5300.945,5283.0267,5266.6609,5251.6063,5237.6734,5224.7107,5212.5951,5201.2255,4826.7274,4432.7709,4043.1193,3656.721,3272.8657,2891.0513,2878.8956,2867.5275,2856.8538,2846.7966,2837.2904,2828.2796,2819.7164,2811.5596,2803.7734,2796.3265,2789.1914,2782.3436,2775.7617,2769.4261,2763.3198
+Offshore Wind - Class 3/Advanced,3919.2247,3655.0904,3498.0719,3387.915,3059.0483,2747.4105,2447.1005,2399.0651,2357.2652,2301.133,2253.6366,2212.5865,2176.5209,2144.4175,2122.9229,2102.935,2084.268,2066.7677,2050.3052,2034.7712,2020.0724,2006.1289,1992.8713,1980.2393,1968.1799,1956.6464,1945.5978,1934.9972,1924.812
+Offshore Wind - Class 3/Moderate,4460.9062,4341.1295,4255.5072,4189.263,4135.4563,4090.2838,3796.5324,3507.6122,3222.495,2921.912,2628.0983,2594.2782,2564.4115,2537.7027,2519.7541,2503.0153,2487.3402,2472.6071,2458.714,2445.5743,2433.1137,2421.2687,2409.9837,2399.2106,2388.9068,2379.035,2369.562,2360.4583,2351.6973
+Offshore Wind - Class 3/Conservative,5416.8147,5398.5047,5381.7812,5366.3976,5352.1601,5338.914,5326.5336,5314.9155,4932.2315,4529.6638,4131.4951,3736.6508,3344.405,2954.2448,2941.8234,2930.2068,2919.2998,2909.0227,2899.3088,2890.101,2881.3506,2873.0155,2865.0592,2857.4495,2850.1584,2843.161,2836.4351,2829.9611,2823.7213
+Offshore Wind - Class 4/Advanced,4175.3368,3893.9419,3726.6627,3609.3073,3258.9499,2926.9473,2607.0127,2555.8384,2511.307,2451.5066,2400.9064,2357.1738,2318.7514,2284.5501,2261.6509,2240.3569,2220.47,2201.8262,2184.2878,2167.7387,2152.0794,2137.2247,2123.1008,2109.6433,2096.7958,2084.5087,2072.738,2061.4447,2050.5939
+Offshore Wind - Class 4/Moderate,4752.4159,4624.8121,4533.5946,4463.0214,4405.6986,4357.5743,4044.6269,3736.8264,3433.0774,3112.8521,2799.8383,2763.8082,2731.9898,2703.5356,2684.4141,2666.5814,2649.882,2634.1862,2619.3852,2605.3868,2592.112,2579.4929,2567.4705,2555.9933,2545.0162,2534.4994,2524.4073,2514.7087,2505.3752
+Offshore Wind - Class 4/Conservative,5770.7908,5751.2843,5733.468,5717.079,5701.9112,5687.7995,5674.6101,5662.2328,5254.5412,4825.6667,4401.4786,3980.8321,3562.954,3147.2978,3134.0646,3121.6889,3110.0691,3099.1205,3088.7718,3078.9623,3069.6401,3060.7603,3052.284,3044.1771,3036.4095,3028.9549,3021.7895,3014.8924,3008.2448
+Offshore Wind - Class 5/Advanced,4263.1798,3975.8648,3805.0662,3685.2419,3327.5134,2988.5261,2661.8605,2609.6095,2564.1412,2503.0827,2451.418,2406.7653,2367.5346,2332.6137,2309.2328,2287.4907,2267.1854,2248.1494,2230.2421,2213.3447,2197.356,2182.1888,2167.7677,2154.0271,2140.9093,2128.3637,2116.3454,2104.8145,2093.7354
+Offshore Wind - Class 5/Moderate,4852.3998,4722.1114,4628.9748,4556.9169,4498.3881,4449.2513,4129.7199,3815.4438,3505.3043,3178.3419,2858.7428,2821.9547,2789.4668,2760.4141,2740.8902,2722.6824,2705.6317,2689.6056,2674.4933,2660.2003,2646.6462,2633.7616,2621.4863,2609.7677,2598.5597,2587.8215,2577.5172,2567.6145,2558.0846
+Offshore Wind - Class 5/Conservative,5892.1998,5872.2829,5854.0918,5837.358,5821.8711,5807.4625,5793.9956,5781.3579,5365.0891,4927.1917,4494.0793,4064.583,3637.9134,3213.5123,3200.0008,3187.3647,3175.5005,3164.3215,3153.755,3143.7392,3134.2208,3125.1543,3116.4996,3108.2222,3100.2912,3092.6796,3085.3635,3078.3213,3071.5339
+Offshore Wind - Class 6/Advanced,4118.311,3840.7593,3675.7647,3560.0122,3214.4398,2886.9717,2571.4067,2520.9313,2477.0081,2418.0245,2368.1153,2324.98,2287.0824,2253.3482,2230.7618,2209.7586,2190.1433,2171.7541,2154.4553,2138.1321,2122.6868,2108.035,2094.1039,2080.8302,2068.1582,2056.0389,2044.429,2033.29,2022.5874
+Offshore Wind - Class 6/Moderate,4687.5084,4561.6474,4471.6757,4402.0665,4345.5265,4298.0594,3989.3862,3685.7896,3386.1892,3070.3374,2761.5987,2726.0607,2694.6768,2666.6113,2647.7509,2630.1618,2613.6905,2598.209,2583.6102,2569.803,2556.7095,2544.2627,2532.4045,2521.0841,2510.257,2499.8837,2489.9295,2480.3633,2471.1573
+Offshore Wind - Class 6/Conservative,5691.9745,5672.7345,5655.1615,5638.9964,5624.0357,5610.1167,5597.1074,5584.8992,5182.7758,4759.7588,4341.3641,3926.4628,3514.2919,3104.3126,3091.2602,3079.0536,3067.5925,3056.7934,3046.586,3036.9105,3027.7156,3018.9571,3010.5966,3002.6004,2994.9389,2987.586,2980.5185,2973.7157,2967.1589
+Offshore Wind - Class 7/Advanced,4314.3319,4023.5694,3850.7215,3729.4595,3367.4388,3024.3841,2693.799,2640.921,2594.9072,2533.1161,2480.8315,2435.643,2395.9416,2360.6017,2336.9402,2314.9373,2294.3884,2275.1239,2257.0017,2239.9017,2223.7211,2208.3719,2193.7778,2179.8723,2166.5971,2153.901,2141.7385,2130.0693,2118.8572
+Offshore Wind - Class 7/Moderate,4910.6216,4778.77,4684.5158,4611.5934,4552.3623,4502.6359,4179.2706,3861.2236,3547.363,3216.4775,2893.0436,2855.8141,2822.9364,2793.5351,2773.777,2755.3507,2738.0953,2721.877,2706.5833,2692.1189,2678.4022,2665.363,2652.9404,2641.0812,2629.7387,2618.8717,2608.4437,2598.4222,2588.778
+Offshore Wind - Class 7/Conservative,5962.8977,5942.7419,5924.3324,5907.3979,5891.7251,5877.1437,5863.5152,5850.7259,5429.4625,4986.3109,4548.0017,4113.3522,3681.5631,3252.0698,3238.3962,3225.6085,3213.6019,3202.2888,3191.5956,3181.4595,3171.827,3162.6516,3153.8932,3145.5163,3137.4902,3129.7874,3122.3834,3115.2568,3108.3879
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/20/df_tc.csv b/tests/data/Fixed_Offshore_Wind/R&D/20/df_tc.csv
new file mode 100644
index 0000000..055bed5
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/20/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Moderate,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Conservative,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+ITC Schedule/*,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Moderate,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Conservative,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PFF/Advanced,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Moderate,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Conservative,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+Year (Advanced)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Moderate)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Conservative)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/20/df_vom.csv b/tests/data/Fixed_Offshore_Wind/R&D/20/df_vom.csv
new file mode 100644
index 0000000..90cc094
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/20/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/30/df_capex.csv b/tests/data/Fixed_Offshore_Wind/R&D/30/df_capex.csv
new file mode 100644
index 0000000..b019daf
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/30/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,5462.550832369848,5094.404759063653,4875.5549262092645,4722.020175198692,4263.651146110876,3829.295613124674,3410.728337949633,3343.7774992451323,3285.5174365197136,3207.2812724221576,3141.08145831941,3083.8665548677945,3033.5990170228683,2988.8537384617885,2958.8949081013798,2931.03615273454,2905.0183721997228,2880.626813817036,2857.6815376796812,2836.0305427943017,2815.5436693022525,2796.109383287182,2777.6312289765,2760.02494615507,2743.21658539724,2727.1416211172086,2711.7421798514206,2696.967261995978,2682.7713005134847
+Offshore Wind - Class 1/Moderate,6217.537549003377,6050.594891259246,5931.2557072685795,5838.925802633735,5763.930885101322,5700.97021105834,5291.544282275952,4888.852075107402,4491.460278945741,4072.51283498425,3663.0000960065295,3615.862270810396,3574.2345093406543,3537.008235424742,3511.991599288189,3488.66149787881,3466.8138219123107,3446.2791640087826,3426.9151687521285,3408.6011001235547,3391.233850228222,3374.724391496717,3358.9956701796727,3343.980167236275,3329.6190113846337,3315.8598725964,3302.656518621953,3289.967817172063,3277.756959836958
+Offshore Wind - Class 1/Conservative,7549.867055466588,7524.346964544596,7501.037928189001,7479.5964751544225,7459.752640146307,7441.2903400603145,7424.034734950038,7407.84169550011,6874.463003342234,6313.370793819921,5758.409845373221,5208.082210940681,4661.376657071959,4117.577748019326,4100.26493465772,4084.0740017131716,4068.8719067407287,4054.548002773674,4041.008827494427,4028.175109779539,4015.978997982083,4004.3617316888726,3993.272200427305,3982.66605671573,3972.5038312954784,3962.750933130862,3953.3765407221345,3944.3531586306726,3935.6561740041584
+Offshore Wind - Class 2/Advanced,5358.739142998236,4997.589328397251,4782.898624109471,4632.281715654107,4182.623529780819,3756.522615291665,3345.909947900305,3280.231438444361,3223.078621467056,3146.329206691839,3081.3876415122254,3025.26002744198,2975.9477343518092,2932.0528187513814,2902.663410055368,2875.334052750732,2849.810635767615,2825.882619436882,2803.3735007815626,2782.133828788493,2762.0364370540406,2742.9714546924165,2724.8444215677036,2707.5726296266243,2691.083792474087,2675.3142714739247,2660.2075235870307,2645.713436159141,2631.787107365084
+Offshore Wind - Class 2/Moderate,6099.377897155915,5935.607747380369,5818.536715338725,5727.961307946685,5654.391607605821,5592.627539486479,5190.982487228406,4795.942992362201,4406.103572325649,3995.1177208761983,3593.3875214533555,3547.1455153865654,3506.308802120767,3469.790092274592,3445.2488611413337,3422.362012811054,3400.929540141509,3380.7851400765067,3361.7891180488486,3343.823177151232,3326.785983388085,3310.5901722205545,3295.16046379854,3280.4303368995647,3266.3420289287787,3252.8444294135797,3239.891971316572,3227.4444092981566,3215.4657110294934
+Offshore Wind - Class 2/Conservative,7406.3874307080805,7381.352390366644,7358.4863853527395,7337.4523748058255,7317.985493391741,7299.874203623014,7282.946548139545,7267.061169343569,6743.818981066585,6193.3899017697695,5648.975449671825,5109.10650357437,4572.7905668380645,4039.326284040601,4022.3425289928423,4006.4591458335417,3991.546085572757,3977.494364274333,3964.21240438866,3951.6227086915546,3939.658312485724,3928.26178578243,3917.383126796111,3906.9784315199345,3897.0093393822713,3887.441702822251,3878.245587289759,3869.393608214876,3860.8620396949195
+Offshore Wind - Class 3/Advanced,5563.666194857099,5188.705465783053,4965.804712217284,4809.427731107721,4342.574030961793,3900.178299552324,3473.8631867267977,3405.6729467788646,3346.3344641684057,3266.6501330575466,3199.2249980367915,3140.950965854653,3089.752906975992,3044.179439195086,3013.6660435766357,2985.291526998198,2958.792132812655,2933.9490061980596,2910.5791029239003,2888.527317673103,2867.6611623442363,2847.867218252979,2829.0469231213624,2811.114797178504,2793.9954497055987,2777.6226920862823,2761.9383182508886,2746.889887302366,2732.431056122389
+Offshore Wind - Class 3/Moderate,6332.62824425191,6162.59523224895,6041.0472110659675,5947.008043619602,5870.624939042819,5806.498813182058,5389.494232391682,4979.34787876988,4574.600276695524,4147.897677749075,3730.8046237328062,3682.7941509664915,3640.395852003069,3602.4805290910094,3577.0010161147275,3553.2388593653677,3530.9867343662136,3510.0719076762357,3490.3494738991394,3471.696590510754,3454.00771050475,3437.1928084933766,3421.172724221887,3405.879495174652,3391.252365301811,3377.238561100198,3363.790852501856,3350.8673311366247,3338.4304125138055
+Offshore Wind - Class 3/Conservative,7689.620050473284,7663.627437134304,7639.887121519657,7618.048758524303,7597.837393762009,7579.033507198603,7561.458489351737,7544.965660925851,7001.713778059379,6430.2353883344795,5865.001678369514,5304.48731653311,4747.661667351704,4193.796766914002,4176.163542997469,4159.672821076962,4144.189452202149,4129.6002394261195,4115.8105008755465,4102.73930239642,4090.317351048657,4078.4849994694414,4067.19036110524,4056.387758049952,4046.037499307501,4036.103996023863,4026.5560940931773,4017.3657437332995,4008.5077777483943
+Offshore Wind - Class 4/Advanced,5975.833019742907,5573.094469456032,5333.680820228931,5165.719279093875,4664.280086695629,4189.110790265383,3731.213396644922,3657.97153506216,3594.2372192017824,3508.6496839396987,3436.2295811919234,3373.638432539796,3318.6475552929614,3269.697913733989,3236.9240161071007,3206.4475397671245,3177.98499343761,3151.3015572032164,3126.2003282454148,3102.5147817706065,3080.1028949688057,3058.8426013967687,3038.628132310759,3019.367466686351,3000.9797812382362,2983.394230864478,2966.5477312724283,2950.3845155039116,2934.854692642071
+Offshore Wind - Class 4/Moderate,6801.761183217273,6619.1318233949605,6488.579378668923,6387.573443592643,6305.531822094643,6236.6551939994615,5788.758157491227,5348.227348553873,4913.495194579753,4455.1817107127035,4007.1895488563277,3955.6225189303327,3910.0833095790017,3869.359017179189,3841.99196451515,3816.4694344816667,3792.568802720853,3770.1046967594084,3748.921124330627,3728.886373414007,3709.887136193929,3691.8264025542844,3674.6196905425268,3658.1932724704134,3642.4826227521417,3627.430754873791,3612.986669231462,3599.105907474802,3585.7475590519857
+Offshore Wind - Class 4/Conservative,8259.281523874955,8231.363342882703,8205.864317014495,8182.408047019821,8160.699511276999,8140.502559446241,8121.625610406816,8103.9108979927505,7520.413786396996,6906.599295051689,6299.492027699934,5697.453566632146,5099.377331312438,4504.481143033195,4485.541553175938,4467.829169004659,4451.198641648249,4435.528791613096,4420.717508822699,4406.677872213025,4393.335821489715,4380.626831066969,4368.49535572402,4356.89261323105,4345.775475662155,4335.106247657932,4324.850892526213,4314.979697454295,4305.465499609663
+Offshore Wind - Class 5/Advanced,6282.856400383134,5859.426312976391,5607.712002763843,5431.121106911791,4903.919131998218,4404.336990394094,3922.9139229701746,3845.90906670065,3778.9002436638907,3688.91532299003,3612.774466531764,3546.9676819851466,3489.1514266823465,3437.686839438965,3403.2291788025045,3371.186903754147,3341.2619992172013,3313.2076714562813,3286.816817732078,3261.9142654920715,3238.350896329211,3215.9983242841176,3194.745237177849,3174.494957500406,3155.162670693132,3136.673651249446,3118.961710552984,3101.9679773218536,3085.640232396413
+Offshore Wind - Class 5/Moderate,7151.218784281058,6959.206384291097,6821.946382965393,6715.751127323762,6629.494388563569,6557.079053170072,6086.1701084333035,5623.006007892007,5165.9382447845255,4684.077800322827,4213.068962883639,4158.852503535129,4110.973631920612,4068.157136205224,4039.3838248980423,4012.5501615695575,3987.42165891054,3963.8032988704326,3941.531439241944,3920.467161538803,3900.4918362475946,3881.503242423113,3863.4124633646497,3846.142223585428,3829.624449701114,3813.7990508740713,3798.613031863727,3784.018940864715,3769.9743151633556
+Offshore Wind - Class 5/Conservative,8683.622841160915,8654.270351743377,8627.461190398502,8602.799777589971,8579.97601355234,8558.741330650955,8538.894502187832,8520.269668581588,7906.793991996092,7261.443230368062,6623.144272666011,5990.174662702622,5361.370722559387,4735.910139057796,4715.997565453123,4697.375170958373,4679.8902893679615,4663.415310803441,4647.842914359215,4633.082076829197,4619.054414039568,4605.692628686925,4592.937849489374,4580.738965974315,4569.05063284176,4557.833048226926,4547.050955881901,4536.672536488602,4526.66962939618
+Offshore Wind - Class 6/Advanced,6054.327951395894,5646.2993008916155,5403.740750003257,5233.573032524783,4725.547130414371,4244.13636941661,3780.224348597275,3706.0204792688073,3641.448993823569,3554.7372499016396,3481.3657828037544,3417.9525427105277,3362.2392449876024,3312.6466758134006,3279.4423858770924,3248.565562646515,3219.729167046685,3192.6951639698427,3167.264211485968,3143.2674565586763,3120.561324216123,3099.0217523783913,3078.5416418772934,3059.0279738700683,3040.3988163843655,3022.5823264999117,3005.514532974426,2989.1391145062103,2973.405182360072
+Offshore Wind - Class 6/Moderate,6891.104950175169,6706.076724201667,6573.809362360196,6471.476883239043,6388.357507068228,6318.576079478668,5864.795684317246,5418.478415974113,4978.035969393947,4513.70231489282,4059.8255748275124,4007.5811371193035,3961.443680240505,3920.184668080688,3892.4579573404626,3866.600271214404,3842.385770152208,3819.626420831674,3798.1647896929426,3777.866725604021,3758.618033799659,3740.320041133183,3722.8872678337116,3706.2450992633676,3690.3282337554206,3675.0784652402026,3660.4447941138183,3646.3815424701647,3632.8477997574205
+Offshore Wind - Class 6/Conservative,8367.770320398857,8339.48560747076,8313.651536378682,8289.887273123944,8267.893472205405,8247.43121156567,8228.306249235115,8210.358934279791,7619.19746916776,6997.320273052247,6382.238330681363,5772.292048423035,5166.359656728911,4563.649220445412,4544.460841216094,4526.515965372261,4509.6670266687215,4493.791293450005,4478.785325215162,4464.561424819229,4451.0439798059915,4438.168131983535,4425.877338312755,4414.122151351611,4402.8589996993815,4392.049522784438,4381.65957304591,4371.658772458867,4362.019625584684
+Offshore Wind - Class 7/Advanced,6421.601266263206,5988.820290613011,5731.547467050367,5551.056875399363,5012.212688734152,4501.598224119789,4009.5438457884584,3930.838485335038,3862.3498977043,3770.377877246376,3692.5556968900287,3625.295534501015,3566.202626070197,3513.6015237408124,3478.382860319226,3445.6330212011326,3415.0473391875917,3386.373366239308,3359.3996757375103,3333.9474364624434,3309.863649602413,3287.0173792178434,3265.2949848870057,3244.5975717258207,3224.838329538955,3205.9409806579697,3187.8378951733484,3170.469093116158,3153.780581427489
+Offshore Wind - Class 7/Moderate,7309.139612095586,7112.887038516299,6972.595886819772,6864.055647217157,6775.89396238266,6701.87945680084,6220.5713602231,5747.179178251301,5280.018150057534,4787.51663824246,4306.1064315882195,4250.69281197255,4201.756474658073,4157.994601502596,4128.585901652064,4101.1595342313185,4075.476022839443,4051.3361364151237,4028.5724632151287,4007.0432021668807,3986.6267303019517,3967.2187201697593,3948.7284811703275,3931.0768530489104,3914.194321128019,3898.019464145569,3882.498067305242,3867.5817918520374,3853.2269555165312
+Offshore Wind - Class 7/Conservative,8875.383790929918,8845.383273936757,8817.98185197444,8792.775962959942,8769.448078924646,8747.744532273511,8727.459439822973,8708.423394193125,8081.400338044277,7421.798180581692,6769.403486705676,6122.456104869517,5479.766192140526,4840.493585478835,4820.141306593594,4801.107589206534,4783.23655191965,4766.397813136889,4750.481612841166,4735.394710452311,4721.057391372057,4707.4003626603235,4694.364087822995,4681.8955716195005,4669.949247012442,4658.484092581294,4647.463854259805,4636.856269255077,4626.632400835331
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/30/df_fin_assump.csv b/tests/data/Fixed_Offshore_Wind/R&D/30/df_fin_assump.csv
new file mode 100644
index 0000000..ca9ad50
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/30/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),30
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/30/df_fom.csv b/tests/data/Fixed_Offshore_Wind/R&D/30/df_fom.csv
new file mode 100644
index 0000000..c78b3e0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/30/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,90.662,84.9785,81.599875,79.229625,77.420125,75.96575,74.755,73.721375,72.822,71.614125,70.592125,69.708875,68.932875,68.242125,67.779625,67.3495,66.94787500000001,66.57124999999999,66.217,65.88275,65.5665,65.26650000000001,64.98125,64.709375,64.44987499999999,64.20175,63.964,63.735875,63.51675
+Offshore Wind - Class 1/Moderate,90.662,87.639125,85.47825,83.806375,82.4485,81.30850000000001,80.32825000000001,79.469875,78.7075,77.55475,76.57300000000001,75.719375,74.96562499999999,74.29162500000001,73.83862500000001,73.41624999999999,73.020625,72.64875,72.298125,71.9665,71.652125,71.353125,71.068375,70.7965,70.53637499999999,70.28725,70.04825,69.8185,69.597375
+Offshore Wind - Class 1/Conservative,90.662,90.167625,89.716125,89.30075000000001,88.916375,88.55874999999999,88.2245,87.910875,87.615375,86.78312500000001,86.06975,85.44600000000001,84.892375,84.395125,84.05975,83.74612499999999,83.45174999999999,83.17425,82.912,82.663375,82.42712499999999,82.20212500000001,81.98724999999999,81.781875,81.58500000000001,81.396125,81.21449999999999,81.03975,80.87125
+Offshore Wind - Class 2/Advanced,90.45362499999999,84.78325,81.41237500000001,79.0475,77.242375,75.79125,74.58325,73.55199999999999,72.65475,71.449625,70.43,69.54875,68.77449999999999,68.08525,67.623875,67.19475,66.794,66.418375,66.064875,65.731375,65.415875,65.1165,64.831875,64.56075,64.301875,64.05425,63.817125,63.5895,63.370875
+Offshore Wind - Class 2/Moderate,90.45362499999999,87.43775,85.281875,83.613875,82.259125,81.12175,80.14362500000001,79.28725,78.526625,77.376625,76.397,75.5455,74.7935,74.121,73.669,73.2475,72.852875,72.481875,72.132125,71.80125000000001,71.4875,71.18925,70.905125,70.633875,70.374375,70.12587500000001,69.88725,69.658125,69.4375
+Offshore Wind - Class 2/Conservative,90.45362499999999,89.9605,89.51,89.095625,88.712125,88.35525000000001,88.02187500000001,87.708875,87.41412499999998,86.583875,85.87199999999999,85.24974999999999,84.69737500000001,84.20125,83.86675,83.55375000000001,83.26,82.983125,82.72149999999999,82.4735,82.23775,82.01325,81.799,81.594,81.397625,81.209125,81.027875,80.8535,80.6855
+Offshore Wind - Class 3/Advanced,90.520875,84.84625,81.47287499999999,79.10624999999999,77.29974999999999,75.8475,74.638625,73.60674999999999,72.708625,71.50274999999999,70.482375,69.600375,68.825625,68.135875,67.674125,67.244625,66.843625,66.467625,66.114,65.78025,65.4645,65.164875,64.88012499999999,64.60875,64.349625,64.101875,63.8645,63.63675,63.417874999999995
+Offshore Wind - Class 3/Moderate,90.520875,87.50275,85.34525000000001,83.67599999999999,82.32025,81.182,80.20325,79.346125,78.58500000000001,77.434125,76.45375,75.601625,74.84899999999999,74.176,73.72375,73.30199999999999,72.907,72.53575,72.185625,71.854625,71.540625,71.242125,70.95775,70.68625,70.426625,70.177875,69.93925,69.709875,69.489
+Offshore Wind - Class 3/Conservative,90.520875,90.02725,89.5765,89.16175000000001,88.778,88.421,88.08725000000001,87.774,87.479125,86.648125,85.93575,85.313,84.76037500000001,84.26387500000001,83.92899999999999,83.615875,83.321875,83.04475,82.783,82.53475,82.29887500000001,82.07412500000001,81.85974999999999,81.65462500000001,81.458,81.269375,81.088125,80.91362500000001,80.745375
+Offshore Wind - Class 4/Advanced,90.50575,84.832,81.45925,79.093,77.28675,75.83487500000001,74.62625,73.594375,72.6965,71.49074999999999,70.4705,69.58875,68.81412499999999,68.1245,67.66275,67.23349999999999,66.8325,66.4565,66.102875,65.76925,65.4535,65.154,64.86925000000001,64.597875,64.338875,64.091125,63.85375,63.626125,63.40725
+Offshore Wind - Class 4/Moderate,90.50575,87.488125,85.33099999999999,83.66199999999999,82.3065,81.16837500000001,80.18974999999999,79.332875,78.571875,77.421125,76.441,75.589,74.8365,74.163625,73.711375,73.28975,72.89475,72.52362500000001,72.173625,71.8425,71.528625,71.23025,70.945875,70.6745,70.414875,70.166125,69.9275,69.698125,69.4775
+Offshore Wind - Class 4/Conservative,90.50575,90.01225,89.5615,89.146875,88.76312499999999,88.406125,88.07249999999999,87.75937499999999,87.46449999999999,86.633625,85.921375,85.29875000000001,84.74612499999999,84.24975,83.915,83.601875,83.307875,83.03087500000001,82.769125,82.521,82.28512500000001,82.06049999999999,81.846,81.64087500000001,81.44437500000001,81.255875,81.0745,80.9,80.731875
+Offshore Wind - Class 5/Advanced,91.497125,85.76124999999999,82.35150000000002,79.959375,78.133375,76.6655,75.443625,74.40050000000001,73.49275,72.273875,71.2425,70.351,69.567875,68.870625,68.403875,67.969875,67.5645,67.1845,66.827,66.48962499999999,66.1705,65.867625,65.57975,65.3055,65.043625,64.793125,64.55325,64.323,64.101875
+Offshore Wind - Class 5/Moderate,91.497125,88.44637499999999,86.265625,84.578375,83.208,82.0575,81.06812500000001,80.201875,79.4325,78.269125,77.27825,76.416875,75.65625,74.976,74.51875,74.0925,73.69325,73.318,72.964125,72.62950000000001,72.312125,72.010375,71.723,71.448625,71.186125,70.93475,70.6935,70.461625,70.2385
+Offshore Wind - Class 5/Conservative,91.497125,90.998125,90.54249999999999,90.123375,89.735375,89.3745,89.03712499999999,88.720625,88.4225,87.58262500000001,86.8625,86.233125,85.674375,85.172625,84.834125,84.517625,84.220375,83.94037499999999,83.67575000000001,83.42487500000001,83.186375,82.95925,82.7425,82.535125,82.3365,82.145875,81.962625,81.78625,81.61612500000001
+Offshore Wind - Class 6/Advanced,90.82724999999999,85.133375,81.748625,79.374,77.56125,76.104125,74.89125,73.85575,72.95474999999999,71.74475,70.720875,69.836,69.0585,68.3665,67.903125,67.47225,67.069875,66.692625,66.33775,66.002875,65.686,65.3855,65.099625,64.827375,64.567375,64.31875,64.080625,63.852125,63.6325
+Offshore Wind - Class 6/Moderate,90.82724999999999,87.798875,85.634,83.95925,82.59875,81.456625,80.474625,79.61475,78.851,77.696125,76.71249999999999,75.8575,75.102375,74.427,73.97325000000001,73.55000000000001,73.15375,72.78125,72.43,72.09774999999999,71.782625,71.48325,71.197875,70.9255,70.66499999999999,70.415375,70.175875,69.94575,69.72425
+Offshore Wind - Class 6/Conservative,90.82724999999999,90.33200000000001,89.879625,89.46350000000001,89.07849999999999,88.720125,88.38525000000001,88.07112500000001,87.775125,86.941375,86.22662500000001,85.60175,85.047125,84.549,84.21300000000001,83.898875,83.60374999999999,83.32587500000001,83.06312500000001,82.814,82.57737499999999,82.351875,82.13675,81.93087500000001,81.73375,81.544375,81.36250000000001,81.187375,81.01862499999999
+Offshore Wind - Class 7/Advanced,91.0155,85.309875,81.91812499999999,79.538625,77.722125,76.262,75.046625,74.009,73.106,71.8935,70.8675,69.98075,69.20175,68.50825,68.043875,67.612125,67.209,66.830875,66.47525,66.13974999999999,65.82225,65.521,65.234625,64.96175,64.70125,64.452125,64.21350000000001,63.984500000000004,63.7645
+Offshore Wind - Class 7/Moderate,91.0155,87.981,85.81162499999999,84.13325,82.770125,81.625625,80.6415,79.779875,79.0145,77.85725000000001,76.87162500000001,76.01474999999999,75.25812499999999,74.58137500000001,74.12662499999999,73.7025,73.305375,72.932125,72.58012500000001,72.24725000000001,71.9315,71.6315,71.3455,71.072625,70.8115,70.561375,70.321375,70.09075,69.868875
+Offshore Wind - Class 7/Conservative,91.0155,90.51925,90.066,89.649125,89.263125,88.904125,88.568625,88.25375,87.957125,87.121625,86.405375,85.77925,85.2235,84.724375,84.38762499999999,84.07287500000001,83.77725,83.498625,83.235375,82.98575,82.74862499999999,82.52274999999999,82.30712499999998,82.100875,81.90325,81.71350000000001,81.53125,81.35575,81.18662499999999
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/30/df_gcc.csv b/tests/data/Fixed_Offshore_Wind/R&D/30/df_gcc.csv
new file mode 100644
index 0000000..d9068d0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/30/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,1084.6748,1011.5737,968.1176,937.6309,846.6146,760.3665,677.2534,663.9593,652.3908,636.8558,623.7108,612.3499,602.3685,593.4836,587.5348,582.003,576.8368,571.9935,567.4373,563.1382,559.0702,555.2112,551.5421,548.0461,544.7085,541.5166,538.4588,535.525,532.7062
+Offshore Wind - Class 1/Moderate,1234.5893,1201.4402,1177.7435,1159.41,1144.5186,1132.0167,1050.7188,970.758,891.8496,808.6611,727.3459,717.986,709.7201,702.3283,697.3608,692.7283,688.3901,684.3126,680.4676,676.831,673.3825,670.1043,666.9811,663.9995,661.1479,658.4158,655.7941,653.2745,650.8499
+Offshore Wind - Class 1/Conservative,1499.1441,1494.0767,1489.4483,1485.1908,1481.2505,1477.5845,1474.1581,1470.9427,1365.0321,1253.6184,1143.4223,1034.1461,925.5892,817.6094,814.1717,810.9567,807.9381,805.0939,802.4055,799.8571,797.4354,795.1286,792.9266,790.8206,788.8027,786.8661,785.0047,783.213,781.486
+Offshore Wind - Class 2/Advanced,998.0205,930.7594,890.775,862.7239,778.9788,699.621,623.1478,610.9158,600.2715,585.9776,573.8828,563.4295,554.2455,546.0704,540.5969,535.507,530.7535,526.2971,522.105,518.1492,514.4063,510.8556,507.4796,504.2628,501.1919,498.255,495.4415,492.7421,490.1484
+Offshore Wind - Class 2/Moderate,1135.9583,1105.4575,1083.654,1066.7851,1053.0833,1041.5803,966.7772,893.2044,820.6001,744.0574,669.2385,660.6263,653.0208,646.2195,641.6489,637.3864,633.3948,629.6431,626.1052,622.7592,619.5862,616.5698,613.6962,610.9528,608.329,605.8152,603.4029,601.0846,598.8537
+Offshore Wind - Class 2/Conservative,1379.3779,1374.7154,1370.4568,1366.5394,1362.9138,1359.5407,1356.3881,1353.4296,1255.9801,1153.4673,1052.0746,951.5285,851.6441,752.2909,749.1278,746.1696,743.3922,740.7752,738.3015,735.9568,733.7285,731.606,729.58,727.6422,725.7855,724.0036,722.2909,720.6423,719.0534
+Offshore Wind - Class 3/Advanced,1099.023,1024.9548,980.924,950.0339,857.8136,770.4247,686.2122,672.7422,661.0207,645.2802,631.9613,620.4501,610.3367,601.3343,595.3068,589.7018,584.4672,579.5598,574.9434,570.5874,566.4656,562.5556,558.8379,555.2957,551.914,548.6798,545.5816,542.609,539.7528
+Offshore Wind - Class 3/Moderate,1250.9205,1217.3329,1193.3228,1174.7467,1159.6583,1146.9911,1064.6178,983.5992,903.6471,819.3581,736.9673,727.4835,719.1083,711.6187,706.5856,701.8917,697.4961,693.3647,689.4688,685.7842,682.29,678.9685,675.8039,672.783,669.8936,667.1254,664.469,661.9161,659.4594
+Offshore Wind - Class 3/Conservative,1518.9749,1513.8404,1509.1509,1504.837,1500.8445,1497.1301,1493.6584,1490.4005,1383.0888,1270.2014,1158.5475,1047.8259,937.8329,828.4248,824.9416,821.6841,818.6256,815.7437,813.0197,810.4377,807.9839,805.6466,803.4155,801.2816,799.2371,797.2748,795.3888,793.5734,791.8236
+Offshore Wind - Class 4/Advanced,1214.6721,1132.8098,1084.1456,1050.0051,948.0805,851.4957,758.4216,743.5341,730.5792,713.1824,698.462,685.7394,674.5618,664.6121,657.9503,651.7555,645.9701,640.5463,635.4442,630.6297,626.0742,621.7528,617.6439,613.7289,609.9913,606.4168,602.9925,599.7071,596.5505
+Offshore Wind - Class 4/Moderate,1382.5536,1345.4316,1318.895,1298.3641,1281.688,1267.6878,1176.6465,1087.1024,998.737,905.5783,814.5176,804.0359,794.7794,786.5016,780.9389,775.7511,770.8929,766.3268,762.0209,757.9486,754.0867,750.4156,746.9181,743.5792,740.3858,737.3263,734.3903,731.5689,728.8536
+Offshore Wind - Class 4/Conservative,1678.8151,1673.1403,1667.9573,1663.1895,1658.7769,1654.6716,1650.8346,1647.2338,1528.6298,1403.8634,1280.4603,1158.0875,1036.5201,915.5991,911.7494,908.1491,904.7687,901.5836,898.573,895.7192,893.0073,890.424,887.9581,885.5997,883.34,881.1713,879.0867,877.0803,875.1464
+Offshore Wind - Class 5/Advanced,1403.7543,1309.149,1252.9094,1213.4544,1095.6637,984.044,876.4815,859.2766,844.3051,824.2001,807.1882,792.4853,779.5676,768.0691,760.3703,753.2113,746.5253,740.2572,734.3608,728.7969,723.5322,718.5381,713.7896,709.2651,704.9458,700.8149,696.8576,693.0607,689.4127
+Offshore Wind - Class 5/Moderate,1597.7692,1554.8686,1524.2011,1500.4743,1481.2023,1465.0228,1359.8095,1256.3265,1154.2056,1046.5454,941.3097,929.1963,918.499,908.9326,902.5039,896.5086,890.8942,885.6173,880.6411,875.9348,871.4718,867.2293,863.1873,859.3287,855.6382,852.1024,848.7094,845.4487,842.3108
+Offshore Wind - Class 5/Conservative,1940.1483,1933.5902,1927.6003,1922.0903,1916.9909,1912.2465,1907.8122,1903.6509,1766.5844,1622.3962,1479.7835,1338.3616,1197.8703,1058.1261,1053.6771,1049.5164,1045.6098,1041.9289,1038.4496,1035.1516,1032.0175,1029.0321,1026.1824,1023.4568,1020.8453,1018.339,1015.93,1013.6112,1011.3763
+Offshore Wind - Class 6/Advanced,1342.4978,1252.0208,1198.2354,1160.5021,1047.8515,941.1026,838.2339,821.7798,807.4616,788.234,771.9645,757.9031,745.5491,734.5524,727.1896,720.3429,713.9487,707.9541,702.315,696.9939,691.959,687.1828,682.6415,678.3145,674.1836,670.233,666.4483,662.8172,659.3283
+Offshore Wind - Class 6/Moderate,1528.0463,1487.0178,1457.6886,1434.9972,1416.5662,1401.0927,1300.4706,1201.5034,1103.8389,1000.8767,900.2332,888.6484,878.4178,869.269,863.1208,857.3871,852.0177,846.971,842.2121,837.7111,833.4429,829.3855,825.5199,821.8296,818.3002,814.9187,811.6738,808.5554,805.5544
+Offshore Wind - Class 6/Conservative,1855.4848,1849.2129,1843.4844,1838.2149,1833.3379,1828.8006,1824.5598,1820.5801,1689.4949,1551.5987,1415.2093,1279.9587,1145.5981,1011.952,1007.6971,1003.718,999.9819,996.4616,993.1341,989.9801,986.9827,984.1276,981.4022,978.7956,976.2981,973.9012,971.5973,969.3797,967.2423
+Offshore Wind - Class 7/Advanced,1477.7456,1378.1536,1318.9497,1277.415,1153.4156,1035.9125,922.6804,904.5687,888.808,867.6433,849.7348,834.2568,820.6583,808.5537,800.4491,792.9127,785.8743,779.2758,773.0686,767.2115,761.6693,756.4119,751.4131,746.6502,742.1032,737.7545,733.5886,729.5917,725.7513
+Offshore Wind - Class 7/Moderate,1681.9869,1636.825,1604.5411,1579.5637,1559.2758,1542.2435,1431.4844,1322.5469,1215.0433,1101.7083,990.9257,978.1739,966.9126,956.8421,950.0745,943.7631,937.8528,932.2977,927.0593,922.105,917.4067,912.9405,908.6855,904.6235,900.7385,897.0163,893.4445,890.012,886.7086
+Offshore Wind - Class 7/Conservative,2042.4126,2035.5089,2029.2032,2023.4028,2018.0346,2013.0401,2008.3721,2003.9915,1859.7003,1707.912,1557.7822,1408.906,1261.0095,1113.8995,1109.216,1104.8359,1100.7234,1096.8485,1093.1858,1089.714,1086.4147,1083.2719,1080.272,1077.4027,1074.6536,1072.0152,1069.4793,1067.0382,1064.6855
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/30/df_lcoe.csv b/tests/data/Fixed_Offshore_Wind/R&D/30/df_lcoe.csv
new file mode 100644
index 0000000..bedff3f
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/30/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,103.40317651354756,93.83552332547741,88.38416017922718,84.68012161423933,77.14512207651676,70.26246556690451,63.83493200218667,62.371793297517186,61.119269551259265,59.444109522265805,58.047423377340834,56.847905060619134,55.7961322903013,54.875937924242514,54.25999214175378,53.68163573751737,53.15658739073624,52.660333920666694,52.18977615591292,51.76187369220304,51.344651093817355,50.955702663160864,50.58355269932716,50.23620015653551,49.89338196698751,49.5821776329635,49.27338216952091,48.97552322430973,48.696963592188766
+Offshore Wind - Class 1/Moderate,114.64277447823692,110.26843605207448,107.17467377121368,104.83154688589475,102.94620582856926,101.36552497904235,94.93759163414131,88.69251450397302,82.59834692215561,76.04503255897754,69.75834888242713,68.69565040491996,67.76718306947242,66.93707649058867,66.38653324626279,65.86826604726527,65.39153082866716,64.92674805364868,64.5103754477146,64.10101785789969,63.722551004411216,63.36031552296506,63.02551998078098,62.69161262336864,62.38258418527363,62.084919700486424,61.79775093688678,61.52028321453995,61.26401837997586
+Offshore Wind - Class 1/Conservative,134.47735921889574,133.80573968350197,133.17908336715539,132.61867354024565,132.11869828751352,131.61857783367836,131.17082156649968,130.74451588437614,122.71178430551302,113.98175123984052,105.42953172095388,97.01968713091945,88.74534034744399,80.54793276124373,80.14661961991082,79.76759104437512,79.40824923920212,79.08290995507494,78.77307286392417,78.4771648535127,78.19387263311494,77.92204842432068,77.66065868949272,77.42503354968763,77.18199514522918,76.96314233429182,76.7516952513619,76.54715617790619,76.34901069317019
+Offshore Wind - Class 2/Advanced,106.01405177298092,96.19879214096234,90.62623298835253,86.82470013159153,79.10557913141753,72.07670567539827,65.50269270407097,64.00267674108171,62.7078687600933,61.00120396781065,59.56979653079143,58.33017355121486,57.266279750484244,56.315573656810216,55.67926152771845,55.09253206581743,54.550348179553495,54.04850674960882,53.572815032316036,53.12061238143435,52.69997366610814,52.29829459077495,51.91389299291383,51.555403729105606,51.21121199213105,50.89014088810694,50.571197280992386,50.273300068817235,49.985726797890855
+Offshore Wind - Class 2/Moderate,117.49568950297652,113.01189172785763,109.85340116381433,107.4488237448314,105.49552008573006,103.90278278752436,97.29668513327927,90.92227281911892,84.70196181635406,78.00532080101459,71.58305386365147,70.48468437321498,69.52540724959758,68.68221202332577,68.1135412540072,67.57803230611043,67.08579308197058,66.61921822650528,66.18943092808139,65.78003162790098,65.38906654867124,65.01482270077555,64.65582895604554,64.3241415914059,64.00508926302182,63.69772299329296,63.4142339651626,63.12756378834895,62.850148842578676
+Offshore Wind - Class 2/Conservative,137.7574026386379,137.06152536265486,136.44204914659454,135.8613736158877,135.3139577666779,134.82514164681385,134.36134238026716,133.9490747763089,125.70969957244307,116.80386329751826,108.0550222580837,99.47618793229994,91.01527873724973,82.63410727830549,82.21963694346161,81.82800352536498,81.47437438829604,81.120824912188,80.80096778423605,80.51294726303242,80.22025893807148,79.9393580674789,79.68652750167739,79.42614173600404,79.19201354144016,78.96611668248077,78.74783273076154,78.5366447673733,78.33206116672389
+Offshore Wind - Class 3/Advanced,108.6767671785382,98.60418018454327,92.89787240353918,88.9859671098618,81.05436376661515,73.81130962886736,67.02053665744171,65.48460864429816,64.15867332392469,62.410908769520724,60.93271184478549,59.67539056111541,58.57404180004419,57.60053894809555,56.9602414693302,56.35926063003215,55.803898655712395,55.278895851533356,54.79176517476174,54.32868310844318,53.897872357973945,53.48650022020648,53.092862717326504,52.725685725958755,52.37316290404589,52.0442911872859,51.71764875609438,51.41253360463674,51.11797468650783
+Offshore Wind - Class 3/Moderate,120.53949971586692,115.92443141973561,112.69197283487777,110.23090393671558,108.25493218115861,106.60130710728096,99.7895592308201,93.21494494352262,86.79823193732322,79.89407101591772,73.25538542956205,72.14671647284591,71.16489096909069,70.30181660575016,69.70521226394418,69.17168897798348,68.66781212318085,68.19025024893195,67.73618100027308,67.31723571729322,66.91713327956954,66.53415904281538,66.18048818088617,65.84093188907978,65.51434318560045,65.19969388740037,64.89609788655122,64.60271912887605,64.33206653253986
+Offshore Wind - Class 3/Conservative,141.47373290100256,140.76143364993342,140.12736493309464,139.53298498705576,138.97268458495537,138.4723578407175,137.9975779599724,137.5755387540014,129.06645969575803,119.8489497283867,110.84484567584255,101.98854169989326,93.23274381139527,84.5808652446624,84.15683184250244,83.77443030750169,83.39442106743772,83.05078330225669,82.72348653296551,82.41081216610297,82.11140720680183,81.84174005588427,81.56534203157848,81.31657291937768,81.0594222242907,80.82829854737228,80.60499731028987,80.3889323162925,80.17959251290318
+Offshore Wind - Class 4/Advanced,114.24838110521867,103.67315607781485,97.6392159360819,93.55175013191412,85.11974353541112,77.41502297516234,70.20299455717144,68.59091618558783,67.2127609302768,65.36447400048014,63.81273914719288,62.492734736046714,61.33644698144766,60.31433750813546,59.63021338628464,58.99937853866747,58.416320679079476,57.86518869318631,57.353747438673736,56.86762212934644,56.41527860848558,55.9834051657535,55.57015208743075,55.184598533943195,54.81448421861797,54.45854986064112,54.12616713369733,53.805788041763016,53.49648558262602
+Offshore Wind - Class 4/Moderate,126.90319227137397,122.06197386135848,118.67068539967575,116.0635321803197,113.99067790892346,112.25588396262387,105.01431236136433,98.021740726631,91.19507456394497,83.83983402811059,76.79868100693021,75.6202363694469,74.6064114420499,73.68591005163782,73.07561264465832,72.50099116979244,71.97262141666842,71.47190822653859,70.99585436251398,70.5564890521087,70.13696709822983,69.7354234081679,69.36449676436098,69.00841264924702,68.6518263956897,68.32194563423903,68.01759724526241,67.70996849620815,67.42613837543686
+Offshore Wind - Class 4/Conservative,149.23521277575261,148.48811014191514,147.82300240690753,147.1995631862773,146.61184633276952,146.08700569500212,145.58900055890757,145.11464533687464,136.07628225322705,126.26349860464973,116.67479859510756,107.21812028329768,97.91358539417944,88.69499646202566,88.25059996427139,87.83076576550378,87.4514768348935,87.07254160086875,86.7295601336246,86.4019484166787,86.10673807951369,85.80559397151623,85.5159726912103,85.2552329363402,85.00409894117016,84.74366763771036,84.5096096310058,84.28317578443647,84.0638282315039
+Offshore Wind - Class 5/Advanced,122.31674512690603,110.98305535160215,104.54385828818047,100.13629420311594,91.08308445914793,82.7919815384588,75.03092627519108,73.29552806315105,71.81251850454879,69.83817276593287,68.18245591858212,66.76227647111853,65.51838654149418,64.43205855754218,63.696109436013444,63.03028586896406,62.40315971319786,61.81031917001058,61.26030167713064,60.749582045848925,60.263133116542974,59.798609369113656,59.35408648737088,58.939557331399484,58.541563268768826,58.17033609704586,57.81301302486293,57.457120808624865,57.12464614473925
+Offshore Wind - Class 5/Moderate,135.96949469987382,130.78086022698892,127.15477111461311,124.37264200756894,122.139381204353,120.2705787721266,112.48640059748553,104.94596307082189,97.58493787054958,89.69499840766248,82.08516271446285,80.83576827651711,79.74639099610286,78.75698199731805,78.10117911309025,77.5000862057043,76.93232969313868,76.3941707494562,75.89851722678983,75.41043486168665,74.97548635391192,74.54383726307165,74.14541274398472,73.74731163596985,73.37940430777032,73.04031973383955,72.69818740834477,72.36755540126478,72.06274957211477
+Offshore Wind - Class 5/Conservative,160.06257982323848,159.25742430189297,158.54107354073116,157.86933247806755,157.27109292013563,156.70571538443482,156.16904105378356,155.65773345361944,145.90740662530177,135.32345244927194,124.98218499361708,114.80889396197291,104.7496345024802,94.82974646582429,94.35230841347854,93.90119999147954,93.4939767739193,93.10722264799024,92.7387699392199,92.38677075004979,92.04963958414056,91.72606006028552,91.43499311039473,91.15508354619635,90.86545732802337,90.60537852098241,90.35406289805076,90.1108853587907,89.87524664194508
+Offshore Wind - Class 6/Advanced,151.57914245388108,137.5415054757264,129.57908184109573,124.12518401747624,112.92394234329005,102.71277912685092,93.11155467065741,90.97949338781032,89.13279475846593,86.68837259445581,84.63587013503847,82.86789330877194,81.34900052644272,79.9967324167511,79.07628794298193,78.25179337697593,77.47525410000767,76.74115818604872,76.06440172119738,75.42118116043825,74.80819856188074,74.24157684157879,73.69949920911166,73.17992895321659,72.69941203798436,72.21922916906414,71.77476521810102,71.34623393013428,70.93247091630786
+Offshore Wind - Class 6/Moderate,168.40051928877315,162.00473722506405,157.5007642417297,154.0664306701488,151.27316630428544,149.0014890378553,139.38479116740885,130.05115721816006,120.98486175377504,111.22693677477008,101.85387667936533,100.30910072976889,98.94732845207037,97.73646536287318,96.93566974374956,96.15583188499721,95.46982702481276,94.7944921317495,94.1775754819088,93.58982927333297,93.02842687990695,92.51597769530541,92.00013614411034,91.52893515619213,91.0757767024326,90.63921693856,90.21802862504043,89.81108824452156,89.41736520029232
+Offshore Wind - Class 6/Conservative,198.085303511816,197.12665867222313,196.23343761688244,195.39561422884316,194.6611548911612,193.9117209795076,193.25369721515344,192.682197805657,180.6282064332926,167.5680429084793,154.829055104627,142.2645445591211,129.88190789342104,117.6497216663292,117.06178958739874,116.50648298707574,115.97987873656687,115.51155914448958,115.0657898435431,114.60796474784725,114.20104520001867,113.81078637155835,113.43580717512317,113.07474850852553,112.75830661907018,112.4218010506707,112.09631365381182,111.81241510947115,111.50647426325375
+Offshore Wind - Class 7/Advanced,207.27487203177816,188.12046876290154,177.1772424361006,169.72963233773453,154.277382773427,140.21700413866765,126.9770050181829,124.05379230774798,121.54059293678205,118.20284403733176,115.38887078146716,112.98218815491998,110.90425804845528,109.02596852526973,107.80063753568298,106.65059598404252,105.60212477826313,104.61135606386507,103.67211812875085,102.81338065086754,101.96162132576174,101.18122816926895,100.43460357678974,99.75189902362303,99.06409523807945,98.43490184902826,97.82925527743708,97.2453723291569,96.681709007605
+Offshore Wind - Class 7/Moderate,230.53019520292176,221.75553255389153,215.5952487352002,210.92782694545394,207.11266987949128,204.00533126251526,190.75541857193193,177.90615136953608,165.38696167366115,151.91529089484433,138.9961050715232,136.8694786909532,135.00466453556695,133.35715047186085,132.255456822636,131.21828937260364,130.237996967807,129.35387376509036,128.46873387016404,127.66914733092793,126.90548634530958,126.21893543571655,125.51734725626426,124.88691969688244,124.23730749724523,123.65413556855917,123.09181424575192,122.50590918035053,121.98109544681712
+Offshore Wind - Class 7/Conservative,271.56900182434714,270.2657309306486,269.0517297951389,267.91332881308534,266.8396439509868,265.9214950780064,264.95277526229955,264.1259251170608,247.502206434658,229.57148295261567,211.94452552734612,194.56182299130535,177.4486033661073,160.55723432934795,159.77228823089519,159.0317177638089,158.33020397290286,157.66341463535724,157.02777022588305,156.42007333961024,155.83774526256357,155.33549626464767,154.79695858559782,154.33431319172703,153.88899170664206,153.403336835444,152.98896731498272,152.58827589623044,152.20035114785992
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/30/df_occ.csv b/tests/data/Fixed_Offshore_Wind/R&D/30/df_occ.csv
new file mode 100644
index 0000000..045f8f4
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/30/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,3842.3701,3583.4153,3429.4759,3321.4792,2999.0614,2693.5348,2399.1137,2352.0203,2311.0401,2256.0086,2209.4435,2169.1984,2133.8401,2102.3662,2081.2931,2061.6972,2043.3962,2026.2391,2010.0994,1994.87,1980.4595,1966.7894,1953.7918,1941.4075,1929.5845,1918.2773,1907.4453,1897.0526,1887.0671
+Offshore Wind - Class 1/Moderate,4373.4293,4256.0015,4172.0581,4107.113,4054.3614,4010.0748,3722.0837,3438.8291,3159.3029,2864.6143,2576.5622,2543.4053,2514.1243,2487.9392,2470.3425,2453.932,2438.5643,2424.1202,2410.4995,2397.6174,2385.4012,2373.7884,2362.7248,2352.1629,2342.0612,2332.383,2323.0957,2314.1705,2305.5813
+Offshore Wind - Class 1/Conservative,5310.5928,5292.6419,5276.2463,5261.1643,5247.2061,5234.2197,5222.0821,5210.6919,4835.5121,4440.8387,4050.4779,3663.3763,3278.8224,2896.3131,2884.1352,2872.7465,2862.0533,2851.9778,2842.4543,2833.4271,2824.8483,2816.6767,2808.8763,2801.4159,2794.2678,2787.4076,2780.8136,2774.4665,2768.3491
+Offshore Wind - Class 2/Advanced,3835.3896,3576.9052,3423.2455,3315.445,2993.6129,2688.6414,2394.7552,2347.7473,2306.8416,2251.91,2205.4296,2165.2576,2129.9635,2098.5468,2077.512,2057.9517,2039.6839,2022.558,2006.4476,1991.2459,1976.8616,1963.2163,1950.2423,1937.8805,1926.079,1914.7923,1903.98,1893.6062,1883.6388
+Offshore Wind - Class 2/Moderate,4365.4841,4248.2695,4164.4787,4099.6515,4046.9958,4002.7896,3715.3218,3432.5817,3153.5634,2859.4101,2571.8813,2538.7847,2509.5568,2483.4194,2465.8546,2449.4739,2434.1341,2419.7162,2406.1203,2393.2616,2381.0676,2369.4759,2358.4324,2347.8897,2337.8063,2328.1457,2318.8753,2309.9663,2301.3928
+Offshore Wind - Class 2/Conservative,5300.945,5283.0267,5266.6609,5251.6063,5237.6734,5224.7107,5212.5951,5201.2255,4826.7274,4432.7709,4043.1193,3656.721,3272.8657,2891.0513,2878.8956,2867.5275,2856.8538,2846.7966,2837.2904,2828.2796,2819.7164,2811.5596,2803.7734,2796.3265,2789.1914,2782.3436,2775.7617,2769.4261,2763.3198
+Offshore Wind - Class 3/Advanced,3919.2247,3655.0904,3498.0719,3387.915,3059.0483,2747.4105,2447.1005,2399.0651,2357.2652,2301.133,2253.6366,2212.5865,2176.5209,2144.4175,2122.9229,2102.935,2084.268,2066.7677,2050.3052,2034.7712,2020.0724,2006.1289,1992.8713,1980.2393,1968.1799,1956.6464,1945.5978,1934.9972,1924.812
+Offshore Wind - Class 3/Moderate,4460.9062,4341.1295,4255.5072,4189.263,4135.4563,4090.2838,3796.5324,3507.6122,3222.495,2921.912,2628.0983,2594.2782,2564.4115,2537.7027,2519.7541,2503.0153,2487.3402,2472.6071,2458.714,2445.5743,2433.1137,2421.2687,2409.9837,2399.2106,2388.9068,2379.035,2369.562,2360.4583,2351.6973
+Offshore Wind - Class 3/Conservative,5416.8147,5398.5047,5381.7812,5366.3976,5352.1601,5338.914,5326.5336,5314.9155,4932.2315,4529.6638,4131.4951,3736.6508,3344.405,2954.2448,2941.8234,2930.2068,2919.2998,2909.0227,2899.3088,2890.101,2881.3506,2873.0155,2865.0592,2857.4495,2850.1584,2843.161,2836.4351,2829.9611,2823.7213
+Offshore Wind - Class 4/Advanced,4175.3368,3893.9419,3726.6627,3609.3073,3258.9499,2926.9473,2607.0127,2555.8384,2511.307,2451.5066,2400.9064,2357.1738,2318.7514,2284.5501,2261.6509,2240.3569,2220.47,2201.8262,2184.2878,2167.7387,2152.0794,2137.2247,2123.1008,2109.6433,2096.7958,2084.5087,2072.738,2061.4447,2050.5939
+Offshore Wind - Class 4/Moderate,4752.4159,4624.8121,4533.5946,4463.0214,4405.6986,4357.5743,4044.6269,3736.8264,3433.0774,3112.8521,2799.8383,2763.8082,2731.9898,2703.5356,2684.4141,2666.5814,2649.882,2634.1862,2619.3852,2605.3868,2592.112,2579.4929,2567.4705,2555.9933,2545.0162,2534.4994,2524.4073,2514.7087,2505.3752
+Offshore Wind - Class 4/Conservative,5770.7908,5751.2843,5733.468,5717.079,5701.9112,5687.7995,5674.6101,5662.2328,5254.5412,4825.6667,4401.4786,3980.8321,3562.954,3147.2978,3134.0646,3121.6889,3110.0691,3099.1205,3088.7718,3078.9623,3069.6401,3060.7603,3052.284,3044.1771,3036.4095,3028.9549,3021.7895,3014.8924,3008.2448
+Offshore Wind - Class 5/Advanced,4263.1798,3975.8648,3805.0662,3685.2419,3327.5134,2988.5261,2661.8605,2609.6095,2564.1412,2503.0827,2451.418,2406.7653,2367.5346,2332.6137,2309.2328,2287.4907,2267.1854,2248.1494,2230.2421,2213.3447,2197.356,2182.1888,2167.7677,2154.0271,2140.9093,2128.3637,2116.3454,2104.8145,2093.7354
+Offshore Wind - Class 5/Moderate,4852.3998,4722.1114,4628.9748,4556.9169,4498.3881,4449.2513,4129.7199,3815.4438,3505.3043,3178.3419,2858.7428,2821.9547,2789.4668,2760.4141,2740.8902,2722.6824,2705.6317,2689.6056,2674.4933,2660.2003,2646.6462,2633.7616,2621.4863,2609.7677,2598.5597,2587.8215,2577.5172,2567.6145,2558.0846
+Offshore Wind - Class 5/Conservative,5892.1998,5872.2829,5854.0918,5837.358,5821.8711,5807.4625,5793.9956,5781.3579,5365.0891,4927.1917,4494.0793,4064.583,3637.9134,3213.5123,3200.0008,3187.3647,3175.5005,3164.3215,3153.755,3143.7392,3134.2208,3125.1543,3116.4996,3108.2222,3100.2912,3092.6796,3085.3635,3078.3213,3071.5339
+Offshore Wind - Class 6/Advanced,4118.311,3840.7593,3675.7647,3560.0122,3214.4398,2886.9717,2571.4067,2520.9313,2477.0081,2418.0245,2368.1153,2324.98,2287.0824,2253.3482,2230.7618,2209.7586,2190.1433,2171.7541,2154.4553,2138.1321,2122.6868,2108.035,2094.1039,2080.8302,2068.1582,2056.0389,2044.429,2033.29,2022.5874
+Offshore Wind - Class 6/Moderate,4687.5084,4561.6474,4471.6757,4402.0665,4345.5265,4298.0594,3989.3862,3685.7896,3386.1892,3070.3374,2761.5987,2726.0607,2694.6768,2666.6113,2647.7509,2630.1618,2613.6905,2598.209,2583.6102,2569.803,2556.7095,2544.2627,2532.4045,2521.0841,2510.257,2499.8837,2489.9295,2480.3633,2471.1573
+Offshore Wind - Class 6/Conservative,5691.9745,5672.7345,5655.1615,5638.9964,5624.0357,5610.1167,5597.1074,5584.8992,5182.7758,4759.7588,4341.3641,3926.4628,3514.2919,3104.3126,3091.2602,3079.0536,3067.5925,3056.7934,3046.586,3036.9105,3027.7156,3018.9571,3010.5966,3002.6004,2994.9389,2987.586,2980.5185,2973.7157,2967.1589
+Offshore Wind - Class 7/Advanced,4314.3319,4023.5694,3850.7215,3729.4595,3367.4388,3024.3841,2693.799,2640.921,2594.9072,2533.1161,2480.8315,2435.643,2395.9416,2360.6017,2336.9402,2314.9373,2294.3884,2275.1239,2257.0017,2239.9017,2223.7211,2208.3719,2193.7778,2179.8723,2166.5971,2153.901,2141.7385,2130.0693,2118.8572
+Offshore Wind - Class 7/Moderate,4910.6216,4778.77,4684.5158,4611.5934,4552.3623,4502.6359,4179.2706,3861.2236,3547.363,3216.4775,2893.0436,2855.8141,2822.9364,2793.5351,2773.777,2755.3507,2738.0953,2721.877,2706.5833,2692.1189,2678.4022,2665.363,2652.9404,2641.0812,2629.7387,2618.8717,2608.4437,2598.4222,2588.778
+Offshore Wind - Class 7/Conservative,5962.8977,5942.7419,5924.3324,5907.3979,5891.7251,5877.1437,5863.5152,5850.7259,5429.4625,4986.3109,4548.0017,4113.3522,3681.5631,3252.0698,3238.3962,3225.6085,3213.6019,3202.2888,3191.5956,3181.4595,3171.827,3162.6516,3153.8932,3145.5163,3137.4902,3129.7874,3122.3834,3115.2568,3108.3879
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/30/df_tc.csv b/tests/data/Fixed_Offshore_Wind/R&D/30/df_tc.csv
new file mode 100644
index 0000000..055bed5
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/30/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Moderate,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Conservative,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+ITC Schedule/*,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Moderate,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Conservative,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PFF/Advanced,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Moderate,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Conservative,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+Year (Advanced)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Moderate)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Conservative)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/30/df_vom.csv b/tests/data/Fixed_Offshore_Wind/R&D/30/df_vom.csv
new file mode 100644
index 0000000..90cc094
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/30/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_capex.csv b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_capex.csv
new file mode 100644
index 0000000..b019daf
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,5462.550832369848,5094.404759063653,4875.5549262092645,4722.020175198692,4263.651146110876,3829.295613124674,3410.728337949633,3343.7774992451323,3285.5174365197136,3207.2812724221576,3141.08145831941,3083.8665548677945,3033.5990170228683,2988.8537384617885,2958.8949081013798,2931.03615273454,2905.0183721997228,2880.626813817036,2857.6815376796812,2836.0305427943017,2815.5436693022525,2796.109383287182,2777.6312289765,2760.02494615507,2743.21658539724,2727.1416211172086,2711.7421798514206,2696.967261995978,2682.7713005134847
+Offshore Wind - Class 1/Moderate,6217.537549003377,6050.594891259246,5931.2557072685795,5838.925802633735,5763.930885101322,5700.97021105834,5291.544282275952,4888.852075107402,4491.460278945741,4072.51283498425,3663.0000960065295,3615.862270810396,3574.2345093406543,3537.008235424742,3511.991599288189,3488.66149787881,3466.8138219123107,3446.2791640087826,3426.9151687521285,3408.6011001235547,3391.233850228222,3374.724391496717,3358.9956701796727,3343.980167236275,3329.6190113846337,3315.8598725964,3302.656518621953,3289.967817172063,3277.756959836958
+Offshore Wind - Class 1/Conservative,7549.867055466588,7524.346964544596,7501.037928189001,7479.5964751544225,7459.752640146307,7441.2903400603145,7424.034734950038,7407.84169550011,6874.463003342234,6313.370793819921,5758.409845373221,5208.082210940681,4661.376657071959,4117.577748019326,4100.26493465772,4084.0740017131716,4068.8719067407287,4054.548002773674,4041.008827494427,4028.175109779539,4015.978997982083,4004.3617316888726,3993.272200427305,3982.66605671573,3972.5038312954784,3962.750933130862,3953.3765407221345,3944.3531586306726,3935.6561740041584
+Offshore Wind - Class 2/Advanced,5358.739142998236,4997.589328397251,4782.898624109471,4632.281715654107,4182.623529780819,3756.522615291665,3345.909947900305,3280.231438444361,3223.078621467056,3146.329206691839,3081.3876415122254,3025.26002744198,2975.9477343518092,2932.0528187513814,2902.663410055368,2875.334052750732,2849.810635767615,2825.882619436882,2803.3735007815626,2782.133828788493,2762.0364370540406,2742.9714546924165,2724.8444215677036,2707.5726296266243,2691.083792474087,2675.3142714739247,2660.2075235870307,2645.713436159141,2631.787107365084
+Offshore Wind - Class 2/Moderate,6099.377897155915,5935.607747380369,5818.536715338725,5727.961307946685,5654.391607605821,5592.627539486479,5190.982487228406,4795.942992362201,4406.103572325649,3995.1177208761983,3593.3875214533555,3547.1455153865654,3506.308802120767,3469.790092274592,3445.2488611413337,3422.362012811054,3400.929540141509,3380.7851400765067,3361.7891180488486,3343.823177151232,3326.785983388085,3310.5901722205545,3295.16046379854,3280.4303368995647,3266.3420289287787,3252.8444294135797,3239.891971316572,3227.4444092981566,3215.4657110294934
+Offshore Wind - Class 2/Conservative,7406.3874307080805,7381.352390366644,7358.4863853527395,7337.4523748058255,7317.985493391741,7299.874203623014,7282.946548139545,7267.061169343569,6743.818981066585,6193.3899017697695,5648.975449671825,5109.10650357437,4572.7905668380645,4039.326284040601,4022.3425289928423,4006.4591458335417,3991.546085572757,3977.494364274333,3964.21240438866,3951.6227086915546,3939.658312485724,3928.26178578243,3917.383126796111,3906.9784315199345,3897.0093393822713,3887.441702822251,3878.245587289759,3869.393608214876,3860.8620396949195
+Offshore Wind - Class 3/Advanced,5563.666194857099,5188.705465783053,4965.804712217284,4809.427731107721,4342.574030961793,3900.178299552324,3473.8631867267977,3405.6729467788646,3346.3344641684057,3266.6501330575466,3199.2249980367915,3140.950965854653,3089.752906975992,3044.179439195086,3013.6660435766357,2985.291526998198,2958.792132812655,2933.9490061980596,2910.5791029239003,2888.527317673103,2867.6611623442363,2847.867218252979,2829.0469231213624,2811.114797178504,2793.9954497055987,2777.6226920862823,2761.9383182508886,2746.889887302366,2732.431056122389
+Offshore Wind - Class 3/Moderate,6332.62824425191,6162.59523224895,6041.0472110659675,5947.008043619602,5870.624939042819,5806.498813182058,5389.494232391682,4979.34787876988,4574.600276695524,4147.897677749075,3730.8046237328062,3682.7941509664915,3640.395852003069,3602.4805290910094,3577.0010161147275,3553.2388593653677,3530.9867343662136,3510.0719076762357,3490.3494738991394,3471.696590510754,3454.00771050475,3437.1928084933766,3421.172724221887,3405.879495174652,3391.252365301811,3377.238561100198,3363.790852501856,3350.8673311366247,3338.4304125138055
+Offshore Wind - Class 3/Conservative,7689.620050473284,7663.627437134304,7639.887121519657,7618.048758524303,7597.837393762009,7579.033507198603,7561.458489351737,7544.965660925851,7001.713778059379,6430.2353883344795,5865.001678369514,5304.48731653311,4747.661667351704,4193.796766914002,4176.163542997469,4159.672821076962,4144.189452202149,4129.6002394261195,4115.8105008755465,4102.73930239642,4090.317351048657,4078.4849994694414,4067.19036110524,4056.387758049952,4046.037499307501,4036.103996023863,4026.5560940931773,4017.3657437332995,4008.5077777483943
+Offshore Wind - Class 4/Advanced,5975.833019742907,5573.094469456032,5333.680820228931,5165.719279093875,4664.280086695629,4189.110790265383,3731.213396644922,3657.97153506216,3594.2372192017824,3508.6496839396987,3436.2295811919234,3373.638432539796,3318.6475552929614,3269.697913733989,3236.9240161071007,3206.4475397671245,3177.98499343761,3151.3015572032164,3126.2003282454148,3102.5147817706065,3080.1028949688057,3058.8426013967687,3038.628132310759,3019.367466686351,3000.9797812382362,2983.394230864478,2966.5477312724283,2950.3845155039116,2934.854692642071
+Offshore Wind - Class 4/Moderate,6801.761183217273,6619.1318233949605,6488.579378668923,6387.573443592643,6305.531822094643,6236.6551939994615,5788.758157491227,5348.227348553873,4913.495194579753,4455.1817107127035,4007.1895488563277,3955.6225189303327,3910.0833095790017,3869.359017179189,3841.99196451515,3816.4694344816667,3792.568802720853,3770.1046967594084,3748.921124330627,3728.886373414007,3709.887136193929,3691.8264025542844,3674.6196905425268,3658.1932724704134,3642.4826227521417,3627.430754873791,3612.986669231462,3599.105907474802,3585.7475590519857
+Offshore Wind - Class 4/Conservative,8259.281523874955,8231.363342882703,8205.864317014495,8182.408047019821,8160.699511276999,8140.502559446241,8121.625610406816,8103.9108979927505,7520.413786396996,6906.599295051689,6299.492027699934,5697.453566632146,5099.377331312438,4504.481143033195,4485.541553175938,4467.829169004659,4451.198641648249,4435.528791613096,4420.717508822699,4406.677872213025,4393.335821489715,4380.626831066969,4368.49535572402,4356.89261323105,4345.775475662155,4335.106247657932,4324.850892526213,4314.979697454295,4305.465499609663
+Offshore Wind - Class 5/Advanced,6282.856400383134,5859.426312976391,5607.712002763843,5431.121106911791,4903.919131998218,4404.336990394094,3922.9139229701746,3845.90906670065,3778.9002436638907,3688.91532299003,3612.774466531764,3546.9676819851466,3489.1514266823465,3437.686839438965,3403.2291788025045,3371.186903754147,3341.2619992172013,3313.2076714562813,3286.816817732078,3261.9142654920715,3238.350896329211,3215.9983242841176,3194.745237177849,3174.494957500406,3155.162670693132,3136.673651249446,3118.961710552984,3101.9679773218536,3085.640232396413
+Offshore Wind - Class 5/Moderate,7151.218784281058,6959.206384291097,6821.946382965393,6715.751127323762,6629.494388563569,6557.079053170072,6086.1701084333035,5623.006007892007,5165.9382447845255,4684.077800322827,4213.068962883639,4158.852503535129,4110.973631920612,4068.157136205224,4039.3838248980423,4012.5501615695575,3987.42165891054,3963.8032988704326,3941.531439241944,3920.467161538803,3900.4918362475946,3881.503242423113,3863.4124633646497,3846.142223585428,3829.624449701114,3813.7990508740713,3798.613031863727,3784.018940864715,3769.9743151633556
+Offshore Wind - Class 5/Conservative,8683.622841160915,8654.270351743377,8627.461190398502,8602.799777589971,8579.97601355234,8558.741330650955,8538.894502187832,8520.269668581588,7906.793991996092,7261.443230368062,6623.144272666011,5990.174662702622,5361.370722559387,4735.910139057796,4715.997565453123,4697.375170958373,4679.8902893679615,4663.415310803441,4647.842914359215,4633.082076829197,4619.054414039568,4605.692628686925,4592.937849489374,4580.738965974315,4569.05063284176,4557.833048226926,4547.050955881901,4536.672536488602,4526.66962939618
+Offshore Wind - Class 6/Advanced,6054.327951395894,5646.2993008916155,5403.740750003257,5233.573032524783,4725.547130414371,4244.13636941661,3780.224348597275,3706.0204792688073,3641.448993823569,3554.7372499016396,3481.3657828037544,3417.9525427105277,3362.2392449876024,3312.6466758134006,3279.4423858770924,3248.565562646515,3219.729167046685,3192.6951639698427,3167.264211485968,3143.2674565586763,3120.561324216123,3099.0217523783913,3078.5416418772934,3059.0279738700683,3040.3988163843655,3022.5823264999117,3005.514532974426,2989.1391145062103,2973.405182360072
+Offshore Wind - Class 6/Moderate,6891.104950175169,6706.076724201667,6573.809362360196,6471.476883239043,6388.357507068228,6318.576079478668,5864.795684317246,5418.478415974113,4978.035969393947,4513.70231489282,4059.8255748275124,4007.5811371193035,3961.443680240505,3920.184668080688,3892.4579573404626,3866.600271214404,3842.385770152208,3819.626420831674,3798.1647896929426,3777.866725604021,3758.618033799659,3740.320041133183,3722.8872678337116,3706.2450992633676,3690.3282337554206,3675.0784652402026,3660.4447941138183,3646.3815424701647,3632.8477997574205
+Offshore Wind - Class 6/Conservative,8367.770320398857,8339.48560747076,8313.651536378682,8289.887273123944,8267.893472205405,8247.43121156567,8228.306249235115,8210.358934279791,7619.19746916776,6997.320273052247,6382.238330681363,5772.292048423035,5166.359656728911,4563.649220445412,4544.460841216094,4526.515965372261,4509.6670266687215,4493.791293450005,4478.785325215162,4464.561424819229,4451.0439798059915,4438.168131983535,4425.877338312755,4414.122151351611,4402.8589996993815,4392.049522784438,4381.65957304591,4371.658772458867,4362.019625584684
+Offshore Wind - Class 7/Advanced,6421.601266263206,5988.820290613011,5731.547467050367,5551.056875399363,5012.212688734152,4501.598224119789,4009.5438457884584,3930.838485335038,3862.3498977043,3770.377877246376,3692.5556968900287,3625.295534501015,3566.202626070197,3513.6015237408124,3478.382860319226,3445.6330212011326,3415.0473391875917,3386.373366239308,3359.3996757375103,3333.9474364624434,3309.863649602413,3287.0173792178434,3265.2949848870057,3244.5975717258207,3224.838329538955,3205.9409806579697,3187.8378951733484,3170.469093116158,3153.780581427489
+Offshore Wind - Class 7/Moderate,7309.139612095586,7112.887038516299,6972.595886819772,6864.055647217157,6775.89396238266,6701.87945680084,6220.5713602231,5747.179178251301,5280.018150057534,4787.51663824246,4306.1064315882195,4250.69281197255,4201.756474658073,4157.994601502596,4128.585901652064,4101.1595342313185,4075.476022839443,4051.3361364151237,4028.5724632151287,4007.0432021668807,3986.6267303019517,3967.2187201697593,3948.7284811703275,3931.0768530489104,3914.194321128019,3898.019464145569,3882.498067305242,3867.5817918520374,3853.2269555165312
+Offshore Wind - Class 7/Conservative,8875.383790929918,8845.383273936757,8817.98185197444,8792.775962959942,8769.448078924646,8747.744532273511,8727.459439822973,8708.423394193125,8081.400338044277,7421.798180581692,6769.403486705676,6122.456104869517,5479.766192140526,4840.493585478835,4820.141306593594,4801.107589206534,4783.23655191965,4766.397813136889,4750.481612841166,4735.394710452311,4721.057391372057,4707.4003626603235,4694.364087822995,4681.8955716195005,4669.949247012442,4658.484092581294,4647.463854259805,4636.856269255077,4626.632400835331
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_fin_assump.csv b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_fin_assump.csv
new file mode 100644
index 0000000..ca9ad50
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),30
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_fom.csv b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_fom.csv
new file mode 100644
index 0000000..c78b3e0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,90.662,84.9785,81.599875,79.229625,77.420125,75.96575,74.755,73.721375,72.822,71.614125,70.592125,69.708875,68.932875,68.242125,67.779625,67.3495,66.94787500000001,66.57124999999999,66.217,65.88275,65.5665,65.26650000000001,64.98125,64.709375,64.44987499999999,64.20175,63.964,63.735875,63.51675
+Offshore Wind - Class 1/Moderate,90.662,87.639125,85.47825,83.806375,82.4485,81.30850000000001,80.32825000000001,79.469875,78.7075,77.55475,76.57300000000001,75.719375,74.96562499999999,74.29162500000001,73.83862500000001,73.41624999999999,73.020625,72.64875,72.298125,71.9665,71.652125,71.353125,71.068375,70.7965,70.53637499999999,70.28725,70.04825,69.8185,69.597375
+Offshore Wind - Class 1/Conservative,90.662,90.167625,89.716125,89.30075000000001,88.916375,88.55874999999999,88.2245,87.910875,87.615375,86.78312500000001,86.06975,85.44600000000001,84.892375,84.395125,84.05975,83.74612499999999,83.45174999999999,83.17425,82.912,82.663375,82.42712499999999,82.20212500000001,81.98724999999999,81.781875,81.58500000000001,81.396125,81.21449999999999,81.03975,80.87125
+Offshore Wind - Class 2/Advanced,90.45362499999999,84.78325,81.41237500000001,79.0475,77.242375,75.79125,74.58325,73.55199999999999,72.65475,71.449625,70.43,69.54875,68.77449999999999,68.08525,67.623875,67.19475,66.794,66.418375,66.064875,65.731375,65.415875,65.1165,64.831875,64.56075,64.301875,64.05425,63.817125,63.5895,63.370875
+Offshore Wind - Class 2/Moderate,90.45362499999999,87.43775,85.281875,83.613875,82.259125,81.12175,80.14362500000001,79.28725,78.526625,77.376625,76.397,75.5455,74.7935,74.121,73.669,73.2475,72.852875,72.481875,72.132125,71.80125000000001,71.4875,71.18925,70.905125,70.633875,70.374375,70.12587500000001,69.88725,69.658125,69.4375
+Offshore Wind - Class 2/Conservative,90.45362499999999,89.9605,89.51,89.095625,88.712125,88.35525000000001,88.02187500000001,87.708875,87.41412499999998,86.583875,85.87199999999999,85.24974999999999,84.69737500000001,84.20125,83.86675,83.55375000000001,83.26,82.983125,82.72149999999999,82.4735,82.23775,82.01325,81.799,81.594,81.397625,81.209125,81.027875,80.8535,80.6855
+Offshore Wind - Class 3/Advanced,90.520875,84.84625,81.47287499999999,79.10624999999999,77.29974999999999,75.8475,74.638625,73.60674999999999,72.708625,71.50274999999999,70.482375,69.600375,68.825625,68.135875,67.674125,67.244625,66.843625,66.467625,66.114,65.78025,65.4645,65.164875,64.88012499999999,64.60875,64.349625,64.101875,63.8645,63.63675,63.417874999999995
+Offshore Wind - Class 3/Moderate,90.520875,87.50275,85.34525000000001,83.67599999999999,82.32025,81.182,80.20325,79.346125,78.58500000000001,77.434125,76.45375,75.601625,74.84899999999999,74.176,73.72375,73.30199999999999,72.907,72.53575,72.185625,71.854625,71.540625,71.242125,70.95775,70.68625,70.426625,70.177875,69.93925,69.709875,69.489
+Offshore Wind - Class 3/Conservative,90.520875,90.02725,89.5765,89.16175000000001,88.778,88.421,88.08725000000001,87.774,87.479125,86.648125,85.93575,85.313,84.76037500000001,84.26387500000001,83.92899999999999,83.615875,83.321875,83.04475,82.783,82.53475,82.29887500000001,82.07412500000001,81.85974999999999,81.65462500000001,81.458,81.269375,81.088125,80.91362500000001,80.745375
+Offshore Wind - Class 4/Advanced,90.50575,84.832,81.45925,79.093,77.28675,75.83487500000001,74.62625,73.594375,72.6965,71.49074999999999,70.4705,69.58875,68.81412499999999,68.1245,67.66275,67.23349999999999,66.8325,66.4565,66.102875,65.76925,65.4535,65.154,64.86925000000001,64.597875,64.338875,64.091125,63.85375,63.626125,63.40725
+Offshore Wind - Class 4/Moderate,90.50575,87.488125,85.33099999999999,83.66199999999999,82.3065,81.16837500000001,80.18974999999999,79.332875,78.571875,77.421125,76.441,75.589,74.8365,74.163625,73.711375,73.28975,72.89475,72.52362500000001,72.173625,71.8425,71.528625,71.23025,70.945875,70.6745,70.414875,70.166125,69.9275,69.698125,69.4775
+Offshore Wind - Class 4/Conservative,90.50575,90.01225,89.5615,89.146875,88.76312499999999,88.406125,88.07249999999999,87.75937499999999,87.46449999999999,86.633625,85.921375,85.29875000000001,84.74612499999999,84.24975,83.915,83.601875,83.307875,83.03087500000001,82.769125,82.521,82.28512500000001,82.06049999999999,81.846,81.64087500000001,81.44437500000001,81.255875,81.0745,80.9,80.731875
+Offshore Wind - Class 5/Advanced,91.497125,85.76124999999999,82.35150000000002,79.959375,78.133375,76.6655,75.443625,74.40050000000001,73.49275,72.273875,71.2425,70.351,69.567875,68.870625,68.403875,67.969875,67.5645,67.1845,66.827,66.48962499999999,66.1705,65.867625,65.57975,65.3055,65.043625,64.793125,64.55325,64.323,64.101875
+Offshore Wind - Class 5/Moderate,91.497125,88.44637499999999,86.265625,84.578375,83.208,82.0575,81.06812500000001,80.201875,79.4325,78.269125,77.27825,76.416875,75.65625,74.976,74.51875,74.0925,73.69325,73.318,72.964125,72.62950000000001,72.312125,72.010375,71.723,71.448625,71.186125,70.93475,70.6935,70.461625,70.2385
+Offshore Wind - Class 5/Conservative,91.497125,90.998125,90.54249999999999,90.123375,89.735375,89.3745,89.03712499999999,88.720625,88.4225,87.58262500000001,86.8625,86.233125,85.674375,85.172625,84.834125,84.517625,84.220375,83.94037499999999,83.67575000000001,83.42487500000001,83.186375,82.95925,82.7425,82.535125,82.3365,82.145875,81.962625,81.78625,81.61612500000001
+Offshore Wind - Class 6/Advanced,90.82724999999999,85.133375,81.748625,79.374,77.56125,76.104125,74.89125,73.85575,72.95474999999999,71.74475,70.720875,69.836,69.0585,68.3665,67.903125,67.47225,67.069875,66.692625,66.33775,66.002875,65.686,65.3855,65.099625,64.827375,64.567375,64.31875,64.080625,63.852125,63.6325
+Offshore Wind - Class 6/Moderate,90.82724999999999,87.798875,85.634,83.95925,82.59875,81.456625,80.474625,79.61475,78.851,77.696125,76.71249999999999,75.8575,75.102375,74.427,73.97325000000001,73.55000000000001,73.15375,72.78125,72.43,72.09774999999999,71.782625,71.48325,71.197875,70.9255,70.66499999999999,70.415375,70.175875,69.94575,69.72425
+Offshore Wind - Class 6/Conservative,90.82724999999999,90.33200000000001,89.879625,89.46350000000001,89.07849999999999,88.720125,88.38525000000001,88.07112500000001,87.775125,86.941375,86.22662500000001,85.60175,85.047125,84.549,84.21300000000001,83.898875,83.60374999999999,83.32587500000001,83.06312500000001,82.814,82.57737499999999,82.351875,82.13675,81.93087500000001,81.73375,81.544375,81.36250000000001,81.187375,81.01862499999999
+Offshore Wind - Class 7/Advanced,91.0155,85.309875,81.91812499999999,79.538625,77.722125,76.262,75.046625,74.009,73.106,71.8935,70.8675,69.98075,69.20175,68.50825,68.043875,67.612125,67.209,66.830875,66.47525,66.13974999999999,65.82225,65.521,65.234625,64.96175,64.70125,64.452125,64.21350000000001,63.984500000000004,63.7645
+Offshore Wind - Class 7/Moderate,91.0155,87.981,85.81162499999999,84.13325,82.770125,81.625625,80.6415,79.779875,79.0145,77.85725000000001,76.87162500000001,76.01474999999999,75.25812499999999,74.58137500000001,74.12662499999999,73.7025,73.305375,72.932125,72.58012500000001,72.24725000000001,71.9315,71.6315,71.3455,71.072625,70.8115,70.561375,70.321375,70.09075,69.868875
+Offshore Wind - Class 7/Conservative,91.0155,90.51925,90.066,89.649125,89.263125,88.904125,88.568625,88.25375,87.957125,87.121625,86.405375,85.77925,85.2235,84.724375,84.38762499999999,84.07287500000001,83.77725,83.498625,83.235375,82.98575,82.74862499999999,82.52274999999999,82.30712499999998,82.100875,81.90325,81.71350000000001,81.53125,81.35575,81.18662499999999
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_gcc.csv b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_gcc.csv
new file mode 100644
index 0000000..d9068d0
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,1084.6748,1011.5737,968.1176,937.6309,846.6146,760.3665,677.2534,663.9593,652.3908,636.8558,623.7108,612.3499,602.3685,593.4836,587.5348,582.003,576.8368,571.9935,567.4373,563.1382,559.0702,555.2112,551.5421,548.0461,544.7085,541.5166,538.4588,535.525,532.7062
+Offshore Wind - Class 1/Moderate,1234.5893,1201.4402,1177.7435,1159.41,1144.5186,1132.0167,1050.7188,970.758,891.8496,808.6611,727.3459,717.986,709.7201,702.3283,697.3608,692.7283,688.3901,684.3126,680.4676,676.831,673.3825,670.1043,666.9811,663.9995,661.1479,658.4158,655.7941,653.2745,650.8499
+Offshore Wind - Class 1/Conservative,1499.1441,1494.0767,1489.4483,1485.1908,1481.2505,1477.5845,1474.1581,1470.9427,1365.0321,1253.6184,1143.4223,1034.1461,925.5892,817.6094,814.1717,810.9567,807.9381,805.0939,802.4055,799.8571,797.4354,795.1286,792.9266,790.8206,788.8027,786.8661,785.0047,783.213,781.486
+Offshore Wind - Class 2/Advanced,998.0205,930.7594,890.775,862.7239,778.9788,699.621,623.1478,610.9158,600.2715,585.9776,573.8828,563.4295,554.2455,546.0704,540.5969,535.507,530.7535,526.2971,522.105,518.1492,514.4063,510.8556,507.4796,504.2628,501.1919,498.255,495.4415,492.7421,490.1484
+Offshore Wind - Class 2/Moderate,1135.9583,1105.4575,1083.654,1066.7851,1053.0833,1041.5803,966.7772,893.2044,820.6001,744.0574,669.2385,660.6263,653.0208,646.2195,641.6489,637.3864,633.3948,629.6431,626.1052,622.7592,619.5862,616.5698,613.6962,610.9528,608.329,605.8152,603.4029,601.0846,598.8537
+Offshore Wind - Class 2/Conservative,1379.3779,1374.7154,1370.4568,1366.5394,1362.9138,1359.5407,1356.3881,1353.4296,1255.9801,1153.4673,1052.0746,951.5285,851.6441,752.2909,749.1278,746.1696,743.3922,740.7752,738.3015,735.9568,733.7285,731.606,729.58,727.6422,725.7855,724.0036,722.2909,720.6423,719.0534
+Offshore Wind - Class 3/Advanced,1099.023,1024.9548,980.924,950.0339,857.8136,770.4247,686.2122,672.7422,661.0207,645.2802,631.9613,620.4501,610.3367,601.3343,595.3068,589.7018,584.4672,579.5598,574.9434,570.5874,566.4656,562.5556,558.8379,555.2957,551.914,548.6798,545.5816,542.609,539.7528
+Offshore Wind - Class 3/Moderate,1250.9205,1217.3329,1193.3228,1174.7467,1159.6583,1146.9911,1064.6178,983.5992,903.6471,819.3581,736.9673,727.4835,719.1083,711.6187,706.5856,701.8917,697.4961,693.3647,689.4688,685.7842,682.29,678.9685,675.8039,672.783,669.8936,667.1254,664.469,661.9161,659.4594
+Offshore Wind - Class 3/Conservative,1518.9749,1513.8404,1509.1509,1504.837,1500.8445,1497.1301,1493.6584,1490.4005,1383.0888,1270.2014,1158.5475,1047.8259,937.8329,828.4248,824.9416,821.6841,818.6256,815.7437,813.0197,810.4377,807.9839,805.6466,803.4155,801.2816,799.2371,797.2748,795.3888,793.5734,791.8236
+Offshore Wind - Class 4/Advanced,1214.6721,1132.8098,1084.1456,1050.0051,948.0805,851.4957,758.4216,743.5341,730.5792,713.1824,698.462,685.7394,674.5618,664.6121,657.9503,651.7555,645.9701,640.5463,635.4442,630.6297,626.0742,621.7528,617.6439,613.7289,609.9913,606.4168,602.9925,599.7071,596.5505
+Offshore Wind - Class 4/Moderate,1382.5536,1345.4316,1318.895,1298.3641,1281.688,1267.6878,1176.6465,1087.1024,998.737,905.5783,814.5176,804.0359,794.7794,786.5016,780.9389,775.7511,770.8929,766.3268,762.0209,757.9486,754.0867,750.4156,746.9181,743.5792,740.3858,737.3263,734.3903,731.5689,728.8536
+Offshore Wind - Class 4/Conservative,1678.8151,1673.1403,1667.9573,1663.1895,1658.7769,1654.6716,1650.8346,1647.2338,1528.6298,1403.8634,1280.4603,1158.0875,1036.5201,915.5991,911.7494,908.1491,904.7687,901.5836,898.573,895.7192,893.0073,890.424,887.9581,885.5997,883.34,881.1713,879.0867,877.0803,875.1464
+Offshore Wind - Class 5/Advanced,1403.7543,1309.149,1252.9094,1213.4544,1095.6637,984.044,876.4815,859.2766,844.3051,824.2001,807.1882,792.4853,779.5676,768.0691,760.3703,753.2113,746.5253,740.2572,734.3608,728.7969,723.5322,718.5381,713.7896,709.2651,704.9458,700.8149,696.8576,693.0607,689.4127
+Offshore Wind - Class 5/Moderate,1597.7692,1554.8686,1524.2011,1500.4743,1481.2023,1465.0228,1359.8095,1256.3265,1154.2056,1046.5454,941.3097,929.1963,918.499,908.9326,902.5039,896.5086,890.8942,885.6173,880.6411,875.9348,871.4718,867.2293,863.1873,859.3287,855.6382,852.1024,848.7094,845.4487,842.3108
+Offshore Wind - Class 5/Conservative,1940.1483,1933.5902,1927.6003,1922.0903,1916.9909,1912.2465,1907.8122,1903.6509,1766.5844,1622.3962,1479.7835,1338.3616,1197.8703,1058.1261,1053.6771,1049.5164,1045.6098,1041.9289,1038.4496,1035.1516,1032.0175,1029.0321,1026.1824,1023.4568,1020.8453,1018.339,1015.93,1013.6112,1011.3763
+Offshore Wind - Class 6/Advanced,1342.4978,1252.0208,1198.2354,1160.5021,1047.8515,941.1026,838.2339,821.7798,807.4616,788.234,771.9645,757.9031,745.5491,734.5524,727.1896,720.3429,713.9487,707.9541,702.315,696.9939,691.959,687.1828,682.6415,678.3145,674.1836,670.233,666.4483,662.8172,659.3283
+Offshore Wind - Class 6/Moderate,1528.0463,1487.0178,1457.6886,1434.9972,1416.5662,1401.0927,1300.4706,1201.5034,1103.8389,1000.8767,900.2332,888.6484,878.4178,869.269,863.1208,857.3871,852.0177,846.971,842.2121,837.7111,833.4429,829.3855,825.5199,821.8296,818.3002,814.9187,811.6738,808.5554,805.5544
+Offshore Wind - Class 6/Conservative,1855.4848,1849.2129,1843.4844,1838.2149,1833.3379,1828.8006,1824.5598,1820.5801,1689.4949,1551.5987,1415.2093,1279.9587,1145.5981,1011.952,1007.6971,1003.718,999.9819,996.4616,993.1341,989.9801,986.9827,984.1276,981.4022,978.7956,976.2981,973.9012,971.5973,969.3797,967.2423
+Offshore Wind - Class 7/Advanced,1477.7456,1378.1536,1318.9497,1277.415,1153.4156,1035.9125,922.6804,904.5687,888.808,867.6433,849.7348,834.2568,820.6583,808.5537,800.4491,792.9127,785.8743,779.2758,773.0686,767.2115,761.6693,756.4119,751.4131,746.6502,742.1032,737.7545,733.5886,729.5917,725.7513
+Offshore Wind - Class 7/Moderate,1681.9869,1636.825,1604.5411,1579.5637,1559.2758,1542.2435,1431.4844,1322.5469,1215.0433,1101.7083,990.9257,978.1739,966.9126,956.8421,950.0745,943.7631,937.8528,932.2977,927.0593,922.105,917.4067,912.9405,908.6855,904.6235,900.7385,897.0163,893.4445,890.012,886.7086
+Offshore Wind - Class 7/Conservative,2042.4126,2035.5089,2029.2032,2023.4028,2018.0346,2013.0401,2008.3721,2003.9915,1859.7003,1707.912,1557.7822,1408.906,1261.0095,1113.8995,1109.216,1104.8359,1100.7234,1096.8485,1093.1858,1089.714,1086.4147,1083.2719,1080.272,1077.4027,1074.6536,1072.0152,1069.4793,1067.0382,1064.6855
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_lcoe.csv b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_lcoe.csv
new file mode 100644
index 0000000..bedff3f
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,103.40317651354756,93.83552332547741,88.38416017922718,84.68012161423933,77.14512207651676,70.26246556690451,63.83493200218667,62.371793297517186,61.119269551259265,59.444109522265805,58.047423377340834,56.847905060619134,55.7961322903013,54.875937924242514,54.25999214175378,53.68163573751737,53.15658739073624,52.660333920666694,52.18977615591292,51.76187369220304,51.344651093817355,50.955702663160864,50.58355269932716,50.23620015653551,49.89338196698751,49.5821776329635,49.27338216952091,48.97552322430973,48.696963592188766
+Offshore Wind - Class 1/Moderate,114.64277447823692,110.26843605207448,107.17467377121368,104.83154688589475,102.94620582856926,101.36552497904235,94.93759163414131,88.69251450397302,82.59834692215561,76.04503255897754,69.75834888242713,68.69565040491996,67.76718306947242,66.93707649058867,66.38653324626279,65.86826604726527,65.39153082866716,64.92674805364868,64.5103754477146,64.10101785789969,63.722551004411216,63.36031552296506,63.02551998078098,62.69161262336864,62.38258418527363,62.084919700486424,61.79775093688678,61.52028321453995,61.26401837997586
+Offshore Wind - Class 1/Conservative,134.47735921889574,133.80573968350197,133.17908336715539,132.61867354024565,132.11869828751352,131.61857783367836,131.17082156649968,130.74451588437614,122.71178430551302,113.98175123984052,105.42953172095388,97.01968713091945,88.74534034744399,80.54793276124373,80.14661961991082,79.76759104437512,79.40824923920212,79.08290995507494,78.77307286392417,78.4771648535127,78.19387263311494,77.92204842432068,77.66065868949272,77.42503354968763,77.18199514522918,76.96314233429182,76.7516952513619,76.54715617790619,76.34901069317019
+Offshore Wind - Class 2/Advanced,106.01405177298092,96.19879214096234,90.62623298835253,86.82470013159153,79.10557913141753,72.07670567539827,65.50269270407097,64.00267674108171,62.7078687600933,61.00120396781065,59.56979653079143,58.33017355121486,57.266279750484244,56.315573656810216,55.67926152771845,55.09253206581743,54.550348179553495,54.04850674960882,53.572815032316036,53.12061238143435,52.69997366610814,52.29829459077495,51.91389299291383,51.555403729105606,51.21121199213105,50.89014088810694,50.571197280992386,50.273300068817235,49.985726797890855
+Offshore Wind - Class 2/Moderate,117.49568950297652,113.01189172785763,109.85340116381433,107.4488237448314,105.49552008573006,103.90278278752436,97.29668513327927,90.92227281911892,84.70196181635406,78.00532080101459,71.58305386365147,70.48468437321498,69.52540724959758,68.68221202332577,68.1135412540072,67.57803230611043,67.08579308197058,66.61921822650528,66.18943092808139,65.78003162790098,65.38906654867124,65.01482270077555,64.65582895604554,64.3241415914059,64.00508926302182,63.69772299329296,63.4142339651626,63.12756378834895,62.850148842578676
+Offshore Wind - Class 2/Conservative,137.7574026386379,137.06152536265486,136.44204914659454,135.8613736158877,135.3139577666779,134.82514164681385,134.36134238026716,133.9490747763089,125.70969957244307,116.80386329751826,108.0550222580837,99.47618793229994,91.01527873724973,82.63410727830549,82.21963694346161,81.82800352536498,81.47437438829604,81.120824912188,80.80096778423605,80.51294726303242,80.22025893807148,79.9393580674789,79.68652750167739,79.42614173600404,79.19201354144016,78.96611668248077,78.74783273076154,78.5366447673733,78.33206116672389
+Offshore Wind - Class 3/Advanced,108.6767671785382,98.60418018454327,92.89787240353918,88.9859671098618,81.05436376661515,73.81130962886736,67.02053665744171,65.48460864429816,64.15867332392469,62.410908769520724,60.93271184478549,59.67539056111541,58.57404180004419,57.60053894809555,56.9602414693302,56.35926063003215,55.803898655712395,55.278895851533356,54.79176517476174,54.32868310844318,53.897872357973945,53.48650022020648,53.092862717326504,52.725685725958755,52.37316290404589,52.0442911872859,51.71764875609438,51.41253360463674,51.11797468650783
+Offshore Wind - Class 3/Moderate,120.53949971586692,115.92443141973561,112.69197283487777,110.23090393671558,108.25493218115861,106.60130710728096,99.7895592308201,93.21494494352262,86.79823193732322,79.89407101591772,73.25538542956205,72.14671647284591,71.16489096909069,70.30181660575016,69.70521226394418,69.17168897798348,68.66781212318085,68.19025024893195,67.73618100027308,67.31723571729322,66.91713327956954,66.53415904281538,66.18048818088617,65.84093188907978,65.51434318560045,65.19969388740037,64.89609788655122,64.60271912887605,64.33206653253986
+Offshore Wind - Class 3/Conservative,141.47373290100256,140.76143364993342,140.12736493309464,139.53298498705576,138.97268458495537,138.4723578407175,137.9975779599724,137.5755387540014,129.06645969575803,119.8489497283867,110.84484567584255,101.98854169989326,93.23274381139527,84.5808652446624,84.15683184250244,83.77443030750169,83.39442106743772,83.05078330225669,82.72348653296551,82.41081216610297,82.11140720680183,81.84174005588427,81.56534203157848,81.31657291937768,81.0594222242907,80.82829854737228,80.60499731028987,80.3889323162925,80.17959251290318
+Offshore Wind - Class 4/Advanced,114.24838110521867,103.67315607781485,97.6392159360819,93.55175013191412,85.11974353541112,77.41502297516234,70.20299455717144,68.59091618558783,67.2127609302768,65.36447400048014,63.81273914719288,62.492734736046714,61.33644698144766,60.31433750813546,59.63021338628464,58.99937853866747,58.416320679079476,57.86518869318631,57.353747438673736,56.86762212934644,56.41527860848558,55.9834051657535,55.57015208743075,55.184598533943195,54.81448421861797,54.45854986064112,54.12616713369733,53.805788041763016,53.49648558262602
+Offshore Wind - Class 4/Moderate,126.90319227137397,122.06197386135848,118.67068539967575,116.0635321803197,113.99067790892346,112.25588396262387,105.01431236136433,98.021740726631,91.19507456394497,83.83983402811059,76.79868100693021,75.6202363694469,74.6064114420499,73.68591005163782,73.07561264465832,72.50099116979244,71.97262141666842,71.47190822653859,70.99585436251398,70.5564890521087,70.13696709822983,69.7354234081679,69.36449676436098,69.00841264924702,68.6518263956897,68.32194563423903,68.01759724526241,67.70996849620815,67.42613837543686
+Offshore Wind - Class 4/Conservative,149.23521277575261,148.48811014191514,147.82300240690753,147.1995631862773,146.61184633276952,146.08700569500212,145.58900055890757,145.11464533687464,136.07628225322705,126.26349860464973,116.67479859510756,107.21812028329768,97.91358539417944,88.69499646202566,88.25059996427139,87.83076576550378,87.4514768348935,87.07254160086875,86.7295601336246,86.4019484166787,86.10673807951369,85.80559397151623,85.5159726912103,85.2552329363402,85.00409894117016,84.74366763771036,84.5096096310058,84.28317578443647,84.0638282315039
+Offshore Wind - Class 5/Advanced,122.31674512690603,110.98305535160215,104.54385828818047,100.13629420311594,91.08308445914793,82.7919815384588,75.03092627519108,73.29552806315105,71.81251850454879,69.83817276593287,68.18245591858212,66.76227647111853,65.51838654149418,64.43205855754218,63.696109436013444,63.03028586896406,62.40315971319786,61.81031917001058,61.26030167713064,60.749582045848925,60.263133116542974,59.798609369113656,59.35408648737088,58.939557331399484,58.541563268768826,58.17033609704586,57.81301302486293,57.457120808624865,57.12464614473925
+Offshore Wind - Class 5/Moderate,135.96949469987382,130.78086022698892,127.15477111461311,124.37264200756894,122.139381204353,120.2705787721266,112.48640059748553,104.94596307082189,97.58493787054958,89.69499840766248,82.08516271446285,80.83576827651711,79.74639099610286,78.75698199731805,78.10117911309025,77.5000862057043,76.93232969313868,76.3941707494562,75.89851722678983,75.41043486168665,74.97548635391192,74.54383726307165,74.14541274398472,73.74731163596985,73.37940430777032,73.04031973383955,72.69818740834477,72.36755540126478,72.06274957211477
+Offshore Wind - Class 5/Conservative,160.06257982323848,159.25742430189297,158.54107354073116,157.86933247806755,157.27109292013563,156.70571538443482,156.16904105378356,155.65773345361944,145.90740662530177,135.32345244927194,124.98218499361708,114.80889396197291,104.7496345024802,94.82974646582429,94.35230841347854,93.90119999147954,93.4939767739193,93.10722264799024,92.7387699392199,92.38677075004979,92.04963958414056,91.72606006028552,91.43499311039473,91.15508354619635,90.86545732802337,90.60537852098241,90.35406289805076,90.1108853587907,89.87524664194508
+Offshore Wind - Class 6/Advanced,151.57914245388108,137.5415054757264,129.57908184109573,124.12518401747624,112.92394234329005,102.71277912685092,93.11155467065741,90.97949338781032,89.13279475846593,86.68837259445581,84.63587013503847,82.86789330877194,81.34900052644272,79.9967324167511,79.07628794298193,78.25179337697593,77.47525410000767,76.74115818604872,76.06440172119738,75.42118116043825,74.80819856188074,74.24157684157879,73.69949920911166,73.17992895321659,72.69941203798436,72.21922916906414,71.77476521810102,71.34623393013428,70.93247091630786
+Offshore Wind - Class 6/Moderate,168.40051928877315,162.00473722506405,157.5007642417297,154.0664306701488,151.27316630428544,149.0014890378553,139.38479116740885,130.05115721816006,120.98486175377504,111.22693677477008,101.85387667936533,100.30910072976889,98.94732845207037,97.73646536287318,96.93566974374956,96.15583188499721,95.46982702481276,94.7944921317495,94.1775754819088,93.58982927333297,93.02842687990695,92.51597769530541,92.00013614411034,91.52893515619213,91.0757767024326,90.63921693856,90.21802862504043,89.81108824452156,89.41736520029232
+Offshore Wind - Class 6/Conservative,198.085303511816,197.12665867222313,196.23343761688244,195.39561422884316,194.6611548911612,193.9117209795076,193.25369721515344,192.682197805657,180.6282064332926,167.5680429084793,154.829055104627,142.2645445591211,129.88190789342104,117.6497216663292,117.06178958739874,116.50648298707574,115.97987873656687,115.51155914448958,115.0657898435431,114.60796474784725,114.20104520001867,113.81078637155835,113.43580717512317,113.07474850852553,112.75830661907018,112.4218010506707,112.09631365381182,111.81241510947115,111.50647426325375
+Offshore Wind - Class 7/Advanced,207.27487203177816,188.12046876290154,177.1772424361006,169.72963233773453,154.277382773427,140.21700413866765,126.9770050181829,124.05379230774798,121.54059293678205,118.20284403733176,115.38887078146716,112.98218815491998,110.90425804845528,109.02596852526973,107.80063753568298,106.65059598404252,105.60212477826313,104.61135606386507,103.67211812875085,102.81338065086754,101.96162132576174,101.18122816926895,100.43460357678974,99.75189902362303,99.06409523807945,98.43490184902826,97.82925527743708,97.2453723291569,96.681709007605
+Offshore Wind - Class 7/Moderate,230.53019520292176,221.75553255389153,215.5952487352002,210.92782694545394,207.11266987949128,204.00533126251526,190.75541857193193,177.90615136953608,165.38696167366115,151.91529089484433,138.9961050715232,136.8694786909532,135.00466453556695,133.35715047186085,132.255456822636,131.21828937260364,130.237996967807,129.35387376509036,128.46873387016404,127.66914733092793,126.90548634530958,126.21893543571655,125.51734725626426,124.88691969688244,124.23730749724523,123.65413556855917,123.09181424575192,122.50590918035053,121.98109544681712
+Offshore Wind - Class 7/Conservative,271.56900182434714,270.2657309306486,269.0517297951389,267.91332881308534,266.8396439509868,265.9214950780064,264.95277526229955,264.1259251170608,247.502206434658,229.57148295261567,211.94452552734612,194.56182299130535,177.4486033661073,160.55723432934795,159.77228823089519,159.0317177638089,158.33020397290286,157.66341463535724,157.02777022588305,156.42007333961024,155.83774526256357,155.33549626464767,154.79695858559782,154.33431319172703,153.88899170664206,153.403336835444,152.98896731498272,152.58827589623044,152.20035114785992
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_occ.csv b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_occ.csv
new file mode 100644
index 0000000..045f8f4
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,3842.3701,3583.4153,3429.4759,3321.4792,2999.0614,2693.5348,2399.1137,2352.0203,2311.0401,2256.0086,2209.4435,2169.1984,2133.8401,2102.3662,2081.2931,2061.6972,2043.3962,2026.2391,2010.0994,1994.87,1980.4595,1966.7894,1953.7918,1941.4075,1929.5845,1918.2773,1907.4453,1897.0526,1887.0671
+Offshore Wind - Class 1/Moderate,4373.4293,4256.0015,4172.0581,4107.113,4054.3614,4010.0748,3722.0837,3438.8291,3159.3029,2864.6143,2576.5622,2543.4053,2514.1243,2487.9392,2470.3425,2453.932,2438.5643,2424.1202,2410.4995,2397.6174,2385.4012,2373.7884,2362.7248,2352.1629,2342.0612,2332.383,2323.0957,2314.1705,2305.5813
+Offshore Wind - Class 1/Conservative,5310.5928,5292.6419,5276.2463,5261.1643,5247.2061,5234.2197,5222.0821,5210.6919,4835.5121,4440.8387,4050.4779,3663.3763,3278.8224,2896.3131,2884.1352,2872.7465,2862.0533,2851.9778,2842.4543,2833.4271,2824.8483,2816.6767,2808.8763,2801.4159,2794.2678,2787.4076,2780.8136,2774.4665,2768.3491
+Offshore Wind - Class 2/Advanced,3835.3896,3576.9052,3423.2455,3315.445,2993.6129,2688.6414,2394.7552,2347.7473,2306.8416,2251.91,2205.4296,2165.2576,2129.9635,2098.5468,2077.512,2057.9517,2039.6839,2022.558,2006.4476,1991.2459,1976.8616,1963.2163,1950.2423,1937.8805,1926.079,1914.7923,1903.98,1893.6062,1883.6388
+Offshore Wind - Class 2/Moderate,4365.4841,4248.2695,4164.4787,4099.6515,4046.9958,4002.7896,3715.3218,3432.5817,3153.5634,2859.4101,2571.8813,2538.7847,2509.5568,2483.4194,2465.8546,2449.4739,2434.1341,2419.7162,2406.1203,2393.2616,2381.0676,2369.4759,2358.4324,2347.8897,2337.8063,2328.1457,2318.8753,2309.9663,2301.3928
+Offshore Wind - Class 2/Conservative,5300.945,5283.0267,5266.6609,5251.6063,5237.6734,5224.7107,5212.5951,5201.2255,4826.7274,4432.7709,4043.1193,3656.721,3272.8657,2891.0513,2878.8956,2867.5275,2856.8538,2846.7966,2837.2904,2828.2796,2819.7164,2811.5596,2803.7734,2796.3265,2789.1914,2782.3436,2775.7617,2769.4261,2763.3198
+Offshore Wind - Class 3/Advanced,3919.2247,3655.0904,3498.0719,3387.915,3059.0483,2747.4105,2447.1005,2399.0651,2357.2652,2301.133,2253.6366,2212.5865,2176.5209,2144.4175,2122.9229,2102.935,2084.268,2066.7677,2050.3052,2034.7712,2020.0724,2006.1289,1992.8713,1980.2393,1968.1799,1956.6464,1945.5978,1934.9972,1924.812
+Offshore Wind - Class 3/Moderate,4460.9062,4341.1295,4255.5072,4189.263,4135.4563,4090.2838,3796.5324,3507.6122,3222.495,2921.912,2628.0983,2594.2782,2564.4115,2537.7027,2519.7541,2503.0153,2487.3402,2472.6071,2458.714,2445.5743,2433.1137,2421.2687,2409.9837,2399.2106,2388.9068,2379.035,2369.562,2360.4583,2351.6973
+Offshore Wind - Class 3/Conservative,5416.8147,5398.5047,5381.7812,5366.3976,5352.1601,5338.914,5326.5336,5314.9155,4932.2315,4529.6638,4131.4951,3736.6508,3344.405,2954.2448,2941.8234,2930.2068,2919.2998,2909.0227,2899.3088,2890.101,2881.3506,2873.0155,2865.0592,2857.4495,2850.1584,2843.161,2836.4351,2829.9611,2823.7213
+Offshore Wind - Class 4/Advanced,4175.3368,3893.9419,3726.6627,3609.3073,3258.9499,2926.9473,2607.0127,2555.8384,2511.307,2451.5066,2400.9064,2357.1738,2318.7514,2284.5501,2261.6509,2240.3569,2220.47,2201.8262,2184.2878,2167.7387,2152.0794,2137.2247,2123.1008,2109.6433,2096.7958,2084.5087,2072.738,2061.4447,2050.5939
+Offshore Wind - Class 4/Moderate,4752.4159,4624.8121,4533.5946,4463.0214,4405.6986,4357.5743,4044.6269,3736.8264,3433.0774,3112.8521,2799.8383,2763.8082,2731.9898,2703.5356,2684.4141,2666.5814,2649.882,2634.1862,2619.3852,2605.3868,2592.112,2579.4929,2567.4705,2555.9933,2545.0162,2534.4994,2524.4073,2514.7087,2505.3752
+Offshore Wind - Class 4/Conservative,5770.7908,5751.2843,5733.468,5717.079,5701.9112,5687.7995,5674.6101,5662.2328,5254.5412,4825.6667,4401.4786,3980.8321,3562.954,3147.2978,3134.0646,3121.6889,3110.0691,3099.1205,3088.7718,3078.9623,3069.6401,3060.7603,3052.284,3044.1771,3036.4095,3028.9549,3021.7895,3014.8924,3008.2448
+Offshore Wind - Class 5/Advanced,4263.1798,3975.8648,3805.0662,3685.2419,3327.5134,2988.5261,2661.8605,2609.6095,2564.1412,2503.0827,2451.418,2406.7653,2367.5346,2332.6137,2309.2328,2287.4907,2267.1854,2248.1494,2230.2421,2213.3447,2197.356,2182.1888,2167.7677,2154.0271,2140.9093,2128.3637,2116.3454,2104.8145,2093.7354
+Offshore Wind - Class 5/Moderate,4852.3998,4722.1114,4628.9748,4556.9169,4498.3881,4449.2513,4129.7199,3815.4438,3505.3043,3178.3419,2858.7428,2821.9547,2789.4668,2760.4141,2740.8902,2722.6824,2705.6317,2689.6056,2674.4933,2660.2003,2646.6462,2633.7616,2621.4863,2609.7677,2598.5597,2587.8215,2577.5172,2567.6145,2558.0846
+Offshore Wind - Class 5/Conservative,5892.1998,5872.2829,5854.0918,5837.358,5821.8711,5807.4625,5793.9956,5781.3579,5365.0891,4927.1917,4494.0793,4064.583,3637.9134,3213.5123,3200.0008,3187.3647,3175.5005,3164.3215,3153.755,3143.7392,3134.2208,3125.1543,3116.4996,3108.2222,3100.2912,3092.6796,3085.3635,3078.3213,3071.5339
+Offshore Wind - Class 6/Advanced,4118.311,3840.7593,3675.7647,3560.0122,3214.4398,2886.9717,2571.4067,2520.9313,2477.0081,2418.0245,2368.1153,2324.98,2287.0824,2253.3482,2230.7618,2209.7586,2190.1433,2171.7541,2154.4553,2138.1321,2122.6868,2108.035,2094.1039,2080.8302,2068.1582,2056.0389,2044.429,2033.29,2022.5874
+Offshore Wind - Class 6/Moderate,4687.5084,4561.6474,4471.6757,4402.0665,4345.5265,4298.0594,3989.3862,3685.7896,3386.1892,3070.3374,2761.5987,2726.0607,2694.6768,2666.6113,2647.7509,2630.1618,2613.6905,2598.209,2583.6102,2569.803,2556.7095,2544.2627,2532.4045,2521.0841,2510.257,2499.8837,2489.9295,2480.3633,2471.1573
+Offshore Wind - Class 6/Conservative,5691.9745,5672.7345,5655.1615,5638.9964,5624.0357,5610.1167,5597.1074,5584.8992,5182.7758,4759.7588,4341.3641,3926.4628,3514.2919,3104.3126,3091.2602,3079.0536,3067.5925,3056.7934,3046.586,3036.9105,3027.7156,3018.9571,3010.5966,3002.6004,2994.9389,2987.586,2980.5185,2973.7157,2967.1589
+Offshore Wind - Class 7/Advanced,4314.3319,4023.5694,3850.7215,3729.4595,3367.4388,3024.3841,2693.799,2640.921,2594.9072,2533.1161,2480.8315,2435.643,2395.9416,2360.6017,2336.9402,2314.9373,2294.3884,2275.1239,2257.0017,2239.9017,2223.7211,2208.3719,2193.7778,2179.8723,2166.5971,2153.901,2141.7385,2130.0693,2118.8572
+Offshore Wind - Class 7/Moderate,4910.6216,4778.77,4684.5158,4611.5934,4552.3623,4502.6359,4179.2706,3861.2236,3547.363,3216.4775,2893.0436,2855.8141,2822.9364,2793.5351,2773.777,2755.3507,2738.0953,2721.877,2706.5833,2692.1189,2678.4022,2665.363,2652.9404,2641.0812,2629.7387,2618.8717,2608.4437,2598.4222,2588.778
+Offshore Wind - Class 7/Conservative,5962.8977,5942.7419,5924.3324,5907.3979,5891.7251,5877.1437,5863.5152,5850.7259,5429.4625,4986.3109,4548.0017,4113.3522,3681.5631,3252.0698,3238.3962,3225.6085,3213.6019,3202.2888,3191.5956,3181.4595,3171.827,3162.6516,3153.8932,3145.5163,3137.4902,3129.7874,3122.3834,3115.2568,3108.3879
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_tc.csv b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_tc.csv
new file mode 100644
index 0000000..055bed5
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Moderate,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Conservative,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+ITC Schedule/*,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Moderate,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Conservative,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PFF/Advanced,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Moderate,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Conservative,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+Year (Advanced)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Moderate)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Conservative)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035.0,2036.0,2037.0,2038.0,2039.0,2040,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_vom.csv b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_vom.csv
new file mode 100644
index 0000000..90cc094
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/TechLife/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 1/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 2/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 3/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 4/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 5/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 6/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 7/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/df_cff.csv b/tests/data/Fixed_Offshore_Wind/R&D/df_cff.csv
new file mode 100644
index 0000000..131c998
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/df_cff.csv
@@ -0,0 +1,4 @@
+Construction Finance Factor,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+CFF/Advanced,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
+CFF/Moderate,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
+CFF/Conservative,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/df_just_wacc.csv b/tests/data/Fixed_Offshore_Wind/R&D/df_just_wacc.csv
new file mode 100644
index 0000000..55043ed
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/df_just_wacc.csv
@@ -0,0 +1,7 @@
+WACC Type,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+WACC Nominal - Advanced,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Nominal - Moderate,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Nominal - Conservative,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Real - Advanced,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
+WACC Real - Moderate,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
+WACC Real - Conservative,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
diff --git a/tests/data/Fixed_Offshore_Wind/R&D/df_wacc.csv b/tests/data/Fixed_Offshore_Wind/R&D/df_wacc.csv
new file mode 100644
index 0000000..f1eeab4
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/R&D/df_wacc.csv
@@ -0,0 +1,25 @@
+WACC,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Inflation Rate,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025
+Interest Rate Nominal - Advanced,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Interest Rate Nominal - Moderate,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Interest Rate Nominal - Conservative,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Calculated Interest Rate Real - Advanced,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Calculated Interest Rate Real - Moderate,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Calculated Interest Rate Real - Conservative,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Interest During Construction  - Nominal,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Rate of Return on Equity Nominal - Advanced,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Rate of Return on Equity Nominal - Moderate,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Rate of Return on Equity Nominal - Conservative,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Calculated Rate of Return on Equity Real - Advanced,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Calculated Rate of Return on Equity Real - Moderate,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Calculated Rate of Return on Equity Real - Conservative,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Debt Fraction - Advanced,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569
+Debt Fraction - Moderate,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569
+Debt Fraction - Conservative,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569
+Tax Rate (Federal and State),0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574
+WACC Nominal - Advanced,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Nominal - Moderate,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Nominal - Conservative,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Real - Advanced,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
+WACC Real - Moderate,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
+WACC Real - Conservative,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
diff --git a/tests/data/Fixed_Offshore_Wind/df_ncf.csv b/tests/data/Fixed_Offshore_Wind/df_ncf.csv
new file mode 100644
index 0000000..6b75c07
--- /dev/null
+++ b/tests/data/Fixed_Offshore_Wind/df_ncf.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 1/Advanced,0.4687,0.4822,0.4903,0.4959,0.5002,0.5037,0.5065,0.509,0.5111,0.514,0.5164,0.5185,0.5204,0.522,0.5231,0.5242,0.5251,0.526,0.5269,0.5276,0.5284,0.5291,0.5298,0.5304,0.5311,0.5316,0.5322,0.5328,0.5333
+Offshore Wind - Class 1/Moderate,0.4687,0.4736,0.4772,0.4799,0.4821,0.484,0.4855,0.4869,0.4882,0.4901,0.4917,0.4931,0.4943,0.4954,0.4961,0.4968,0.4974,0.4981,0.4986,0.4992,0.4997,0.5002,0.5006,0.5011,0.5015,0.5019,0.5023,0.5027,0.503
+Offshore Wind - Class 1/Conservative,0.4687,0.4693,0.4699,0.4704,0.4708,0.4713,0.4717,0.4721,0.4724,0.4734,0.4743,0.4751,0.4757,0.4763,0.4767,0.4771,0.4775,0.4778,0.4781,0.4784,0.4787,0.479,0.4793,0.4795,0.4798,0.48,0.4802,0.4804,0.4806
+Offshore Wind - Class 2/Advanced,0.4501,0.4631,0.4708,0.4762,0.4804,0.4837,0.4864,0.4888,0.4909,0.4936,0.4959,0.498,0.4997,0.5013,0.5024,0.5034,0.5043,0.5051,0.5059,0.5067,0.5074,0.5081,0.5088,0.5094,0.51,0.5105,0.5111,0.5116,0.5121
+Offshore Wind - Class 2/Moderate,0.4501,0.4548,0.4582,0.4608,0.463,0.4647,0.4663,0.4676,0.4688,0.4706,0.4721,0.4735,0.4747,0.4757,0.4764,0.4771,0.4777,0.4783,0.4788,0.4793,0.4798,0.4803,0.4808,0.4812,0.4816,0.482,0.4823,0.4827,0.4831
+Offshore Wind - Class 2/Conservative,0.4501,0.4507,0.4512,0.4517,0.4522,0.4526,0.453,0.4533,0.4537,0.4546,0.4555,0.4562,0.4568,0.4574,0.4578,0.4582,0.4585,0.4589,0.4592,0.4594,0.4597,0.46,0.4602,0.4605,0.4607,0.4609,0.4611,0.4613,0.4615
+Offshore Wind - Class 3/Advanced,0.4523,0.4654,0.4731,0.4786,0.4827,0.486,0.4888,0.4912,0.4933,0.496,0.4984,0.5004,0.5022,0.5038,0.5048,0.5058,0.5067,0.5076,0.5084,0.5092,0.5099,0.5106,0.5113,0.5119,0.5125,0.513,0.5136,0.5141,0.5146
+Offshore Wind - Class 3/Moderate,0.4523,0.4571,0.4605,0.4631,0.4652,0.467,0.4686,0.4699,0.4711,0.4729,0.4745,0.4758,0.477,0.478,0.4788,0.4794,0.48,0.4806,0.4812,0.4817,0.4822,0.4827,0.4831,0.4835,0.4839,0.4843,0.4847,0.4851,0.4854
+Offshore Wind - Class 3/Conservative,0.4523,0.4529,0.4534,0.4539,0.4544,0.4548,0.4552,0.4555,0.4559,0.4569,0.4577,0.4584,0.4591,0.4597,0.4601,0.4604,0.4608,0.4611,0.4614,0.4617,0.462,0.4622,0.4625,0.4627,0.463,0.4632,0.4634,0.4636,0.4638
+Offshore Wind - Class 4/Advanced,0.4554,0.4685,0.4764,0.4818,0.486,0.4894,0.4922,0.4946,0.4966,0.4994,0.5018,0.5038,0.5056,0.5072,0.5083,0.5093,0.5102,0.5111,0.5119,0.5127,0.5134,0.5141,0.5148,0.5154,0.516,0.5166,0.5171,0.5176,0.5181
+Offshore Wind - Class 4/Moderate,0.4554,0.4602,0.4636,0.4663,0.4684,0.4702,0.4718,0.4731,0.4743,0.4762,0.4777,0.4791,0.4802,0.4813,0.482,0.4827,0.4833,0.4839,0.4845,0.485,0.4855,0.486,0.4864,0.4868,0.4873,0.4877,0.488,0.4884,0.4887
+Offshore Wind - Class 4/Conservative,0.4554,0.456,0.4565,0.457,0.4575,0.4579,0.4583,0.4587,0.459,0.46,0.4608,0.4616,0.4622,0.4628,0.4632,0.4636,0.4639,0.4643,0.4646,0.4649,0.4651,0.4654,0.4657,0.4659,0.4661,0.4664,0.4666,0.4668,0.467
+Offshore Wind - Class 5/Advanced,0.4438,0.4566,0.4642,0.4696,0.4736,0.4769,0.4796,0.482,0.484,0.4867,0.489,0.491,0.4928,0.4943,0.4954,0.4963,0.4972,0.4981,0.4989,0.4996,0.5003,0.501,0.5017,0.5023,0.5029,0.5034,0.5039,0.5045,0.505
+Offshore Wind - Class 5/Moderate,0.4438,0.4485,0.4518,0.4544,0.4565,0.4583,0.4598,0.4611,0.4623,0.464,0.4656,0.4669,0.468,0.4691,0.4698,0.4704,0.471,0.4716,0.4721,0.4727,0.4731,0.4736,0.474,0.4745,0.4749,0.4752,0.4756,0.476,0.4763
+Offshore Wind - Class 5/Conservative,0.4438,0.4444,0.4449,0.4454,0.4458,0.4462,0.4466,0.447,0.4473,0.4483,0.4491,0.4498,0.4505,0.451,0.4514,0.4518,0.4521,0.4524,0.4527,0.453,0.4533,0.4536,0.4538,0.454,0.4543,0.4545,0.4547,0.4549,0.4551
+Offshore Wind - Class 6/Advanced,0.3471,0.3571,0.363,0.3672,0.3704,0.3729,0.3751,0.3769,0.3785,0.3806,0.3824,0.384,0.3853,0.3865,0.3874,0.3881,0.3888,0.3895,0.3901,0.3907,0.3913,0.3918,0.3923,0.3928,0.3932,0.3937,0.3941,0.3945,0.3949
+Offshore Wind - Class 6/Moderate,0.3471,0.3507,0.3533,0.3553,0.357,0.3583,0.3595,0.3606,0.3615,0.3629,0.3641,0.3651,0.366,0.3668,0.3673,0.3679,0.3683,0.3688,0.3692,0.3696,0.37,0.3703,0.3707,0.371,0.3713,0.3716,0.3719,0.3722,0.3725
+Offshore Wind - Class 6/Conservative,0.3471,0.3475,0.3479,0.3483,0.3486,0.349,0.3493,0.3495,0.3498,0.3506,0.3512,0.3518,0.3523,0.3527,0.353,0.3533,0.3536,0.3538,0.354,0.3543,0.3545,0.3547,0.3549,0.3551,0.3552,0.3554,0.3556,0.3557,0.3559
+Offshore Wind - Class 7/Advanced,0.2663,0.2739,0.2785,0.2817,0.2842,0.2861,0.2878,0.2892,0.2904,0.292,0.2934,0.2946,0.2956,0.2966,0.2972,0.2978,0.2983,0.2988,0.2993,0.2997,0.3002,0.3006,0.301,0.3013,0.3017,0.302,0.3023,0.3026,0.3029
+Offshore Wind - Class 7/Moderate,0.2663,0.2691,0.2711,0.2726,0.2739,0.2749,0.2758,0.2766,0.2773,0.2784,0.2793,0.2801,0.2808,0.2814,0.2818,0.2822,0.2826,0.2829,0.2833,0.2836,0.2839,0.2841,0.2844,0.2846,0.2849,0.2851,0.2853,0.2856,0.2858
+Offshore Wind - Class 7/Conservative,0.2663,0.2666,0.2669,0.2672,0.2675,0.2677,0.268,0.2682,0.2684,0.2689,0.2694,0.2699,0.2703,0.2706,0.2708,0.271,0.2712,0.2714,0.2716,0.2718,0.272,0.2721,0.2723,0.2724,0.2725,0.2727,0.2728,0.2729,0.273
diff --git a/tests/data/Floating_Offshore_Wind/Market/20/df_capex.csv b/tests/data/Floating_Offshore_Wind/Market/20/df_capex.csv
new file mode 100644
index 0000000..48aaa3e
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/20/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,6164.393079155067,5504.442350486707,5127.996867726996,4869.7148063506875,4675.460752031988,4521.027964517991,4181.32647681124,3955.8994689532415,3789.4485139119115,3658.6606949270113,3551.6090894147055,3461.4120769098504,3383.755867003581,3315.7674080971583,3255.442083151268,3201.3281773540753,3152.3428360723738,3107.6579809550435,3066.6269148509114,3028.735539578943,2993.56854097348
+Offshore Wind - Class 8/Moderate,8972.557992722874,7911.509016245191,7115.361849729815,6854.491558455669,6655.757965015436,6496.126765702345,6139.546404741941,5898.483029197435,5718.0374502403065,5574.708052575891,5456.331430674453,5355.822630867479,5268.705440094559,5191.977977322759,5123.532628486631,5061.834970721061,5005.734962958142,4954.348981625986,4906.983875586392,4863.086964349291,4822.209784006486
+Offshore Wind - Class 8/Conservative,13617.880972305991,12472.287069859833,11538.619138826649,10697.274903780875,9907.486722659387,9150.512241029572,8830.724213877127,8610.631986324295,8443.699750238353,8309.711484371428,8198.086212207783,8102.60464292073,8019.307544217199,7945.521539034585,7879.359087685128,7819.438544378004,7764.719517193688,7714.399094976894,7667.845104376691,7624.550986283925,7584.105196068877
+Offshore Wind - Class 9/Advanced,6558.840756878646,5856.661025758063,5456.127543127564,5181.318394895795,4974.634406682637,4810.319780701124,4448.881485732,4209.0299051236,4031.9280154142275,3892.7712722983247,3778.8697547702554,3682.9011392659736,3600.2759049094507,3527.937068921801,3463.7515174356276,3406.17496027115,3354.0551389863795,3306.510979989622,3262.8544321030654,3222.538469140551,3185.121279316132
+Offshore Wind - Class 9/Moderate,9546.694570497915,8417.75115177491,7570.660148319435,7293.097243214567,7081.6471202797065,6911.8013655180175,6532.404114379638,6275.91568689869,6083.923686750289,5931.422897274402,5805.471614638324,5698.531432173666,5605.839762957256,5524.20259049191,5451.377484367961,5385.732013785848,5326.042299120715,5271.36817376157,5220.972471694673,5174.266480101112,5130.773796159257
+Offshore Wind - Class 9/Conservative,14489.262976229513,13270.364682251466,12276.953265231648,11381.772850492516,10541.447609706373,9736.035810799354,9395.785190401062,9161.609643969132,8983.995873452806,8841.433908958357,8722.665920531352,8621.074709565988,8532.447487042864,8453.94002722631,8383.544054409776,8319.789338707838,8261.568966978499,8208.028584987751,8158.4957740450745,8112.431268773591,8069.39735952941
+Offshore Wind - Class 10/Advanced,6748.110486865921,6025.667947904331,5613.576070262512,5330.836816230673,5118.1884243416125,4949.132165622009,4577.263675574761,4330.490672636434,4148.278179141638,4005.105771562267,3887.9173295629544,3789.179324698292,3704.169637122116,3629.743365173169,3563.705641115856,3504.4674946826312,3450.8437394263824,3401.9276910847607,3357.0113421132132,3315.5319229695933,3277.034871966981
+Offshore Wind - Class 10/Moderate,9822.185561260063,8660.663928172953,7789.128260225514,7503.555645591015,7286.003641787134,7111.256603353412,6720.911067682522,6457.021045514077,6259.488603614352,6102.587213534271,5973.001211302103,5862.975109326782,5767.608732623316,5683.615711063982,5608.688977784607,5541.1492045237865,5479.736922802638,5423.48513578377,5371.635058056139,5323.581346495215,5278.833517953941
+Offshore Wind - Class 10/Conservative,14907.38256357729,13653.310286265418,12631.231770156972,11710.218947356327,10845.644392734888,10016.990633038271,9666.92136933382,9425.988153647959,9243.248922939856,9096.573064310081,8974.377680763704,8869.854879523824,8778.6700268652,8697.897186817227,8625.469544997572,8559.87518488806,8499.974708816384,8444.889371433632,8393.927019419943,8346.533420123389,8302.257670524286
+Offshore Wind - Class 11/Advanced,6956.321691478424,6211.58833433994,5786.781590234056,5495.318410480601,5276.108919550027,5101.836399169968,4718.494106932648,4464.10686313231,4276.27221765125,4128.682246555951,4007.8780435089548,3906.0934775235946,3818.4609690138946,3741.7381627276673,3673.6627827572092,3612.5970766051614,3557.318716808526,3506.893191060219,3460.5909832870884,3417.8318066917336,3378.147019261812
+Offshore Wind - Class 11/Moderate,10125.246605283506,8927.886441850036,8029.459791454079,7735.075997427815,7510.811447932585,7330.672642679775,6928.282996204787,6656.250665536574,6452.623549233597,6290.880966319118,6157.296706010031,6043.875693445647,5945.566750465955,5858.98217294766,5781.7437163185405,5712.119944026248,5648.812916151575,5590.8253687009,5537.375455572721,5487.839096831512,5441.710620317747
+Offshore Wind - Class 11/Conservative,15367.34588463045,14074.579653497436,13020.965088843674,12071.534843276095,11180.283948017326,10326.06231298724,9965.191665783244,9716.824592616986,9528.446912223111,9377.245393090887,9251.279808391977,9143.531947417756,9049.533690523212,8966.26852200647,8891.606321455141,8823.987942283095,8762.239284913625,8705.454330296612,8652.919527452297,8604.063569948312,8558.421696176958
+Offshore Wind - Class 12/Advanced,7245.576477514379,6469.875939151453,6027.405038760588,5723.822357484229,5495.497796043878,5313.9787862933945,4914.696456988965,4649.731451865308,4454.086438784636,4300.359441441109,4174.531888278836,4068.515020382145,3977.238479305209,3897.3256477951445,3826.41945720222,3762.8145251195583,3705.237635348968,3652.715360668218,3604.487806979223,3559.950628975789,3518.6156717536455
+Offshore Wind - Class 12/Moderate,10546.270287467178,9299.122093334134,8363.337346133056,8056.712538484164,7823.122822284838,7635.493616512525,7216.371886948146,6933.028176741409,6720.933795766869,6552.465695522657,6413.326802268119,6295.189545898889,6192.792762929343,6102.607945981941,6022.157733862976,5949.6388470998245,5883.699352714367,5823.300632686345,5767.628245515243,5716.032057120063,5667.985552024907
+Offshore Wind - Class 12/Conservative,16006.34442385554,14659.82283631448,13562.397394538018,12573.488355592783,11645.177822080408,10755.436182490917,10379.5601213956,10120.865517571236,9924.65485236211,9767.166079887564,9635.962614130893,9523.734437954206,9425.827504895678,9339.100239355173,9261.33327161348,9190.90326210478,9126.586996416443,9067.440760138938,9012.721511217214,8961.834106447515,8914.294382198923
+Offshore Wind - Class 13/Advanced,8067.847304177014,7204.115684313053,6711.430463055241,6373.395553708924,6119.159313083605,5917.0404546315685,5472.445199000929,5177.410383944034,4959.562360700135,4788.389618418754,4648.282397902372,4530.234058233854,4428.599054130361,4339.61705175403,4260.664232352999,4189.840860682058,4125.729812965057,4067.2471258817523,4013.546427744839,3963.954856388974,3917.928933426527
+Offshore Wind - Class 13/Moderate,11743.123337447973,10354.441375182545,9312.458268016122,8971.035876283919,8710.936898584381,8502.014471234905,8035.328404569617,7719.829111498906,7483.665023989759,7296.078280931126,7141.148912491345,7009.604747206893,6895.5874827517155,6795.167932251564,6705.587682347766,6624.839011677291,6551.416323238098,6484.163256446148,6422.172794432979,6364.721186298052,6311.2219365965375
+Offshore Wind - Class 13/Conservative,17822.838891664425,16323.506082275928,15101.538388224133,14000.401949183142,12966.741312160691,11976.026665500049,11557.493870491991,11269.441012077474,11050.963254594135,10875.60167093344,10729.508427343852,10604.543987043204,10495.526125063212,10398.956379445155,10312.364151986274,10233.941174122267,10162.325978166451,10096.46752880371,10035.538412895146,9978.875857327488,9925.941151067387
+Offshore Wind - Class 14/Advanced,8772.617149963404,7833.433833506027,7297.709935649757,6930.145923040228,6653.700685341661,6433.92576402004,5950.492757859008,5629.684960366007,5392.806656664875,5206.681052257928,5054.334813755595,4925.974354178844,4815.460873380183,4718.705866157529,4632.856126410186,4555.845948442863,4486.134368136903,4422.542962036146,4364.1512981589285,4310.227532189312,4260.181066540415
+Offshore Wind - Class 14/Moderate,12768.948217937565,11258.957378283958,10125.951508504344,9754.703994068908,9471.884027620466,9244.71105940988,8737.257461550169,8394.197649926717,8137.403335691084,7933.4297546877115,7764.966532666483,7621.931491411524,7497.954115183718,7388.762300206951,7291.356826297187,7203.554245195355,7123.717691353731,7050.589691930108,6983.184069801279,6920.7137680366495,6862.541069850083
+Offshore Wind - Class 14/Conservative,19379.759455956522,17749.451902947963,16420.738711875958,15223.412141659841,14099.455708117157,13022.196729277817,12567.102983447312,12253.887253075498,12016.32422425768,11825.644022616503,11666.788682494893,11530.90777697982,11412.366736790163,11307.360991475107,11213.20441407107,11127.930858979074,11050.059785524207,10978.44802649822,10912.196436710647,10850.584258715955,10793.025329675436
diff --git a/tests/data/Floating_Offshore_Wind/Market/20/df_fin_assump.csv b/tests/data/Floating_Offshore_Wind/Market/20/df_fin_assump.csv
new file mode 100644
index 0000000..e9d9b87
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/20/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),20
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Floating_Offshore_Wind/Market/20/df_fom.csv b/tests/data/Floating_Offshore_Wind/Market/20/df_fom.csv
new file mode 100644
index 0000000..93154eb
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/20/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,61.229875,59.1585,57.97687500000001,57.16625,56.5565,56.071875000000006,55.005625,54.298125,53.775625,53.365125000000006,53.02912499999999,52.746,52.502375,52.288875,52.099624999999996,51.92975,51.775999999999996,51.63575,51.507,51.388,51.277625
+Offshore Wind - Class 8/Moderate,66.816625,64.739375,63.523624999999996,62.67525,62.028875,61.50975,60.350125,59.566125,58.97925,58.513124999999995,58.128125,57.801249999999996,57.517875,57.268375000000006,57.04575,56.845125,56.662625000000006,56.49549999999999,56.341499999999996,56.198750000000004,56.06575
+Offshore Wind - Class 8/Conservative,73.84925,71.96600000000001,70.83624999999999,70.034875,69.41675000000001,68.91525,67.77825,66.99575,66.402125,65.92575,65.528875,65.189375,64.89325,64.630875,64.39574999999999,64.182625,63.988125,63.809125,63.643625,63.48975,63.34587499999999
+Offshore Wind - Class 9/Advanced,63.01412499999999,60.882374999999996,59.666375,58.832125,58.20462499999999,57.70575,56.6085,55.880375,55.342625,54.920249999999996,54.574375,54.283125,54.03225,53.812625,53.61775,53.443,53.28475,53.140375000000006,53.007875,52.8855,52.771875
+Offshore Wind - Class 9/Moderate,68.763625,66.625875,65.37474999999999,64.501625,63.8365,63.302125000000004,62.108625,61.301874999999995,60.697875,60.218125,59.821999999999996,59.4855,59.194,58.937125,58.708,58.5015,58.313750000000006,58.141749999999995,57.98325,57.836375000000004,57.6995
+Offshore Wind - Class 9/Conservative,76.00125,74.063125,72.9005,72.075625,71.43950000000001,70.92337500000001,69.75325,68.94800000000001,68.337125,67.84687500000001,67.438375,67.089,66.78425,66.51425,66.27225,66.053,65.85275,65.668625,65.49825,65.339875,65.191875
+Offshore Wind - Class 10/Advanced,62.7405,60.617999999999995,59.40725,58.576625,57.951875,57.45525,56.362625,55.63775,55.102374999999995,54.681749999999994,54.3375,54.047375,53.797625,53.579,53.385,53.210875,53.053375,52.909625,52.77775,52.655874999999995,52.54275
+Offshore Wind - Class 10/Moderate,68.465,66.3365,65.090875,64.2215,63.55925,63.027249999999995,61.839000000000006,61.035624999999996,60.43425,59.956625,59.562125,59.22725,58.936875,58.68125,58.453125,58.2475,58.060625,57.889375,57.731500000000004,57.585249999999995,57.449000000000005
+Offshore Wind - Class 10/Conservative,75.671125,73.7415,72.583875,71.76275000000001,71.12925,70.615375,69.450375,68.6485,68.040375,67.55225,67.14562500000001,66.79775000000001,66.49425,66.22550000000001,65.984375,65.766125,65.56675,65.383375,65.213875,65.056125,64.90875
+Offshore Wind - Class 11/Advanced,63.692,61.53725,60.30825,59.465,58.830749999999995,58.32662499999999,57.2175,56.481500000000004,55.938,55.510999999999996,55.1615,54.867,54.6135,54.39149999999999,54.194625,54.017875000000004,53.858,53.712125,53.578125,53.454375,53.339625
+Offshore Wind - Class 11/Moderate,69.503375,67.342625,66.078,65.1955,64.52325,63.983125,62.776875,61.96125000000001,61.350875,60.866,60.4655,60.1255,59.83075,59.571125,59.339625,59.130874999999996,58.941125,58.767250000000004,58.607,58.4585,58.32025
+Offshore Wind - Class 11/Conservative,76.81875,74.859875,73.68475000000001,72.851,72.208,71.686375,70.503625,69.689625,69.07225,68.57675,68.163875,67.81075,67.50275,67.229875,66.985125,66.76350000000001,66.561125,66.375,66.202875,66.04275,65.893125
+Offshore Wind - Class 12/Advanced,66.758375,64.5,63.211875,62.328,61.66325,61.134750000000004,59.97225,59.200875,58.63125,58.183625,57.81725,57.508625,57.242875,57.01025,56.803749999999994,56.618624999999994,56.451,56.298125,56.157624999999996,56.028000000000006,55.907625
+Offshore Wind - Class 12/Moderate,72.849625,70.584875,69.259375,68.334375,67.62975,67.063625,65.79925,64.94449999999999,64.304625,63.796375000000005,63.376625000000004,63.020250000000004,62.711375000000004,62.43925,62.1965,61.97775,61.778875,61.596624999999996,61.42875,61.272999999999996,61.128125000000004
+Offshore Wind - Class 12/Conservative,80.51724999999999,78.464,77.23237499999999,76.35849999999999,75.6845,75.13775,73.898125,73.04487499999999,72.39775,71.87837499999999,71.44575,71.075625,70.752625,70.466625,70.210125,69.977875,69.76575,69.57075,69.39025,69.222375,69.065625
+Offshore Wind - Class 13/Advanced,63.717,61.5615,60.332,59.488375,58.853875,58.3495,57.24,56.503625,55.96,55.532875,55.18325,54.888625,54.635,54.412875,54.215875000000004,54.039125,53.879124999999995,53.733125,53.599125,53.475375,53.3605
+Offshore Wind - Class 13/Moderate,69.530625,67.369125,66.104,65.221125,64.5485,64.00825,62.8015,61.985625000000006,61.375,60.889875,60.48925,60.149125000000005,59.85425,59.594625,59.363,59.15412500000001,58.96425,58.790375,58.630125,58.481500000000004,58.343125
+Offshore Wind - Class 13/Conservative,76.849,74.88925,73.71362500000001,72.879625,72.236375,71.7145,70.531375,69.717,69.099375,68.60375,68.19075,67.837375,67.52925,67.25625,67.0115,66.78975,66.58725,66.401125,66.228875,66.06875,65.919
+Offshore Wind - Class 14/Advanced,64.952,62.75475,61.501374999999996,60.64149999999999,59.99475,59.480500000000006,58.3495,57.59887499999999,57.04475000000001,56.609249999999996,56.252874999999996,55.9525,55.694,55.467625,55.26675,55.086625,54.923500000000004,54.77475,54.638125,54.512,54.394875
+Offshore Wind - Class 14/Moderate,70.878375,68.674875,67.385375,66.485375,65.79975,65.249,64.018875,63.187125,62.56462499999999,62.070125000000004,61.66175,61.315,61.0145,60.749750000000006,60.513625,60.30075,60.10725,59.93000000000001,59.7665,59.615125000000006,59.474125
+Offshore Wind - Class 14/Conservative,78.33862500000001,76.340875,75.1425,74.292375,73.63662500000001,73.104625,71.8985,71.068375,70.438875,69.93350000000001,69.5125,69.152375,68.83825,68.559875,68.310375,68.084375,67.878,67.68825,67.512625,67.349375,67.19675
diff --git a/tests/data/Floating_Offshore_Wind/Market/20/df_gcc.csv b/tests/data/Floating_Offshore_Wind/Market/20/df_gcc.csv
new file mode 100644
index 0000000..a559485
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/20/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,1124.5467,1004.1544,935.4809,888.3635,852.9265,824.7539,762.7834,721.6596,691.2946,667.4355,647.9065,631.4522,617.2857,604.8828,593.8779,584.0061,575.0699,566.9182,559.433,552.5207,546.1053
+Offshore Wind - Class 8/Moderate,1636.8295,1443.2664,1298.0283,1250.4387,1214.1845,1185.0636,1120.014,1076.0377,1043.1197,1016.9727,995.3777,977.0423,961.1498,947.1527,934.6665,923.4112,913.1771,903.803,895.1623,887.1544,879.6973
+Offshore Wind - Class 8/Conservative,2484.258,2275.2717,2104.9462,1951.463,1807.385,1669.293,1610.9553,1570.8047,1540.3519,1515.9089,1495.5456,1478.1272,1462.9317,1449.4712,1437.4014,1426.4703,1416.4881,1407.3084,1398.8157,1390.9177,1383.5394
+Offshore Wind - Class 9/Advanced,1301.6071,1162.259,1082.7728,1028.2367,987.2201,954.6117,882.884,835.2853,800.1393,772.5235,749.9197,730.8746,714.4776,700.1219,687.3842,675.9581,665.6149,656.1797,647.516,639.5153,632.0898
+Offshore Wind - Class 9/Moderate,1894.549,1670.5093,1502.4034,1447.3209,1405.3584,1371.6524,1296.3607,1245.4604,1207.3594,1177.0955,1152.1004,1130.878,1112.4833,1096.2823,1081.8301,1068.8027,1056.9573,1046.1071,1036.1061,1026.8372,1018.2061
+Offshore Wind - Class 9/Conservative,2875.4056,2633.5143,2436.371,2258.7217,2091.9585,1932.1239,1864.6009,1818.1286,1782.881,1754.5895,1731.0199,1710.859,1693.2709,1677.691,1663.7209,1651.0687,1639.5148,1628.8897,1619.0599,1609.9183,1601.3782
+Offshore Wind - Class 10/Advanced,1437.5413,1283.6403,1195.8529,1135.6213,1090.3211,1054.3073,975.0886,922.5189,883.7024,853.2025,828.238,807.204,789.0945,773.2396,759.1716,746.5522,735.1288,724.7083,715.1398,706.3035,698.1025
+Offshore Wind - Class 10/Moderate,2092.4076,1844.9701,1659.308,1598.4728,1552.128,1514.9019,1431.7471,1375.5309,1333.4508,1300.0263,1272.4208,1248.9821,1228.6663,1210.7734,1194.8118,1180.4239,1167.3413,1155.3581,1144.3125,1134.0757,1124.5431
+Offshore Wind - Class 10/Conservative,3175.7006,2908.5472,2690.8151,2494.6129,2310.4337,2133.9067,2059.3319,2008.0062,1969.0775,1937.8313,1911.8002,1889.5338,1870.1088,1852.9019,1837.4727,1823.4992,1810.7387,1799.004,1788.1475,1778.0513,1768.6193
+Offshore Wind - Class 11/Advanced,1568.3903,1400.4808,1304.7028,1238.9887,1189.5652,1150.2733,1063.8439,1006.4891,964.1394,930.8634,903.6266,880.678,860.9201,843.622,828.2735,814.5055,802.0423,790.6732,780.2338,770.5932,761.6458
+Offshore Wind - Class 11/Moderate,2282.8643,2012.9044,1810.3428,1743.9703,1693.407,1652.7924,1562.0686,1500.7355,1454.8252,1418.3583,1388.2401,1362.6679,1340.5029,1320.9813,1303.5669,1287.8694,1273.596,1260.522,1248.471,1237.3024,1226.9022
+Offshore Wind - Class 11/Conservative,3464.7616,3173.2912,2935.7405,2721.6795,2520.7358,2328.1408,2246.7779,2190.7804,2148.3083,2114.218,2085.8175,2061.5244,2040.3313,2021.5581,2004.7246,1989.4792,1975.5572,1962.7543,1950.9097,1939.8945,1929.6039
+Offshore Wind - Class 12/Advanced,1725.4782,1540.7511,1435.3801,1363.0842,1308.7105,1265.4831,1170.3971,1107.2977,1060.7064,1024.0975,994.1326,968.8855,947.1487,928.1181,911.2323,896.0853,882.3738,869.866,858.381,847.7748,837.9312
+Offshore Wind - Class 12/Moderate,2511.513,2214.5143,1991.6644,1918.644,1863.0164,1818.334,1718.5234,1651.0473,1600.5386,1560.4192,1527.2844,1499.1509,1474.7659,1453.2891,1434.1305,1416.8607,1401.1577,1386.7742,1373.5162,1361.229,1349.7871
+Offshore Wind - Class 12/Conservative,3811.7876,3491.1239,3229.7805,2994.2794,2773.2094,2561.3243,2471.8123,2410.2062,2363.4801,2325.9754,2294.7303,2268.004,2244.6882,2224.0348,2205.5152,2188.7428,2173.4264,2159.3412,2146.3102,2134.1918,2122.8705
+Offshore Wind - Class 13/Advanced,2017.4966,1801.5064,1678.3025,1593.7713,1530.1954,1479.6523,1368.474,1294.6958,1240.2193,1197.4148,1162.3787,1132.8588,1107.4433,1085.1919,1065.4485,1047.7379,1031.7059,1017.0814,1003.6526,991.2515,979.7419
+Offshore Wind - Class 13/Moderate,2936.5592,2589.2967,2328.7318,2243.3536,2178.3116,2126.0672,2009.3647,1930.469,1871.4123,1824.5032,1785.7606,1752.8658,1724.3539,1699.2424,1676.8414,1656.6489,1638.2883,1621.4706,1605.9689,1591.6022,1578.2238
+Offshore Wind - Class 13/Conservative,4456.8911,4081.9585,3776.3856,3501.0285,3242.5448,2994.8005,2890.1395,2818.1072,2763.4733,2719.6213,2683.0883,2651.8389,2624.5772,2600.4284,2578.7746,2559.1636,2541.2551,2524.7861,2509.5498,2495.3804,2482.1432
+Offshore Wind - Class 14/Advanced,2383.5514,2128.3719,1982.8138,1882.9454,1807.8342,1748.1206,1616.7701,1529.6055,1465.2448,1414.6738,1373.2808,1338.4048,1308.3779,1282.0892,1258.7635,1237.8396,1218.8987,1201.6207,1185.7555,1171.1042,1157.5064
+Offshore Wind - Class 14/Moderate,3469.3688,3059.0989,2751.2572,2650.3879,2573.5447,2511.821,2373.944,2280.7335,2210.9615,2155.5412,2109.7691,2070.906,2037.2209,2007.5531,1981.0877,1957.2314,1935.5395,1915.6704,1897.356,1880.3826,1864.5769
+Offshore Wind - Class 14/Conservative,5265.5498,4822.5894,4461.5733,4136.2554,3830.8724,3538.1773,3414.5267,3329.4249,3264.8782,3213.0697,3169.9081,3132.9888,3100.7808,3072.2503,3046.6677,3023.4985,3002.3407,2982.8835,2964.8827,2948.1425,2932.5035
diff --git a/tests/data/Floating_Offshore_Wind/Market/20/df_lcoe.csv b/tests/data/Floating_Offshore_Wind/Market/20/df_lcoe.csv
new file mode 100644
index 0000000..929cd7f
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/20/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,94.43427628139298,84.87164353092875,79.35303764750867,75.51921958662082,72.62513681610872,70.31563090709236,65.59514066157922,62.44087853160255,60.100764491393655,58.245933882277676,56.72557631861677,55.4346991328289,54.32535596512248,53.34754586754379,52.4742026654936,51.695551995686316,50.98666641607639,50.33633840217468,49.74538868348691,49.18757544729781,48.67634508936664
+Offshore Wind - Class 8/Moderate,138.5990104627304,123.1100565140365,111.6321867569182,107.57772652087664,104.47587633511179,101.96681456241689,96.75262111938243,93.19255968477086,90.52025613729282,88.37990703624638,86.6153567464186,85.08936671558638,83.7731602511759,82.62300161567882,81.57468124180745,80.63990945580247,79.78534297969325,78.99840161399075,78.26919182306911,77.58980340403676,76.96948079165315
+Offshore Wind - Class 8/Conservative,210.55753386211725,193.49193633524172,179.7037257530821,167.42256489987386,155.9461965021826,145.02344193959772,140.14661918927877,136.7877931329461,134.19346206430424,132.12032013141754,130.3812438580948,128.8834801593546,127.56798561514654,126.394838875288,125.36268710150553,124.3970564402083,123.53584888096712,122.74027659415263,122.00098738222562,121.31041967330727,120.66240425426673
+Offshore Wind - Class 9/Advanced,99.35258507756983,89.26500862567502,83.42782597031776,79.38554112673059,76.33427268851113,73.89943527746198,68.91933054696413,65.59187549938602,63.12342810022078,61.16711055047619,59.552085035673024,58.20225866219524,57.0213358153216,55.99046017968311,55.08032429154433,54.2488662461014,53.50156519807766,52.816040781084276,52.19305011714285,51.60516138672588,51.066271898941864
+Offshore Wind - Class 9/Moderate,145.96153288482915,129.61057868393868,117.4665698942618,113.21522100322302,109.94432947283775,107.2986654053955,101.7972317317377,98.04145777576281,95.22231408643209,92.96453664499766,91.08460671932524,89.49372297221888,88.10551524630448,86.87463710651754,85.76933344925185,84.78365388452669,83.882618738944,83.05291416192351,82.28412100543044,81.56789755258,80.91382223534562
+Offshore Wind - Class 9/Conservative,221.9513353005104,203.93132400060742,189.3685926698297,176.3950430144938,164.27049464814138,152.72962436380493,147.58494141566902,144.0109720499551,141.30529256218114,139.11855638745837,137.25508378407304,135.6757929747833,134.31729690270146,133.08015410990964,131.9635188221357,130.97334776306437,130.06506828190172,129.19870501855672,128.41924789844842,127.69119231283763,127.00804534963446
+Offshore Wind - Class 10/Advanced,101.54242459297767,91.20394254359499,85.22217268382354,81.08009006626736,77.95363023265921,75.45891136880688,70.35429551432533,66.9438850245951,64.41400479963892,62.4091104446799,60.76584545331824,59.3708209140168,58.16077166513065,57.104469519801995,56.171862631404274,55.31995182110391,54.55428350221876,53.851931391352245,53.213619729477806,52.611349670705636,52.05924399649378
+Offshore Wind - Class 10/Moderate,149.31955402133465,132.5791779004178,120.12029461052725,115.76314172944488,112.3879457324535,109.69979169855905,104.03900504010349,100.2104266028706,97.30087984197962,94.98721851245787,93.0797596329608,91.43064525347413,90.00814760786588,88.74697506489555,87.6322486440147,86.62205134431659,85.68130489367803,84.83120673619034,84.06050968975784,83.32656264987028,82.63957026114461
+Offshore Wind - Class 10/Conservative,227.29570226830103,208.8095035636275,193.8667449304164,180.55265046843763,168.10867989263957,156.26286680540247,150.99006204689462,147.3271861993299,144.55423483736493,142.31317257169283,140.40359397786662,138.78515377846549,137.39289439995494,136.12517643301013,134.98090964571097,133.96621311867986,133.03544253972268,132.14773616109235,131.34903632483494,130.60297917584845,129.9029612781829
+Offshore Wind - Class 11/Advanced,105.01539008324959,94.30643236064087,88.11014336160142,83.83592109276549,80.59659026644847,77.9965726240601,72.72431272796217,69.19161757282332,66.55809249360095,64.4817013811407,62.77983594493822,61.335054395615785,60.093438772499006,58.999218419632584,58.02200272098498,57.150686841601726,56.357548765556494,55.6300003572744,54.9687749781847,54.34487549274899,53.77298841461043
+Offshore Wind - Class 11/Moderate,154.50703017425747,137.16246776633827,124.25282984695978,119.71437564773228,116.24251773156391,113.45773092857823,107.59484310723832,103.62956884424851,100.61602195724906,98.21963437489842,96.24399248788481,94.55514406578928,93.08142714032104,91.77478287109761,90.60148333340308,89.55513361051973,88.59866490143648,87.7179190147728,86.90183858494687,86.14157611901629,85.44729681734165
+Offshore Wind - Class 11/Conservative,235.28151959359013,216.12759451115042,200.64370746002098,186.84702336766102,173.95167957526385,161.67610716845473,156.21546395419222,152.45458344759953,149.55016460960323,147.2291498412084,145.28224035872708,143.60559570793703,142.13307213131066,140.81997076743468,139.6644680750413,138.5837696855799,137.6197376732527,136.7292447938298,135.8728904815867,135.10013366923988,134.37504484694605
+Offshore Wind - Class 12/Advanced,111.6392587477059,100.24994993025071,93.6771448868306,89.12872475828695,85.68113470382845,82.92999411566183,77.32534714792965,73.56922486390005,70.78264285118746,68.57388605845614,66.76348382204722,65.23922681891274,63.90541575888541,62.741164913985564,61.713349811649586,60.78608455360913,59.94188935144763,59.16744157053478,58.463714899045364,57.799473750251245,57.19071170814782
+Offshore Wind - Class 12/Moderate,164.2331914391804,145.79457672326134,132.0715541742486,127.26923777596139,123.57387998263766,120.6099210331697,114.40085354923326,110.16123623417745,106.97880407216695,104.42972755223235,102.30694048937167,100.51071616669668,98.9431204188842,97.57335357084018,96.32468813319223,95.211388252962,94.19361121261221,93.25631759547495,92.38778055587282,91.59748877529526,90.83981092998458
+Offshore Wind - Class 12/Conservative,249.995824344457,229.6411301504562,213.23448103752423,198.57291625637478,184.8698407566517,171.86432094256114,166.0586901426164,162.02477967258108,158.9710719371035,156.4686385750454,154.39837745808114,152.61525113681415,151.08180645630054,149.68464654668253,148.42338221181004,147.3054572638114,146.2799039104365,145.3325258138676,144.42077742330505,143.59849950770126,142.82691077534298
+Offshore Wind - Class 13/Advanced,154.88718758418898,138.9257357009399,129.66312989517527,123.2690240627931,118.43506653714178,114.59127631881911,106.71211887328627,101.43208363097578,97.52023755087745,94.42057209136625,91.88531924791732,89.7338724327398,87.86839311132796,86.22362511005332,84.77524258098401,83.4683401554019,82.29889241180406,81.20681861621289,80.21823484691373,79.3010120605146,78.44576294630141
+Offshore Wind - Class 13/Moderate,228.89511782350638,202.92786291075467,183.6068448900021,176.82510682238666,171.65700409921882,167.4445589453109,158.74450414420454,152.81006739688513,148.32864151285844,144.73791854113406,141.7843804744152,139.25928905753173,137.05560417219016,135.10157021279804,133.38195994624306,131.78909563346,130.36558192278403,129.05509779643867,127.84109542660505,126.71033466508652,125.68520548238735
+Offshore Wind - Class 13/Conservative,349.80870146588495,321.09501227947044,297.96373810525165,277.2194641836995,257.89901854395384,239.44784791359677,231.30644820795746,225.65248461741683,221.3873283508769,217.88318086706803,214.99799373138435,212.4568205648319,210.27926661865212,208.33920468663948,206.58963960348544,204.99609764036794,203.58881176146357,202.23512318626462,200.975776818876,199.85320159234456,198.74666695833392
+Offshore Wind - Class 14/Advanced,218.40406050008576,195.79471449015944,182.70610037312056,173.60336429142328,166.79664091513968,161.30785585724354,150.15101153446483,142.6766030251821,137.10576741941628,132.7314383644556,129.1232555601225,126.10108035679923,123.44261266646669,121.13715937592275,119.07906898029512,117.25995533114865,115.56794939826462,114.05240773611129,112.61780982545238,111.32136435653564,110.11266848163167
+Offshore Wind - Class 14/Moderate,323.303902180753,286.44708773121977,259.05588598408906,249.4866906806795,242.15601025978535,236.18007558456623,223.8400408797483,215.41990096327612,209.13201619254838,204.03223581277993,199.8520076633741,196.2787736025727,193.16093092614767,190.3966940554038,187.91467053629677,185.72685497746312,183.66534629245552,181.82763012407807,180.1262071833858,178.4811186893221,177.00049530637227
+Offshore Wind - Class 14/Conservative,494.8135182029108,454.0988848516299,421.20749130428305,391.8493631125935,364.3944965436272,338.2974528746833,326.67786852757126,318.7028899487906,312.60721549934226,307.67690941382335,303.53829784456696,299.971621936745,296.94416352536007,294.14584383742647,291.723593077651,289.417135683894,287.39936464126885,285.5368124641175,283.70502273928935,282.09116896564797,280.57784685301976
diff --git a/tests/data/Floating_Offshore_Wind/Market/20/df_occ.csv b/tests/data/Floating_Offshore_Wind/Market/20/df_occ.csv
new file mode 100644
index 0000000..ea3d820
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/20/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,4435.5373,3960.6753,3689.8071,3503.9624,3364.1885,3253.0677,3008.6384,2846.4343,2726.6659,2632.5586,2555.5305,2490.63,2434.7531,2385.8326,2342.426,2303.4888,2268.2418,2236.0892,2206.5657,2179.3012,2153.9971
+Offshore Wind - Class 8/Moderate,6456.1288,5692.6599,5119.7989,4932.0919,4789.0948,4674.2335,4417.6591,4244.204,4114.3659,4011.2344,3926.0575,3853.7372,3791.0528,3735.8442,3686.5949,3642.2009,3601.8346,3564.8602,3530.7791,3499.1934,3469.7806
+Offshore Wind - Class 8/Conservative,9798.632,8974.3295,8302.5166,7697.1344,7128.8489,6584.1743,6354.0735,6195.708,6075.5933,5979.1832,5898.8641,5830.1612,5770.2254,5717.1333,5669.5267,5626.4114,5587.0388,5550.8311,5517.3336,5486.1817,5457.0792
+Offshore Wind - Class 9/Advanced,4614.256,4120.2606,3838.4785,3645.1456,3499.7399,3384.1418,3129.8638,2961.1241,2836.5299,2738.6308,2658.4991,2590.9836,2532.8553,2481.9637,2436.8081,2396.302,2359.6348,2326.1867,2295.4736,2267.1106,2240.787
+Offshore Wind - Class 9/Moderate,6716.262,5922.0311,5326.0882,5130.8179,4982.0592,4862.5698,4595.6574,4415.2134,4280.1438,4172.8569,4084.248,4009.0138,3943.8036,3886.3705,3835.1368,3788.9541,3746.9613,3708.4972,3673.0429,3640.1845,3609.5866
+Offshore Wind - Class 9/Conservative,10193.4429,9335.9272,8637.0454,8007.2708,7416.0877,6849.4668,6610.0947,6445.3482,6320.3939,6220.0991,6136.5438,6065.0727,6002.7219,5947.4906,5897.9658,5853.1133,5812.1543,5774.4877,5739.6405,5707.2334,5676.9583
+Offshore Wind - Class 10/Advanced,4649.037,4151.3181,3867.4119,3672.6218,3526.12,3409.6505,3153.4558,2983.4442,2857.9109,2759.2739,2678.5382,2610.5137,2551.9472,2500.672,2455.1761,2414.3646,2377.4211,2343.7209,2312.7763,2284.1995,2257.6774
+Offshore Wind - Class 10/Moderate,6766.8874,5966.6698,5366.2348,5169.4927,5019.6126,4899.2225,4630.2982,4448.4941,4312.4063,4204.3108,4115.0339,4039.2326,3973.531,3915.6649,3864.045,3817.5142,3775.2049,3736.4508,3700.7293,3667.6232,3636.7947
+Offshore Wind - Class 10/Conservative,10270.2783,9406.2989,8702.1491,8067.6274,7471.9882,6901.0962,6659.9198,6493.9315,6368.0353,6266.9846,6182.7994,6110.7896,6047.9688,5992.3212,5942.423,5897.2325,5855.9647,5818.0142,5782.9043,5750.253,5719.7497
+Offshore Wind - Class 11/Advanced,4705.9878,4202.1718,3914.7878,3717.6115,3569.3151,3451.4188,3192.0858,3019.9915,2892.9204,2793.075,2711.3503,2642.4925,2583.2087,2531.3053,2485.252,2443.9407,2406.5446,2372.4315,2341.1078,2312.181,2285.334
+Offshore Wind - Class 11/Moderate,6849.782,6039.7616,5431.9713,5232.8191,5081.103,4959.2382,4687.0195,4502.9882,4365.2334,4255.8137,4165.4432,4088.7133,4022.2068,3963.6319,3911.3797,3864.2788,3821.4513,3782.2224,3746.0633,3712.5517,3681.3455
+Offshore Wind - Class 11/Conservative,10396.0894,9521.5263,8808.7506,8166.4561,7563.5202,6985.6348,6741.504,6573.4824,6446.0439,6343.7553,6258.5389,6185.6469,6122.0566,6065.7273,6015.2179,5969.4737,5927.7004,5889.2851,5853.745,5820.6937,5789.8168
+Offshore Wind - Class 12/Advanced,4809.7984,4294.8686,4001.1451,3799.6192,3648.0515,3527.5546,3262.5008,3086.6103,2956.7361,2854.6882,2771.1607,2700.784,2640.1923,2587.1441,2540.0748,2497.8522,2459.6312,2424.7656,2392.7509,2363.186,2335.7468
+Offshore Wind - Class 12/Moderate,7000.8831,6172.9943,5551.7965,5348.2512,5193.1884,5068.6353,4790.4116,4602.3208,4461.5272,4349.6938,4257.3298,4178.9073,4110.9337,4051.0667,3997.6618,3949.5219,3905.7496,3865.6554,3828.6987,3794.4478,3762.5533
+Offshore Wind - Class 12/Conservative,10625.4195,9731.5641,9003.0651,8346.6021,7730.3659,7139.7327,6890.2166,6718.4885,6588.2389,6483.6938,6396.5976,6322.0977,6257.1046,6199.5328,6147.9091,6101.1559,6058.4611,6019.1983,5982.8743,5949.0939,5917.5359
+Offshore Wind - Class 13/Advanced,5259.4418,4696.3739,4375.1916,4154.8262,3989.0892,3857.3276,3567.4953,3375.1616,3233.1462,3121.5584,3030.2223,2953.2664,2887.0104,2829.0029,2777.5334,2731.3636,2689.5695,2651.4445,2616.437,2584.1081,2554.1038
+Offshore Wind - Class 13/Moderate,7655.3598,6750.0759,6070.8056,5848.2318,5678.6729,5542.476,5238.2427,5032.5682,4878.6125,4756.3244,4655.3257,4569.5719,4495.2439,4429.7802,4371.3827,4318.7425,4270.8782,4227.0358,4186.6241,4149.1713,4114.2951
+Offshore Wind - Class 13/Conservative,11618.7355,10641.3182,9844.7156,9126.8831,8453.0382,7807.1898,7534.3477,7346.5656,7204.1396,7089.8211,6994.5827,6913.1182,6842.0493,6779.0953,6722.6457,6671.5217,6624.8356,6581.9024,6542.1826,6505.2442,6470.736
+Offshore Wind - Class 14/Advanced,5529.0667,4937.1331,4599.4855,4367.823,4193.5895,4055.0732,3750.3827,3548.189,3398.8931,3281.5848,3185.5664,3104.6654,3035.0127,2974.0315,2919.9235,2871.3867,2827.45,2787.3706,2750.5684,2716.5822,2685.0397
+Offshore Wind - Class 14/Moderate,8047.8112,7096.118,6382.0249,6148.0409,5969.7896,5826.6106,5506.7808,5290.5624,5128.7142,5000.1569,4893.9806,4803.8307,4725.6922,4656.8725,4595.4813,4540.1425,4489.8244,4443.7344,4401.2511,4361.8783,4325.2141
+Offshore Wind - Class 14/Conservative,12214.369,11186.8445,10349.4041,9594.772,8886.3825,8207.4247,7920.5954,7723.1867,7573.4592,7453.2803,7353.1595,7267.5186,7192.8064,7126.6251,7067.2815,7013.5367,6964.4573,6919.323,6877.567,6838.735,6802.4577
diff --git a/tests/data/Floating_Offshore_Wind/Market/20/df_tc.csv b/tests/data/Floating_Offshore_Wind/Market/20/df_tc.csv
new file mode 100644
index 0000000..af34ddc
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/20/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Moderate,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Conservative,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Moderate,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Conservative,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PFF/Advanced,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Moderate,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Conservative,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+Year (Advanced)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Moderate)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Conservative)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
diff --git a/tests/data/Floating_Offshore_Wind/Market/20/df_vom.csv b/tests/data/Floating_Offshore_Wind/Market/20/df_vom.csv
new file mode 100644
index 0000000..b02e3a0
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/20/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Floating_Offshore_Wind/Market/30/df_capex.csv b/tests/data/Floating_Offshore_Wind/Market/30/df_capex.csv
new file mode 100644
index 0000000..48aaa3e
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/30/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,6164.393079155067,5504.442350486707,5127.996867726996,4869.7148063506875,4675.460752031988,4521.027964517991,4181.32647681124,3955.8994689532415,3789.4485139119115,3658.6606949270113,3551.6090894147055,3461.4120769098504,3383.755867003581,3315.7674080971583,3255.442083151268,3201.3281773540753,3152.3428360723738,3107.6579809550435,3066.6269148509114,3028.735539578943,2993.56854097348
+Offshore Wind - Class 8/Moderate,8972.557992722874,7911.509016245191,7115.361849729815,6854.491558455669,6655.757965015436,6496.126765702345,6139.546404741941,5898.483029197435,5718.0374502403065,5574.708052575891,5456.331430674453,5355.822630867479,5268.705440094559,5191.977977322759,5123.532628486631,5061.834970721061,5005.734962958142,4954.348981625986,4906.983875586392,4863.086964349291,4822.209784006486
+Offshore Wind - Class 8/Conservative,13617.880972305991,12472.287069859833,11538.619138826649,10697.274903780875,9907.486722659387,9150.512241029572,8830.724213877127,8610.631986324295,8443.699750238353,8309.711484371428,8198.086212207783,8102.60464292073,8019.307544217199,7945.521539034585,7879.359087685128,7819.438544378004,7764.719517193688,7714.399094976894,7667.845104376691,7624.550986283925,7584.105196068877
+Offshore Wind - Class 9/Advanced,6558.840756878646,5856.661025758063,5456.127543127564,5181.318394895795,4974.634406682637,4810.319780701124,4448.881485732,4209.0299051236,4031.9280154142275,3892.7712722983247,3778.8697547702554,3682.9011392659736,3600.2759049094507,3527.937068921801,3463.7515174356276,3406.17496027115,3354.0551389863795,3306.510979989622,3262.8544321030654,3222.538469140551,3185.121279316132
+Offshore Wind - Class 9/Moderate,9546.694570497915,8417.75115177491,7570.660148319435,7293.097243214567,7081.6471202797065,6911.8013655180175,6532.404114379638,6275.91568689869,6083.923686750289,5931.422897274402,5805.471614638324,5698.531432173666,5605.839762957256,5524.20259049191,5451.377484367961,5385.732013785848,5326.042299120715,5271.36817376157,5220.972471694673,5174.266480101112,5130.773796159257
+Offshore Wind - Class 9/Conservative,14489.262976229513,13270.364682251466,12276.953265231648,11381.772850492516,10541.447609706373,9736.035810799354,9395.785190401062,9161.609643969132,8983.995873452806,8841.433908958357,8722.665920531352,8621.074709565988,8532.447487042864,8453.94002722631,8383.544054409776,8319.789338707838,8261.568966978499,8208.028584987751,8158.4957740450745,8112.431268773591,8069.39735952941
+Offshore Wind - Class 10/Advanced,6748.110486865921,6025.667947904331,5613.576070262512,5330.836816230673,5118.1884243416125,4949.132165622009,4577.263675574761,4330.490672636434,4148.278179141638,4005.105771562267,3887.9173295629544,3789.179324698292,3704.169637122116,3629.743365173169,3563.705641115856,3504.4674946826312,3450.8437394263824,3401.9276910847607,3357.0113421132132,3315.5319229695933,3277.034871966981
+Offshore Wind - Class 10/Moderate,9822.185561260063,8660.663928172953,7789.128260225514,7503.555645591015,7286.003641787134,7111.256603353412,6720.911067682522,6457.021045514077,6259.488603614352,6102.587213534271,5973.001211302103,5862.975109326782,5767.608732623316,5683.615711063982,5608.688977784607,5541.1492045237865,5479.736922802638,5423.48513578377,5371.635058056139,5323.581346495215,5278.833517953941
+Offshore Wind - Class 10/Conservative,14907.38256357729,13653.310286265418,12631.231770156972,11710.218947356327,10845.644392734888,10016.990633038271,9666.92136933382,9425.988153647959,9243.248922939856,9096.573064310081,8974.377680763704,8869.854879523824,8778.6700268652,8697.897186817227,8625.469544997572,8559.87518488806,8499.974708816384,8444.889371433632,8393.927019419943,8346.533420123389,8302.257670524286
+Offshore Wind - Class 11/Advanced,6956.321691478424,6211.58833433994,5786.781590234056,5495.318410480601,5276.108919550027,5101.836399169968,4718.494106932648,4464.10686313231,4276.27221765125,4128.682246555951,4007.8780435089548,3906.0934775235946,3818.4609690138946,3741.7381627276673,3673.6627827572092,3612.5970766051614,3557.318716808526,3506.893191060219,3460.5909832870884,3417.8318066917336,3378.147019261812
+Offshore Wind - Class 11/Moderate,10125.246605283506,8927.886441850036,8029.459791454079,7735.075997427815,7510.811447932585,7330.672642679775,6928.282996204787,6656.250665536574,6452.623549233597,6290.880966319118,6157.296706010031,6043.875693445647,5945.566750465955,5858.98217294766,5781.7437163185405,5712.119944026248,5648.812916151575,5590.8253687009,5537.375455572721,5487.839096831512,5441.710620317747
+Offshore Wind - Class 11/Conservative,15367.34588463045,14074.579653497436,13020.965088843674,12071.534843276095,11180.283948017326,10326.06231298724,9965.191665783244,9716.824592616986,9528.446912223111,9377.245393090887,9251.279808391977,9143.531947417756,9049.533690523212,8966.26852200647,8891.606321455141,8823.987942283095,8762.239284913625,8705.454330296612,8652.919527452297,8604.063569948312,8558.421696176958
+Offshore Wind - Class 12/Advanced,7245.576477514379,6469.875939151453,6027.405038760588,5723.822357484229,5495.497796043878,5313.9787862933945,4914.696456988965,4649.731451865308,4454.086438784636,4300.359441441109,4174.531888278836,4068.515020382145,3977.238479305209,3897.3256477951445,3826.41945720222,3762.8145251195583,3705.237635348968,3652.715360668218,3604.487806979223,3559.950628975789,3518.6156717536455
+Offshore Wind - Class 12/Moderate,10546.270287467178,9299.122093334134,8363.337346133056,8056.712538484164,7823.122822284838,7635.493616512525,7216.371886948146,6933.028176741409,6720.933795766869,6552.465695522657,6413.326802268119,6295.189545898889,6192.792762929343,6102.607945981941,6022.157733862976,5949.6388470998245,5883.699352714367,5823.300632686345,5767.628245515243,5716.032057120063,5667.985552024907
+Offshore Wind - Class 12/Conservative,16006.34442385554,14659.82283631448,13562.397394538018,12573.488355592783,11645.177822080408,10755.436182490917,10379.5601213956,10120.865517571236,9924.65485236211,9767.166079887564,9635.962614130893,9523.734437954206,9425.827504895678,9339.100239355173,9261.33327161348,9190.90326210478,9126.586996416443,9067.440760138938,9012.721511217214,8961.834106447515,8914.294382198923
+Offshore Wind - Class 13/Advanced,8067.847304177014,7204.115684313053,6711.430463055241,6373.395553708924,6119.159313083605,5917.0404546315685,5472.445199000929,5177.410383944034,4959.562360700135,4788.389618418754,4648.282397902372,4530.234058233854,4428.599054130361,4339.61705175403,4260.664232352999,4189.840860682058,4125.729812965057,4067.2471258817523,4013.546427744839,3963.954856388974,3917.928933426527
+Offshore Wind - Class 13/Moderate,11743.123337447973,10354.441375182545,9312.458268016122,8971.035876283919,8710.936898584381,8502.014471234905,8035.328404569617,7719.829111498906,7483.665023989759,7296.078280931126,7141.148912491345,7009.604747206893,6895.5874827517155,6795.167932251564,6705.587682347766,6624.839011677291,6551.416323238098,6484.163256446148,6422.172794432979,6364.721186298052,6311.2219365965375
+Offshore Wind - Class 13/Conservative,17822.838891664425,16323.506082275928,15101.538388224133,14000.401949183142,12966.741312160691,11976.026665500049,11557.493870491991,11269.441012077474,11050.963254594135,10875.60167093344,10729.508427343852,10604.543987043204,10495.526125063212,10398.956379445155,10312.364151986274,10233.941174122267,10162.325978166451,10096.46752880371,10035.538412895146,9978.875857327488,9925.941151067387
+Offshore Wind - Class 14/Advanced,8772.617149963404,7833.433833506027,7297.709935649757,6930.145923040228,6653.700685341661,6433.92576402004,5950.492757859008,5629.684960366007,5392.806656664875,5206.681052257928,5054.334813755595,4925.974354178844,4815.460873380183,4718.705866157529,4632.856126410186,4555.845948442863,4486.134368136903,4422.542962036146,4364.1512981589285,4310.227532189312,4260.181066540415
+Offshore Wind - Class 14/Moderate,12768.948217937565,11258.957378283958,10125.951508504344,9754.703994068908,9471.884027620466,9244.71105940988,8737.257461550169,8394.197649926717,8137.403335691084,7933.4297546877115,7764.966532666483,7621.931491411524,7497.954115183718,7388.762300206951,7291.356826297187,7203.554245195355,7123.717691353731,7050.589691930108,6983.184069801279,6920.7137680366495,6862.541069850083
+Offshore Wind - Class 14/Conservative,19379.759455956522,17749.451902947963,16420.738711875958,15223.412141659841,14099.455708117157,13022.196729277817,12567.102983447312,12253.887253075498,12016.32422425768,11825.644022616503,11666.788682494893,11530.90777697982,11412.366736790163,11307.360991475107,11213.20441407107,11127.930858979074,11050.059785524207,10978.44802649822,10912.196436710647,10850.584258715955,10793.025329675436
diff --git a/tests/data/Floating_Offshore_Wind/Market/30/df_fin_assump.csv b/tests/data/Floating_Offshore_Wind/Market/30/df_fin_assump.csv
new file mode 100644
index 0000000..ca9ad50
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/30/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),30
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Floating_Offshore_Wind/Market/30/df_fom.csv b/tests/data/Floating_Offshore_Wind/Market/30/df_fom.csv
new file mode 100644
index 0000000..93154eb
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/30/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,61.229875,59.1585,57.97687500000001,57.16625,56.5565,56.071875000000006,55.005625,54.298125,53.775625,53.365125000000006,53.02912499999999,52.746,52.502375,52.288875,52.099624999999996,51.92975,51.775999999999996,51.63575,51.507,51.388,51.277625
+Offshore Wind - Class 8/Moderate,66.816625,64.739375,63.523624999999996,62.67525,62.028875,61.50975,60.350125,59.566125,58.97925,58.513124999999995,58.128125,57.801249999999996,57.517875,57.268375000000006,57.04575,56.845125,56.662625000000006,56.49549999999999,56.341499999999996,56.198750000000004,56.06575
+Offshore Wind - Class 8/Conservative,73.84925,71.96600000000001,70.83624999999999,70.034875,69.41675000000001,68.91525,67.77825,66.99575,66.402125,65.92575,65.528875,65.189375,64.89325,64.630875,64.39574999999999,64.182625,63.988125,63.809125,63.643625,63.48975,63.34587499999999
+Offshore Wind - Class 9/Advanced,63.01412499999999,60.882374999999996,59.666375,58.832125,58.20462499999999,57.70575,56.6085,55.880375,55.342625,54.920249999999996,54.574375,54.283125,54.03225,53.812625,53.61775,53.443,53.28475,53.140375000000006,53.007875,52.8855,52.771875
+Offshore Wind - Class 9/Moderate,68.763625,66.625875,65.37474999999999,64.501625,63.8365,63.302125000000004,62.108625,61.301874999999995,60.697875,60.218125,59.821999999999996,59.4855,59.194,58.937125,58.708,58.5015,58.313750000000006,58.141749999999995,57.98325,57.836375000000004,57.6995
+Offshore Wind - Class 9/Conservative,76.00125,74.063125,72.9005,72.075625,71.43950000000001,70.92337500000001,69.75325,68.94800000000001,68.337125,67.84687500000001,67.438375,67.089,66.78425,66.51425,66.27225,66.053,65.85275,65.668625,65.49825,65.339875,65.191875
+Offshore Wind - Class 10/Advanced,62.7405,60.617999999999995,59.40725,58.576625,57.951875,57.45525,56.362625,55.63775,55.102374999999995,54.681749999999994,54.3375,54.047375,53.797625,53.579,53.385,53.210875,53.053375,52.909625,52.77775,52.655874999999995,52.54275
+Offshore Wind - Class 10/Moderate,68.465,66.3365,65.090875,64.2215,63.55925,63.027249999999995,61.839000000000006,61.035624999999996,60.43425,59.956625,59.562125,59.22725,58.936875,58.68125,58.453125,58.2475,58.060625,57.889375,57.731500000000004,57.585249999999995,57.449000000000005
+Offshore Wind - Class 10/Conservative,75.671125,73.7415,72.583875,71.76275000000001,71.12925,70.615375,69.450375,68.6485,68.040375,67.55225,67.14562500000001,66.79775000000001,66.49425,66.22550000000001,65.984375,65.766125,65.56675,65.383375,65.213875,65.056125,64.90875
+Offshore Wind - Class 11/Advanced,63.692,61.53725,60.30825,59.465,58.830749999999995,58.32662499999999,57.2175,56.481500000000004,55.938,55.510999999999996,55.1615,54.867,54.6135,54.39149999999999,54.194625,54.017875000000004,53.858,53.712125,53.578125,53.454375,53.339625
+Offshore Wind - Class 11/Moderate,69.503375,67.342625,66.078,65.1955,64.52325,63.983125,62.776875,61.96125000000001,61.350875,60.866,60.4655,60.1255,59.83075,59.571125,59.339625,59.130874999999996,58.941125,58.767250000000004,58.607,58.4585,58.32025
+Offshore Wind - Class 11/Conservative,76.81875,74.859875,73.68475000000001,72.851,72.208,71.686375,70.503625,69.689625,69.07225,68.57675,68.163875,67.81075,67.50275,67.229875,66.985125,66.76350000000001,66.561125,66.375,66.202875,66.04275,65.893125
+Offshore Wind - Class 12/Advanced,66.758375,64.5,63.211875,62.328,61.66325,61.134750000000004,59.97225,59.200875,58.63125,58.183625,57.81725,57.508625,57.242875,57.01025,56.803749999999994,56.618624999999994,56.451,56.298125,56.157624999999996,56.028000000000006,55.907625
+Offshore Wind - Class 12/Moderate,72.849625,70.584875,69.259375,68.334375,67.62975,67.063625,65.79925,64.94449999999999,64.304625,63.796375000000005,63.376625000000004,63.020250000000004,62.711375000000004,62.43925,62.1965,61.97775,61.778875,61.596624999999996,61.42875,61.272999999999996,61.128125000000004
+Offshore Wind - Class 12/Conservative,80.51724999999999,78.464,77.23237499999999,76.35849999999999,75.6845,75.13775,73.898125,73.04487499999999,72.39775,71.87837499999999,71.44575,71.075625,70.752625,70.466625,70.210125,69.977875,69.76575,69.57075,69.39025,69.222375,69.065625
+Offshore Wind - Class 13/Advanced,63.717,61.5615,60.332,59.488375,58.853875,58.3495,57.24,56.503625,55.96,55.532875,55.18325,54.888625,54.635,54.412875,54.215875000000004,54.039125,53.879124999999995,53.733125,53.599125,53.475375,53.3605
+Offshore Wind - Class 13/Moderate,69.530625,67.369125,66.104,65.221125,64.5485,64.00825,62.8015,61.985625000000006,61.375,60.889875,60.48925,60.149125000000005,59.85425,59.594625,59.363,59.15412500000001,58.96425,58.790375,58.630125,58.481500000000004,58.343125
+Offshore Wind - Class 13/Conservative,76.849,74.88925,73.71362500000001,72.879625,72.236375,71.7145,70.531375,69.717,69.099375,68.60375,68.19075,67.837375,67.52925,67.25625,67.0115,66.78975,66.58725,66.401125,66.228875,66.06875,65.919
+Offshore Wind - Class 14/Advanced,64.952,62.75475,61.501374999999996,60.64149999999999,59.99475,59.480500000000006,58.3495,57.59887499999999,57.04475000000001,56.609249999999996,56.252874999999996,55.9525,55.694,55.467625,55.26675,55.086625,54.923500000000004,54.77475,54.638125,54.512,54.394875
+Offshore Wind - Class 14/Moderate,70.878375,68.674875,67.385375,66.485375,65.79975,65.249,64.018875,63.187125,62.56462499999999,62.070125000000004,61.66175,61.315,61.0145,60.749750000000006,60.513625,60.30075,60.10725,59.93000000000001,59.7665,59.615125000000006,59.474125
+Offshore Wind - Class 14/Conservative,78.33862500000001,76.340875,75.1425,74.292375,73.63662500000001,73.104625,71.8985,71.068375,70.438875,69.93350000000001,69.5125,69.152375,68.83825,68.559875,68.310375,68.084375,67.878,67.68825,67.512625,67.349375,67.19675
diff --git a/tests/data/Floating_Offshore_Wind/Market/30/df_gcc.csv b/tests/data/Floating_Offshore_Wind/Market/30/df_gcc.csv
new file mode 100644
index 0000000..a559485
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/30/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,1124.5467,1004.1544,935.4809,888.3635,852.9265,824.7539,762.7834,721.6596,691.2946,667.4355,647.9065,631.4522,617.2857,604.8828,593.8779,584.0061,575.0699,566.9182,559.433,552.5207,546.1053
+Offshore Wind - Class 8/Moderate,1636.8295,1443.2664,1298.0283,1250.4387,1214.1845,1185.0636,1120.014,1076.0377,1043.1197,1016.9727,995.3777,977.0423,961.1498,947.1527,934.6665,923.4112,913.1771,903.803,895.1623,887.1544,879.6973
+Offshore Wind - Class 8/Conservative,2484.258,2275.2717,2104.9462,1951.463,1807.385,1669.293,1610.9553,1570.8047,1540.3519,1515.9089,1495.5456,1478.1272,1462.9317,1449.4712,1437.4014,1426.4703,1416.4881,1407.3084,1398.8157,1390.9177,1383.5394
+Offshore Wind - Class 9/Advanced,1301.6071,1162.259,1082.7728,1028.2367,987.2201,954.6117,882.884,835.2853,800.1393,772.5235,749.9197,730.8746,714.4776,700.1219,687.3842,675.9581,665.6149,656.1797,647.516,639.5153,632.0898
+Offshore Wind - Class 9/Moderate,1894.549,1670.5093,1502.4034,1447.3209,1405.3584,1371.6524,1296.3607,1245.4604,1207.3594,1177.0955,1152.1004,1130.878,1112.4833,1096.2823,1081.8301,1068.8027,1056.9573,1046.1071,1036.1061,1026.8372,1018.2061
+Offshore Wind - Class 9/Conservative,2875.4056,2633.5143,2436.371,2258.7217,2091.9585,1932.1239,1864.6009,1818.1286,1782.881,1754.5895,1731.0199,1710.859,1693.2709,1677.691,1663.7209,1651.0687,1639.5148,1628.8897,1619.0599,1609.9183,1601.3782
+Offshore Wind - Class 10/Advanced,1437.5413,1283.6403,1195.8529,1135.6213,1090.3211,1054.3073,975.0886,922.5189,883.7024,853.2025,828.238,807.204,789.0945,773.2396,759.1716,746.5522,735.1288,724.7083,715.1398,706.3035,698.1025
+Offshore Wind - Class 10/Moderate,2092.4076,1844.9701,1659.308,1598.4728,1552.128,1514.9019,1431.7471,1375.5309,1333.4508,1300.0263,1272.4208,1248.9821,1228.6663,1210.7734,1194.8118,1180.4239,1167.3413,1155.3581,1144.3125,1134.0757,1124.5431
+Offshore Wind - Class 10/Conservative,3175.7006,2908.5472,2690.8151,2494.6129,2310.4337,2133.9067,2059.3319,2008.0062,1969.0775,1937.8313,1911.8002,1889.5338,1870.1088,1852.9019,1837.4727,1823.4992,1810.7387,1799.004,1788.1475,1778.0513,1768.6193
+Offshore Wind - Class 11/Advanced,1568.3903,1400.4808,1304.7028,1238.9887,1189.5652,1150.2733,1063.8439,1006.4891,964.1394,930.8634,903.6266,880.678,860.9201,843.622,828.2735,814.5055,802.0423,790.6732,780.2338,770.5932,761.6458
+Offshore Wind - Class 11/Moderate,2282.8643,2012.9044,1810.3428,1743.9703,1693.407,1652.7924,1562.0686,1500.7355,1454.8252,1418.3583,1388.2401,1362.6679,1340.5029,1320.9813,1303.5669,1287.8694,1273.596,1260.522,1248.471,1237.3024,1226.9022
+Offshore Wind - Class 11/Conservative,3464.7616,3173.2912,2935.7405,2721.6795,2520.7358,2328.1408,2246.7779,2190.7804,2148.3083,2114.218,2085.8175,2061.5244,2040.3313,2021.5581,2004.7246,1989.4792,1975.5572,1962.7543,1950.9097,1939.8945,1929.6039
+Offshore Wind - Class 12/Advanced,1725.4782,1540.7511,1435.3801,1363.0842,1308.7105,1265.4831,1170.3971,1107.2977,1060.7064,1024.0975,994.1326,968.8855,947.1487,928.1181,911.2323,896.0853,882.3738,869.866,858.381,847.7748,837.9312
+Offshore Wind - Class 12/Moderate,2511.513,2214.5143,1991.6644,1918.644,1863.0164,1818.334,1718.5234,1651.0473,1600.5386,1560.4192,1527.2844,1499.1509,1474.7659,1453.2891,1434.1305,1416.8607,1401.1577,1386.7742,1373.5162,1361.229,1349.7871
+Offshore Wind - Class 12/Conservative,3811.7876,3491.1239,3229.7805,2994.2794,2773.2094,2561.3243,2471.8123,2410.2062,2363.4801,2325.9754,2294.7303,2268.004,2244.6882,2224.0348,2205.5152,2188.7428,2173.4264,2159.3412,2146.3102,2134.1918,2122.8705
+Offshore Wind - Class 13/Advanced,2017.4966,1801.5064,1678.3025,1593.7713,1530.1954,1479.6523,1368.474,1294.6958,1240.2193,1197.4148,1162.3787,1132.8588,1107.4433,1085.1919,1065.4485,1047.7379,1031.7059,1017.0814,1003.6526,991.2515,979.7419
+Offshore Wind - Class 13/Moderate,2936.5592,2589.2967,2328.7318,2243.3536,2178.3116,2126.0672,2009.3647,1930.469,1871.4123,1824.5032,1785.7606,1752.8658,1724.3539,1699.2424,1676.8414,1656.6489,1638.2883,1621.4706,1605.9689,1591.6022,1578.2238
+Offshore Wind - Class 13/Conservative,4456.8911,4081.9585,3776.3856,3501.0285,3242.5448,2994.8005,2890.1395,2818.1072,2763.4733,2719.6213,2683.0883,2651.8389,2624.5772,2600.4284,2578.7746,2559.1636,2541.2551,2524.7861,2509.5498,2495.3804,2482.1432
+Offshore Wind - Class 14/Advanced,2383.5514,2128.3719,1982.8138,1882.9454,1807.8342,1748.1206,1616.7701,1529.6055,1465.2448,1414.6738,1373.2808,1338.4048,1308.3779,1282.0892,1258.7635,1237.8396,1218.8987,1201.6207,1185.7555,1171.1042,1157.5064
+Offshore Wind - Class 14/Moderate,3469.3688,3059.0989,2751.2572,2650.3879,2573.5447,2511.821,2373.944,2280.7335,2210.9615,2155.5412,2109.7691,2070.906,2037.2209,2007.5531,1981.0877,1957.2314,1935.5395,1915.6704,1897.356,1880.3826,1864.5769
+Offshore Wind - Class 14/Conservative,5265.5498,4822.5894,4461.5733,4136.2554,3830.8724,3538.1773,3414.5267,3329.4249,3264.8782,3213.0697,3169.9081,3132.9888,3100.7808,3072.2503,3046.6677,3023.4985,3002.3407,2982.8835,2964.8827,2948.1425,2932.5035
diff --git a/tests/data/Floating_Offshore_Wind/Market/30/df_lcoe.csv b/tests/data/Floating_Offshore_Wind/Market/30/df_lcoe.csv
new file mode 100644
index 0000000..6bfb223
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/30/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,79.49406924416465,71.60518133240926,67.05008021920094,63.884355488374524,61.49393965058081,59.5858699832229,55.69295092489356,53.090837134371185,51.159854455146174,49.62872517224789,48.37350681464589,47.307371674707376,46.39113743030717,45.58327504098316,44.86150000317473,44.218059908248556,43.632106996217495,43.094406003976076,42.60594565417351,42.144475734591374,41.72170419385769
+Offshore Wind - Class 8/Moderate,115.82687381182741,103.11034688555459,93.70106973579541,90.3542200600494,87.79329246955106,85.72134916070104,81.42106233048274,78.48422087391872,76.27947521132516,74.51320708439128,73.05704166638307,71.79717631148458,70.71057070848642,69.76117862196986,68.89538919484959,68.12353754274748,67.41779519562988,66.76779781899128,66.16539068575783,65.60405053230001,65.09173093683037
+Offshore Wind - Class 8/Conservative,174.842369079658,160.85173222585493,149.56528709004954,139.52382673702283,130.14615638630485,121.22535452462685,117.19993789665259,114.42742299045298,112.28538736546481,110.5737477567562,109.13776087999851,107.90089164926532,106.81442413459,105.84541238898146,104.99308031371322,104.19529914861889,103.48401934418948,102.82689270454405,102.21621286289059,101.64573730570216,101.11036867902548
+Offshore Wind - Class 9/Advanced,83.55759228186464,75.23902409573128,70.42269416962363,67.08630210899004,64.56719139102397,62.55649325713471,58.45110857792348,55.70723997144906,53.671210216317334,52.05700381941664,50.72389973213255,49.60988377684907,48.6346614993043,47.783352091286865,47.031813450435486,46.344764122078246,45.72735076453037,45.16082236454676,44.64612274078229,44.160020350661895,43.714593210026074
+Offshore Wind - Class 9/Moderate,121.88873216748893,108.46801432838554,98.51434448640154,95.00679666519537,92.30747975427857,90.12368907605553,85.58830370625394,82.49127150753175,80.16632905307183,78.3039320745728,76.75287328109887,75.4403194244123,74.29477197386602,73.27885417027433,72.36640861298723,71.55287684065263,70.80909096787703,70.12407927251151,69.48925965782738,68.89775800248475,68.35780268930826
+Offshore Wind - Class 9/Conservative,184.19625431494586,169.42635216957575,157.50791554917913,146.90176671431212,136.99560269567684,127.57091811910526,123.32618563601538,120.37699316205104,118.14430749930355,116.33965434006929,114.80129031349402,113.4976640284035,112.37649166075919,111.35507308229366,110.43305564070725,109.61568098430165,108.865850254758,108.1502580425915,107.50668226555409,106.9055064926603,106.34137026678978
+Offshore Wind - Class 10/Advanced,85.32390189569811,76.8017038854947,71.86804728294675,68.45069762921322,65.87059743177286,63.811335299917495,59.60488712562015,56.79370051033503,54.70782185109147,53.05419910354482,51.69865426678933,50.54750138602613,49.5486562695975,48.676725335135046,47.906960991779066,47.20332078644857,46.571014860222355,45.990841176686686,45.46371867666687,44.965955903201994,44.5098129725973
+Offshore Wind - Class 10/Moderate,124.6035710173781,110.86704795082328,100.65738967731946,97.06398693467362,94.27940624807027,92.06178285140727,87.39645016338778,84.24092728859011,81.84202817955939,79.93428888133539,78.36146969446489,77.00109984135179,75.82772769029141,74.78724063388479,73.8677165959382,73.0342913559199,72.25773464075162,71.55618153055714,70.92036899204068,70.31449010794873,69.74728533858786
+Offshore Wind - Class 10/Conservative,188.52623374085792,173.37731952476256,161.14979091296993,150.26663534894584,140.10059534359723,130.427790921759,126.07909013809721,123.05774920611937,120.77048024221935,118.92174602239398,117.34598087759998,116.010590411383,114.86201903038666,113.81579946782854,112.87135854012615,112.03408790136083,111.26601036436935,110.53310411778747,109.87392382051877,109.25814184671577,108.68031909619522
+Offshore Wind - Class 11/Advanced,88.20632899540604,79.3802336353244,74.27053837977967,70.74510748575734,68.0723398609581,65.92624605823028,61.58270506589311,58.671208419859724,56.499930150489796,54.787637331267376,53.383998771008855,52.19200180611495,51.16759160674038,50.26452266881063,49.45778367850844,48.73854814512075,48.08367911576881,47.48280722372012,46.93685882895569,46.42131804535022,45.94892488578471
+Offshore Wind - Class 11/Moderate,128.88997119502682,114.65923012145811,104.08113114772341,100.33853151822932,97.47504788754667,95.17811434138434,90.3470429960058,87.0794101605978,84.59520022036858,82.61959283842886,80.99083591293237,79.59826493954068,78.38286046489019,77.30504633746821,76.33705225557132,75.47395524479178,74.6848819461274,73.95816725613906,73.2847090489253,72.6572210736731,72.08442347524985
+Offshore Wind - Class 11/Conservative,195.09998535247078,179.40532062628705,166.7358775722116,155.45886901226692,144.92458512926544,134.90126483206683,130.39845840274194,127.29718021141512,124.90157053128402,122.98723247559943,121.38128115638162,119.99812242168248,118.78323235162198,117.69975913222335,116.74654277924137,115.85464900457669,115.05927287701577,114.3245176699123,113.61756507313568,112.97986622739536,112.38146109112769
+Offshore Wind - Class 12/Advanced,93.78551009752209,84.39782417945285,78.9774255703225,75.22541392781902,72.38047491145723,70.1096777197964,65.49191129584575,62.39598858085606,60.09862821978648,58.276981390735436,56.783657928299284,55.526278282936815,54.42533422314001,53.464350088778886,52.616047206615015,51.85053326774854,51.15341107878453,50.51371588559402,49.93259503597653,49.383638381271744,48.88070852694523
+Offshore Wind - Class 12/Moderate,137.02195385033406,121.89271310325452,110.64754514548497,106.68732256720295,103.6391874924934,101.19421473713042,96.07784432912575,92.58347286439596,89.96016609045003,87.85848186298126,86.10788583945053,84.62663067365196,83.33367304628648,82.20402648796319,81.17373581829257,80.25531835226403,79.41557482331108,78.64211425930763,77.92528734788122,77.27327670336808,76.64775495017396
+Offshore Wind - Class 12/Conservative,207.323024900298,190.64371427457496,177.21934286443548,165.23503658347957,154.0405946628847,143.42166529588945,138.6340016585089,135.30693766847645,132.78833258236563,130.723822841664,129.01597652258206,127.54484131948074,126.27991555730328,125.1269735914868,124.08606286533256,123.16369893067792,122.31748492515531,121.53572231991977,120.78295568051726,120.10432214672042,119.46748101415466
+Offshore Wind - Class 13/Advanced,129.61543378862604,116.48132745040316,108.85523112298453,103.58980869118015,99.60809758962577,96.44153307337321,89.9600749754856,85.61519042270469,82.39558746851277,79.84363768705813,77.756223815581,75.9843183249046,74.44749933397088,73.09211824289613,71.89873903750865,70.82166600604553,69.85814134249514,68.9576743169166,68.1428365251204,67.38666388532637,66.68143877811352
+Offshore Wind - Class 13/Moderate,190.37637662806992,169.09223813062374,153.27410962047767,147.69070045940933,143.4354450550789,139.96605741699815,132.80895729447658,127.9260321051624,124.23793292607934,121.2822617078699,118.85115921238372,116.77237562321164,114.95788630344292,113.34869511419737,111.9328695395901,110.62067131415489,109.44833134528214,108.36894108732979,107.36889163309684,106.43728874023006,105.59314082261604
+Offshore Wind - Class 13/Conservative,289.3996716607543,265.8910498468873,246.97726499545257,230.0296712217655,214.25405196428778,199.19351249639868,192.4912386151395,187.83616189758519,184.32468998173746,181.43896203081354,179.06323062222714,176.9700390716734,175.17670846332936,173.57883544446727,172.13774830946966,170.82506691372492,169.66626053324217,168.55099041149177,167.5133634851272,166.58888632905968,165.67702253598748
+Offshore Wind - Class 14/Advanced,182.49593935841702,163.9031536620753,153.1345349490479,145.6429181176591,140.04072845245614,135.5213718091179,126.34936215209574,120.20272815656313,115.6200351379133,112.02134212604955,109.05211030086161,106.56530104986062,104.37635067603762,102.47840159643187,100.78368637079184,99.28628181265118,97.89234589151982,96.6443572939712,95.46191732056941,94.39394398635366,93.39806352675856
+Offshore Wind - Class 14/Moderate,268.57644585351574,238.37825053459008,215.96065708468083,208.0879103069599,202.05593218051595,197.13734499432547,186.99184046892773,180.06777872069043,174.8971164757232,170.70181344989842,167.26327726390707,164.32358535895554,161.7581526905122,159.48331984390862,157.44042540787618,155.640358115931,153.94306387103146,152.43072559512737,151.03038996134117,149.67533449688574,148.4564715167879
+Offshore Wind - Class 14/Conservative,408.98658781081787,375.6636106500271,348.7753166845753,324.79635752741154,302.38232787036736,281.08564429288754,271.525526636344,264.9641027039318,259.9484052017173,255.89120863597702,252.48518055435736,249.54956758599758,247.05848310798348,244.7548368075098,242.76153382615757,240.86245130122225,239.20182987011384,237.66887835988874,236.16021004859903,234.83181352010217,233.58609590695542
diff --git a/tests/data/Floating_Offshore_Wind/Market/30/df_occ.csv b/tests/data/Floating_Offshore_Wind/Market/30/df_occ.csv
new file mode 100644
index 0000000..ea3d820
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/30/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,4435.5373,3960.6753,3689.8071,3503.9624,3364.1885,3253.0677,3008.6384,2846.4343,2726.6659,2632.5586,2555.5305,2490.63,2434.7531,2385.8326,2342.426,2303.4888,2268.2418,2236.0892,2206.5657,2179.3012,2153.9971
+Offshore Wind - Class 8/Moderate,6456.1288,5692.6599,5119.7989,4932.0919,4789.0948,4674.2335,4417.6591,4244.204,4114.3659,4011.2344,3926.0575,3853.7372,3791.0528,3735.8442,3686.5949,3642.2009,3601.8346,3564.8602,3530.7791,3499.1934,3469.7806
+Offshore Wind - Class 8/Conservative,9798.632,8974.3295,8302.5166,7697.1344,7128.8489,6584.1743,6354.0735,6195.708,6075.5933,5979.1832,5898.8641,5830.1612,5770.2254,5717.1333,5669.5267,5626.4114,5587.0388,5550.8311,5517.3336,5486.1817,5457.0792
+Offshore Wind - Class 9/Advanced,4614.256,4120.2606,3838.4785,3645.1456,3499.7399,3384.1418,3129.8638,2961.1241,2836.5299,2738.6308,2658.4991,2590.9836,2532.8553,2481.9637,2436.8081,2396.302,2359.6348,2326.1867,2295.4736,2267.1106,2240.787
+Offshore Wind - Class 9/Moderate,6716.262,5922.0311,5326.0882,5130.8179,4982.0592,4862.5698,4595.6574,4415.2134,4280.1438,4172.8569,4084.248,4009.0138,3943.8036,3886.3705,3835.1368,3788.9541,3746.9613,3708.4972,3673.0429,3640.1845,3609.5866
+Offshore Wind - Class 9/Conservative,10193.4429,9335.9272,8637.0454,8007.2708,7416.0877,6849.4668,6610.0947,6445.3482,6320.3939,6220.0991,6136.5438,6065.0727,6002.7219,5947.4906,5897.9658,5853.1133,5812.1543,5774.4877,5739.6405,5707.2334,5676.9583
+Offshore Wind - Class 10/Advanced,4649.037,4151.3181,3867.4119,3672.6218,3526.12,3409.6505,3153.4558,2983.4442,2857.9109,2759.2739,2678.5382,2610.5137,2551.9472,2500.672,2455.1761,2414.3646,2377.4211,2343.7209,2312.7763,2284.1995,2257.6774
+Offshore Wind - Class 10/Moderate,6766.8874,5966.6698,5366.2348,5169.4927,5019.6126,4899.2225,4630.2982,4448.4941,4312.4063,4204.3108,4115.0339,4039.2326,3973.531,3915.6649,3864.045,3817.5142,3775.2049,3736.4508,3700.7293,3667.6232,3636.7947
+Offshore Wind - Class 10/Conservative,10270.2783,9406.2989,8702.1491,8067.6274,7471.9882,6901.0962,6659.9198,6493.9315,6368.0353,6266.9846,6182.7994,6110.7896,6047.9688,5992.3212,5942.423,5897.2325,5855.9647,5818.0142,5782.9043,5750.253,5719.7497
+Offshore Wind - Class 11/Advanced,4705.9878,4202.1718,3914.7878,3717.6115,3569.3151,3451.4188,3192.0858,3019.9915,2892.9204,2793.075,2711.3503,2642.4925,2583.2087,2531.3053,2485.252,2443.9407,2406.5446,2372.4315,2341.1078,2312.181,2285.334
+Offshore Wind - Class 11/Moderate,6849.782,6039.7616,5431.9713,5232.8191,5081.103,4959.2382,4687.0195,4502.9882,4365.2334,4255.8137,4165.4432,4088.7133,4022.2068,3963.6319,3911.3797,3864.2788,3821.4513,3782.2224,3746.0633,3712.5517,3681.3455
+Offshore Wind - Class 11/Conservative,10396.0894,9521.5263,8808.7506,8166.4561,7563.5202,6985.6348,6741.504,6573.4824,6446.0439,6343.7553,6258.5389,6185.6469,6122.0566,6065.7273,6015.2179,5969.4737,5927.7004,5889.2851,5853.745,5820.6937,5789.8168
+Offshore Wind - Class 12/Advanced,4809.7984,4294.8686,4001.1451,3799.6192,3648.0515,3527.5546,3262.5008,3086.6103,2956.7361,2854.6882,2771.1607,2700.784,2640.1923,2587.1441,2540.0748,2497.8522,2459.6312,2424.7656,2392.7509,2363.186,2335.7468
+Offshore Wind - Class 12/Moderate,7000.8831,6172.9943,5551.7965,5348.2512,5193.1884,5068.6353,4790.4116,4602.3208,4461.5272,4349.6938,4257.3298,4178.9073,4110.9337,4051.0667,3997.6618,3949.5219,3905.7496,3865.6554,3828.6987,3794.4478,3762.5533
+Offshore Wind - Class 12/Conservative,10625.4195,9731.5641,9003.0651,8346.6021,7730.3659,7139.7327,6890.2166,6718.4885,6588.2389,6483.6938,6396.5976,6322.0977,6257.1046,6199.5328,6147.9091,6101.1559,6058.4611,6019.1983,5982.8743,5949.0939,5917.5359
+Offshore Wind - Class 13/Advanced,5259.4418,4696.3739,4375.1916,4154.8262,3989.0892,3857.3276,3567.4953,3375.1616,3233.1462,3121.5584,3030.2223,2953.2664,2887.0104,2829.0029,2777.5334,2731.3636,2689.5695,2651.4445,2616.437,2584.1081,2554.1038
+Offshore Wind - Class 13/Moderate,7655.3598,6750.0759,6070.8056,5848.2318,5678.6729,5542.476,5238.2427,5032.5682,4878.6125,4756.3244,4655.3257,4569.5719,4495.2439,4429.7802,4371.3827,4318.7425,4270.8782,4227.0358,4186.6241,4149.1713,4114.2951
+Offshore Wind - Class 13/Conservative,11618.7355,10641.3182,9844.7156,9126.8831,8453.0382,7807.1898,7534.3477,7346.5656,7204.1396,7089.8211,6994.5827,6913.1182,6842.0493,6779.0953,6722.6457,6671.5217,6624.8356,6581.9024,6542.1826,6505.2442,6470.736
+Offshore Wind - Class 14/Advanced,5529.0667,4937.1331,4599.4855,4367.823,4193.5895,4055.0732,3750.3827,3548.189,3398.8931,3281.5848,3185.5664,3104.6654,3035.0127,2974.0315,2919.9235,2871.3867,2827.45,2787.3706,2750.5684,2716.5822,2685.0397
+Offshore Wind - Class 14/Moderate,8047.8112,7096.118,6382.0249,6148.0409,5969.7896,5826.6106,5506.7808,5290.5624,5128.7142,5000.1569,4893.9806,4803.8307,4725.6922,4656.8725,4595.4813,4540.1425,4489.8244,4443.7344,4401.2511,4361.8783,4325.2141
+Offshore Wind - Class 14/Conservative,12214.369,11186.8445,10349.4041,9594.772,8886.3825,8207.4247,7920.5954,7723.1867,7573.4592,7453.2803,7353.1595,7267.5186,7192.8064,7126.6251,7067.2815,7013.5367,6964.4573,6919.323,6877.567,6838.735,6802.4577
diff --git a/tests/data/Floating_Offshore_Wind/Market/30/df_tc.csv b/tests/data/Floating_Offshore_Wind/Market/30/df_tc.csv
new file mode 100644
index 0000000..af34ddc
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/30/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Moderate,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Conservative,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Moderate,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Conservative,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PFF/Advanced,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Moderate,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Conservative,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+Year (Advanced)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Moderate)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Conservative)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
diff --git a/tests/data/Floating_Offshore_Wind/Market/30/df_vom.csv b/tests/data/Floating_Offshore_Wind/Market/30/df_vom.csv
new file mode 100644
index 0000000..b02e3a0
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/30/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Floating_Offshore_Wind/Market/TechLife/df_capex.csv b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_capex.csv
new file mode 100644
index 0000000..48aaa3e
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,6164.393079155067,5504.442350486707,5127.996867726996,4869.7148063506875,4675.460752031988,4521.027964517991,4181.32647681124,3955.8994689532415,3789.4485139119115,3658.6606949270113,3551.6090894147055,3461.4120769098504,3383.755867003581,3315.7674080971583,3255.442083151268,3201.3281773540753,3152.3428360723738,3107.6579809550435,3066.6269148509114,3028.735539578943,2993.56854097348
+Offshore Wind - Class 8/Moderate,8972.557992722874,7911.509016245191,7115.361849729815,6854.491558455669,6655.757965015436,6496.126765702345,6139.546404741941,5898.483029197435,5718.0374502403065,5574.708052575891,5456.331430674453,5355.822630867479,5268.705440094559,5191.977977322759,5123.532628486631,5061.834970721061,5005.734962958142,4954.348981625986,4906.983875586392,4863.086964349291,4822.209784006486
+Offshore Wind - Class 8/Conservative,13617.880972305991,12472.287069859833,11538.619138826649,10697.274903780875,9907.486722659387,9150.512241029572,8830.724213877127,8610.631986324295,8443.699750238353,8309.711484371428,8198.086212207783,8102.60464292073,8019.307544217199,7945.521539034585,7879.359087685128,7819.438544378004,7764.719517193688,7714.399094976894,7667.845104376691,7624.550986283925,7584.105196068877
+Offshore Wind - Class 9/Advanced,6558.840756878646,5856.661025758063,5456.127543127564,5181.318394895795,4974.634406682637,4810.319780701124,4448.881485732,4209.0299051236,4031.9280154142275,3892.7712722983247,3778.8697547702554,3682.9011392659736,3600.2759049094507,3527.937068921801,3463.7515174356276,3406.17496027115,3354.0551389863795,3306.510979989622,3262.8544321030654,3222.538469140551,3185.121279316132
+Offshore Wind - Class 9/Moderate,9546.694570497915,8417.75115177491,7570.660148319435,7293.097243214567,7081.6471202797065,6911.8013655180175,6532.404114379638,6275.91568689869,6083.923686750289,5931.422897274402,5805.471614638324,5698.531432173666,5605.839762957256,5524.20259049191,5451.377484367961,5385.732013785848,5326.042299120715,5271.36817376157,5220.972471694673,5174.266480101112,5130.773796159257
+Offshore Wind - Class 9/Conservative,14489.262976229513,13270.364682251466,12276.953265231648,11381.772850492516,10541.447609706373,9736.035810799354,9395.785190401062,9161.609643969132,8983.995873452806,8841.433908958357,8722.665920531352,8621.074709565988,8532.447487042864,8453.94002722631,8383.544054409776,8319.789338707838,8261.568966978499,8208.028584987751,8158.4957740450745,8112.431268773591,8069.39735952941
+Offshore Wind - Class 10/Advanced,6748.110486865921,6025.667947904331,5613.576070262512,5330.836816230673,5118.1884243416125,4949.132165622009,4577.263675574761,4330.490672636434,4148.278179141638,4005.105771562267,3887.9173295629544,3789.179324698292,3704.169637122116,3629.743365173169,3563.705641115856,3504.4674946826312,3450.8437394263824,3401.9276910847607,3357.0113421132132,3315.5319229695933,3277.034871966981
+Offshore Wind - Class 10/Moderate,9822.185561260063,8660.663928172953,7789.128260225514,7503.555645591015,7286.003641787134,7111.256603353412,6720.911067682522,6457.021045514077,6259.488603614352,6102.587213534271,5973.001211302103,5862.975109326782,5767.608732623316,5683.615711063982,5608.688977784607,5541.1492045237865,5479.736922802638,5423.48513578377,5371.635058056139,5323.581346495215,5278.833517953941
+Offshore Wind - Class 10/Conservative,14907.38256357729,13653.310286265418,12631.231770156972,11710.218947356327,10845.644392734888,10016.990633038271,9666.92136933382,9425.988153647959,9243.248922939856,9096.573064310081,8974.377680763704,8869.854879523824,8778.6700268652,8697.897186817227,8625.469544997572,8559.87518488806,8499.974708816384,8444.889371433632,8393.927019419943,8346.533420123389,8302.257670524286
+Offshore Wind - Class 11/Advanced,6956.321691478424,6211.58833433994,5786.781590234056,5495.318410480601,5276.108919550027,5101.836399169968,4718.494106932648,4464.10686313231,4276.27221765125,4128.682246555951,4007.8780435089548,3906.0934775235946,3818.4609690138946,3741.7381627276673,3673.6627827572092,3612.5970766051614,3557.318716808526,3506.893191060219,3460.5909832870884,3417.8318066917336,3378.147019261812
+Offshore Wind - Class 11/Moderate,10125.246605283506,8927.886441850036,8029.459791454079,7735.075997427815,7510.811447932585,7330.672642679775,6928.282996204787,6656.250665536574,6452.623549233597,6290.880966319118,6157.296706010031,6043.875693445647,5945.566750465955,5858.98217294766,5781.7437163185405,5712.119944026248,5648.812916151575,5590.8253687009,5537.375455572721,5487.839096831512,5441.710620317747
+Offshore Wind - Class 11/Conservative,15367.34588463045,14074.579653497436,13020.965088843674,12071.534843276095,11180.283948017326,10326.06231298724,9965.191665783244,9716.824592616986,9528.446912223111,9377.245393090887,9251.279808391977,9143.531947417756,9049.533690523212,8966.26852200647,8891.606321455141,8823.987942283095,8762.239284913625,8705.454330296612,8652.919527452297,8604.063569948312,8558.421696176958
+Offshore Wind - Class 12/Advanced,7245.576477514379,6469.875939151453,6027.405038760588,5723.822357484229,5495.497796043878,5313.9787862933945,4914.696456988965,4649.731451865308,4454.086438784636,4300.359441441109,4174.531888278836,4068.515020382145,3977.238479305209,3897.3256477951445,3826.41945720222,3762.8145251195583,3705.237635348968,3652.715360668218,3604.487806979223,3559.950628975789,3518.6156717536455
+Offshore Wind - Class 12/Moderate,10546.270287467178,9299.122093334134,8363.337346133056,8056.712538484164,7823.122822284838,7635.493616512525,7216.371886948146,6933.028176741409,6720.933795766869,6552.465695522657,6413.326802268119,6295.189545898889,6192.792762929343,6102.607945981941,6022.157733862976,5949.6388470998245,5883.699352714367,5823.300632686345,5767.628245515243,5716.032057120063,5667.985552024907
+Offshore Wind - Class 12/Conservative,16006.34442385554,14659.82283631448,13562.397394538018,12573.488355592783,11645.177822080408,10755.436182490917,10379.5601213956,10120.865517571236,9924.65485236211,9767.166079887564,9635.962614130893,9523.734437954206,9425.827504895678,9339.100239355173,9261.33327161348,9190.90326210478,9126.586996416443,9067.440760138938,9012.721511217214,8961.834106447515,8914.294382198923
+Offshore Wind - Class 13/Advanced,8067.847304177014,7204.115684313053,6711.430463055241,6373.395553708924,6119.159313083605,5917.0404546315685,5472.445199000929,5177.410383944034,4959.562360700135,4788.389618418754,4648.282397902372,4530.234058233854,4428.599054130361,4339.61705175403,4260.664232352999,4189.840860682058,4125.729812965057,4067.2471258817523,4013.546427744839,3963.954856388974,3917.928933426527
+Offshore Wind - Class 13/Moderate,11743.123337447973,10354.441375182545,9312.458268016122,8971.035876283919,8710.936898584381,8502.014471234905,8035.328404569617,7719.829111498906,7483.665023989759,7296.078280931126,7141.148912491345,7009.604747206893,6895.5874827517155,6795.167932251564,6705.587682347766,6624.839011677291,6551.416323238098,6484.163256446148,6422.172794432979,6364.721186298052,6311.2219365965375
+Offshore Wind - Class 13/Conservative,17822.838891664425,16323.506082275928,15101.538388224133,14000.401949183142,12966.741312160691,11976.026665500049,11557.493870491991,11269.441012077474,11050.963254594135,10875.60167093344,10729.508427343852,10604.543987043204,10495.526125063212,10398.956379445155,10312.364151986274,10233.941174122267,10162.325978166451,10096.46752880371,10035.538412895146,9978.875857327488,9925.941151067387
+Offshore Wind - Class 14/Advanced,8772.617149963404,7833.433833506027,7297.709935649757,6930.145923040228,6653.700685341661,6433.92576402004,5950.492757859008,5629.684960366007,5392.806656664875,5206.681052257928,5054.334813755595,4925.974354178844,4815.460873380183,4718.705866157529,4632.856126410186,4555.845948442863,4486.134368136903,4422.542962036146,4364.1512981589285,4310.227532189312,4260.181066540415
+Offshore Wind - Class 14/Moderate,12768.948217937565,11258.957378283958,10125.951508504344,9754.703994068908,9471.884027620466,9244.71105940988,8737.257461550169,8394.197649926717,8137.403335691084,7933.4297546877115,7764.966532666483,7621.931491411524,7497.954115183718,7388.762300206951,7291.356826297187,7203.554245195355,7123.717691353731,7050.589691930108,6983.184069801279,6920.7137680366495,6862.541069850083
+Offshore Wind - Class 14/Conservative,19379.759455956522,17749.451902947963,16420.738711875958,15223.412141659841,14099.455708117157,13022.196729277817,12567.102983447312,12253.887253075498,12016.32422425768,11825.644022616503,11666.788682494893,11530.90777697982,11412.366736790163,11307.360991475107,11213.20441407107,11127.930858979074,11050.059785524207,10978.44802649822,10912.196436710647,10850.584258715955,10793.025329675436
diff --git a/tests/data/Floating_Offshore_Wind/Market/TechLife/df_fin_assump.csv b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_fin_assump.csv
new file mode 100644
index 0000000..ca9ad50
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),30
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Floating_Offshore_Wind/Market/TechLife/df_fom.csv b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_fom.csv
new file mode 100644
index 0000000..93154eb
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,61.229875,59.1585,57.97687500000001,57.16625,56.5565,56.071875000000006,55.005625,54.298125,53.775625,53.365125000000006,53.02912499999999,52.746,52.502375,52.288875,52.099624999999996,51.92975,51.775999999999996,51.63575,51.507,51.388,51.277625
+Offshore Wind - Class 8/Moderate,66.816625,64.739375,63.523624999999996,62.67525,62.028875,61.50975,60.350125,59.566125,58.97925,58.513124999999995,58.128125,57.801249999999996,57.517875,57.268375000000006,57.04575,56.845125,56.662625000000006,56.49549999999999,56.341499999999996,56.198750000000004,56.06575
+Offshore Wind - Class 8/Conservative,73.84925,71.96600000000001,70.83624999999999,70.034875,69.41675000000001,68.91525,67.77825,66.99575,66.402125,65.92575,65.528875,65.189375,64.89325,64.630875,64.39574999999999,64.182625,63.988125,63.809125,63.643625,63.48975,63.34587499999999
+Offshore Wind - Class 9/Advanced,63.01412499999999,60.882374999999996,59.666375,58.832125,58.20462499999999,57.70575,56.6085,55.880375,55.342625,54.920249999999996,54.574375,54.283125,54.03225,53.812625,53.61775,53.443,53.28475,53.140375000000006,53.007875,52.8855,52.771875
+Offshore Wind - Class 9/Moderate,68.763625,66.625875,65.37474999999999,64.501625,63.8365,63.302125000000004,62.108625,61.301874999999995,60.697875,60.218125,59.821999999999996,59.4855,59.194,58.937125,58.708,58.5015,58.313750000000006,58.141749999999995,57.98325,57.836375000000004,57.6995
+Offshore Wind - Class 9/Conservative,76.00125,74.063125,72.9005,72.075625,71.43950000000001,70.92337500000001,69.75325,68.94800000000001,68.337125,67.84687500000001,67.438375,67.089,66.78425,66.51425,66.27225,66.053,65.85275,65.668625,65.49825,65.339875,65.191875
+Offshore Wind - Class 10/Advanced,62.7405,60.617999999999995,59.40725,58.576625,57.951875,57.45525,56.362625,55.63775,55.102374999999995,54.681749999999994,54.3375,54.047375,53.797625,53.579,53.385,53.210875,53.053375,52.909625,52.77775,52.655874999999995,52.54275
+Offshore Wind - Class 10/Moderate,68.465,66.3365,65.090875,64.2215,63.55925,63.027249999999995,61.839000000000006,61.035624999999996,60.43425,59.956625,59.562125,59.22725,58.936875,58.68125,58.453125,58.2475,58.060625,57.889375,57.731500000000004,57.585249999999995,57.449000000000005
+Offshore Wind - Class 10/Conservative,75.671125,73.7415,72.583875,71.76275000000001,71.12925,70.615375,69.450375,68.6485,68.040375,67.55225,67.14562500000001,66.79775000000001,66.49425,66.22550000000001,65.984375,65.766125,65.56675,65.383375,65.213875,65.056125,64.90875
+Offshore Wind - Class 11/Advanced,63.692,61.53725,60.30825,59.465,58.830749999999995,58.32662499999999,57.2175,56.481500000000004,55.938,55.510999999999996,55.1615,54.867,54.6135,54.39149999999999,54.194625,54.017875000000004,53.858,53.712125,53.578125,53.454375,53.339625
+Offshore Wind - Class 11/Moderate,69.503375,67.342625,66.078,65.1955,64.52325,63.983125,62.776875,61.96125000000001,61.350875,60.866,60.4655,60.1255,59.83075,59.571125,59.339625,59.130874999999996,58.941125,58.767250000000004,58.607,58.4585,58.32025
+Offshore Wind - Class 11/Conservative,76.81875,74.859875,73.68475000000001,72.851,72.208,71.686375,70.503625,69.689625,69.07225,68.57675,68.163875,67.81075,67.50275,67.229875,66.985125,66.76350000000001,66.561125,66.375,66.202875,66.04275,65.893125
+Offshore Wind - Class 12/Advanced,66.758375,64.5,63.211875,62.328,61.66325,61.134750000000004,59.97225,59.200875,58.63125,58.183625,57.81725,57.508625,57.242875,57.01025,56.803749999999994,56.618624999999994,56.451,56.298125,56.157624999999996,56.028000000000006,55.907625
+Offshore Wind - Class 12/Moderate,72.849625,70.584875,69.259375,68.334375,67.62975,67.063625,65.79925,64.94449999999999,64.304625,63.796375000000005,63.376625000000004,63.020250000000004,62.711375000000004,62.43925,62.1965,61.97775,61.778875,61.596624999999996,61.42875,61.272999999999996,61.128125000000004
+Offshore Wind - Class 12/Conservative,80.51724999999999,78.464,77.23237499999999,76.35849999999999,75.6845,75.13775,73.898125,73.04487499999999,72.39775,71.87837499999999,71.44575,71.075625,70.752625,70.466625,70.210125,69.977875,69.76575,69.57075,69.39025,69.222375,69.065625
+Offshore Wind - Class 13/Advanced,63.717,61.5615,60.332,59.488375,58.853875,58.3495,57.24,56.503625,55.96,55.532875,55.18325,54.888625,54.635,54.412875,54.215875000000004,54.039125,53.879124999999995,53.733125,53.599125,53.475375,53.3605
+Offshore Wind - Class 13/Moderate,69.530625,67.369125,66.104,65.221125,64.5485,64.00825,62.8015,61.985625000000006,61.375,60.889875,60.48925,60.149125000000005,59.85425,59.594625,59.363,59.15412500000001,58.96425,58.790375,58.630125,58.481500000000004,58.343125
+Offshore Wind - Class 13/Conservative,76.849,74.88925,73.71362500000001,72.879625,72.236375,71.7145,70.531375,69.717,69.099375,68.60375,68.19075,67.837375,67.52925,67.25625,67.0115,66.78975,66.58725,66.401125,66.228875,66.06875,65.919
+Offshore Wind - Class 14/Advanced,64.952,62.75475,61.501374999999996,60.64149999999999,59.99475,59.480500000000006,58.3495,57.59887499999999,57.04475000000001,56.609249999999996,56.252874999999996,55.9525,55.694,55.467625,55.26675,55.086625,54.923500000000004,54.77475,54.638125,54.512,54.394875
+Offshore Wind - Class 14/Moderate,70.878375,68.674875,67.385375,66.485375,65.79975,65.249,64.018875,63.187125,62.56462499999999,62.070125000000004,61.66175,61.315,61.0145,60.749750000000006,60.513625,60.30075,60.10725,59.93000000000001,59.7665,59.615125000000006,59.474125
+Offshore Wind - Class 14/Conservative,78.33862500000001,76.340875,75.1425,74.292375,73.63662500000001,73.104625,71.8985,71.068375,70.438875,69.93350000000001,69.5125,69.152375,68.83825,68.559875,68.310375,68.084375,67.878,67.68825,67.512625,67.349375,67.19675
diff --git a/tests/data/Floating_Offshore_Wind/Market/TechLife/df_gcc.csv b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_gcc.csv
new file mode 100644
index 0000000..a559485
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,1124.5467,1004.1544,935.4809,888.3635,852.9265,824.7539,762.7834,721.6596,691.2946,667.4355,647.9065,631.4522,617.2857,604.8828,593.8779,584.0061,575.0699,566.9182,559.433,552.5207,546.1053
+Offshore Wind - Class 8/Moderate,1636.8295,1443.2664,1298.0283,1250.4387,1214.1845,1185.0636,1120.014,1076.0377,1043.1197,1016.9727,995.3777,977.0423,961.1498,947.1527,934.6665,923.4112,913.1771,903.803,895.1623,887.1544,879.6973
+Offshore Wind - Class 8/Conservative,2484.258,2275.2717,2104.9462,1951.463,1807.385,1669.293,1610.9553,1570.8047,1540.3519,1515.9089,1495.5456,1478.1272,1462.9317,1449.4712,1437.4014,1426.4703,1416.4881,1407.3084,1398.8157,1390.9177,1383.5394
+Offshore Wind - Class 9/Advanced,1301.6071,1162.259,1082.7728,1028.2367,987.2201,954.6117,882.884,835.2853,800.1393,772.5235,749.9197,730.8746,714.4776,700.1219,687.3842,675.9581,665.6149,656.1797,647.516,639.5153,632.0898
+Offshore Wind - Class 9/Moderate,1894.549,1670.5093,1502.4034,1447.3209,1405.3584,1371.6524,1296.3607,1245.4604,1207.3594,1177.0955,1152.1004,1130.878,1112.4833,1096.2823,1081.8301,1068.8027,1056.9573,1046.1071,1036.1061,1026.8372,1018.2061
+Offshore Wind - Class 9/Conservative,2875.4056,2633.5143,2436.371,2258.7217,2091.9585,1932.1239,1864.6009,1818.1286,1782.881,1754.5895,1731.0199,1710.859,1693.2709,1677.691,1663.7209,1651.0687,1639.5148,1628.8897,1619.0599,1609.9183,1601.3782
+Offshore Wind - Class 10/Advanced,1437.5413,1283.6403,1195.8529,1135.6213,1090.3211,1054.3073,975.0886,922.5189,883.7024,853.2025,828.238,807.204,789.0945,773.2396,759.1716,746.5522,735.1288,724.7083,715.1398,706.3035,698.1025
+Offshore Wind - Class 10/Moderate,2092.4076,1844.9701,1659.308,1598.4728,1552.128,1514.9019,1431.7471,1375.5309,1333.4508,1300.0263,1272.4208,1248.9821,1228.6663,1210.7734,1194.8118,1180.4239,1167.3413,1155.3581,1144.3125,1134.0757,1124.5431
+Offshore Wind - Class 10/Conservative,3175.7006,2908.5472,2690.8151,2494.6129,2310.4337,2133.9067,2059.3319,2008.0062,1969.0775,1937.8313,1911.8002,1889.5338,1870.1088,1852.9019,1837.4727,1823.4992,1810.7387,1799.004,1788.1475,1778.0513,1768.6193
+Offshore Wind - Class 11/Advanced,1568.3903,1400.4808,1304.7028,1238.9887,1189.5652,1150.2733,1063.8439,1006.4891,964.1394,930.8634,903.6266,880.678,860.9201,843.622,828.2735,814.5055,802.0423,790.6732,780.2338,770.5932,761.6458
+Offshore Wind - Class 11/Moderate,2282.8643,2012.9044,1810.3428,1743.9703,1693.407,1652.7924,1562.0686,1500.7355,1454.8252,1418.3583,1388.2401,1362.6679,1340.5029,1320.9813,1303.5669,1287.8694,1273.596,1260.522,1248.471,1237.3024,1226.9022
+Offshore Wind - Class 11/Conservative,3464.7616,3173.2912,2935.7405,2721.6795,2520.7358,2328.1408,2246.7779,2190.7804,2148.3083,2114.218,2085.8175,2061.5244,2040.3313,2021.5581,2004.7246,1989.4792,1975.5572,1962.7543,1950.9097,1939.8945,1929.6039
+Offshore Wind - Class 12/Advanced,1725.4782,1540.7511,1435.3801,1363.0842,1308.7105,1265.4831,1170.3971,1107.2977,1060.7064,1024.0975,994.1326,968.8855,947.1487,928.1181,911.2323,896.0853,882.3738,869.866,858.381,847.7748,837.9312
+Offshore Wind - Class 12/Moderate,2511.513,2214.5143,1991.6644,1918.644,1863.0164,1818.334,1718.5234,1651.0473,1600.5386,1560.4192,1527.2844,1499.1509,1474.7659,1453.2891,1434.1305,1416.8607,1401.1577,1386.7742,1373.5162,1361.229,1349.7871
+Offshore Wind - Class 12/Conservative,3811.7876,3491.1239,3229.7805,2994.2794,2773.2094,2561.3243,2471.8123,2410.2062,2363.4801,2325.9754,2294.7303,2268.004,2244.6882,2224.0348,2205.5152,2188.7428,2173.4264,2159.3412,2146.3102,2134.1918,2122.8705
+Offshore Wind - Class 13/Advanced,2017.4966,1801.5064,1678.3025,1593.7713,1530.1954,1479.6523,1368.474,1294.6958,1240.2193,1197.4148,1162.3787,1132.8588,1107.4433,1085.1919,1065.4485,1047.7379,1031.7059,1017.0814,1003.6526,991.2515,979.7419
+Offshore Wind - Class 13/Moderate,2936.5592,2589.2967,2328.7318,2243.3536,2178.3116,2126.0672,2009.3647,1930.469,1871.4123,1824.5032,1785.7606,1752.8658,1724.3539,1699.2424,1676.8414,1656.6489,1638.2883,1621.4706,1605.9689,1591.6022,1578.2238
+Offshore Wind - Class 13/Conservative,4456.8911,4081.9585,3776.3856,3501.0285,3242.5448,2994.8005,2890.1395,2818.1072,2763.4733,2719.6213,2683.0883,2651.8389,2624.5772,2600.4284,2578.7746,2559.1636,2541.2551,2524.7861,2509.5498,2495.3804,2482.1432
+Offshore Wind - Class 14/Advanced,2383.5514,2128.3719,1982.8138,1882.9454,1807.8342,1748.1206,1616.7701,1529.6055,1465.2448,1414.6738,1373.2808,1338.4048,1308.3779,1282.0892,1258.7635,1237.8396,1218.8987,1201.6207,1185.7555,1171.1042,1157.5064
+Offshore Wind - Class 14/Moderate,3469.3688,3059.0989,2751.2572,2650.3879,2573.5447,2511.821,2373.944,2280.7335,2210.9615,2155.5412,2109.7691,2070.906,2037.2209,2007.5531,1981.0877,1957.2314,1935.5395,1915.6704,1897.356,1880.3826,1864.5769
+Offshore Wind - Class 14/Conservative,5265.5498,4822.5894,4461.5733,4136.2554,3830.8724,3538.1773,3414.5267,3329.4249,3264.8782,3213.0697,3169.9081,3132.9888,3100.7808,3072.2503,3046.6677,3023.4985,3002.3407,2982.8835,2964.8827,2948.1425,2932.5035
diff --git a/tests/data/Floating_Offshore_Wind/Market/TechLife/df_lcoe.csv b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_lcoe.csv
new file mode 100644
index 0000000..6bfb223
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,79.49406924416465,71.60518133240926,67.05008021920094,63.884355488374524,61.49393965058081,59.5858699832229,55.69295092489356,53.090837134371185,51.159854455146174,49.62872517224789,48.37350681464589,47.307371674707376,46.39113743030717,45.58327504098316,44.86150000317473,44.218059908248556,43.632106996217495,43.094406003976076,42.60594565417351,42.144475734591374,41.72170419385769
+Offshore Wind - Class 8/Moderate,115.82687381182741,103.11034688555459,93.70106973579541,90.3542200600494,87.79329246955106,85.72134916070104,81.42106233048274,78.48422087391872,76.27947521132516,74.51320708439128,73.05704166638307,71.79717631148458,70.71057070848642,69.76117862196986,68.89538919484959,68.12353754274748,67.41779519562988,66.76779781899128,66.16539068575783,65.60405053230001,65.09173093683037
+Offshore Wind - Class 8/Conservative,174.842369079658,160.85173222585493,149.56528709004954,139.52382673702283,130.14615638630485,121.22535452462685,117.19993789665259,114.42742299045298,112.28538736546481,110.5737477567562,109.13776087999851,107.90089164926532,106.81442413459,105.84541238898146,104.99308031371322,104.19529914861889,103.48401934418948,102.82689270454405,102.21621286289059,101.64573730570216,101.11036867902548
+Offshore Wind - Class 9/Advanced,83.55759228186464,75.23902409573128,70.42269416962363,67.08630210899004,64.56719139102397,62.55649325713471,58.45110857792348,55.70723997144906,53.671210216317334,52.05700381941664,50.72389973213255,49.60988377684907,48.6346614993043,47.783352091286865,47.031813450435486,46.344764122078246,45.72735076453037,45.16082236454676,44.64612274078229,44.160020350661895,43.714593210026074
+Offshore Wind - Class 9/Moderate,121.88873216748893,108.46801432838554,98.51434448640154,95.00679666519537,92.30747975427857,90.12368907605553,85.58830370625394,82.49127150753175,80.16632905307183,78.3039320745728,76.75287328109887,75.4403194244123,74.29477197386602,73.27885417027433,72.36640861298723,71.55287684065263,70.80909096787703,70.12407927251151,69.48925965782738,68.89775800248475,68.35780268930826
+Offshore Wind - Class 9/Conservative,184.19625431494586,169.42635216957575,157.50791554917913,146.90176671431212,136.99560269567684,127.57091811910526,123.32618563601538,120.37699316205104,118.14430749930355,116.33965434006929,114.80129031349402,113.4976640284035,112.37649166075919,111.35507308229366,110.43305564070725,109.61568098430165,108.865850254758,108.1502580425915,107.50668226555409,106.9055064926603,106.34137026678978
+Offshore Wind - Class 10/Advanced,85.32390189569811,76.8017038854947,71.86804728294675,68.45069762921322,65.87059743177286,63.811335299917495,59.60488712562015,56.79370051033503,54.70782185109147,53.05419910354482,51.69865426678933,50.54750138602613,49.5486562695975,48.676725335135046,47.906960991779066,47.20332078644857,46.571014860222355,45.990841176686686,45.46371867666687,44.965955903201994,44.5098129725973
+Offshore Wind - Class 10/Moderate,124.6035710173781,110.86704795082328,100.65738967731946,97.06398693467362,94.27940624807027,92.06178285140727,87.39645016338778,84.24092728859011,81.84202817955939,79.93428888133539,78.36146969446489,77.00109984135179,75.82772769029141,74.78724063388479,73.8677165959382,73.0342913559199,72.25773464075162,71.55618153055714,70.92036899204068,70.31449010794873,69.74728533858786
+Offshore Wind - Class 10/Conservative,188.52623374085792,173.37731952476256,161.14979091296993,150.26663534894584,140.10059534359723,130.427790921759,126.07909013809721,123.05774920611937,120.77048024221935,118.92174602239398,117.34598087759998,116.010590411383,114.86201903038666,113.81579946782854,112.87135854012615,112.03408790136083,111.26601036436935,110.53310411778747,109.87392382051877,109.25814184671577,108.68031909619522
+Offshore Wind - Class 11/Advanced,88.20632899540604,79.3802336353244,74.27053837977967,70.74510748575734,68.0723398609581,65.92624605823028,61.58270506589311,58.671208419859724,56.499930150489796,54.787637331267376,53.383998771008855,52.19200180611495,51.16759160674038,50.26452266881063,49.45778367850844,48.73854814512075,48.08367911576881,47.48280722372012,46.93685882895569,46.42131804535022,45.94892488578471
+Offshore Wind - Class 11/Moderate,128.88997119502682,114.65923012145811,104.08113114772341,100.33853151822932,97.47504788754667,95.17811434138434,90.3470429960058,87.0794101605978,84.59520022036858,82.61959283842886,80.99083591293237,79.59826493954068,78.38286046489019,77.30504633746821,76.33705225557132,75.47395524479178,74.6848819461274,73.95816725613906,73.2847090489253,72.6572210736731,72.08442347524985
+Offshore Wind - Class 11/Conservative,195.09998535247078,179.40532062628705,166.7358775722116,155.45886901226692,144.92458512926544,134.90126483206683,130.39845840274194,127.29718021141512,124.90157053128402,122.98723247559943,121.38128115638162,119.99812242168248,118.78323235162198,117.69975913222335,116.74654277924137,115.85464900457669,115.05927287701577,114.3245176699123,113.61756507313568,112.97986622739536,112.38146109112769
+Offshore Wind - Class 12/Advanced,93.78551009752209,84.39782417945285,78.9774255703225,75.22541392781902,72.38047491145723,70.1096777197964,65.49191129584575,62.39598858085606,60.09862821978648,58.276981390735436,56.783657928299284,55.526278282936815,54.42533422314001,53.464350088778886,52.616047206615015,51.85053326774854,51.15341107878453,50.51371588559402,49.93259503597653,49.383638381271744,48.88070852694523
+Offshore Wind - Class 12/Moderate,137.02195385033406,121.89271310325452,110.64754514548497,106.68732256720295,103.6391874924934,101.19421473713042,96.07784432912575,92.58347286439596,89.96016609045003,87.85848186298126,86.10788583945053,84.62663067365196,83.33367304628648,82.20402648796319,81.17373581829257,80.25531835226403,79.41557482331108,78.64211425930763,77.92528734788122,77.27327670336808,76.64775495017396
+Offshore Wind - Class 12/Conservative,207.323024900298,190.64371427457496,177.21934286443548,165.23503658347957,154.0405946628847,143.42166529588945,138.6340016585089,135.30693766847645,132.78833258236563,130.723822841664,129.01597652258206,127.54484131948074,126.27991555730328,125.1269735914868,124.08606286533256,123.16369893067792,122.31748492515531,121.53572231991977,120.78295568051726,120.10432214672042,119.46748101415466
+Offshore Wind - Class 13/Advanced,129.61543378862604,116.48132745040316,108.85523112298453,103.58980869118015,99.60809758962577,96.44153307337321,89.9600749754856,85.61519042270469,82.39558746851277,79.84363768705813,77.756223815581,75.9843183249046,74.44749933397088,73.09211824289613,71.89873903750865,70.82166600604553,69.85814134249514,68.9576743169166,68.1428365251204,67.38666388532637,66.68143877811352
+Offshore Wind - Class 13/Moderate,190.37637662806992,169.09223813062374,153.27410962047767,147.69070045940933,143.4354450550789,139.96605741699815,132.80895729447658,127.9260321051624,124.23793292607934,121.2822617078699,118.85115921238372,116.77237562321164,114.95788630344292,113.34869511419737,111.9328695395901,110.62067131415489,109.44833134528214,108.36894108732979,107.36889163309684,106.43728874023006,105.59314082261604
+Offshore Wind - Class 13/Conservative,289.3996716607543,265.8910498468873,246.97726499545257,230.0296712217655,214.25405196428778,199.19351249639868,192.4912386151395,187.83616189758519,184.32468998173746,181.43896203081354,179.06323062222714,176.9700390716734,175.17670846332936,173.57883544446727,172.13774830946966,170.82506691372492,169.66626053324217,168.55099041149177,167.5133634851272,166.58888632905968,165.67702253598748
+Offshore Wind - Class 14/Advanced,182.49593935841702,163.9031536620753,153.1345349490479,145.6429181176591,140.04072845245614,135.5213718091179,126.34936215209574,120.20272815656313,115.6200351379133,112.02134212604955,109.05211030086161,106.56530104986062,104.37635067603762,102.47840159643187,100.78368637079184,99.28628181265118,97.89234589151982,96.6443572939712,95.46191732056941,94.39394398635366,93.39806352675856
+Offshore Wind - Class 14/Moderate,268.57644585351574,238.37825053459008,215.96065708468083,208.0879103069599,202.05593218051595,197.13734499432547,186.99184046892773,180.06777872069043,174.8971164757232,170.70181344989842,167.26327726390707,164.32358535895554,161.7581526905122,159.48331984390862,157.44042540787618,155.640358115931,153.94306387103146,152.43072559512737,151.03038996134117,149.67533449688574,148.4564715167879
+Offshore Wind - Class 14/Conservative,408.98658781081787,375.6636106500271,348.7753166845753,324.79635752741154,302.38232787036736,281.08564429288754,271.525526636344,264.9641027039318,259.9484052017173,255.89120863597702,252.48518055435736,249.54956758599758,247.05848310798348,244.7548368075098,242.76153382615757,240.86245130122225,239.20182987011384,237.66887835988874,236.16021004859903,234.83181352010217,233.58609590695542
diff --git a/tests/data/Floating_Offshore_Wind/Market/TechLife/df_occ.csv b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_occ.csv
new file mode 100644
index 0000000..ea3d820
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,4435.5373,3960.6753,3689.8071,3503.9624,3364.1885,3253.0677,3008.6384,2846.4343,2726.6659,2632.5586,2555.5305,2490.63,2434.7531,2385.8326,2342.426,2303.4888,2268.2418,2236.0892,2206.5657,2179.3012,2153.9971
+Offshore Wind - Class 8/Moderate,6456.1288,5692.6599,5119.7989,4932.0919,4789.0948,4674.2335,4417.6591,4244.204,4114.3659,4011.2344,3926.0575,3853.7372,3791.0528,3735.8442,3686.5949,3642.2009,3601.8346,3564.8602,3530.7791,3499.1934,3469.7806
+Offshore Wind - Class 8/Conservative,9798.632,8974.3295,8302.5166,7697.1344,7128.8489,6584.1743,6354.0735,6195.708,6075.5933,5979.1832,5898.8641,5830.1612,5770.2254,5717.1333,5669.5267,5626.4114,5587.0388,5550.8311,5517.3336,5486.1817,5457.0792
+Offshore Wind - Class 9/Advanced,4614.256,4120.2606,3838.4785,3645.1456,3499.7399,3384.1418,3129.8638,2961.1241,2836.5299,2738.6308,2658.4991,2590.9836,2532.8553,2481.9637,2436.8081,2396.302,2359.6348,2326.1867,2295.4736,2267.1106,2240.787
+Offshore Wind - Class 9/Moderate,6716.262,5922.0311,5326.0882,5130.8179,4982.0592,4862.5698,4595.6574,4415.2134,4280.1438,4172.8569,4084.248,4009.0138,3943.8036,3886.3705,3835.1368,3788.9541,3746.9613,3708.4972,3673.0429,3640.1845,3609.5866
+Offshore Wind - Class 9/Conservative,10193.4429,9335.9272,8637.0454,8007.2708,7416.0877,6849.4668,6610.0947,6445.3482,6320.3939,6220.0991,6136.5438,6065.0727,6002.7219,5947.4906,5897.9658,5853.1133,5812.1543,5774.4877,5739.6405,5707.2334,5676.9583
+Offshore Wind - Class 10/Advanced,4649.037,4151.3181,3867.4119,3672.6218,3526.12,3409.6505,3153.4558,2983.4442,2857.9109,2759.2739,2678.5382,2610.5137,2551.9472,2500.672,2455.1761,2414.3646,2377.4211,2343.7209,2312.7763,2284.1995,2257.6774
+Offshore Wind - Class 10/Moderate,6766.8874,5966.6698,5366.2348,5169.4927,5019.6126,4899.2225,4630.2982,4448.4941,4312.4063,4204.3108,4115.0339,4039.2326,3973.531,3915.6649,3864.045,3817.5142,3775.2049,3736.4508,3700.7293,3667.6232,3636.7947
+Offshore Wind - Class 10/Conservative,10270.2783,9406.2989,8702.1491,8067.6274,7471.9882,6901.0962,6659.9198,6493.9315,6368.0353,6266.9846,6182.7994,6110.7896,6047.9688,5992.3212,5942.423,5897.2325,5855.9647,5818.0142,5782.9043,5750.253,5719.7497
+Offshore Wind - Class 11/Advanced,4705.9878,4202.1718,3914.7878,3717.6115,3569.3151,3451.4188,3192.0858,3019.9915,2892.9204,2793.075,2711.3503,2642.4925,2583.2087,2531.3053,2485.252,2443.9407,2406.5446,2372.4315,2341.1078,2312.181,2285.334
+Offshore Wind - Class 11/Moderate,6849.782,6039.7616,5431.9713,5232.8191,5081.103,4959.2382,4687.0195,4502.9882,4365.2334,4255.8137,4165.4432,4088.7133,4022.2068,3963.6319,3911.3797,3864.2788,3821.4513,3782.2224,3746.0633,3712.5517,3681.3455
+Offshore Wind - Class 11/Conservative,10396.0894,9521.5263,8808.7506,8166.4561,7563.5202,6985.6348,6741.504,6573.4824,6446.0439,6343.7553,6258.5389,6185.6469,6122.0566,6065.7273,6015.2179,5969.4737,5927.7004,5889.2851,5853.745,5820.6937,5789.8168
+Offshore Wind - Class 12/Advanced,4809.7984,4294.8686,4001.1451,3799.6192,3648.0515,3527.5546,3262.5008,3086.6103,2956.7361,2854.6882,2771.1607,2700.784,2640.1923,2587.1441,2540.0748,2497.8522,2459.6312,2424.7656,2392.7509,2363.186,2335.7468
+Offshore Wind - Class 12/Moderate,7000.8831,6172.9943,5551.7965,5348.2512,5193.1884,5068.6353,4790.4116,4602.3208,4461.5272,4349.6938,4257.3298,4178.9073,4110.9337,4051.0667,3997.6618,3949.5219,3905.7496,3865.6554,3828.6987,3794.4478,3762.5533
+Offshore Wind - Class 12/Conservative,10625.4195,9731.5641,9003.0651,8346.6021,7730.3659,7139.7327,6890.2166,6718.4885,6588.2389,6483.6938,6396.5976,6322.0977,6257.1046,6199.5328,6147.9091,6101.1559,6058.4611,6019.1983,5982.8743,5949.0939,5917.5359
+Offshore Wind - Class 13/Advanced,5259.4418,4696.3739,4375.1916,4154.8262,3989.0892,3857.3276,3567.4953,3375.1616,3233.1462,3121.5584,3030.2223,2953.2664,2887.0104,2829.0029,2777.5334,2731.3636,2689.5695,2651.4445,2616.437,2584.1081,2554.1038
+Offshore Wind - Class 13/Moderate,7655.3598,6750.0759,6070.8056,5848.2318,5678.6729,5542.476,5238.2427,5032.5682,4878.6125,4756.3244,4655.3257,4569.5719,4495.2439,4429.7802,4371.3827,4318.7425,4270.8782,4227.0358,4186.6241,4149.1713,4114.2951
+Offshore Wind - Class 13/Conservative,11618.7355,10641.3182,9844.7156,9126.8831,8453.0382,7807.1898,7534.3477,7346.5656,7204.1396,7089.8211,6994.5827,6913.1182,6842.0493,6779.0953,6722.6457,6671.5217,6624.8356,6581.9024,6542.1826,6505.2442,6470.736
+Offshore Wind - Class 14/Advanced,5529.0667,4937.1331,4599.4855,4367.823,4193.5895,4055.0732,3750.3827,3548.189,3398.8931,3281.5848,3185.5664,3104.6654,3035.0127,2974.0315,2919.9235,2871.3867,2827.45,2787.3706,2750.5684,2716.5822,2685.0397
+Offshore Wind - Class 14/Moderate,8047.8112,7096.118,6382.0249,6148.0409,5969.7896,5826.6106,5506.7808,5290.5624,5128.7142,5000.1569,4893.9806,4803.8307,4725.6922,4656.8725,4595.4813,4540.1425,4489.8244,4443.7344,4401.2511,4361.8783,4325.2141
+Offshore Wind - Class 14/Conservative,12214.369,11186.8445,10349.4041,9594.772,8886.3825,8207.4247,7920.5954,7723.1867,7573.4592,7453.2803,7353.1595,7267.5186,7192.8064,7126.6251,7067.2815,7013.5367,6964.4573,6919.323,6877.567,6838.735,6802.4577
diff --git a/tests/data/Floating_Offshore_Wind/Market/TechLife/df_tc.csv b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_tc.csv
new file mode 100644
index 0000000..af34ddc
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Moderate,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+10 year CRF/Conservative,0.1304639909307722,0.13046236525434168,0.13046040284202187,0.13046038862851897,0.13046037582857625,0.13046036413469903,0.13046035614551693,0.1304603485955869,0.130460341458937,0.13046033467231982,0.13046032821917583,0.1304603220080445,0.13046031609832356,0.13046031043400655,0.13046030498619188,0.13046029975090487,0.13046029468712364,0.13046028980207539,0.13046028505328955,0.13046028047563135,0.13046027608749747
+ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Moderate,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PVD/Conservative,0.815682260050052,0.8156875372054168,0.8156939075675728,0.8156939537077692,0.8156939952592402,0.815694033220181,0.8156940591548553,0.815694083663621,0.8156941068307884,0.8156941288616727,0.8156941498100293,0.8156941699727599,0.8156941891570466,0.8156942075446967,0.8156942252295324,0.8156942422244571,0.8156942586626358,0.8156942745206073,0.8156942899362415,0.815694304796357,0.8156943190412346
+PFF/Advanced,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Moderate,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+PFF/Conservative,0.7023119682927002,0.7023104135003299,0.7023085366197396,0.7023085230255927,0.702308510783408,0.7023084995990906,0.7023084919580357,0.7023084847370921,0.7023084779114194,0.7023084714205263,0.7023084652485753,0.7023084593080906,0.7023084536558821,0.7023084482383842,0.7023084430279545,0.7023084380207909,0.7023084331776599,0.7023084285054736,0.7023084239636118,0.7023084195854209,0.7023084153884955
+Year (Advanced)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Moderate)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
+3/nan,0.7986791823716837,0.798685051251887,0.7986921359118638,0.7986921872256505,0.7986922334361889,0.7986922756535988,0.798692304496266,0.7986923317531405,0.7986923575179862,0.7986923820191404,0.7986924053163856,0.7986924277399142,0.7986924490752884,0.7986924695247009,0.798692489192494,0.7986925080930181,0.7986925263743693,0.7986925440104564,0.798692561154608,0.7986925776809515,0.7986925935230723
+4/nan,0.7410198121111736,0.7410270723677368,0.7410358366611538,0.7410359001405241,0.7410359573067578,0.7410360095331644,0.7410360452139154,0.7410360789329108,0.7410361108061444,0.7410361411160876,0.7410361699366967,0.7410361976764468,0.7410362240700606,0.7410362493676672,0.7410362736983466,0.7410362970798509,0.7410363196953879,0.74103634151268,0.7410363627214074,0.7410363831658556,0.7410364027638642
+5/nan,0.6875230681619768,0.6875314883146834,0.6875416528161404,0.6875417264372621,0.6875417927366333,0.6875418533069693,0.6875418946882408,0.687541933794338,0.6875419707597864,0.6875420059121864,0.6875420393373098,0.6875420715088912,0.6875421021192718,0.6875421314585421,0.6875421596764046,0.6875421867934477,0.6875422130221491,0.6875422383250747,0.6875422629222081,0.687542286632958,0.6875423093620371
+6/nan,0.6378884363539014,0.6378978110932295,0.6379091279674551,0.6379092099352938,0.6379092837512876,0.6379093511887243,0.6379093972615562,0.6379094408012687,0.6379094819576389,0.6379095210954085,0.6379095583100736,0.6379095941290779,0.6379096282098818,0.6379096608754651,0.6379096922925022,0.6379097224839156,0.6379097516862726,0.6379097798578951,0.637909807243707,0.6379098336426426,0.6379098589486115
+Year (Conservative)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.927806594270693,0.9278088668446027,0.9278116101833356,0.9278116300531218,0.9278116479468214,0.9278116642942964,0.9278116754627875,0.9278116860172259,0.9278116959939189,0.9278117054812837,0.9278117145024692,0.9278117231853331,0.9278117314468405,0.9278117393652846,0.9278117469810692,0.9278117542997507,0.9278117613786755,0.9278117682077403,0.927811774846317,0.9278117812456655,0.9278117873800684
+2/nan,0.8608250763721824,0.8608292933954658,0.8608343839909939,0.860834420861831,0.8608344540657964,0.8608344844005521,0.860834505125065,0.8608345247101272,0.8608345432231123,0.8608345608280883,0.8608345775680115,0.8608345936801372,0.860834609010384,0.8608346237040347,0.8608346378360634,0.860834651416781,0.8608346645526003,0.8608346772247736,0.8608346895434729,0.8608347014182547,0.8608347128013973
diff --git a/tests/data/Floating_Offshore_Wind/Market/TechLife/df_vom.csv b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_vom.csv
new file mode 100644
index 0000000..b02e3a0
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/TechLife/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Floating_Offshore_Wind/Market/df_cff.csv b/tests/data/Floating_Offshore_Wind/Market/df_cff.csv
new file mode 100644
index 0000000..c1069c4
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/df_cff.csv
@@ -0,0 +1,4 @@
+Construction Finance Factor,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+CFF/Advanced,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
+CFF/Moderate,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
+CFF/Conservative,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
diff --git a/tests/data/Floating_Offshore_Wind/Market/df_just_wacc.csv b/tests/data/Floating_Offshore_Wind/Market/df_just_wacc.csv
new file mode 100644
index 0000000..cc3b490
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/df_just_wacc.csv
@@ -0,0 +1,7 @@
+WACC Type,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+WACC Nominal - Advanced,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Nominal - Moderate,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Nominal - Conservative,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Real - Advanced,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
+WACC Real - Moderate,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
+WACC Real - Conservative,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
diff --git a/tests/data/Floating_Offshore_Wind/Market/df_wacc.csv b/tests/data/Floating_Offshore_Wind/Market/df_wacc.csv
new file mode 100644
index 0000000..303ad3a
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/Market/df_wacc.csv
@@ -0,0 +1,25 @@
+WACC,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Inflation Rate,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025
+Interest Rate Nominal - Advanced,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Interest Rate Nominal - Moderate,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Interest Rate Nominal - Conservative,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Calculated Interest Rate Real - Advanced,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Calculated Interest Rate Real - Moderate,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Calculated Interest Rate Real - Conservative,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Interest During Construction  - Nominal,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Rate of Return on Equity Nominal - Advanced,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Rate of Return on Equity Nominal - Moderate,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Rate of Return on Equity Nominal - Conservative,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Calculated Rate of Return on Equity Real - Advanced,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Calculated Rate of Return on Equity Real - Moderate,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Calculated Rate of Return on Equity Real - Conservative,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Debt Fraction - Advanced,0.512828946704104,0.512878740897547,0.512938849658125,0.512939285019844,0.512939677084028,0.512940035269274,0.512940279979148,0.512940511234675,0.512940729831368,0.512940937706514,0.512941135367327,0.512941325615257,0.512941506630955,0.512941680129883,0.512941846997314,0.512942007354996,0.512942162459432,0.512942312089244,0.512942457545326,0.512942597759742,0.512942732169002
+Debt Fraction - Moderate,0.512828946704104,0.512878740897547,0.512938849658125,0.512939285019844,0.512939677084028,0.512940035269274,0.512940279979148,0.512940511234675,0.512940729831368,0.512940937706514,0.512941135367327,0.512941325615257,0.512941506630955,0.512941680129883,0.512941846997314,0.512942007354996,0.512942162459432,0.512942312089244,0.512942457545326,0.512942597759742,0.512942732169002
+Debt Fraction - Conservative,0.512828946704104,0.512878740897547,0.512938849658125,0.512939285019844,0.512939677084028,0.512940035269274,0.512940279979148,0.512940511234675,0.512940729831368,0.512940937706514,0.512941135367327,0.512941325615257,0.512941506630955,0.512941680129883,0.512941846997314,0.512942007354996,0.512942162459432,0.512942312089244,0.512942457545326,0.512942597759742,0.512942732169002
+Tax Rate (Federal and State),0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996
+WACC Nominal - Advanced,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Nominal - Moderate,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Nominal - Conservative,0.07781083490364182,0.07780819491509386,0.07780500806882554,0.07780498498681791,0.07780496420035901,0.07780494521009364,0.07780493223606554,0.07780491997536,0.07780490838580054,0.07780489736467604,0.07780488688509507,0.0778048767985303,0.07780486720144003,0.07780485800287387,0.0778048491558964,0.07780484065405283,0.07780483243072583,0.07780482449765247,0.07780481678586192,0.07780480935197401,0.07780480222586386
+WACC Real - Advanced,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
+WACC Real - Moderate,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
+WACC Real - Conservative,0.051522765759650646,0.05152019016106735,0.05151708104275676,0.05151705852372479,0.05151703824425291,0.0515170197171646,0.05151700705957607,0.05151699509791241,0.051516983791024984,0.05151697303870839,0.05151696281472695,0.05151695297417591,0.0515169436111611,0.051516934636950173,0.05151692600575264,0.05151691771127109,0.05151690968851308,0.05151690194892922,0.05151689442523111,0.05151688717265768,0.051516880220355166
diff --git a/tests/data/Floating_Offshore_Wind/R&D/20/df_capex.csv b/tests/data/Floating_Offshore_Wind/R&D/20/df_capex.csv
new file mode 100644
index 0000000..48aaa3e
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/20/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,6164.393079155067,5504.442350486707,5127.996867726996,4869.7148063506875,4675.460752031988,4521.027964517991,4181.32647681124,3955.8994689532415,3789.4485139119115,3658.6606949270113,3551.6090894147055,3461.4120769098504,3383.755867003581,3315.7674080971583,3255.442083151268,3201.3281773540753,3152.3428360723738,3107.6579809550435,3066.6269148509114,3028.735539578943,2993.56854097348
+Offshore Wind - Class 8/Moderate,8972.557992722874,7911.509016245191,7115.361849729815,6854.491558455669,6655.757965015436,6496.126765702345,6139.546404741941,5898.483029197435,5718.0374502403065,5574.708052575891,5456.331430674453,5355.822630867479,5268.705440094559,5191.977977322759,5123.532628486631,5061.834970721061,5005.734962958142,4954.348981625986,4906.983875586392,4863.086964349291,4822.209784006486
+Offshore Wind - Class 8/Conservative,13617.880972305991,12472.287069859833,11538.619138826649,10697.274903780875,9907.486722659387,9150.512241029572,8830.724213877127,8610.631986324295,8443.699750238353,8309.711484371428,8198.086212207783,8102.60464292073,8019.307544217199,7945.521539034585,7879.359087685128,7819.438544378004,7764.719517193688,7714.399094976894,7667.845104376691,7624.550986283925,7584.105196068877
+Offshore Wind - Class 9/Advanced,6558.840756878646,5856.661025758063,5456.127543127564,5181.318394895795,4974.634406682637,4810.319780701124,4448.881485732,4209.0299051236,4031.9280154142275,3892.7712722983247,3778.8697547702554,3682.9011392659736,3600.2759049094507,3527.937068921801,3463.7515174356276,3406.17496027115,3354.0551389863795,3306.510979989622,3262.8544321030654,3222.538469140551,3185.121279316132
+Offshore Wind - Class 9/Moderate,9546.694570497915,8417.75115177491,7570.660148319435,7293.097243214567,7081.6471202797065,6911.8013655180175,6532.404114379638,6275.91568689869,6083.923686750289,5931.422897274402,5805.471614638324,5698.531432173666,5605.839762957256,5524.20259049191,5451.377484367961,5385.732013785848,5326.042299120715,5271.36817376157,5220.972471694673,5174.266480101112,5130.773796159257
+Offshore Wind - Class 9/Conservative,14489.262976229513,13270.364682251466,12276.953265231648,11381.772850492516,10541.447609706373,9736.035810799354,9395.785190401062,9161.609643969132,8983.995873452806,8841.433908958357,8722.665920531352,8621.074709565988,8532.447487042864,8453.94002722631,8383.544054409776,8319.789338707838,8261.568966978499,8208.028584987751,8158.4957740450745,8112.431268773591,8069.39735952941
+Offshore Wind - Class 10/Advanced,6748.110486865921,6025.667947904331,5613.576070262512,5330.836816230673,5118.1884243416125,4949.132165622009,4577.263675574761,4330.490672636434,4148.278179141638,4005.105771562267,3887.9173295629544,3789.179324698292,3704.169637122116,3629.743365173169,3563.705641115856,3504.4674946826312,3450.8437394263824,3401.9276910847607,3357.0113421132132,3315.5319229695933,3277.034871966981
+Offshore Wind - Class 10/Moderate,9822.185561260063,8660.663928172953,7789.128260225514,7503.555645591015,7286.003641787134,7111.256603353412,6720.911067682522,6457.021045514077,6259.488603614352,6102.587213534271,5973.001211302103,5862.975109326782,5767.608732623316,5683.615711063982,5608.688977784607,5541.1492045237865,5479.736922802638,5423.48513578377,5371.635058056139,5323.581346495215,5278.833517953941
+Offshore Wind - Class 10/Conservative,14907.38256357729,13653.310286265418,12631.231770156972,11710.218947356327,10845.644392734888,10016.990633038271,9666.92136933382,9425.988153647959,9243.248922939856,9096.573064310081,8974.377680763704,8869.854879523824,8778.6700268652,8697.897186817227,8625.469544997572,8559.87518488806,8499.974708816384,8444.889371433632,8393.927019419943,8346.533420123389,8302.257670524286
+Offshore Wind - Class 11/Advanced,6956.321691478424,6211.58833433994,5786.781590234056,5495.318410480601,5276.108919550027,5101.836399169968,4718.494106932648,4464.10686313231,4276.27221765125,4128.682246555951,4007.8780435089548,3906.0934775235946,3818.4609690138946,3741.7381627276673,3673.6627827572092,3612.5970766051614,3557.318716808526,3506.893191060219,3460.5909832870884,3417.8318066917336,3378.147019261812
+Offshore Wind - Class 11/Moderate,10125.246605283506,8927.886441850036,8029.459791454079,7735.075997427815,7510.811447932585,7330.672642679775,6928.282996204787,6656.250665536574,6452.623549233597,6290.880966319118,6157.296706010031,6043.875693445647,5945.566750465955,5858.98217294766,5781.7437163185405,5712.119944026248,5648.812916151575,5590.8253687009,5537.375455572721,5487.839096831512,5441.710620317747
+Offshore Wind - Class 11/Conservative,15367.34588463045,14074.579653497436,13020.965088843674,12071.534843276095,11180.283948017326,10326.06231298724,9965.191665783244,9716.824592616986,9528.446912223111,9377.245393090887,9251.279808391977,9143.531947417756,9049.533690523212,8966.26852200647,8891.606321455141,8823.987942283095,8762.239284913625,8705.454330296612,8652.919527452297,8604.063569948312,8558.421696176958
+Offshore Wind - Class 12/Advanced,7245.576477514379,6469.875939151453,6027.405038760588,5723.822357484229,5495.497796043878,5313.9787862933945,4914.696456988965,4649.731451865308,4454.086438784636,4300.359441441109,4174.531888278836,4068.515020382145,3977.238479305209,3897.3256477951445,3826.41945720222,3762.8145251195583,3705.237635348968,3652.715360668218,3604.487806979223,3559.950628975789,3518.6156717536455
+Offshore Wind - Class 12/Moderate,10546.270287467178,9299.122093334134,8363.337346133056,8056.712538484164,7823.122822284838,7635.493616512525,7216.371886948146,6933.028176741409,6720.933795766869,6552.465695522657,6413.326802268119,6295.189545898889,6192.792762929343,6102.607945981941,6022.157733862976,5949.6388470998245,5883.699352714367,5823.300632686345,5767.628245515243,5716.032057120063,5667.985552024907
+Offshore Wind - Class 12/Conservative,16006.34442385554,14659.82283631448,13562.397394538018,12573.488355592783,11645.177822080408,10755.436182490917,10379.5601213956,10120.865517571236,9924.65485236211,9767.166079887564,9635.962614130893,9523.734437954206,9425.827504895678,9339.100239355173,9261.33327161348,9190.90326210478,9126.586996416443,9067.440760138938,9012.721511217214,8961.834106447515,8914.294382198923
+Offshore Wind - Class 13/Advanced,8067.847304177014,7204.115684313053,6711.430463055241,6373.395553708924,6119.159313083605,5917.0404546315685,5472.445199000929,5177.410383944034,4959.562360700135,4788.389618418754,4648.282397902372,4530.234058233854,4428.599054130361,4339.61705175403,4260.664232352999,4189.840860682058,4125.729812965057,4067.2471258817523,4013.546427744839,3963.954856388974,3917.928933426527
+Offshore Wind - Class 13/Moderate,11743.123337447973,10354.441375182545,9312.458268016122,8971.035876283919,8710.936898584381,8502.014471234905,8035.328404569617,7719.829111498906,7483.665023989759,7296.078280931126,7141.148912491345,7009.604747206893,6895.5874827517155,6795.167932251564,6705.587682347766,6624.839011677291,6551.416323238098,6484.163256446148,6422.172794432979,6364.721186298052,6311.2219365965375
+Offshore Wind - Class 13/Conservative,17822.838891664425,16323.506082275928,15101.538388224133,14000.401949183142,12966.741312160691,11976.026665500049,11557.493870491991,11269.441012077474,11050.963254594135,10875.60167093344,10729.508427343852,10604.543987043204,10495.526125063212,10398.956379445155,10312.364151986274,10233.941174122267,10162.325978166451,10096.46752880371,10035.538412895146,9978.875857327488,9925.941151067387
+Offshore Wind - Class 14/Advanced,8772.617149963404,7833.433833506027,7297.709935649757,6930.145923040228,6653.700685341661,6433.92576402004,5950.492757859008,5629.684960366007,5392.806656664875,5206.681052257928,5054.334813755595,4925.974354178844,4815.460873380183,4718.705866157529,4632.856126410186,4555.845948442863,4486.134368136903,4422.542962036146,4364.1512981589285,4310.227532189312,4260.181066540415
+Offshore Wind - Class 14/Moderate,12768.948217937565,11258.957378283958,10125.951508504344,9754.703994068908,9471.884027620466,9244.71105940988,8737.257461550169,8394.197649926717,8137.403335691084,7933.4297546877115,7764.966532666483,7621.931491411524,7497.954115183718,7388.762300206951,7291.356826297187,7203.554245195355,7123.717691353731,7050.589691930108,6983.184069801279,6920.7137680366495,6862.541069850083
+Offshore Wind - Class 14/Conservative,19379.759455956522,17749.451902947963,16420.738711875958,15223.412141659841,14099.455708117157,13022.196729277817,12567.102983447312,12253.887253075498,12016.32422425768,11825.644022616503,11666.788682494893,11530.90777697982,11412.366736790163,11307.360991475107,11213.20441407107,11127.930858979074,11050.059785524207,10978.44802649822,10912.196436710647,10850.584258715955,10793.025329675436
diff --git a/tests/data/Floating_Offshore_Wind/R&D/20/df_fin_assump.csv b/tests/data/Floating_Offshore_Wind/R&D/20/df_fin_assump.csv
new file mode 100644
index 0000000..e9d9b87
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/20/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),20
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Floating_Offshore_Wind/R&D/20/df_fom.csv b/tests/data/Floating_Offshore_Wind/R&D/20/df_fom.csv
new file mode 100644
index 0000000..93154eb
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/20/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,61.229875,59.1585,57.97687500000001,57.16625,56.5565,56.071875000000006,55.005625,54.298125,53.775625,53.365125000000006,53.02912499999999,52.746,52.502375,52.288875,52.099624999999996,51.92975,51.775999999999996,51.63575,51.507,51.388,51.277625
+Offshore Wind - Class 8/Moderate,66.816625,64.739375,63.523624999999996,62.67525,62.028875,61.50975,60.350125,59.566125,58.97925,58.513124999999995,58.128125,57.801249999999996,57.517875,57.268375000000006,57.04575,56.845125,56.662625000000006,56.49549999999999,56.341499999999996,56.198750000000004,56.06575
+Offshore Wind - Class 8/Conservative,73.84925,71.96600000000001,70.83624999999999,70.034875,69.41675000000001,68.91525,67.77825,66.99575,66.402125,65.92575,65.528875,65.189375,64.89325,64.630875,64.39574999999999,64.182625,63.988125,63.809125,63.643625,63.48975,63.34587499999999
+Offshore Wind - Class 9/Advanced,63.01412499999999,60.882374999999996,59.666375,58.832125,58.20462499999999,57.70575,56.6085,55.880375,55.342625,54.920249999999996,54.574375,54.283125,54.03225,53.812625,53.61775,53.443,53.28475,53.140375000000006,53.007875,52.8855,52.771875
+Offshore Wind - Class 9/Moderate,68.763625,66.625875,65.37474999999999,64.501625,63.8365,63.302125000000004,62.108625,61.301874999999995,60.697875,60.218125,59.821999999999996,59.4855,59.194,58.937125,58.708,58.5015,58.313750000000006,58.141749999999995,57.98325,57.836375000000004,57.6995
+Offshore Wind - Class 9/Conservative,76.00125,74.063125,72.9005,72.075625,71.43950000000001,70.92337500000001,69.75325,68.94800000000001,68.337125,67.84687500000001,67.438375,67.089,66.78425,66.51425,66.27225,66.053,65.85275,65.668625,65.49825,65.339875,65.191875
+Offshore Wind - Class 10/Advanced,62.7405,60.617999999999995,59.40725,58.576625,57.951875,57.45525,56.362625,55.63775,55.102374999999995,54.681749999999994,54.3375,54.047375,53.797625,53.579,53.385,53.210875,53.053375,52.909625,52.77775,52.655874999999995,52.54275
+Offshore Wind - Class 10/Moderate,68.465,66.3365,65.090875,64.2215,63.55925,63.027249999999995,61.839000000000006,61.035624999999996,60.43425,59.956625,59.562125,59.22725,58.936875,58.68125,58.453125,58.2475,58.060625,57.889375,57.731500000000004,57.585249999999995,57.449000000000005
+Offshore Wind - Class 10/Conservative,75.671125,73.7415,72.583875,71.76275000000001,71.12925,70.615375,69.450375,68.6485,68.040375,67.55225,67.14562500000001,66.79775000000001,66.49425,66.22550000000001,65.984375,65.766125,65.56675,65.383375,65.213875,65.056125,64.90875
+Offshore Wind - Class 11/Advanced,63.692,61.53725,60.30825,59.465,58.830749999999995,58.32662499999999,57.2175,56.481500000000004,55.938,55.510999999999996,55.1615,54.867,54.6135,54.39149999999999,54.194625,54.017875000000004,53.858,53.712125,53.578125,53.454375,53.339625
+Offshore Wind - Class 11/Moderate,69.503375,67.342625,66.078,65.1955,64.52325,63.983125,62.776875,61.96125000000001,61.350875,60.866,60.4655,60.1255,59.83075,59.571125,59.339625,59.130874999999996,58.941125,58.767250000000004,58.607,58.4585,58.32025
+Offshore Wind - Class 11/Conservative,76.81875,74.859875,73.68475000000001,72.851,72.208,71.686375,70.503625,69.689625,69.07225,68.57675,68.163875,67.81075,67.50275,67.229875,66.985125,66.76350000000001,66.561125,66.375,66.202875,66.04275,65.893125
+Offshore Wind - Class 12/Advanced,66.758375,64.5,63.211875,62.328,61.66325,61.134750000000004,59.97225,59.200875,58.63125,58.183625,57.81725,57.508625,57.242875,57.01025,56.803749999999994,56.618624999999994,56.451,56.298125,56.157624999999996,56.028000000000006,55.907625
+Offshore Wind - Class 12/Moderate,72.849625,70.584875,69.259375,68.334375,67.62975,67.063625,65.79925,64.94449999999999,64.304625,63.796375000000005,63.376625000000004,63.020250000000004,62.711375000000004,62.43925,62.1965,61.97775,61.778875,61.596624999999996,61.42875,61.272999999999996,61.128125000000004
+Offshore Wind - Class 12/Conservative,80.51724999999999,78.464,77.23237499999999,76.35849999999999,75.6845,75.13775,73.898125,73.04487499999999,72.39775,71.87837499999999,71.44575,71.075625,70.752625,70.466625,70.210125,69.977875,69.76575,69.57075,69.39025,69.222375,69.065625
+Offshore Wind - Class 13/Advanced,63.717,61.5615,60.332,59.488375,58.853875,58.3495,57.24,56.503625,55.96,55.532875,55.18325,54.888625,54.635,54.412875,54.215875000000004,54.039125,53.879124999999995,53.733125,53.599125,53.475375,53.3605
+Offshore Wind - Class 13/Moderate,69.530625,67.369125,66.104,65.221125,64.5485,64.00825,62.8015,61.985625000000006,61.375,60.889875,60.48925,60.149125000000005,59.85425,59.594625,59.363,59.15412500000001,58.96425,58.790375,58.630125,58.481500000000004,58.343125
+Offshore Wind - Class 13/Conservative,76.849,74.88925,73.71362500000001,72.879625,72.236375,71.7145,70.531375,69.717,69.099375,68.60375,68.19075,67.837375,67.52925,67.25625,67.0115,66.78975,66.58725,66.401125,66.228875,66.06875,65.919
+Offshore Wind - Class 14/Advanced,64.952,62.75475,61.501374999999996,60.64149999999999,59.99475,59.480500000000006,58.3495,57.59887499999999,57.04475000000001,56.609249999999996,56.252874999999996,55.9525,55.694,55.467625,55.26675,55.086625,54.923500000000004,54.77475,54.638125,54.512,54.394875
+Offshore Wind - Class 14/Moderate,70.878375,68.674875,67.385375,66.485375,65.79975,65.249,64.018875,63.187125,62.56462499999999,62.070125000000004,61.66175,61.315,61.0145,60.749750000000006,60.513625,60.30075,60.10725,59.93000000000001,59.7665,59.615125000000006,59.474125
+Offshore Wind - Class 14/Conservative,78.33862500000001,76.340875,75.1425,74.292375,73.63662500000001,73.104625,71.8985,71.068375,70.438875,69.93350000000001,69.5125,69.152375,68.83825,68.559875,68.310375,68.084375,67.878,67.68825,67.512625,67.349375,67.19675
diff --git a/tests/data/Floating_Offshore_Wind/R&D/20/df_gcc.csv b/tests/data/Floating_Offshore_Wind/R&D/20/df_gcc.csv
new file mode 100644
index 0000000..a559485
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/20/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,1124.5467,1004.1544,935.4809,888.3635,852.9265,824.7539,762.7834,721.6596,691.2946,667.4355,647.9065,631.4522,617.2857,604.8828,593.8779,584.0061,575.0699,566.9182,559.433,552.5207,546.1053
+Offshore Wind - Class 8/Moderate,1636.8295,1443.2664,1298.0283,1250.4387,1214.1845,1185.0636,1120.014,1076.0377,1043.1197,1016.9727,995.3777,977.0423,961.1498,947.1527,934.6665,923.4112,913.1771,903.803,895.1623,887.1544,879.6973
+Offshore Wind - Class 8/Conservative,2484.258,2275.2717,2104.9462,1951.463,1807.385,1669.293,1610.9553,1570.8047,1540.3519,1515.9089,1495.5456,1478.1272,1462.9317,1449.4712,1437.4014,1426.4703,1416.4881,1407.3084,1398.8157,1390.9177,1383.5394
+Offshore Wind - Class 9/Advanced,1301.6071,1162.259,1082.7728,1028.2367,987.2201,954.6117,882.884,835.2853,800.1393,772.5235,749.9197,730.8746,714.4776,700.1219,687.3842,675.9581,665.6149,656.1797,647.516,639.5153,632.0898
+Offshore Wind - Class 9/Moderate,1894.549,1670.5093,1502.4034,1447.3209,1405.3584,1371.6524,1296.3607,1245.4604,1207.3594,1177.0955,1152.1004,1130.878,1112.4833,1096.2823,1081.8301,1068.8027,1056.9573,1046.1071,1036.1061,1026.8372,1018.2061
+Offshore Wind - Class 9/Conservative,2875.4056,2633.5143,2436.371,2258.7217,2091.9585,1932.1239,1864.6009,1818.1286,1782.881,1754.5895,1731.0199,1710.859,1693.2709,1677.691,1663.7209,1651.0687,1639.5148,1628.8897,1619.0599,1609.9183,1601.3782
+Offshore Wind - Class 10/Advanced,1437.5413,1283.6403,1195.8529,1135.6213,1090.3211,1054.3073,975.0886,922.5189,883.7024,853.2025,828.238,807.204,789.0945,773.2396,759.1716,746.5522,735.1288,724.7083,715.1398,706.3035,698.1025
+Offshore Wind - Class 10/Moderate,2092.4076,1844.9701,1659.308,1598.4728,1552.128,1514.9019,1431.7471,1375.5309,1333.4508,1300.0263,1272.4208,1248.9821,1228.6663,1210.7734,1194.8118,1180.4239,1167.3413,1155.3581,1144.3125,1134.0757,1124.5431
+Offshore Wind - Class 10/Conservative,3175.7006,2908.5472,2690.8151,2494.6129,2310.4337,2133.9067,2059.3319,2008.0062,1969.0775,1937.8313,1911.8002,1889.5338,1870.1088,1852.9019,1837.4727,1823.4992,1810.7387,1799.004,1788.1475,1778.0513,1768.6193
+Offshore Wind - Class 11/Advanced,1568.3903,1400.4808,1304.7028,1238.9887,1189.5652,1150.2733,1063.8439,1006.4891,964.1394,930.8634,903.6266,880.678,860.9201,843.622,828.2735,814.5055,802.0423,790.6732,780.2338,770.5932,761.6458
+Offshore Wind - Class 11/Moderate,2282.8643,2012.9044,1810.3428,1743.9703,1693.407,1652.7924,1562.0686,1500.7355,1454.8252,1418.3583,1388.2401,1362.6679,1340.5029,1320.9813,1303.5669,1287.8694,1273.596,1260.522,1248.471,1237.3024,1226.9022
+Offshore Wind - Class 11/Conservative,3464.7616,3173.2912,2935.7405,2721.6795,2520.7358,2328.1408,2246.7779,2190.7804,2148.3083,2114.218,2085.8175,2061.5244,2040.3313,2021.5581,2004.7246,1989.4792,1975.5572,1962.7543,1950.9097,1939.8945,1929.6039
+Offshore Wind - Class 12/Advanced,1725.4782,1540.7511,1435.3801,1363.0842,1308.7105,1265.4831,1170.3971,1107.2977,1060.7064,1024.0975,994.1326,968.8855,947.1487,928.1181,911.2323,896.0853,882.3738,869.866,858.381,847.7748,837.9312
+Offshore Wind - Class 12/Moderate,2511.513,2214.5143,1991.6644,1918.644,1863.0164,1818.334,1718.5234,1651.0473,1600.5386,1560.4192,1527.2844,1499.1509,1474.7659,1453.2891,1434.1305,1416.8607,1401.1577,1386.7742,1373.5162,1361.229,1349.7871
+Offshore Wind - Class 12/Conservative,3811.7876,3491.1239,3229.7805,2994.2794,2773.2094,2561.3243,2471.8123,2410.2062,2363.4801,2325.9754,2294.7303,2268.004,2244.6882,2224.0348,2205.5152,2188.7428,2173.4264,2159.3412,2146.3102,2134.1918,2122.8705
+Offshore Wind - Class 13/Advanced,2017.4966,1801.5064,1678.3025,1593.7713,1530.1954,1479.6523,1368.474,1294.6958,1240.2193,1197.4148,1162.3787,1132.8588,1107.4433,1085.1919,1065.4485,1047.7379,1031.7059,1017.0814,1003.6526,991.2515,979.7419
+Offshore Wind - Class 13/Moderate,2936.5592,2589.2967,2328.7318,2243.3536,2178.3116,2126.0672,2009.3647,1930.469,1871.4123,1824.5032,1785.7606,1752.8658,1724.3539,1699.2424,1676.8414,1656.6489,1638.2883,1621.4706,1605.9689,1591.6022,1578.2238
+Offshore Wind - Class 13/Conservative,4456.8911,4081.9585,3776.3856,3501.0285,3242.5448,2994.8005,2890.1395,2818.1072,2763.4733,2719.6213,2683.0883,2651.8389,2624.5772,2600.4284,2578.7746,2559.1636,2541.2551,2524.7861,2509.5498,2495.3804,2482.1432
+Offshore Wind - Class 14/Advanced,2383.5514,2128.3719,1982.8138,1882.9454,1807.8342,1748.1206,1616.7701,1529.6055,1465.2448,1414.6738,1373.2808,1338.4048,1308.3779,1282.0892,1258.7635,1237.8396,1218.8987,1201.6207,1185.7555,1171.1042,1157.5064
+Offshore Wind - Class 14/Moderate,3469.3688,3059.0989,2751.2572,2650.3879,2573.5447,2511.821,2373.944,2280.7335,2210.9615,2155.5412,2109.7691,2070.906,2037.2209,2007.5531,1981.0877,1957.2314,1935.5395,1915.6704,1897.356,1880.3826,1864.5769
+Offshore Wind - Class 14/Conservative,5265.5498,4822.5894,4461.5733,4136.2554,3830.8724,3538.1773,3414.5267,3329.4249,3264.8782,3213.0697,3169.9081,3132.9888,3100.7808,3072.2503,3046.6677,3023.4985,3002.3407,2982.8835,2964.8827,2948.1425,2932.5035
diff --git a/tests/data/Floating_Offshore_Wind/R&D/20/df_lcoe.csv b/tests/data/Floating_Offshore_Wind/R&D/20/df_lcoe.csv
new file mode 100644
index 0000000..34830ea
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/20/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,123.54604058876015,110.72351857569367,103.32903255729963,98.19324609426914,94.31762689613662,91.22581023095024,84.89255307937714,80.66226774150469,77.52484166139138,75.03918479765161,73.00212660598947,71.27327460410457,69.78760305985227,68.47860100460878,67.30988376527294,66.26773660992983,65.31928162903122,64.44946775470805,63.658788365706926,62.91322278321216,62.229605303171084
+Offshore Wind - Class 8/Moderate,182.9716937397643,162.08276728728208,146.57633518062298,141.14290087528207,136.9869153214334,133.62600968891024,126.63080168595059,121.856215247088,118.27274048274917,115.40338755014726,113.03786162467921,110.9932523383508,109.22960392232308,107.68819540248397,106.28416245019835,105.0318954431882,103.88730387189497,102.83348925735919,101.85716951349639,100.94773154412617,100.1169354130481
+Offshore Wind - Class 8/Conservative,280.1503752969721,257.0967215028848,238.43749413232518,221.79163387161796,206.22534491321142,191.40120179302312,184.86516976229458,180.36375070726103,176.88799569131572,174.11036684257596,171.7806382007231,169.77445119654024,168.01263612482657,166.44167806277468,165.05910029880457,163.76637082300084,162.61299010174065,161.54762071553768,160.55770313440436,159.6331051612859,158.7655687227484
+Offshore Wind - Class 9/Advanced,130.12994354116688,116.59693736613285,108.77221781037734,103.35430166895179,99.265974510048,96.00458313565214,89.31982801160312,84.85508338271143,81.54394381607842,78.9209231072561,76.75649191602821,74.94712083248413,73.36533113234768,71.98451909073538,70.76531101220476,69.65243124011896,68.65200694420889,67.73458486489316,66.90055832595769,66.11430997123318,65.39328256364774
+Offshore Wind - Class 9/Moderate,192.86862720789674,170.810329127328,154.40065363436705,148.69980360055453,144.31504287171802,140.7692932672509,133.3852316868725,128.34570823221696,124.56347108589375,121.53518166554424,119.01435274234464,116.88106448973107,115.01996486768628,113.37017620287737,111.88903462441459,110.5678771800799,109.3603982117186,108.24871952696745,107.21884197412061,106.25956375853835,105.38309429610031
+Offshore Wind - Class 9/Conservative,295.51905871414925,271.1699145796776,251.45865816169126,233.871548367789,217.423836046583,201.75896088542567,194.8604660694011,190.06894223419707,186.44150234761346,183.51017211022628,181.01313661066925,178.8966390572063,177.075654341384,175.41811555266855,173.9222159969596,172.5953059798428,171.37824796444696,170.21806815368197,169.17381136179736,168.19849802202225,167.28342827168024
+Offshore Wind - Class 10/Advanced,133.1450529233866,119.26906409466251,111.24668301005109,105.69225368719188,101.50105871426113,98.1577306637405,91.30276978519007,86.72459558288418,83.3294485336626,80.63999920798756,78.43602806405853,76.56574913259269,74.94410775169578,73.52850530987793,72.27855305206677,71.13769452141412,70.11213150578796,69.1716798992376,68.31668454877729,67.51075233110444,66.77163600498858
+Offshore Wind - Class 10/Moderate,197.47992221724692,174.88882021600475,158.04959025570622,152.20405998229919,147.67788869971088,144.07277824752032,136.47205810027558,131.3318356031488,127.42714475612776,124.32242818571102,121.76282868718303,119.5510138744922,117.64302503283811,115.95178490380933,114.45665214577362,113.10196529535841,111.84124952608573,110.70167025112808,109.66811362430818,108.6845905218227,107.76415899710005
+Offshore Wind - Class 10/Conservative,302.8400121483734,277.8549190352875,257.6255222453159,239.5740454612593,222.6908678824675,206.6103138180098,199.5366271436308,194.62353907851963,190.90410009470887,187.89847850187243,185.33837319095184,183.16833417492248,181.30118362795454,179.60181712140079,178.06813687780894,176.7076796307485,175.4598594165998,174.27048478139915,173.19989531571147,172.19996368163157,171.26181736271286
+Offshore Wind - Class 11/Advanced,137.76871293868837,123.39257594331154,115.08075595871554,109.34730242267081,105.00386413293391,101.5192489241027,94.43710593527632,89.69382303688998,86.15947491935331,83.37353230427334,81.09048532120572,79.15307996710203,77.48817699418396,76.02144316726157,74.71200471091399,73.54431677157295,72.4817219814726,71.50730826787081,70.62143291515095,69.78636568955068,69.02058646154764
+Offshore Wind - Class 11/Moderate,204.42319140234417,181.01371303374756,163.5634222921498,157.474026271123,152.81658495582906,149.08108391114848,141.2073996120987,135.88256859564405,131.8374561444274,128.62105792487804,125.96941202795773,123.70318320614778,121.72607171074726,119.97348770763867,118.40009309495026,116.99662446494753,115.71393936866494,114.53302108292398,113.4390019156629,112.41999179595652,111.48897205702735
+Offshore Wind - Class 11/Conservative,313.5773123775219,287.68696140378484,266.723262845754,248.01626762102833,230.519715246384,213.8549729040754,206.52770970658136,201.48140765104156,197.5854321172088,194.47189568727308,191.86053621563573,189.6119550255778,187.6373635384165,185.87677067145867,184.32705982973988,182.87842607705093,181.5857242797054,180.39173632533243,179.24423418364918,178.20828239175694,177.23631808237658
+Offshore Wind - Class 12/Advanced,146.42820922288948,131.14041401714647,122.32394770328416,116.22350091141968,111.6014760932854,107.91425208079323,100.38637688271751,95.34366183140165,91.60368843471365,88.6405351968778,86.21221301923413,84.16786839615618,82.38024885563887,80.81987439644746,79.44222828007173,78.19974430008433,77.06893533728463,76.03188371905429,75.08922474686575,74.20031897800385,73.38531286506914
+Offshore Wind - Class 12/Moderate,217.2556919456544,192.37127384077817,173.82264812171462,167.37928006617597,162.42263206745915,158.44728788878902,150.1087802864437,144.41683513400596,140.14478609407593,136.723837652641,133.87573041526784,131.465699606226,129.36289411533744,127.52518558513034,125.85095585600746,124.35787335090635,122.99314862595753,121.73658097363888,120.57239489875536,119.51262433832262,118.49740397515018
+Offshore Wind - Class 12/Conservative,333.1459759225685,305.63398395020715,283.4207573491516,263.54178577036873,244.94991167075483,227.29342455805548,219.50399246264573,214.09259170918003,209.9960871972236,206.64023879142744,203.86371356962638,201.4725883160674,199.41586277376393,197.5427792449822,195.8520976974415,194.35307098631824,192.97802833652594,191.70790567386805,190.48634026541163,189.38413453463033,188.34995571126765
+Offshore Wind - Class 13/Advanced,204.13050384459905,182.66234225542274,170.21354860162393,161.61988465023458,155.125085684028,149.96153187595667,139.35854441482675,132.25609338613106,126.9952092412246,122.82816035641217,119.42016342158867,116.52907067662478,114.02310197232443,111.81438036294794,109.86905074936853,108.11425997793312,106.54351236212898,105.07803812619017,103.75086091918548,102.51978617426175,101.37217267566103
+Offshore Wind - Class 13/Moderate,303.95087255995804,268.86212110169214,242.7192583613204,233.60224633863731,226.6552114352482,220.9947171067764,209.28776347866352,201.3041513158807,195.2766997971066,190.44839670646434,186.47674431854176,183.08189585918277,180.11975376889,177.49369689913826,175.18207736426805,173.04225692958337,171.12926152958275,169.36842708339125,167.73747846173003,166.21860377099833,164.84078298205586
+Offshore Wind - Class 13/Conservative,467.5188130688586,428.66897717135396,397.3261415657409,369.18294630727695,342.9543805587956,317.8955764425549,306.9496268900278,299.3490497437869,293.6151293744336,288.9058207875425,285.0278202950814,281.61363377412385,278.6873178303845,276.08040992497234,273.7296942193311,271.58882182983024,269.69730936677274,267.8790006541804,266.1875768335993,264.67895712592264,263.19305646544404
+Offshore Wind - Class 14/Advanced,288.3728873571584,257.94064557359167,240.33514657714704,228.0926898526183,218.93859447574144,211.5606070046247,196.53572608439384,186.4737589561711,178.97723864651556,173.09135702446133,168.23799292936997,164.17250254785847,160.59904499502625,157.4994526365868,154.73322152411228,152.28716574407645,150.01428523652874,147.97734022049363,146.05134075294748,144.3096524378086,142.68622529469872
+Offshore Wind - Class 14/Moderate,429.94317470022077,380.1170921498129,343.03983819635084,330.16464580346553,320.3030894110548,312.2666262288458,295.6499070901365,284.31422467920487,275.8491101074596,268.9866966701316,263.3610707640068,258.5532006271155,254.35883143894216,250.64085350264156,247.30306419044211,244.35961333218793,241.5883315968853,239.1165267015103,236.82835221472706,234.61805429830378,232.62731885941642
+Offshore Wind - Class 14/Conservative,662.0517206303214,606.9428667225461,562.3632630044599,522.5222797206238,485.2438835216638,449.7919386675835,434.15889197629326,423.4292025345986,415.22889165829156,408.5970909081676,403.03084044208254,398.2343678844349,394.161641682477,390.39931919125866,387.1411509758599,384.04081651657646,381.32704686553313,378.8221828190751,376.3607073726437,374.19056733110483,372.1557497301592
diff --git a/tests/data/Floating_Offshore_Wind/R&D/20/df_occ.csv b/tests/data/Floating_Offshore_Wind/R&D/20/df_occ.csv
new file mode 100644
index 0000000..ea3d820
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/20/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,4435.5373,3960.6753,3689.8071,3503.9624,3364.1885,3253.0677,3008.6384,2846.4343,2726.6659,2632.5586,2555.5305,2490.63,2434.7531,2385.8326,2342.426,2303.4888,2268.2418,2236.0892,2206.5657,2179.3012,2153.9971
+Offshore Wind - Class 8/Moderate,6456.1288,5692.6599,5119.7989,4932.0919,4789.0948,4674.2335,4417.6591,4244.204,4114.3659,4011.2344,3926.0575,3853.7372,3791.0528,3735.8442,3686.5949,3642.2009,3601.8346,3564.8602,3530.7791,3499.1934,3469.7806
+Offshore Wind - Class 8/Conservative,9798.632,8974.3295,8302.5166,7697.1344,7128.8489,6584.1743,6354.0735,6195.708,6075.5933,5979.1832,5898.8641,5830.1612,5770.2254,5717.1333,5669.5267,5626.4114,5587.0388,5550.8311,5517.3336,5486.1817,5457.0792
+Offshore Wind - Class 9/Advanced,4614.256,4120.2606,3838.4785,3645.1456,3499.7399,3384.1418,3129.8638,2961.1241,2836.5299,2738.6308,2658.4991,2590.9836,2532.8553,2481.9637,2436.8081,2396.302,2359.6348,2326.1867,2295.4736,2267.1106,2240.787
+Offshore Wind - Class 9/Moderate,6716.262,5922.0311,5326.0882,5130.8179,4982.0592,4862.5698,4595.6574,4415.2134,4280.1438,4172.8569,4084.248,4009.0138,3943.8036,3886.3705,3835.1368,3788.9541,3746.9613,3708.4972,3673.0429,3640.1845,3609.5866
+Offshore Wind - Class 9/Conservative,10193.4429,9335.9272,8637.0454,8007.2708,7416.0877,6849.4668,6610.0947,6445.3482,6320.3939,6220.0991,6136.5438,6065.0727,6002.7219,5947.4906,5897.9658,5853.1133,5812.1543,5774.4877,5739.6405,5707.2334,5676.9583
+Offshore Wind - Class 10/Advanced,4649.037,4151.3181,3867.4119,3672.6218,3526.12,3409.6505,3153.4558,2983.4442,2857.9109,2759.2739,2678.5382,2610.5137,2551.9472,2500.672,2455.1761,2414.3646,2377.4211,2343.7209,2312.7763,2284.1995,2257.6774
+Offshore Wind - Class 10/Moderate,6766.8874,5966.6698,5366.2348,5169.4927,5019.6126,4899.2225,4630.2982,4448.4941,4312.4063,4204.3108,4115.0339,4039.2326,3973.531,3915.6649,3864.045,3817.5142,3775.2049,3736.4508,3700.7293,3667.6232,3636.7947
+Offshore Wind - Class 10/Conservative,10270.2783,9406.2989,8702.1491,8067.6274,7471.9882,6901.0962,6659.9198,6493.9315,6368.0353,6266.9846,6182.7994,6110.7896,6047.9688,5992.3212,5942.423,5897.2325,5855.9647,5818.0142,5782.9043,5750.253,5719.7497
+Offshore Wind - Class 11/Advanced,4705.9878,4202.1718,3914.7878,3717.6115,3569.3151,3451.4188,3192.0858,3019.9915,2892.9204,2793.075,2711.3503,2642.4925,2583.2087,2531.3053,2485.252,2443.9407,2406.5446,2372.4315,2341.1078,2312.181,2285.334
+Offshore Wind - Class 11/Moderate,6849.782,6039.7616,5431.9713,5232.8191,5081.103,4959.2382,4687.0195,4502.9882,4365.2334,4255.8137,4165.4432,4088.7133,4022.2068,3963.6319,3911.3797,3864.2788,3821.4513,3782.2224,3746.0633,3712.5517,3681.3455
+Offshore Wind - Class 11/Conservative,10396.0894,9521.5263,8808.7506,8166.4561,7563.5202,6985.6348,6741.504,6573.4824,6446.0439,6343.7553,6258.5389,6185.6469,6122.0566,6065.7273,6015.2179,5969.4737,5927.7004,5889.2851,5853.745,5820.6937,5789.8168
+Offshore Wind - Class 12/Advanced,4809.7984,4294.8686,4001.1451,3799.6192,3648.0515,3527.5546,3262.5008,3086.6103,2956.7361,2854.6882,2771.1607,2700.784,2640.1923,2587.1441,2540.0748,2497.8522,2459.6312,2424.7656,2392.7509,2363.186,2335.7468
+Offshore Wind - Class 12/Moderate,7000.8831,6172.9943,5551.7965,5348.2512,5193.1884,5068.6353,4790.4116,4602.3208,4461.5272,4349.6938,4257.3298,4178.9073,4110.9337,4051.0667,3997.6618,3949.5219,3905.7496,3865.6554,3828.6987,3794.4478,3762.5533
+Offshore Wind - Class 12/Conservative,10625.4195,9731.5641,9003.0651,8346.6021,7730.3659,7139.7327,6890.2166,6718.4885,6588.2389,6483.6938,6396.5976,6322.0977,6257.1046,6199.5328,6147.9091,6101.1559,6058.4611,6019.1983,5982.8743,5949.0939,5917.5359
+Offshore Wind - Class 13/Advanced,5259.4418,4696.3739,4375.1916,4154.8262,3989.0892,3857.3276,3567.4953,3375.1616,3233.1462,3121.5584,3030.2223,2953.2664,2887.0104,2829.0029,2777.5334,2731.3636,2689.5695,2651.4445,2616.437,2584.1081,2554.1038
+Offshore Wind - Class 13/Moderate,7655.3598,6750.0759,6070.8056,5848.2318,5678.6729,5542.476,5238.2427,5032.5682,4878.6125,4756.3244,4655.3257,4569.5719,4495.2439,4429.7802,4371.3827,4318.7425,4270.8782,4227.0358,4186.6241,4149.1713,4114.2951
+Offshore Wind - Class 13/Conservative,11618.7355,10641.3182,9844.7156,9126.8831,8453.0382,7807.1898,7534.3477,7346.5656,7204.1396,7089.8211,6994.5827,6913.1182,6842.0493,6779.0953,6722.6457,6671.5217,6624.8356,6581.9024,6542.1826,6505.2442,6470.736
+Offshore Wind - Class 14/Advanced,5529.0667,4937.1331,4599.4855,4367.823,4193.5895,4055.0732,3750.3827,3548.189,3398.8931,3281.5848,3185.5664,3104.6654,3035.0127,2974.0315,2919.9235,2871.3867,2827.45,2787.3706,2750.5684,2716.5822,2685.0397
+Offshore Wind - Class 14/Moderate,8047.8112,7096.118,6382.0249,6148.0409,5969.7896,5826.6106,5506.7808,5290.5624,5128.7142,5000.1569,4893.9806,4803.8307,4725.6922,4656.8725,4595.4813,4540.1425,4489.8244,4443.7344,4401.2511,4361.8783,4325.2141
+Offshore Wind - Class 14/Conservative,12214.369,11186.8445,10349.4041,9594.772,8886.3825,8207.4247,7920.5954,7723.1867,7573.4592,7453.2803,7353.1595,7267.5186,7192.8064,7126.6251,7067.2815,7013.5367,6964.4573,6919.323,6877.567,6838.735,6802.4577
diff --git a/tests/data/Floating_Offshore_Wind/R&D/20/df_tc.csv b/tests/data/Floating_Offshore_Wind/R&D/20/df_tc.csv
new file mode 100644
index 0000000..b183205
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/20/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Moderate,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Conservative,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+ITC Schedule/*,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Moderate,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Conservative,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PFF/Advanced,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Moderate,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Conservative,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+Year (Advanced)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Moderate)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Conservative)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
diff --git a/tests/data/Floating_Offshore_Wind/R&D/20/df_vom.csv b/tests/data/Floating_Offshore_Wind/R&D/20/df_vom.csv
new file mode 100644
index 0000000..b02e3a0
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/20/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Floating_Offshore_Wind/R&D/30/df_capex.csv b/tests/data/Floating_Offshore_Wind/R&D/30/df_capex.csv
new file mode 100644
index 0000000..48aaa3e
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/30/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,6164.393079155067,5504.442350486707,5127.996867726996,4869.7148063506875,4675.460752031988,4521.027964517991,4181.32647681124,3955.8994689532415,3789.4485139119115,3658.6606949270113,3551.6090894147055,3461.4120769098504,3383.755867003581,3315.7674080971583,3255.442083151268,3201.3281773540753,3152.3428360723738,3107.6579809550435,3066.6269148509114,3028.735539578943,2993.56854097348
+Offshore Wind - Class 8/Moderate,8972.557992722874,7911.509016245191,7115.361849729815,6854.491558455669,6655.757965015436,6496.126765702345,6139.546404741941,5898.483029197435,5718.0374502403065,5574.708052575891,5456.331430674453,5355.822630867479,5268.705440094559,5191.977977322759,5123.532628486631,5061.834970721061,5005.734962958142,4954.348981625986,4906.983875586392,4863.086964349291,4822.209784006486
+Offshore Wind - Class 8/Conservative,13617.880972305991,12472.287069859833,11538.619138826649,10697.274903780875,9907.486722659387,9150.512241029572,8830.724213877127,8610.631986324295,8443.699750238353,8309.711484371428,8198.086212207783,8102.60464292073,8019.307544217199,7945.521539034585,7879.359087685128,7819.438544378004,7764.719517193688,7714.399094976894,7667.845104376691,7624.550986283925,7584.105196068877
+Offshore Wind - Class 9/Advanced,6558.840756878646,5856.661025758063,5456.127543127564,5181.318394895795,4974.634406682637,4810.319780701124,4448.881485732,4209.0299051236,4031.9280154142275,3892.7712722983247,3778.8697547702554,3682.9011392659736,3600.2759049094507,3527.937068921801,3463.7515174356276,3406.17496027115,3354.0551389863795,3306.510979989622,3262.8544321030654,3222.538469140551,3185.121279316132
+Offshore Wind - Class 9/Moderate,9546.694570497915,8417.75115177491,7570.660148319435,7293.097243214567,7081.6471202797065,6911.8013655180175,6532.404114379638,6275.91568689869,6083.923686750289,5931.422897274402,5805.471614638324,5698.531432173666,5605.839762957256,5524.20259049191,5451.377484367961,5385.732013785848,5326.042299120715,5271.36817376157,5220.972471694673,5174.266480101112,5130.773796159257
+Offshore Wind - Class 9/Conservative,14489.262976229513,13270.364682251466,12276.953265231648,11381.772850492516,10541.447609706373,9736.035810799354,9395.785190401062,9161.609643969132,8983.995873452806,8841.433908958357,8722.665920531352,8621.074709565988,8532.447487042864,8453.94002722631,8383.544054409776,8319.789338707838,8261.568966978499,8208.028584987751,8158.4957740450745,8112.431268773591,8069.39735952941
+Offshore Wind - Class 10/Advanced,6748.110486865921,6025.667947904331,5613.576070262512,5330.836816230673,5118.1884243416125,4949.132165622009,4577.263675574761,4330.490672636434,4148.278179141638,4005.105771562267,3887.9173295629544,3789.179324698292,3704.169637122116,3629.743365173169,3563.705641115856,3504.4674946826312,3450.8437394263824,3401.9276910847607,3357.0113421132132,3315.5319229695933,3277.034871966981
+Offshore Wind - Class 10/Moderate,9822.185561260063,8660.663928172953,7789.128260225514,7503.555645591015,7286.003641787134,7111.256603353412,6720.911067682522,6457.021045514077,6259.488603614352,6102.587213534271,5973.001211302103,5862.975109326782,5767.608732623316,5683.615711063982,5608.688977784607,5541.1492045237865,5479.736922802638,5423.48513578377,5371.635058056139,5323.581346495215,5278.833517953941
+Offshore Wind - Class 10/Conservative,14907.38256357729,13653.310286265418,12631.231770156972,11710.218947356327,10845.644392734888,10016.990633038271,9666.92136933382,9425.988153647959,9243.248922939856,9096.573064310081,8974.377680763704,8869.854879523824,8778.6700268652,8697.897186817227,8625.469544997572,8559.87518488806,8499.974708816384,8444.889371433632,8393.927019419943,8346.533420123389,8302.257670524286
+Offshore Wind - Class 11/Advanced,6956.321691478424,6211.58833433994,5786.781590234056,5495.318410480601,5276.108919550027,5101.836399169968,4718.494106932648,4464.10686313231,4276.27221765125,4128.682246555951,4007.8780435089548,3906.0934775235946,3818.4609690138946,3741.7381627276673,3673.6627827572092,3612.5970766051614,3557.318716808526,3506.893191060219,3460.5909832870884,3417.8318066917336,3378.147019261812
+Offshore Wind - Class 11/Moderate,10125.246605283506,8927.886441850036,8029.459791454079,7735.075997427815,7510.811447932585,7330.672642679775,6928.282996204787,6656.250665536574,6452.623549233597,6290.880966319118,6157.296706010031,6043.875693445647,5945.566750465955,5858.98217294766,5781.7437163185405,5712.119944026248,5648.812916151575,5590.8253687009,5537.375455572721,5487.839096831512,5441.710620317747
+Offshore Wind - Class 11/Conservative,15367.34588463045,14074.579653497436,13020.965088843674,12071.534843276095,11180.283948017326,10326.06231298724,9965.191665783244,9716.824592616986,9528.446912223111,9377.245393090887,9251.279808391977,9143.531947417756,9049.533690523212,8966.26852200647,8891.606321455141,8823.987942283095,8762.239284913625,8705.454330296612,8652.919527452297,8604.063569948312,8558.421696176958
+Offshore Wind - Class 12/Advanced,7245.576477514379,6469.875939151453,6027.405038760588,5723.822357484229,5495.497796043878,5313.9787862933945,4914.696456988965,4649.731451865308,4454.086438784636,4300.359441441109,4174.531888278836,4068.515020382145,3977.238479305209,3897.3256477951445,3826.41945720222,3762.8145251195583,3705.237635348968,3652.715360668218,3604.487806979223,3559.950628975789,3518.6156717536455
+Offshore Wind - Class 12/Moderate,10546.270287467178,9299.122093334134,8363.337346133056,8056.712538484164,7823.122822284838,7635.493616512525,7216.371886948146,6933.028176741409,6720.933795766869,6552.465695522657,6413.326802268119,6295.189545898889,6192.792762929343,6102.607945981941,6022.157733862976,5949.6388470998245,5883.699352714367,5823.300632686345,5767.628245515243,5716.032057120063,5667.985552024907
+Offshore Wind - Class 12/Conservative,16006.34442385554,14659.82283631448,13562.397394538018,12573.488355592783,11645.177822080408,10755.436182490917,10379.5601213956,10120.865517571236,9924.65485236211,9767.166079887564,9635.962614130893,9523.734437954206,9425.827504895678,9339.100239355173,9261.33327161348,9190.90326210478,9126.586996416443,9067.440760138938,9012.721511217214,8961.834106447515,8914.294382198923
+Offshore Wind - Class 13/Advanced,8067.847304177014,7204.115684313053,6711.430463055241,6373.395553708924,6119.159313083605,5917.0404546315685,5472.445199000929,5177.410383944034,4959.562360700135,4788.389618418754,4648.282397902372,4530.234058233854,4428.599054130361,4339.61705175403,4260.664232352999,4189.840860682058,4125.729812965057,4067.2471258817523,4013.546427744839,3963.954856388974,3917.928933426527
+Offshore Wind - Class 13/Moderate,11743.123337447973,10354.441375182545,9312.458268016122,8971.035876283919,8710.936898584381,8502.014471234905,8035.328404569617,7719.829111498906,7483.665023989759,7296.078280931126,7141.148912491345,7009.604747206893,6895.5874827517155,6795.167932251564,6705.587682347766,6624.839011677291,6551.416323238098,6484.163256446148,6422.172794432979,6364.721186298052,6311.2219365965375
+Offshore Wind - Class 13/Conservative,17822.838891664425,16323.506082275928,15101.538388224133,14000.401949183142,12966.741312160691,11976.026665500049,11557.493870491991,11269.441012077474,11050.963254594135,10875.60167093344,10729.508427343852,10604.543987043204,10495.526125063212,10398.956379445155,10312.364151986274,10233.941174122267,10162.325978166451,10096.46752880371,10035.538412895146,9978.875857327488,9925.941151067387
+Offshore Wind - Class 14/Advanced,8772.617149963404,7833.433833506027,7297.709935649757,6930.145923040228,6653.700685341661,6433.92576402004,5950.492757859008,5629.684960366007,5392.806656664875,5206.681052257928,5054.334813755595,4925.974354178844,4815.460873380183,4718.705866157529,4632.856126410186,4555.845948442863,4486.134368136903,4422.542962036146,4364.1512981589285,4310.227532189312,4260.181066540415
+Offshore Wind - Class 14/Moderate,12768.948217937565,11258.957378283958,10125.951508504344,9754.703994068908,9471.884027620466,9244.71105940988,8737.257461550169,8394.197649926717,8137.403335691084,7933.4297546877115,7764.966532666483,7621.931491411524,7497.954115183718,7388.762300206951,7291.356826297187,7203.554245195355,7123.717691353731,7050.589691930108,6983.184069801279,6920.7137680366495,6862.541069850083
+Offshore Wind - Class 14/Conservative,19379.759455956522,17749.451902947963,16420.738711875958,15223.412141659841,14099.455708117157,13022.196729277817,12567.102983447312,12253.887253075498,12016.32422425768,11825.644022616503,11666.788682494893,11530.90777697982,11412.366736790163,11307.360991475107,11213.20441407107,11127.930858979074,11050.059785524207,10978.44802649822,10912.196436710647,10850.584258715955,10793.025329675436
diff --git a/tests/data/Floating_Offshore_Wind/R&D/30/df_fin_assump.csv b/tests/data/Floating_Offshore_Wind/R&D/30/df_fin_assump.csv
new file mode 100644
index 0000000..ca9ad50
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/30/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),30
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Floating_Offshore_Wind/R&D/30/df_fom.csv b/tests/data/Floating_Offshore_Wind/R&D/30/df_fom.csv
new file mode 100644
index 0000000..93154eb
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/30/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,61.229875,59.1585,57.97687500000001,57.16625,56.5565,56.071875000000006,55.005625,54.298125,53.775625,53.365125000000006,53.02912499999999,52.746,52.502375,52.288875,52.099624999999996,51.92975,51.775999999999996,51.63575,51.507,51.388,51.277625
+Offshore Wind - Class 8/Moderate,66.816625,64.739375,63.523624999999996,62.67525,62.028875,61.50975,60.350125,59.566125,58.97925,58.513124999999995,58.128125,57.801249999999996,57.517875,57.268375000000006,57.04575,56.845125,56.662625000000006,56.49549999999999,56.341499999999996,56.198750000000004,56.06575
+Offshore Wind - Class 8/Conservative,73.84925,71.96600000000001,70.83624999999999,70.034875,69.41675000000001,68.91525,67.77825,66.99575,66.402125,65.92575,65.528875,65.189375,64.89325,64.630875,64.39574999999999,64.182625,63.988125,63.809125,63.643625,63.48975,63.34587499999999
+Offshore Wind - Class 9/Advanced,63.01412499999999,60.882374999999996,59.666375,58.832125,58.20462499999999,57.70575,56.6085,55.880375,55.342625,54.920249999999996,54.574375,54.283125,54.03225,53.812625,53.61775,53.443,53.28475,53.140375000000006,53.007875,52.8855,52.771875
+Offshore Wind - Class 9/Moderate,68.763625,66.625875,65.37474999999999,64.501625,63.8365,63.302125000000004,62.108625,61.301874999999995,60.697875,60.218125,59.821999999999996,59.4855,59.194,58.937125,58.708,58.5015,58.313750000000006,58.141749999999995,57.98325,57.836375000000004,57.6995
+Offshore Wind - Class 9/Conservative,76.00125,74.063125,72.9005,72.075625,71.43950000000001,70.92337500000001,69.75325,68.94800000000001,68.337125,67.84687500000001,67.438375,67.089,66.78425,66.51425,66.27225,66.053,65.85275,65.668625,65.49825,65.339875,65.191875
+Offshore Wind - Class 10/Advanced,62.7405,60.617999999999995,59.40725,58.576625,57.951875,57.45525,56.362625,55.63775,55.102374999999995,54.681749999999994,54.3375,54.047375,53.797625,53.579,53.385,53.210875,53.053375,52.909625,52.77775,52.655874999999995,52.54275
+Offshore Wind - Class 10/Moderate,68.465,66.3365,65.090875,64.2215,63.55925,63.027249999999995,61.839000000000006,61.035624999999996,60.43425,59.956625,59.562125,59.22725,58.936875,58.68125,58.453125,58.2475,58.060625,57.889375,57.731500000000004,57.585249999999995,57.449000000000005
+Offshore Wind - Class 10/Conservative,75.671125,73.7415,72.583875,71.76275000000001,71.12925,70.615375,69.450375,68.6485,68.040375,67.55225,67.14562500000001,66.79775000000001,66.49425,66.22550000000001,65.984375,65.766125,65.56675,65.383375,65.213875,65.056125,64.90875
+Offshore Wind - Class 11/Advanced,63.692,61.53725,60.30825,59.465,58.830749999999995,58.32662499999999,57.2175,56.481500000000004,55.938,55.510999999999996,55.1615,54.867,54.6135,54.39149999999999,54.194625,54.017875000000004,53.858,53.712125,53.578125,53.454375,53.339625
+Offshore Wind - Class 11/Moderate,69.503375,67.342625,66.078,65.1955,64.52325,63.983125,62.776875,61.96125000000001,61.350875,60.866,60.4655,60.1255,59.83075,59.571125,59.339625,59.130874999999996,58.941125,58.767250000000004,58.607,58.4585,58.32025
+Offshore Wind - Class 11/Conservative,76.81875,74.859875,73.68475000000001,72.851,72.208,71.686375,70.503625,69.689625,69.07225,68.57675,68.163875,67.81075,67.50275,67.229875,66.985125,66.76350000000001,66.561125,66.375,66.202875,66.04275,65.893125
+Offshore Wind - Class 12/Advanced,66.758375,64.5,63.211875,62.328,61.66325,61.134750000000004,59.97225,59.200875,58.63125,58.183625,57.81725,57.508625,57.242875,57.01025,56.803749999999994,56.618624999999994,56.451,56.298125,56.157624999999996,56.028000000000006,55.907625
+Offshore Wind - Class 12/Moderate,72.849625,70.584875,69.259375,68.334375,67.62975,67.063625,65.79925,64.94449999999999,64.304625,63.796375000000005,63.376625000000004,63.020250000000004,62.711375000000004,62.43925,62.1965,61.97775,61.778875,61.596624999999996,61.42875,61.272999999999996,61.128125000000004
+Offshore Wind - Class 12/Conservative,80.51724999999999,78.464,77.23237499999999,76.35849999999999,75.6845,75.13775,73.898125,73.04487499999999,72.39775,71.87837499999999,71.44575,71.075625,70.752625,70.466625,70.210125,69.977875,69.76575,69.57075,69.39025,69.222375,69.065625
+Offshore Wind - Class 13/Advanced,63.717,61.5615,60.332,59.488375,58.853875,58.3495,57.24,56.503625,55.96,55.532875,55.18325,54.888625,54.635,54.412875,54.215875000000004,54.039125,53.879124999999995,53.733125,53.599125,53.475375,53.3605
+Offshore Wind - Class 13/Moderate,69.530625,67.369125,66.104,65.221125,64.5485,64.00825,62.8015,61.985625000000006,61.375,60.889875,60.48925,60.149125000000005,59.85425,59.594625,59.363,59.15412500000001,58.96425,58.790375,58.630125,58.481500000000004,58.343125
+Offshore Wind - Class 13/Conservative,76.849,74.88925,73.71362500000001,72.879625,72.236375,71.7145,70.531375,69.717,69.099375,68.60375,68.19075,67.837375,67.52925,67.25625,67.0115,66.78975,66.58725,66.401125,66.228875,66.06875,65.919
+Offshore Wind - Class 14/Advanced,64.952,62.75475,61.501374999999996,60.64149999999999,59.99475,59.480500000000006,58.3495,57.59887499999999,57.04475000000001,56.609249999999996,56.252874999999996,55.9525,55.694,55.467625,55.26675,55.086625,54.923500000000004,54.77475,54.638125,54.512,54.394875
+Offshore Wind - Class 14/Moderate,70.878375,68.674875,67.385375,66.485375,65.79975,65.249,64.018875,63.187125,62.56462499999999,62.070125000000004,61.66175,61.315,61.0145,60.749750000000006,60.513625,60.30075,60.10725,59.93000000000001,59.7665,59.615125000000006,59.474125
+Offshore Wind - Class 14/Conservative,78.33862500000001,76.340875,75.1425,74.292375,73.63662500000001,73.104625,71.8985,71.068375,70.438875,69.93350000000001,69.5125,69.152375,68.83825,68.559875,68.310375,68.084375,67.878,67.68825,67.512625,67.349375,67.19675
diff --git a/tests/data/Floating_Offshore_Wind/R&D/30/df_gcc.csv b/tests/data/Floating_Offshore_Wind/R&D/30/df_gcc.csv
new file mode 100644
index 0000000..a559485
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/30/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,1124.5467,1004.1544,935.4809,888.3635,852.9265,824.7539,762.7834,721.6596,691.2946,667.4355,647.9065,631.4522,617.2857,604.8828,593.8779,584.0061,575.0699,566.9182,559.433,552.5207,546.1053
+Offshore Wind - Class 8/Moderate,1636.8295,1443.2664,1298.0283,1250.4387,1214.1845,1185.0636,1120.014,1076.0377,1043.1197,1016.9727,995.3777,977.0423,961.1498,947.1527,934.6665,923.4112,913.1771,903.803,895.1623,887.1544,879.6973
+Offshore Wind - Class 8/Conservative,2484.258,2275.2717,2104.9462,1951.463,1807.385,1669.293,1610.9553,1570.8047,1540.3519,1515.9089,1495.5456,1478.1272,1462.9317,1449.4712,1437.4014,1426.4703,1416.4881,1407.3084,1398.8157,1390.9177,1383.5394
+Offshore Wind - Class 9/Advanced,1301.6071,1162.259,1082.7728,1028.2367,987.2201,954.6117,882.884,835.2853,800.1393,772.5235,749.9197,730.8746,714.4776,700.1219,687.3842,675.9581,665.6149,656.1797,647.516,639.5153,632.0898
+Offshore Wind - Class 9/Moderate,1894.549,1670.5093,1502.4034,1447.3209,1405.3584,1371.6524,1296.3607,1245.4604,1207.3594,1177.0955,1152.1004,1130.878,1112.4833,1096.2823,1081.8301,1068.8027,1056.9573,1046.1071,1036.1061,1026.8372,1018.2061
+Offshore Wind - Class 9/Conservative,2875.4056,2633.5143,2436.371,2258.7217,2091.9585,1932.1239,1864.6009,1818.1286,1782.881,1754.5895,1731.0199,1710.859,1693.2709,1677.691,1663.7209,1651.0687,1639.5148,1628.8897,1619.0599,1609.9183,1601.3782
+Offshore Wind - Class 10/Advanced,1437.5413,1283.6403,1195.8529,1135.6213,1090.3211,1054.3073,975.0886,922.5189,883.7024,853.2025,828.238,807.204,789.0945,773.2396,759.1716,746.5522,735.1288,724.7083,715.1398,706.3035,698.1025
+Offshore Wind - Class 10/Moderate,2092.4076,1844.9701,1659.308,1598.4728,1552.128,1514.9019,1431.7471,1375.5309,1333.4508,1300.0263,1272.4208,1248.9821,1228.6663,1210.7734,1194.8118,1180.4239,1167.3413,1155.3581,1144.3125,1134.0757,1124.5431
+Offshore Wind - Class 10/Conservative,3175.7006,2908.5472,2690.8151,2494.6129,2310.4337,2133.9067,2059.3319,2008.0062,1969.0775,1937.8313,1911.8002,1889.5338,1870.1088,1852.9019,1837.4727,1823.4992,1810.7387,1799.004,1788.1475,1778.0513,1768.6193
+Offshore Wind - Class 11/Advanced,1568.3903,1400.4808,1304.7028,1238.9887,1189.5652,1150.2733,1063.8439,1006.4891,964.1394,930.8634,903.6266,880.678,860.9201,843.622,828.2735,814.5055,802.0423,790.6732,780.2338,770.5932,761.6458
+Offshore Wind - Class 11/Moderate,2282.8643,2012.9044,1810.3428,1743.9703,1693.407,1652.7924,1562.0686,1500.7355,1454.8252,1418.3583,1388.2401,1362.6679,1340.5029,1320.9813,1303.5669,1287.8694,1273.596,1260.522,1248.471,1237.3024,1226.9022
+Offshore Wind - Class 11/Conservative,3464.7616,3173.2912,2935.7405,2721.6795,2520.7358,2328.1408,2246.7779,2190.7804,2148.3083,2114.218,2085.8175,2061.5244,2040.3313,2021.5581,2004.7246,1989.4792,1975.5572,1962.7543,1950.9097,1939.8945,1929.6039
+Offshore Wind - Class 12/Advanced,1725.4782,1540.7511,1435.3801,1363.0842,1308.7105,1265.4831,1170.3971,1107.2977,1060.7064,1024.0975,994.1326,968.8855,947.1487,928.1181,911.2323,896.0853,882.3738,869.866,858.381,847.7748,837.9312
+Offshore Wind - Class 12/Moderate,2511.513,2214.5143,1991.6644,1918.644,1863.0164,1818.334,1718.5234,1651.0473,1600.5386,1560.4192,1527.2844,1499.1509,1474.7659,1453.2891,1434.1305,1416.8607,1401.1577,1386.7742,1373.5162,1361.229,1349.7871
+Offshore Wind - Class 12/Conservative,3811.7876,3491.1239,3229.7805,2994.2794,2773.2094,2561.3243,2471.8123,2410.2062,2363.4801,2325.9754,2294.7303,2268.004,2244.6882,2224.0348,2205.5152,2188.7428,2173.4264,2159.3412,2146.3102,2134.1918,2122.8705
+Offshore Wind - Class 13/Advanced,2017.4966,1801.5064,1678.3025,1593.7713,1530.1954,1479.6523,1368.474,1294.6958,1240.2193,1197.4148,1162.3787,1132.8588,1107.4433,1085.1919,1065.4485,1047.7379,1031.7059,1017.0814,1003.6526,991.2515,979.7419
+Offshore Wind - Class 13/Moderate,2936.5592,2589.2967,2328.7318,2243.3536,2178.3116,2126.0672,2009.3647,1930.469,1871.4123,1824.5032,1785.7606,1752.8658,1724.3539,1699.2424,1676.8414,1656.6489,1638.2883,1621.4706,1605.9689,1591.6022,1578.2238
+Offshore Wind - Class 13/Conservative,4456.8911,4081.9585,3776.3856,3501.0285,3242.5448,2994.8005,2890.1395,2818.1072,2763.4733,2719.6213,2683.0883,2651.8389,2624.5772,2600.4284,2578.7746,2559.1636,2541.2551,2524.7861,2509.5498,2495.3804,2482.1432
+Offshore Wind - Class 14/Advanced,2383.5514,2128.3719,1982.8138,1882.9454,1807.8342,1748.1206,1616.7701,1529.6055,1465.2448,1414.6738,1373.2808,1338.4048,1308.3779,1282.0892,1258.7635,1237.8396,1218.8987,1201.6207,1185.7555,1171.1042,1157.5064
+Offshore Wind - Class 14/Moderate,3469.3688,3059.0989,2751.2572,2650.3879,2573.5447,2511.821,2373.944,2280.7335,2210.9615,2155.5412,2109.7691,2070.906,2037.2209,2007.5531,1981.0877,1957.2314,1935.5395,1915.6704,1897.356,1880.3826,1864.5769
+Offshore Wind - Class 14/Conservative,5265.5498,4822.5894,4461.5733,4136.2554,3830.8724,3538.1773,3414.5267,3329.4249,3264.8782,3213.0697,3169.9081,3132.9888,3100.7808,3072.2503,3046.6677,3023.4985,3002.3407,2982.8835,2964.8827,2948.1425,2932.5035
diff --git a/tests/data/Floating_Offshore_Wind/R&D/30/df_lcoe.csv b/tests/data/Floating_Offshore_Wind/R&D/30/df_lcoe.csv
new file mode 100644
index 0000000..bd8ff02
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/30/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,100.12498122711872,89.92648620132637,84.04262547282364,79.95415926665008,76.86810137028495,74.4055865885271,69.36964998983676,66.00492581525724,63.50886407393264,61.53064938118469,59.90922997294035,58.532689193310546,57.34974002032594,56.30715225110978,55.37603707539957,54.54584942701734,53.790106804174734,53.09684990239218,52.46683545447933,51.87230010450898,51.327352919429885
+Offshore Wind - Class 8/Moderate,147.27288695862651,130.7304291584401,118.46709198735287,114.14292673184228,110.83490591306732,108.15923897790309,102.59669330990381,98.79908191914437,95.94856257724769,93.66562840882229,91.78353444543123,90.15610900770199,88.75238881152168,87.52570713520522,86.40781443867161,85.41094529190843,84.49965433136424,83.66051672004976,82.8829761738405,82.1585937921578,81.49710606257138
+Offshore Wind - Class 8/Conservative,224.1613925207357,205.92864282365494,191.1917647755499,178.05691523318143,165.78059742780874,154.09476454601412,148.89341811908398,145.3111154458787,142.54439054167926,140.33346229948359,138.47886471501207,136.88166295466885,135.4788769215883,134.22792651043864,133.1272391292167,132.097635222943,131.17928549892085,130.33094745559072,129.54264161342908,128.80630355711617,128.11535548243316
+Offshore Wind - Class 9/Advanced,105.36887677930098,94.60924765755566,88.38506557019018,84.0737250791468,80.81962211758851,78.22312249560103,72.90959962108909,69.35969928824026,66.72642820799493,64.63970936793073,62.91722518318976,61.477516381033006,60.21818802782966,59.11886850438257,58.148281460400405,57.26178043145108,56.464971363495756,55.73409045533767,55.06982370508002,54.44313820535237,53.86862475385495
+Offshore Wind - Class 9/Moderate,155.13083058989312,137.6664065954677,124.690696780276,120.15584900932936,116.66710394986595,113.84539953256731,107.97573887613031,103.9688752892322,100.96136034669891,98.55287930632507,96.54759712089073,94.85062593095671,93.36992680245068,92.05711552162292,90.8783033129729,89.82700924775381,88.86603836695996,87.98118405374308,87.16132696628237,86.39756594405252,85.69999403502358
+Offshore Wind - Class 9/Conservative,236.3321953217573,217.07855205149133,201.51310706012666,187.63719421224243,174.66707626037677,162.3195858059233,156.83187592380054,153.01976834066764,150.13380590187177,147.80143910748075,145.81405250458587,144.12969413602002,142.68074457443848,141.36138101828408,140.1705698120993,139.11454029752426,138.14587103575823,137.2220441971057,136.39079889775385,135.61438600805099,134.88588092578533
+Offshore Wind - Class 10/Advanced,107.72003826966848,96.69154349016384,90.31244014696108,85.89412082595584,82.55941334104583,79.89871857941506,74.45174701902634,70.8129307335643,68.11381141002676,65.97502410734447,64.22209020100851,62.73411054877287,61.44355803779372,60.31698052633141,59.322304338666136,58.413878543942765,57.59737778732022,56.8484561790221,56.16776378652637,55.525659846475975,54.9369771616664
+Offshore Wind - Class 10/Moderate,158.7338390020321,140.85202406634411,127.53908009783008,122.8908247760256,119.2905178473456,116.42302393135975,110.3828017455408,106.29767779613697,103.19349096138848,100.72510799931162,98.69009818747215,96.93092667985528,95.41347337581813,94.06818552468147,92.87905710417795,91.80148275522168,90.79815511558452,89.89143896853527,89.06933087165716,88.2865708024871,87.55392152537377
+Offshore Wind - Class 10/Conservative,242.06294115210764,222.31002187098926,206.33765122556326,192.09697527268227,178.7847382001848,166.11064590694278,160.48560781465218,156.57820630894068,153.62013571080053,151.22953794167603,149.19272751797217,147.46640494086645,145.98126638876414,144.6291268946119,143.4086992273702,142.32637979482752,141.33360180424106,140.38689624264114,139.53502160990706,138.73931309403793,137.9927234160686
+Offshore Wind - Class 11/Advanced,111.41793904573994,99.99367475386792,93.38546382077713,88.8258348742542,85.37055570322033,82.59752329434635,76.97126246034948,73.20178545033221,70.39206674719424,68.17689358357096,66.36135443445605,64.8202204838149,63.495814158159035,62.32873407926223,61.28653919558576,60.357256241903976,59.51141550561486,58.73558310826278,58.030418887864215,57.365217518218664,56.75540749123354
+Offshore Wind - Class 11/Moderate,164.26453379283518,145.73674508061222,131.94179026051071,127.09999693547442,123.39625943028621,120.42553032743757,114.1693467415788,109.93815568301753,106.72284504930981,104.16607247831737,102.05821226260409,100.25643555523706,98.68426130633921,97.29039735313619,96.03884490858586,94.92264801998012,93.90237636276781,92.96292143695705,92.09248063557129,91.28161132418471,90.54102953399493
+Offshore Wind - Class 11/Conservative,250.58661242550355,230.11966822376016,213.5685466420903,198.81145802355033,185.01616177009132,171.88210516880326,166.05637095283373,162.0440783876196,158.945725335293,156.46970607856144,154.39284175760304,152.60433704951038,151.03361889736834,149.63299744740158,148.40039632246734,147.24773797012216,146.21942591742692,145.26957677762374,144.35628102361323,143.5320499912658,142.7586786856792
+Offshore Wind - Class 12/Advanced,118.439727810161,106.28999289442423,99.280319988748,94.42834359054446,90.75105011427134,87.8168248897208,81.83600743588106,77.82823728239121,74.85517972467112,72.49886959906175,70.5676079569144,68.9416269224491,67.51905550335765,66.2773270326379,65.1810887878853,64.19217025450918,63.29191666552175,62.46610661730445,61.71564764911743,61.00746478371154,60.35836390359685
+Offshore Wind - Class 12/Moderate,174.59791556517848,154.90176433066415,140.23786479477937,135.11458531758663,131.1725409690792,128.01077356268877,121.38520459300486,116.86152526277418,113.46597515047192,110.74637014304307,108.48171902878512,106.56544193366692,104.89316622831953,103.43187648454253,102.09997671602888,100.91239697651304,99.82676225612488,98.82702361118452,97.9006623422793,97.05766496380573,96.24961599288432
+Offshore Wind - Class 12/Conservative,266.24983677144195,244.50008793851256,226.96257483023638,211.2805408715733,196.62126303968572,182.70605375306673,176.51241252730466,172.20908241246417,168.95141875894225,166.28207098704164,164.07367690995812,162.17163739373652,160.53584947826639,159.0456087371164,157.70035963456502,156.50789986891263,155.41399466215154,154.40349556357137,153.4311544780808,152.55412981748137,151.73118522072983
+Offshore Wind - Class 13/Advanced,164.513164918587,147.47759759440675,137.59459428665,130.7702834145515,125.61148796953482,121.50957077383879,113.09765052244981,107.46116445317269,103.28545758136435,99.97702128223382,97.27106780808654,94.97495348695058,92.98420092134849,91.22912947975273,89.68354948842224,88.28904506839673,87.04110768465958,85.87600107287899,84.82119247769297,83.84258404235372,82.93015199727425
+Offshore Wind - Class 13/Moderate,243.56685500076208,215.82005356104392,195.16894504822642,187.93046514391108,182.41443413187588,177.91877679978532,168.63059662686837,162.2953599875781,157.51154722881049,153.67876726951548,150.52609815786664,147.83089327421922,145.47886416753374,143.3933917425798,141.55799300100713,139.85815204396505,138.33890319592527,136.94033758478594,135.64478721043037,134.43811767134497,133.34400793322084
+Offshore Wind - Class 13/Conservative,372.8184203956118,342.12905592302667,317.3985402611388,295.20711608337155,274.5355081696362,254.7919407605952,246.10200096772525,240.0673044606032,235.51487933188096,231.7750215413774,228.69565750625225,225.98373908888243,223.65974217726753,221.58925907066651,219.72212199218583,218.02153450705651,216.51954557588363,215.07498840272856,213.73113831456152,212.53306288004873,211.35233382427663
+Offshore Wind - Class 14/Advanced,232.08141597872324,207.94616979806895,193.97806111884765,184.2612362837605,176.9953990995137,171.1371127889836,159.22370656562845,151.24319105145696,145.29570724906114,140.62573179371537,136.7740030689555,133.5477656821432,130.71033519051323,128.24955664633774,126.05296158501172,124.11122509677276,122.30560666989106,120.68808462448536,119.15737433618659,117.7738447564394,116.48403247835456
+Offshore Wind - Class 14/Moderate,344.14951734608184,304.7624762456525,275.48273797910775,265.2669432245746,257.44126730625595,251.06233055084883,237.88581054066157,228.89541726285364,222.1816886487254,216.73715669894187,212.27422596228817,208.4595127286454,205.13111568576824,202.18034015658353,199.53094100582067,197.1953344782631,194.99500483620065,193.03327090624694,191.21708885345552,189.4614543719501,187.8810614929837
+Offshore Wind - Class 14/Conservative,527.5048815850713,483.9846196440484,448.81687272635554,417.4084098383537,388.032154712425,360.1053722882211,347.7007972412523,339.18703227180197,332.6797213924512,327.416630208652,322.99879722718237,319.19159603186847,315.9597043470877,312.97284549177834,310.3871078132391,307.9253855832851,305.7714938023141,303.78332117486514,301.82838004367034,300.1057310227011,298.4904179804297
diff --git a/tests/data/Floating_Offshore_Wind/R&D/30/df_occ.csv b/tests/data/Floating_Offshore_Wind/R&D/30/df_occ.csv
new file mode 100644
index 0000000..ea3d820
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/30/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,4435.5373,3960.6753,3689.8071,3503.9624,3364.1885,3253.0677,3008.6384,2846.4343,2726.6659,2632.5586,2555.5305,2490.63,2434.7531,2385.8326,2342.426,2303.4888,2268.2418,2236.0892,2206.5657,2179.3012,2153.9971
+Offshore Wind - Class 8/Moderate,6456.1288,5692.6599,5119.7989,4932.0919,4789.0948,4674.2335,4417.6591,4244.204,4114.3659,4011.2344,3926.0575,3853.7372,3791.0528,3735.8442,3686.5949,3642.2009,3601.8346,3564.8602,3530.7791,3499.1934,3469.7806
+Offshore Wind - Class 8/Conservative,9798.632,8974.3295,8302.5166,7697.1344,7128.8489,6584.1743,6354.0735,6195.708,6075.5933,5979.1832,5898.8641,5830.1612,5770.2254,5717.1333,5669.5267,5626.4114,5587.0388,5550.8311,5517.3336,5486.1817,5457.0792
+Offshore Wind - Class 9/Advanced,4614.256,4120.2606,3838.4785,3645.1456,3499.7399,3384.1418,3129.8638,2961.1241,2836.5299,2738.6308,2658.4991,2590.9836,2532.8553,2481.9637,2436.8081,2396.302,2359.6348,2326.1867,2295.4736,2267.1106,2240.787
+Offshore Wind - Class 9/Moderate,6716.262,5922.0311,5326.0882,5130.8179,4982.0592,4862.5698,4595.6574,4415.2134,4280.1438,4172.8569,4084.248,4009.0138,3943.8036,3886.3705,3835.1368,3788.9541,3746.9613,3708.4972,3673.0429,3640.1845,3609.5866
+Offshore Wind - Class 9/Conservative,10193.4429,9335.9272,8637.0454,8007.2708,7416.0877,6849.4668,6610.0947,6445.3482,6320.3939,6220.0991,6136.5438,6065.0727,6002.7219,5947.4906,5897.9658,5853.1133,5812.1543,5774.4877,5739.6405,5707.2334,5676.9583
+Offshore Wind - Class 10/Advanced,4649.037,4151.3181,3867.4119,3672.6218,3526.12,3409.6505,3153.4558,2983.4442,2857.9109,2759.2739,2678.5382,2610.5137,2551.9472,2500.672,2455.1761,2414.3646,2377.4211,2343.7209,2312.7763,2284.1995,2257.6774
+Offshore Wind - Class 10/Moderate,6766.8874,5966.6698,5366.2348,5169.4927,5019.6126,4899.2225,4630.2982,4448.4941,4312.4063,4204.3108,4115.0339,4039.2326,3973.531,3915.6649,3864.045,3817.5142,3775.2049,3736.4508,3700.7293,3667.6232,3636.7947
+Offshore Wind - Class 10/Conservative,10270.2783,9406.2989,8702.1491,8067.6274,7471.9882,6901.0962,6659.9198,6493.9315,6368.0353,6266.9846,6182.7994,6110.7896,6047.9688,5992.3212,5942.423,5897.2325,5855.9647,5818.0142,5782.9043,5750.253,5719.7497
+Offshore Wind - Class 11/Advanced,4705.9878,4202.1718,3914.7878,3717.6115,3569.3151,3451.4188,3192.0858,3019.9915,2892.9204,2793.075,2711.3503,2642.4925,2583.2087,2531.3053,2485.252,2443.9407,2406.5446,2372.4315,2341.1078,2312.181,2285.334
+Offshore Wind - Class 11/Moderate,6849.782,6039.7616,5431.9713,5232.8191,5081.103,4959.2382,4687.0195,4502.9882,4365.2334,4255.8137,4165.4432,4088.7133,4022.2068,3963.6319,3911.3797,3864.2788,3821.4513,3782.2224,3746.0633,3712.5517,3681.3455
+Offshore Wind - Class 11/Conservative,10396.0894,9521.5263,8808.7506,8166.4561,7563.5202,6985.6348,6741.504,6573.4824,6446.0439,6343.7553,6258.5389,6185.6469,6122.0566,6065.7273,6015.2179,5969.4737,5927.7004,5889.2851,5853.745,5820.6937,5789.8168
+Offshore Wind - Class 12/Advanced,4809.7984,4294.8686,4001.1451,3799.6192,3648.0515,3527.5546,3262.5008,3086.6103,2956.7361,2854.6882,2771.1607,2700.784,2640.1923,2587.1441,2540.0748,2497.8522,2459.6312,2424.7656,2392.7509,2363.186,2335.7468
+Offshore Wind - Class 12/Moderate,7000.8831,6172.9943,5551.7965,5348.2512,5193.1884,5068.6353,4790.4116,4602.3208,4461.5272,4349.6938,4257.3298,4178.9073,4110.9337,4051.0667,3997.6618,3949.5219,3905.7496,3865.6554,3828.6987,3794.4478,3762.5533
+Offshore Wind - Class 12/Conservative,10625.4195,9731.5641,9003.0651,8346.6021,7730.3659,7139.7327,6890.2166,6718.4885,6588.2389,6483.6938,6396.5976,6322.0977,6257.1046,6199.5328,6147.9091,6101.1559,6058.4611,6019.1983,5982.8743,5949.0939,5917.5359
+Offshore Wind - Class 13/Advanced,5259.4418,4696.3739,4375.1916,4154.8262,3989.0892,3857.3276,3567.4953,3375.1616,3233.1462,3121.5584,3030.2223,2953.2664,2887.0104,2829.0029,2777.5334,2731.3636,2689.5695,2651.4445,2616.437,2584.1081,2554.1038
+Offshore Wind - Class 13/Moderate,7655.3598,6750.0759,6070.8056,5848.2318,5678.6729,5542.476,5238.2427,5032.5682,4878.6125,4756.3244,4655.3257,4569.5719,4495.2439,4429.7802,4371.3827,4318.7425,4270.8782,4227.0358,4186.6241,4149.1713,4114.2951
+Offshore Wind - Class 13/Conservative,11618.7355,10641.3182,9844.7156,9126.8831,8453.0382,7807.1898,7534.3477,7346.5656,7204.1396,7089.8211,6994.5827,6913.1182,6842.0493,6779.0953,6722.6457,6671.5217,6624.8356,6581.9024,6542.1826,6505.2442,6470.736
+Offshore Wind - Class 14/Advanced,5529.0667,4937.1331,4599.4855,4367.823,4193.5895,4055.0732,3750.3827,3548.189,3398.8931,3281.5848,3185.5664,3104.6654,3035.0127,2974.0315,2919.9235,2871.3867,2827.45,2787.3706,2750.5684,2716.5822,2685.0397
+Offshore Wind - Class 14/Moderate,8047.8112,7096.118,6382.0249,6148.0409,5969.7896,5826.6106,5506.7808,5290.5624,5128.7142,5000.1569,4893.9806,4803.8307,4725.6922,4656.8725,4595.4813,4540.1425,4489.8244,4443.7344,4401.2511,4361.8783,4325.2141
+Offshore Wind - Class 14/Conservative,12214.369,11186.8445,10349.4041,9594.772,8886.3825,8207.4247,7920.5954,7723.1867,7573.4592,7453.2803,7353.1595,7267.5186,7192.8064,7126.6251,7067.2815,7013.5367,6964.4573,6919.323,6877.567,6838.735,6802.4577
diff --git a/tests/data/Floating_Offshore_Wind/R&D/30/df_tc.csv b/tests/data/Floating_Offshore_Wind/R&D/30/df_tc.csv
new file mode 100644
index 0000000..b183205
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/30/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Moderate,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Conservative,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+ITC Schedule/*,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Moderate,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Conservative,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PFF/Advanced,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Moderate,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Conservative,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+Year (Advanced)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Moderate)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Conservative)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
diff --git a/tests/data/Floating_Offshore_Wind/R&D/30/df_vom.csv b/tests/data/Floating_Offshore_Wind/R&D/30/df_vom.csv
new file mode 100644
index 0000000..b02e3a0
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/30/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_capex.csv b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_capex.csv
new file mode 100644
index 0000000..48aaa3e
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_capex.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,6164.393079155067,5504.442350486707,5127.996867726996,4869.7148063506875,4675.460752031988,4521.027964517991,4181.32647681124,3955.8994689532415,3789.4485139119115,3658.6606949270113,3551.6090894147055,3461.4120769098504,3383.755867003581,3315.7674080971583,3255.442083151268,3201.3281773540753,3152.3428360723738,3107.6579809550435,3066.6269148509114,3028.735539578943,2993.56854097348
+Offshore Wind - Class 8/Moderate,8972.557992722874,7911.509016245191,7115.361849729815,6854.491558455669,6655.757965015436,6496.126765702345,6139.546404741941,5898.483029197435,5718.0374502403065,5574.708052575891,5456.331430674453,5355.822630867479,5268.705440094559,5191.977977322759,5123.532628486631,5061.834970721061,5005.734962958142,4954.348981625986,4906.983875586392,4863.086964349291,4822.209784006486
+Offshore Wind - Class 8/Conservative,13617.880972305991,12472.287069859833,11538.619138826649,10697.274903780875,9907.486722659387,9150.512241029572,8830.724213877127,8610.631986324295,8443.699750238353,8309.711484371428,8198.086212207783,8102.60464292073,8019.307544217199,7945.521539034585,7879.359087685128,7819.438544378004,7764.719517193688,7714.399094976894,7667.845104376691,7624.550986283925,7584.105196068877
+Offshore Wind - Class 9/Advanced,6558.840756878646,5856.661025758063,5456.127543127564,5181.318394895795,4974.634406682637,4810.319780701124,4448.881485732,4209.0299051236,4031.9280154142275,3892.7712722983247,3778.8697547702554,3682.9011392659736,3600.2759049094507,3527.937068921801,3463.7515174356276,3406.17496027115,3354.0551389863795,3306.510979989622,3262.8544321030654,3222.538469140551,3185.121279316132
+Offshore Wind - Class 9/Moderate,9546.694570497915,8417.75115177491,7570.660148319435,7293.097243214567,7081.6471202797065,6911.8013655180175,6532.404114379638,6275.91568689869,6083.923686750289,5931.422897274402,5805.471614638324,5698.531432173666,5605.839762957256,5524.20259049191,5451.377484367961,5385.732013785848,5326.042299120715,5271.36817376157,5220.972471694673,5174.266480101112,5130.773796159257
+Offshore Wind - Class 9/Conservative,14489.262976229513,13270.364682251466,12276.953265231648,11381.772850492516,10541.447609706373,9736.035810799354,9395.785190401062,9161.609643969132,8983.995873452806,8841.433908958357,8722.665920531352,8621.074709565988,8532.447487042864,8453.94002722631,8383.544054409776,8319.789338707838,8261.568966978499,8208.028584987751,8158.4957740450745,8112.431268773591,8069.39735952941
+Offshore Wind - Class 10/Advanced,6748.110486865921,6025.667947904331,5613.576070262512,5330.836816230673,5118.1884243416125,4949.132165622009,4577.263675574761,4330.490672636434,4148.278179141638,4005.105771562267,3887.9173295629544,3789.179324698292,3704.169637122116,3629.743365173169,3563.705641115856,3504.4674946826312,3450.8437394263824,3401.9276910847607,3357.0113421132132,3315.5319229695933,3277.034871966981
+Offshore Wind - Class 10/Moderate,9822.185561260063,8660.663928172953,7789.128260225514,7503.555645591015,7286.003641787134,7111.256603353412,6720.911067682522,6457.021045514077,6259.488603614352,6102.587213534271,5973.001211302103,5862.975109326782,5767.608732623316,5683.615711063982,5608.688977784607,5541.1492045237865,5479.736922802638,5423.48513578377,5371.635058056139,5323.581346495215,5278.833517953941
+Offshore Wind - Class 10/Conservative,14907.38256357729,13653.310286265418,12631.231770156972,11710.218947356327,10845.644392734888,10016.990633038271,9666.92136933382,9425.988153647959,9243.248922939856,9096.573064310081,8974.377680763704,8869.854879523824,8778.6700268652,8697.897186817227,8625.469544997572,8559.87518488806,8499.974708816384,8444.889371433632,8393.927019419943,8346.533420123389,8302.257670524286
+Offshore Wind - Class 11/Advanced,6956.321691478424,6211.58833433994,5786.781590234056,5495.318410480601,5276.108919550027,5101.836399169968,4718.494106932648,4464.10686313231,4276.27221765125,4128.682246555951,4007.8780435089548,3906.0934775235946,3818.4609690138946,3741.7381627276673,3673.6627827572092,3612.5970766051614,3557.318716808526,3506.893191060219,3460.5909832870884,3417.8318066917336,3378.147019261812
+Offshore Wind - Class 11/Moderate,10125.246605283506,8927.886441850036,8029.459791454079,7735.075997427815,7510.811447932585,7330.672642679775,6928.282996204787,6656.250665536574,6452.623549233597,6290.880966319118,6157.296706010031,6043.875693445647,5945.566750465955,5858.98217294766,5781.7437163185405,5712.119944026248,5648.812916151575,5590.8253687009,5537.375455572721,5487.839096831512,5441.710620317747
+Offshore Wind - Class 11/Conservative,15367.34588463045,14074.579653497436,13020.965088843674,12071.534843276095,11180.283948017326,10326.06231298724,9965.191665783244,9716.824592616986,9528.446912223111,9377.245393090887,9251.279808391977,9143.531947417756,9049.533690523212,8966.26852200647,8891.606321455141,8823.987942283095,8762.239284913625,8705.454330296612,8652.919527452297,8604.063569948312,8558.421696176958
+Offshore Wind - Class 12/Advanced,7245.576477514379,6469.875939151453,6027.405038760588,5723.822357484229,5495.497796043878,5313.9787862933945,4914.696456988965,4649.731451865308,4454.086438784636,4300.359441441109,4174.531888278836,4068.515020382145,3977.238479305209,3897.3256477951445,3826.41945720222,3762.8145251195583,3705.237635348968,3652.715360668218,3604.487806979223,3559.950628975789,3518.6156717536455
+Offshore Wind - Class 12/Moderate,10546.270287467178,9299.122093334134,8363.337346133056,8056.712538484164,7823.122822284838,7635.493616512525,7216.371886948146,6933.028176741409,6720.933795766869,6552.465695522657,6413.326802268119,6295.189545898889,6192.792762929343,6102.607945981941,6022.157733862976,5949.6388470998245,5883.699352714367,5823.300632686345,5767.628245515243,5716.032057120063,5667.985552024907
+Offshore Wind - Class 12/Conservative,16006.34442385554,14659.82283631448,13562.397394538018,12573.488355592783,11645.177822080408,10755.436182490917,10379.5601213956,10120.865517571236,9924.65485236211,9767.166079887564,9635.962614130893,9523.734437954206,9425.827504895678,9339.100239355173,9261.33327161348,9190.90326210478,9126.586996416443,9067.440760138938,9012.721511217214,8961.834106447515,8914.294382198923
+Offshore Wind - Class 13/Advanced,8067.847304177014,7204.115684313053,6711.430463055241,6373.395553708924,6119.159313083605,5917.0404546315685,5472.445199000929,5177.410383944034,4959.562360700135,4788.389618418754,4648.282397902372,4530.234058233854,4428.599054130361,4339.61705175403,4260.664232352999,4189.840860682058,4125.729812965057,4067.2471258817523,4013.546427744839,3963.954856388974,3917.928933426527
+Offshore Wind - Class 13/Moderate,11743.123337447973,10354.441375182545,9312.458268016122,8971.035876283919,8710.936898584381,8502.014471234905,8035.328404569617,7719.829111498906,7483.665023989759,7296.078280931126,7141.148912491345,7009.604747206893,6895.5874827517155,6795.167932251564,6705.587682347766,6624.839011677291,6551.416323238098,6484.163256446148,6422.172794432979,6364.721186298052,6311.2219365965375
+Offshore Wind - Class 13/Conservative,17822.838891664425,16323.506082275928,15101.538388224133,14000.401949183142,12966.741312160691,11976.026665500049,11557.493870491991,11269.441012077474,11050.963254594135,10875.60167093344,10729.508427343852,10604.543987043204,10495.526125063212,10398.956379445155,10312.364151986274,10233.941174122267,10162.325978166451,10096.46752880371,10035.538412895146,9978.875857327488,9925.941151067387
+Offshore Wind - Class 14/Advanced,8772.617149963404,7833.433833506027,7297.709935649757,6930.145923040228,6653.700685341661,6433.92576402004,5950.492757859008,5629.684960366007,5392.806656664875,5206.681052257928,5054.334813755595,4925.974354178844,4815.460873380183,4718.705866157529,4632.856126410186,4555.845948442863,4486.134368136903,4422.542962036146,4364.1512981589285,4310.227532189312,4260.181066540415
+Offshore Wind - Class 14/Moderate,12768.948217937565,11258.957378283958,10125.951508504344,9754.703994068908,9471.884027620466,9244.71105940988,8737.257461550169,8394.197649926717,8137.403335691084,7933.4297546877115,7764.966532666483,7621.931491411524,7497.954115183718,7388.762300206951,7291.356826297187,7203.554245195355,7123.717691353731,7050.589691930108,6983.184069801279,6920.7137680366495,6862.541069850083
+Offshore Wind - Class 14/Conservative,19379.759455956522,17749.451902947963,16420.738711875958,15223.412141659841,14099.455708117157,13022.196729277817,12567.102983447312,12253.887253075498,12016.32422425768,11825.644022616503,11666.788682494893,11530.90777697982,11412.366736790163,11307.360991475107,11213.20441407107,11127.930858979074,11050.059785524207,10978.44802649822,10912.196436710647,10850.584258715955,10793.025329675436
diff --git a/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_fin_assump.csv b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_fin_assump.csv
new file mode 100644
index 0000000..ca9ad50
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_fin_assump.csv
@@ -0,0 +1,5 @@
+Financial Assumptions,Value
+Capital Recovery Period (Years),30
+Depreciation Period,5
+Equity Premium During Construction,0.02
+Construction Duration yrs,3
diff --git a/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_fom.csv b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_fom.csv
new file mode 100644
index 0000000..93154eb
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_fom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,61.229875,59.1585,57.97687500000001,57.16625,56.5565,56.071875000000006,55.005625,54.298125,53.775625,53.365125000000006,53.02912499999999,52.746,52.502375,52.288875,52.099624999999996,51.92975,51.775999999999996,51.63575,51.507,51.388,51.277625
+Offshore Wind - Class 8/Moderate,66.816625,64.739375,63.523624999999996,62.67525,62.028875,61.50975,60.350125,59.566125,58.97925,58.513124999999995,58.128125,57.801249999999996,57.517875,57.268375000000006,57.04575,56.845125,56.662625000000006,56.49549999999999,56.341499999999996,56.198750000000004,56.06575
+Offshore Wind - Class 8/Conservative,73.84925,71.96600000000001,70.83624999999999,70.034875,69.41675000000001,68.91525,67.77825,66.99575,66.402125,65.92575,65.528875,65.189375,64.89325,64.630875,64.39574999999999,64.182625,63.988125,63.809125,63.643625,63.48975,63.34587499999999
+Offshore Wind - Class 9/Advanced,63.01412499999999,60.882374999999996,59.666375,58.832125,58.20462499999999,57.70575,56.6085,55.880375,55.342625,54.920249999999996,54.574375,54.283125,54.03225,53.812625,53.61775,53.443,53.28475,53.140375000000006,53.007875,52.8855,52.771875
+Offshore Wind - Class 9/Moderate,68.763625,66.625875,65.37474999999999,64.501625,63.8365,63.302125000000004,62.108625,61.301874999999995,60.697875,60.218125,59.821999999999996,59.4855,59.194,58.937125,58.708,58.5015,58.313750000000006,58.141749999999995,57.98325,57.836375000000004,57.6995
+Offshore Wind - Class 9/Conservative,76.00125,74.063125,72.9005,72.075625,71.43950000000001,70.92337500000001,69.75325,68.94800000000001,68.337125,67.84687500000001,67.438375,67.089,66.78425,66.51425,66.27225,66.053,65.85275,65.668625,65.49825,65.339875,65.191875
+Offshore Wind - Class 10/Advanced,62.7405,60.617999999999995,59.40725,58.576625,57.951875,57.45525,56.362625,55.63775,55.102374999999995,54.681749999999994,54.3375,54.047375,53.797625,53.579,53.385,53.210875,53.053375,52.909625,52.77775,52.655874999999995,52.54275
+Offshore Wind - Class 10/Moderate,68.465,66.3365,65.090875,64.2215,63.55925,63.027249999999995,61.839000000000006,61.035624999999996,60.43425,59.956625,59.562125,59.22725,58.936875,58.68125,58.453125,58.2475,58.060625,57.889375,57.731500000000004,57.585249999999995,57.449000000000005
+Offshore Wind - Class 10/Conservative,75.671125,73.7415,72.583875,71.76275000000001,71.12925,70.615375,69.450375,68.6485,68.040375,67.55225,67.14562500000001,66.79775000000001,66.49425,66.22550000000001,65.984375,65.766125,65.56675,65.383375,65.213875,65.056125,64.90875
+Offshore Wind - Class 11/Advanced,63.692,61.53725,60.30825,59.465,58.830749999999995,58.32662499999999,57.2175,56.481500000000004,55.938,55.510999999999996,55.1615,54.867,54.6135,54.39149999999999,54.194625,54.017875000000004,53.858,53.712125,53.578125,53.454375,53.339625
+Offshore Wind - Class 11/Moderate,69.503375,67.342625,66.078,65.1955,64.52325,63.983125,62.776875,61.96125000000001,61.350875,60.866,60.4655,60.1255,59.83075,59.571125,59.339625,59.130874999999996,58.941125,58.767250000000004,58.607,58.4585,58.32025
+Offshore Wind - Class 11/Conservative,76.81875,74.859875,73.68475000000001,72.851,72.208,71.686375,70.503625,69.689625,69.07225,68.57675,68.163875,67.81075,67.50275,67.229875,66.985125,66.76350000000001,66.561125,66.375,66.202875,66.04275,65.893125
+Offshore Wind - Class 12/Advanced,66.758375,64.5,63.211875,62.328,61.66325,61.134750000000004,59.97225,59.200875,58.63125,58.183625,57.81725,57.508625,57.242875,57.01025,56.803749999999994,56.618624999999994,56.451,56.298125,56.157624999999996,56.028000000000006,55.907625
+Offshore Wind - Class 12/Moderate,72.849625,70.584875,69.259375,68.334375,67.62975,67.063625,65.79925,64.94449999999999,64.304625,63.796375000000005,63.376625000000004,63.020250000000004,62.711375000000004,62.43925,62.1965,61.97775,61.778875,61.596624999999996,61.42875,61.272999999999996,61.128125000000004
+Offshore Wind - Class 12/Conservative,80.51724999999999,78.464,77.23237499999999,76.35849999999999,75.6845,75.13775,73.898125,73.04487499999999,72.39775,71.87837499999999,71.44575,71.075625,70.752625,70.466625,70.210125,69.977875,69.76575,69.57075,69.39025,69.222375,69.065625
+Offshore Wind - Class 13/Advanced,63.717,61.5615,60.332,59.488375,58.853875,58.3495,57.24,56.503625,55.96,55.532875,55.18325,54.888625,54.635,54.412875,54.215875000000004,54.039125,53.879124999999995,53.733125,53.599125,53.475375,53.3605
+Offshore Wind - Class 13/Moderate,69.530625,67.369125,66.104,65.221125,64.5485,64.00825,62.8015,61.985625000000006,61.375,60.889875,60.48925,60.149125000000005,59.85425,59.594625,59.363,59.15412500000001,58.96425,58.790375,58.630125,58.481500000000004,58.343125
+Offshore Wind - Class 13/Conservative,76.849,74.88925,73.71362500000001,72.879625,72.236375,71.7145,70.531375,69.717,69.099375,68.60375,68.19075,67.837375,67.52925,67.25625,67.0115,66.78975,66.58725,66.401125,66.228875,66.06875,65.919
+Offshore Wind - Class 14/Advanced,64.952,62.75475,61.501374999999996,60.64149999999999,59.99475,59.480500000000006,58.3495,57.59887499999999,57.04475000000001,56.609249999999996,56.252874999999996,55.9525,55.694,55.467625,55.26675,55.086625,54.923500000000004,54.77475,54.638125,54.512,54.394875
+Offshore Wind - Class 14/Moderate,70.878375,68.674875,67.385375,66.485375,65.79975,65.249,64.018875,63.187125,62.56462499999999,62.070125000000004,61.66175,61.315,61.0145,60.749750000000006,60.513625,60.30075,60.10725,59.93000000000001,59.7665,59.615125000000006,59.474125
+Offshore Wind - Class 14/Conservative,78.33862500000001,76.340875,75.1425,74.292375,73.63662500000001,73.104625,71.8985,71.068375,70.438875,69.93350000000001,69.5125,69.152375,68.83825,68.559875,68.310375,68.084375,67.878,67.68825,67.512625,67.349375,67.19675
diff --git a/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_gcc.csv b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_gcc.csv
new file mode 100644
index 0000000..a559485
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_gcc.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,1124.5467,1004.1544,935.4809,888.3635,852.9265,824.7539,762.7834,721.6596,691.2946,667.4355,647.9065,631.4522,617.2857,604.8828,593.8779,584.0061,575.0699,566.9182,559.433,552.5207,546.1053
+Offshore Wind - Class 8/Moderate,1636.8295,1443.2664,1298.0283,1250.4387,1214.1845,1185.0636,1120.014,1076.0377,1043.1197,1016.9727,995.3777,977.0423,961.1498,947.1527,934.6665,923.4112,913.1771,903.803,895.1623,887.1544,879.6973
+Offshore Wind - Class 8/Conservative,2484.258,2275.2717,2104.9462,1951.463,1807.385,1669.293,1610.9553,1570.8047,1540.3519,1515.9089,1495.5456,1478.1272,1462.9317,1449.4712,1437.4014,1426.4703,1416.4881,1407.3084,1398.8157,1390.9177,1383.5394
+Offshore Wind - Class 9/Advanced,1301.6071,1162.259,1082.7728,1028.2367,987.2201,954.6117,882.884,835.2853,800.1393,772.5235,749.9197,730.8746,714.4776,700.1219,687.3842,675.9581,665.6149,656.1797,647.516,639.5153,632.0898
+Offshore Wind - Class 9/Moderate,1894.549,1670.5093,1502.4034,1447.3209,1405.3584,1371.6524,1296.3607,1245.4604,1207.3594,1177.0955,1152.1004,1130.878,1112.4833,1096.2823,1081.8301,1068.8027,1056.9573,1046.1071,1036.1061,1026.8372,1018.2061
+Offshore Wind - Class 9/Conservative,2875.4056,2633.5143,2436.371,2258.7217,2091.9585,1932.1239,1864.6009,1818.1286,1782.881,1754.5895,1731.0199,1710.859,1693.2709,1677.691,1663.7209,1651.0687,1639.5148,1628.8897,1619.0599,1609.9183,1601.3782
+Offshore Wind - Class 10/Advanced,1437.5413,1283.6403,1195.8529,1135.6213,1090.3211,1054.3073,975.0886,922.5189,883.7024,853.2025,828.238,807.204,789.0945,773.2396,759.1716,746.5522,735.1288,724.7083,715.1398,706.3035,698.1025
+Offshore Wind - Class 10/Moderate,2092.4076,1844.9701,1659.308,1598.4728,1552.128,1514.9019,1431.7471,1375.5309,1333.4508,1300.0263,1272.4208,1248.9821,1228.6663,1210.7734,1194.8118,1180.4239,1167.3413,1155.3581,1144.3125,1134.0757,1124.5431
+Offshore Wind - Class 10/Conservative,3175.7006,2908.5472,2690.8151,2494.6129,2310.4337,2133.9067,2059.3319,2008.0062,1969.0775,1937.8313,1911.8002,1889.5338,1870.1088,1852.9019,1837.4727,1823.4992,1810.7387,1799.004,1788.1475,1778.0513,1768.6193
+Offshore Wind - Class 11/Advanced,1568.3903,1400.4808,1304.7028,1238.9887,1189.5652,1150.2733,1063.8439,1006.4891,964.1394,930.8634,903.6266,880.678,860.9201,843.622,828.2735,814.5055,802.0423,790.6732,780.2338,770.5932,761.6458
+Offshore Wind - Class 11/Moderate,2282.8643,2012.9044,1810.3428,1743.9703,1693.407,1652.7924,1562.0686,1500.7355,1454.8252,1418.3583,1388.2401,1362.6679,1340.5029,1320.9813,1303.5669,1287.8694,1273.596,1260.522,1248.471,1237.3024,1226.9022
+Offshore Wind - Class 11/Conservative,3464.7616,3173.2912,2935.7405,2721.6795,2520.7358,2328.1408,2246.7779,2190.7804,2148.3083,2114.218,2085.8175,2061.5244,2040.3313,2021.5581,2004.7246,1989.4792,1975.5572,1962.7543,1950.9097,1939.8945,1929.6039
+Offshore Wind - Class 12/Advanced,1725.4782,1540.7511,1435.3801,1363.0842,1308.7105,1265.4831,1170.3971,1107.2977,1060.7064,1024.0975,994.1326,968.8855,947.1487,928.1181,911.2323,896.0853,882.3738,869.866,858.381,847.7748,837.9312
+Offshore Wind - Class 12/Moderate,2511.513,2214.5143,1991.6644,1918.644,1863.0164,1818.334,1718.5234,1651.0473,1600.5386,1560.4192,1527.2844,1499.1509,1474.7659,1453.2891,1434.1305,1416.8607,1401.1577,1386.7742,1373.5162,1361.229,1349.7871
+Offshore Wind - Class 12/Conservative,3811.7876,3491.1239,3229.7805,2994.2794,2773.2094,2561.3243,2471.8123,2410.2062,2363.4801,2325.9754,2294.7303,2268.004,2244.6882,2224.0348,2205.5152,2188.7428,2173.4264,2159.3412,2146.3102,2134.1918,2122.8705
+Offshore Wind - Class 13/Advanced,2017.4966,1801.5064,1678.3025,1593.7713,1530.1954,1479.6523,1368.474,1294.6958,1240.2193,1197.4148,1162.3787,1132.8588,1107.4433,1085.1919,1065.4485,1047.7379,1031.7059,1017.0814,1003.6526,991.2515,979.7419
+Offshore Wind - Class 13/Moderate,2936.5592,2589.2967,2328.7318,2243.3536,2178.3116,2126.0672,2009.3647,1930.469,1871.4123,1824.5032,1785.7606,1752.8658,1724.3539,1699.2424,1676.8414,1656.6489,1638.2883,1621.4706,1605.9689,1591.6022,1578.2238
+Offshore Wind - Class 13/Conservative,4456.8911,4081.9585,3776.3856,3501.0285,3242.5448,2994.8005,2890.1395,2818.1072,2763.4733,2719.6213,2683.0883,2651.8389,2624.5772,2600.4284,2578.7746,2559.1636,2541.2551,2524.7861,2509.5498,2495.3804,2482.1432
+Offshore Wind - Class 14/Advanced,2383.5514,2128.3719,1982.8138,1882.9454,1807.8342,1748.1206,1616.7701,1529.6055,1465.2448,1414.6738,1373.2808,1338.4048,1308.3779,1282.0892,1258.7635,1237.8396,1218.8987,1201.6207,1185.7555,1171.1042,1157.5064
+Offshore Wind - Class 14/Moderate,3469.3688,3059.0989,2751.2572,2650.3879,2573.5447,2511.821,2373.944,2280.7335,2210.9615,2155.5412,2109.7691,2070.906,2037.2209,2007.5531,1981.0877,1957.2314,1935.5395,1915.6704,1897.356,1880.3826,1864.5769
+Offshore Wind - Class 14/Conservative,5265.5498,4822.5894,4461.5733,4136.2554,3830.8724,3538.1773,3414.5267,3329.4249,3264.8782,3213.0697,3169.9081,3132.9888,3100.7808,3072.2503,3046.6677,3023.4985,3002.3407,2982.8835,2964.8827,2948.1425,2932.5035
diff --git a/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_lcoe.csv b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_lcoe.csv
new file mode 100644
index 0000000..bd8ff02
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_lcoe.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,100.12498122711872,89.92648620132637,84.04262547282364,79.95415926665008,76.86810137028495,74.4055865885271,69.36964998983676,66.00492581525724,63.50886407393264,61.53064938118469,59.90922997294035,58.532689193310546,57.34974002032594,56.30715225110978,55.37603707539957,54.54584942701734,53.790106804174734,53.09684990239218,52.46683545447933,51.87230010450898,51.327352919429885
+Offshore Wind - Class 8/Moderate,147.27288695862651,130.7304291584401,118.46709198735287,114.14292673184228,110.83490591306732,108.15923897790309,102.59669330990381,98.79908191914437,95.94856257724769,93.66562840882229,91.78353444543123,90.15610900770199,88.75238881152168,87.52570713520522,86.40781443867161,85.41094529190843,84.49965433136424,83.66051672004976,82.8829761738405,82.1585937921578,81.49710606257138
+Offshore Wind - Class 8/Conservative,224.1613925207357,205.92864282365494,191.1917647755499,178.05691523318143,165.78059742780874,154.09476454601412,148.89341811908398,145.3111154458787,142.54439054167926,140.33346229948359,138.47886471501207,136.88166295466885,135.4788769215883,134.22792651043864,133.1272391292167,132.097635222943,131.17928549892085,130.33094745559072,129.54264161342908,128.80630355711617,128.11535548243316
+Offshore Wind - Class 9/Advanced,105.36887677930098,94.60924765755566,88.38506557019018,84.0737250791468,80.81962211758851,78.22312249560103,72.90959962108909,69.35969928824026,66.72642820799493,64.63970936793073,62.91722518318976,61.477516381033006,60.21818802782966,59.11886850438257,58.148281460400405,57.26178043145108,56.464971363495756,55.73409045533767,55.06982370508002,54.44313820535237,53.86862475385495
+Offshore Wind - Class 9/Moderate,155.13083058989312,137.6664065954677,124.690696780276,120.15584900932936,116.66710394986595,113.84539953256731,107.97573887613031,103.9688752892322,100.96136034669891,98.55287930632507,96.54759712089073,94.85062593095671,93.36992680245068,92.05711552162292,90.8783033129729,89.82700924775381,88.86603836695996,87.98118405374308,87.16132696628237,86.39756594405252,85.69999403502358
+Offshore Wind - Class 9/Conservative,236.3321953217573,217.07855205149133,201.51310706012666,187.63719421224243,174.66707626037677,162.3195858059233,156.83187592380054,153.01976834066764,150.13380590187177,147.80143910748075,145.81405250458587,144.12969413602002,142.68074457443848,141.36138101828408,140.1705698120993,139.11454029752426,138.14587103575823,137.2220441971057,136.39079889775385,135.61438600805099,134.88588092578533
+Offshore Wind - Class 10/Advanced,107.72003826966848,96.69154349016384,90.31244014696108,85.89412082595584,82.55941334104583,79.89871857941506,74.45174701902634,70.8129307335643,68.11381141002676,65.97502410734447,64.22209020100851,62.73411054877287,61.44355803779372,60.31698052633141,59.322304338666136,58.413878543942765,57.59737778732022,56.8484561790221,56.16776378652637,55.525659846475975,54.9369771616664
+Offshore Wind - Class 10/Moderate,158.7338390020321,140.85202406634411,127.53908009783008,122.8908247760256,119.2905178473456,116.42302393135975,110.3828017455408,106.29767779613697,103.19349096138848,100.72510799931162,98.69009818747215,96.93092667985528,95.41347337581813,94.06818552468147,92.87905710417795,91.80148275522168,90.79815511558452,89.89143896853527,89.06933087165716,88.2865708024871,87.55392152537377
+Offshore Wind - Class 10/Conservative,242.06294115210764,222.31002187098926,206.33765122556326,192.09697527268227,178.7847382001848,166.11064590694278,160.48560781465218,156.57820630894068,153.62013571080053,151.22953794167603,149.19272751797217,147.46640494086645,145.98126638876414,144.6291268946119,143.4086992273702,142.32637979482752,141.33360180424106,140.38689624264114,139.53502160990706,138.73931309403793,137.9927234160686
+Offshore Wind - Class 11/Advanced,111.41793904573994,99.99367475386792,93.38546382077713,88.8258348742542,85.37055570322033,82.59752329434635,76.97126246034948,73.20178545033221,70.39206674719424,68.17689358357096,66.36135443445605,64.8202204838149,63.495814158159035,62.32873407926223,61.28653919558576,60.357256241903976,59.51141550561486,58.73558310826278,58.030418887864215,57.365217518218664,56.75540749123354
+Offshore Wind - Class 11/Moderate,164.26453379283518,145.73674508061222,131.94179026051071,127.09999693547442,123.39625943028621,120.42553032743757,114.1693467415788,109.93815568301753,106.72284504930981,104.16607247831737,102.05821226260409,100.25643555523706,98.68426130633921,97.29039735313619,96.03884490858586,94.92264801998012,93.90237636276781,92.96292143695705,92.09248063557129,91.28161132418471,90.54102953399493
+Offshore Wind - Class 11/Conservative,250.58661242550355,230.11966822376016,213.5685466420903,198.81145802355033,185.01616177009132,171.88210516880326,166.05637095283373,162.0440783876196,158.945725335293,156.46970607856144,154.39284175760304,152.60433704951038,151.03361889736834,149.63299744740158,148.40039632246734,147.24773797012216,146.21942591742692,145.26957677762374,144.35628102361323,143.5320499912658,142.7586786856792
+Offshore Wind - Class 12/Advanced,118.439727810161,106.28999289442423,99.280319988748,94.42834359054446,90.75105011427134,87.8168248897208,81.83600743588106,77.82823728239121,74.85517972467112,72.49886959906175,70.5676079569144,68.9416269224491,67.51905550335765,66.2773270326379,65.1810887878853,64.19217025450918,63.29191666552175,62.46610661730445,61.71564764911743,61.00746478371154,60.35836390359685
+Offshore Wind - Class 12/Moderate,174.59791556517848,154.90176433066415,140.23786479477937,135.11458531758663,131.1725409690792,128.01077356268877,121.38520459300486,116.86152526277418,113.46597515047192,110.74637014304307,108.48171902878512,106.56544193366692,104.89316622831953,103.43187648454253,102.09997671602888,100.91239697651304,99.82676225612488,98.82702361118452,97.9006623422793,97.05766496380573,96.24961599288432
+Offshore Wind - Class 12/Conservative,266.24983677144195,244.50008793851256,226.96257483023638,211.2805408715733,196.62126303968572,182.70605375306673,176.51241252730466,172.20908241246417,168.95141875894225,166.28207098704164,164.07367690995812,162.17163739373652,160.53584947826639,159.0456087371164,157.70035963456502,156.50789986891263,155.41399466215154,154.40349556357137,153.4311544780808,152.55412981748137,151.73118522072983
+Offshore Wind - Class 13/Advanced,164.513164918587,147.47759759440675,137.59459428665,130.7702834145515,125.61148796953482,121.50957077383879,113.09765052244981,107.46116445317269,103.28545758136435,99.97702128223382,97.27106780808654,94.97495348695058,92.98420092134849,91.22912947975273,89.68354948842224,88.28904506839673,87.04110768465958,85.87600107287899,84.82119247769297,83.84258404235372,82.93015199727425
+Offshore Wind - Class 13/Moderate,243.56685500076208,215.82005356104392,195.16894504822642,187.93046514391108,182.41443413187588,177.91877679978532,168.63059662686837,162.2953599875781,157.51154722881049,153.67876726951548,150.52609815786664,147.83089327421922,145.47886416753374,143.3933917425798,141.55799300100713,139.85815204396505,138.33890319592527,136.94033758478594,135.64478721043037,134.43811767134497,133.34400793322084
+Offshore Wind - Class 13/Conservative,372.8184203956118,342.12905592302667,317.3985402611388,295.20711608337155,274.5355081696362,254.7919407605952,246.10200096772525,240.0673044606032,235.51487933188096,231.7750215413774,228.69565750625225,225.98373908888243,223.65974217726753,221.58925907066651,219.72212199218583,218.02153450705651,216.51954557588363,215.07498840272856,213.73113831456152,212.53306288004873,211.35233382427663
+Offshore Wind - Class 14/Advanced,232.08141597872324,207.94616979806895,193.97806111884765,184.2612362837605,176.9953990995137,171.1371127889836,159.22370656562845,151.24319105145696,145.29570724906114,140.62573179371537,136.7740030689555,133.5477656821432,130.71033519051323,128.24955664633774,126.05296158501172,124.11122509677276,122.30560666989106,120.68808462448536,119.15737433618659,117.7738447564394,116.48403247835456
+Offshore Wind - Class 14/Moderate,344.14951734608184,304.7624762456525,275.48273797910775,265.2669432245746,257.44126730625595,251.06233055084883,237.88581054066157,228.89541726285364,222.1816886487254,216.73715669894187,212.27422596228817,208.4595127286454,205.13111568576824,202.18034015658353,199.53094100582067,197.1953344782631,194.99500483620065,193.03327090624694,191.21708885345552,189.4614543719501,187.8810614929837
+Offshore Wind - Class 14/Conservative,527.5048815850713,483.9846196440484,448.81687272635554,417.4084098383537,388.032154712425,360.1053722882211,347.7007972412523,339.18703227180197,332.6797213924512,327.416630208652,322.99879722718237,319.19159603186847,315.9597043470877,312.97284549177834,310.3871078132391,307.9253855832851,305.7714938023141,303.78332117486514,301.82838004367034,300.1057310227011,298.4904179804297
diff --git a/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_occ.csv b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_occ.csv
new file mode 100644
index 0000000..ea3d820
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_occ.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,4435.5373,3960.6753,3689.8071,3503.9624,3364.1885,3253.0677,3008.6384,2846.4343,2726.6659,2632.5586,2555.5305,2490.63,2434.7531,2385.8326,2342.426,2303.4888,2268.2418,2236.0892,2206.5657,2179.3012,2153.9971
+Offshore Wind - Class 8/Moderate,6456.1288,5692.6599,5119.7989,4932.0919,4789.0948,4674.2335,4417.6591,4244.204,4114.3659,4011.2344,3926.0575,3853.7372,3791.0528,3735.8442,3686.5949,3642.2009,3601.8346,3564.8602,3530.7791,3499.1934,3469.7806
+Offshore Wind - Class 8/Conservative,9798.632,8974.3295,8302.5166,7697.1344,7128.8489,6584.1743,6354.0735,6195.708,6075.5933,5979.1832,5898.8641,5830.1612,5770.2254,5717.1333,5669.5267,5626.4114,5587.0388,5550.8311,5517.3336,5486.1817,5457.0792
+Offshore Wind - Class 9/Advanced,4614.256,4120.2606,3838.4785,3645.1456,3499.7399,3384.1418,3129.8638,2961.1241,2836.5299,2738.6308,2658.4991,2590.9836,2532.8553,2481.9637,2436.8081,2396.302,2359.6348,2326.1867,2295.4736,2267.1106,2240.787
+Offshore Wind - Class 9/Moderate,6716.262,5922.0311,5326.0882,5130.8179,4982.0592,4862.5698,4595.6574,4415.2134,4280.1438,4172.8569,4084.248,4009.0138,3943.8036,3886.3705,3835.1368,3788.9541,3746.9613,3708.4972,3673.0429,3640.1845,3609.5866
+Offshore Wind - Class 9/Conservative,10193.4429,9335.9272,8637.0454,8007.2708,7416.0877,6849.4668,6610.0947,6445.3482,6320.3939,6220.0991,6136.5438,6065.0727,6002.7219,5947.4906,5897.9658,5853.1133,5812.1543,5774.4877,5739.6405,5707.2334,5676.9583
+Offshore Wind - Class 10/Advanced,4649.037,4151.3181,3867.4119,3672.6218,3526.12,3409.6505,3153.4558,2983.4442,2857.9109,2759.2739,2678.5382,2610.5137,2551.9472,2500.672,2455.1761,2414.3646,2377.4211,2343.7209,2312.7763,2284.1995,2257.6774
+Offshore Wind - Class 10/Moderate,6766.8874,5966.6698,5366.2348,5169.4927,5019.6126,4899.2225,4630.2982,4448.4941,4312.4063,4204.3108,4115.0339,4039.2326,3973.531,3915.6649,3864.045,3817.5142,3775.2049,3736.4508,3700.7293,3667.6232,3636.7947
+Offshore Wind - Class 10/Conservative,10270.2783,9406.2989,8702.1491,8067.6274,7471.9882,6901.0962,6659.9198,6493.9315,6368.0353,6266.9846,6182.7994,6110.7896,6047.9688,5992.3212,5942.423,5897.2325,5855.9647,5818.0142,5782.9043,5750.253,5719.7497
+Offshore Wind - Class 11/Advanced,4705.9878,4202.1718,3914.7878,3717.6115,3569.3151,3451.4188,3192.0858,3019.9915,2892.9204,2793.075,2711.3503,2642.4925,2583.2087,2531.3053,2485.252,2443.9407,2406.5446,2372.4315,2341.1078,2312.181,2285.334
+Offshore Wind - Class 11/Moderate,6849.782,6039.7616,5431.9713,5232.8191,5081.103,4959.2382,4687.0195,4502.9882,4365.2334,4255.8137,4165.4432,4088.7133,4022.2068,3963.6319,3911.3797,3864.2788,3821.4513,3782.2224,3746.0633,3712.5517,3681.3455
+Offshore Wind - Class 11/Conservative,10396.0894,9521.5263,8808.7506,8166.4561,7563.5202,6985.6348,6741.504,6573.4824,6446.0439,6343.7553,6258.5389,6185.6469,6122.0566,6065.7273,6015.2179,5969.4737,5927.7004,5889.2851,5853.745,5820.6937,5789.8168
+Offshore Wind - Class 12/Advanced,4809.7984,4294.8686,4001.1451,3799.6192,3648.0515,3527.5546,3262.5008,3086.6103,2956.7361,2854.6882,2771.1607,2700.784,2640.1923,2587.1441,2540.0748,2497.8522,2459.6312,2424.7656,2392.7509,2363.186,2335.7468
+Offshore Wind - Class 12/Moderate,7000.8831,6172.9943,5551.7965,5348.2512,5193.1884,5068.6353,4790.4116,4602.3208,4461.5272,4349.6938,4257.3298,4178.9073,4110.9337,4051.0667,3997.6618,3949.5219,3905.7496,3865.6554,3828.6987,3794.4478,3762.5533
+Offshore Wind - Class 12/Conservative,10625.4195,9731.5641,9003.0651,8346.6021,7730.3659,7139.7327,6890.2166,6718.4885,6588.2389,6483.6938,6396.5976,6322.0977,6257.1046,6199.5328,6147.9091,6101.1559,6058.4611,6019.1983,5982.8743,5949.0939,5917.5359
+Offshore Wind - Class 13/Advanced,5259.4418,4696.3739,4375.1916,4154.8262,3989.0892,3857.3276,3567.4953,3375.1616,3233.1462,3121.5584,3030.2223,2953.2664,2887.0104,2829.0029,2777.5334,2731.3636,2689.5695,2651.4445,2616.437,2584.1081,2554.1038
+Offshore Wind - Class 13/Moderate,7655.3598,6750.0759,6070.8056,5848.2318,5678.6729,5542.476,5238.2427,5032.5682,4878.6125,4756.3244,4655.3257,4569.5719,4495.2439,4429.7802,4371.3827,4318.7425,4270.8782,4227.0358,4186.6241,4149.1713,4114.2951
+Offshore Wind - Class 13/Conservative,11618.7355,10641.3182,9844.7156,9126.8831,8453.0382,7807.1898,7534.3477,7346.5656,7204.1396,7089.8211,6994.5827,6913.1182,6842.0493,6779.0953,6722.6457,6671.5217,6624.8356,6581.9024,6542.1826,6505.2442,6470.736
+Offshore Wind - Class 14/Advanced,5529.0667,4937.1331,4599.4855,4367.823,4193.5895,4055.0732,3750.3827,3548.189,3398.8931,3281.5848,3185.5664,3104.6654,3035.0127,2974.0315,2919.9235,2871.3867,2827.45,2787.3706,2750.5684,2716.5822,2685.0397
+Offshore Wind - Class 14/Moderate,8047.8112,7096.118,6382.0249,6148.0409,5969.7896,5826.6106,5506.7808,5290.5624,5128.7142,5000.1569,4893.9806,4803.8307,4725.6922,4656.8725,4595.4813,4540.1425,4489.8244,4443.7344,4401.2511,4361.8783,4325.2141
+Offshore Wind - Class 14/Conservative,12214.369,11186.8445,10349.4041,9594.772,8886.3825,8207.4247,7920.5954,7723.1867,7573.4592,7453.2803,7353.1595,7267.5186,7192.8064,7126.6251,7067.2815,7013.5367,6964.4573,6919.323,6877.567,6838.735,6802.4577
diff --git a/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_tc.csv b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_tc.csv
new file mode 100644
index 0000000..b183205
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_tc.csv
@@ -0,0 +1,31 @@
+Tax Credit,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+10 year CRF/Advanced,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Moderate,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+10 year CRF/Conservative,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799,0.12335665390499799
+ITC Schedule/*,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PVD/Advanced,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Moderate,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PVD/Conservative,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541,0.8396433529415541
+PFF/Advanced,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Moderate,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+PFF/Conservative,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125,1.055582818412125
+Year (Advanced)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Moderate)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
+3/nan,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777,0.825266636307777
+4/nan,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383,0.7740916518815383
+5/nan,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675,0.7260900406607675
+6/nan,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523,0.6810650210027523
+Year (Conservative)/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
+1/nan,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087,0.9379897572799087
+2/nan,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022,0.879824784762022
diff --git a/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_vom.csv b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_vom.csv
new file mode 100644
index 0000000..b02e3a0
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/TechLife/df_vom.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 8/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 9/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 10/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 11/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 12/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 13/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Advanced,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Moderate,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Offshore Wind - Class 14/Conservative,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/tests/data/Floating_Offshore_Wind/R&D/df_cff.csv b/tests/data/Floating_Offshore_Wind/R&D/df_cff.csv
new file mode 100644
index 0000000..c1069c4
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/df_cff.csv
@@ -0,0 +1,4 @@
+Construction Finance Factor,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+CFF/Advanced,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
+CFF/Moderate,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
+CFF/Conservative,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348,1.1086870412668348
diff --git a/tests/data/Floating_Offshore_Wind/R&D/df_just_wacc.csv b/tests/data/Floating_Offshore_Wind/R&D/df_just_wacc.csv
new file mode 100644
index 0000000..9f56242
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/df_just_wacc.csv
@@ -0,0 +1,7 @@
+WACC Type,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+WACC Nominal - Advanced,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Nominal - Moderate,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Nominal - Conservative,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Real - Advanced,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
+WACC Real - Moderate,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
+WACC Real - Conservative,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
diff --git a/tests/data/Floating_Offshore_Wind/R&D/df_wacc.csv b/tests/data/Floating_Offshore_Wind/R&D/df_wacc.csv
new file mode 100644
index 0000000..eb95dac
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/R&D/df_wacc.csv
@@ -0,0 +1,25 @@
+WACC,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Inflation Rate,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025,0.025
+Interest Rate Nominal - Advanced,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Interest Rate Nominal - Moderate,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Interest Rate Nominal - Conservative,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Calculated Interest Rate Real - Advanced,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Calculated Interest Rate Real - Moderate,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Calculated Interest Rate Real - Conservative,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505,0.043902439024390505
+Interest During Construction  - Nominal,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07,0.07
+Rate of Return on Equity Nominal - Advanced,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Rate of Return on Equity Nominal - Moderate,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Rate of Return on Equity Nominal - Conservative,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105,0.105
+Calculated Rate of Return on Equity Real - Advanced,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Calculated Rate of Return on Equity Real - Moderate,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Calculated Rate of Return on Equity Real - Conservative,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
+Debt Fraction - Advanced,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569
+Debt Fraction - Moderate,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569
+Debt Fraction - Conservative,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569,0.733529694274569
+Tax Rate (Federal and State),0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574,0.2574
+WACC Nominal - Advanced,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Nominal - Moderate,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Nominal - Conservative,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509,0.0661097226689509
+WACC Real - Advanced,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
+WACC Real - Moderate,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
+WACC Real - Conservative,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936,0.0401070465062936
diff --git a/tests/data/Floating_Offshore_Wind/df_ncf.csv b/tests/data/Floating_Offshore_Wind/df_ncf.csv
new file mode 100644
index 0000000..15ad0a7
--- /dev/null
+++ b/tests/data/Floating_Offshore_Wind/df_ncf.csv
@@ -0,0 +1,22 @@
+tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
+Offshore Wind - Class 8/Advanced,0.4994,0.5022,0.5045,0.5066,0.5084,0.51,0.5111,0.5121,0.513,0.5139,0.5147,0.5155,0.5162,0.5169,0.5176,0.5182,0.5188,0.5194,0.5199,0.5205,0.521
+Offshore Wind - Class 8/Moderate,0.4769,0.4788,0.4803,0.4817,0.4829,0.484,0.4847,0.4854,0.486,0.4866,0.4871,0.4877,0.4882,0.4886,0.4891,0.4895,0.4899,0.4903,0.4907,0.4911,0.4914
+Offshore Wind - Class 8/Conservative,0.4615,0.4625,0.4634,0.4641,0.4648,0.4654,0.4658,0.4661,0.4665,0.4668,0.4671,0.4674,0.4677,0.468,0.4682,0.4685,0.4687,0.4689,0.4691,0.4693,0.4695
+Offshore Wind - Class 9/Advanced,0.5026,0.5054,0.5078,0.5099,0.5117,0.5133,0.5144,0.5154,0.5163,0.5172,0.5181,0.5188,0.5196,0.5203,0.5209,0.5216,0.5222,0.5228,0.5233,0.5239,0.5244
+Offshore Wind - Class 9/Moderate,0.48,0.4819,0.4835,0.4848,0.486,0.4871,0.4878,0.4885,0.4891,0.4897,0.4903,0.4908,0.4913,0.4918,0.4923,0.4927,0.4931,0.4935,0.4939,0.4943,0.4946
+Offshore Wind - Class 9/Conservative,0.4645,0.4655,0.4664,0.4671,0.4678,0.4684,0.4688,0.4692,0.4695,0.4698,0.4702,0.4705,0.4707,0.471,0.4713,0.4715,0.4717,0.472,0.4722,0.4724,0.4726
+Offshore Wind - Class 10/Advanced,0.5036,0.5064,0.5088,0.5109,0.5127,0.5143,0.5154,0.5164,0.5173,0.5182,0.519,0.5198,0.5206,0.5213,0.5219,0.5226,0.5232,0.5238,0.5243,0.5249,0.5254
+Offshore Wind - Class 10/Moderate,0.481,0.4828,0.4844,0.4857,0.487,0.488,0.4888,0.4894,0.4901,0.4907,0.4912,0.4918,0.4923,0.4928,0.4932,0.4936,0.4941,0.4945,0.4948,0.4952,0.4956
+Offshore Wind - Class 10/Conservative,0.4654,0.4664,0.4673,0.468,0.4687,0.4693,0.4697,0.4701,0.4704,0.4707,0.4711,0.4714,0.4716,0.4719,0.4722,0.4724,0.4726,0.4729,0.4731,0.4733,0.4735
+Offshore Wind - Class 11/Advanced,0.5009,0.5037,0.5061,0.5081,0.5099,0.5116,0.5126,0.5136,0.5146,0.5155,0.5163,0.5171,0.5178,0.5185,0.5192,0.5198,0.5204,0.521,0.5215,0.5221,0.5226
+Offshore Wind - Class 11/Moderate,0.4784,0.4802,0.4818,0.4832,0.4844,0.4854,0.4862,0.4868,0.4875,0.4881,0.4886,0.4891,0.4896,0.4901,0.4906,0.491,0.4914,0.4918,0.4922,0.4926,0.4929
+Offshore Wind - Class 11/Conservative,0.4629,0.4639,0.4648,0.4655,0.4662,0.4668,0.4672,0.4675,0.4679,0.4682,0.4685,0.4688,0.4691,0.4694,0.4696,0.4699,0.4701,0.4703,0.4706,0.4708,0.471
+Offshore Wind - Class 12/Advanced,0.4912,0.494,0.4963,0.4983,0.5001,0.5017,0.5027,0.5037,0.5046,0.5055,0.5063,0.507,0.5078,0.5085,0.5091,0.5097,0.5103,0.5109,0.5114,0.512,0.5125
+Offshore Wind - Class 12/Moderate,0.4691,0.4709,0.4725,0.4738,0.475,0.476,0.4767,0.4774,0.478,0.4786,0.4792,0.4797,0.4802,0.4806,0.4811,0.4815,0.4819,0.4823,0.4827,0.483,0.4834
+Offshore Wind - Class 12/Conservative,0.454,0.455,0.4558,0.4565,0.4572,0.4577,0.4581,0.4585,0.4588,0.4592,0.4595,0.4598,0.46,0.4603,0.4606,0.4608,0.461,0.4612,0.4615,0.4617,0.4619
+Offshore Wind - Class 13/Advanced,0.3864,0.3885,0.3904,0.392,0.3934,0.3946,0.3954,0.3962,0.3969,0.3976,0.3982,0.3988,0.3994,0.4,0.4005,0.401,0.4014,0.4019,0.4023,0.4027,0.4031
+Offshore Wind - Class 13/Moderate,0.369,0.3704,0.3716,0.3727,0.3736,0.3745,0.375,0.3755,0.376,0.3765,0.3769,0.3773,0.3777,0.3781,0.3784,0.3788,0.3791,0.3794,0.3797,0.38,0.3802
+Offshore Wind - Class 13/Conservative,0.3571,0.3579,0.3585,0.3591,0.3596,0.3601,0.3604,0.3607,0.3609,0.3612,0.3614,0.3617,0.3619,0.3621,0.3623,0.3625,0.3626,0.3628,0.363,0.3631,0.3633
+Offshore Wind - Class 14/Advanced,0.2957,0.2973,0.2987,0.3,0.301,0.302,0.3026,0.3032,0.3038,0.3043,0.3048,0.3052,0.3057,0.3061,0.3065,0.3068,0.3072,0.3075,0.3079,0.3082,0.3085
+Offshore Wind - Class 14/Moderate,0.2824,0.2835,0.2844,0.2852,0.2859,0.2866,0.287,0.2874,0.2877,0.2881,0.2884,0.2887,0.289,0.2893,0.2896,0.2898,0.2901,0.2903,0.2905,0.2908,0.291
+Offshore Wind - Class 14/Conservative,0.2733,0.2739,0.2744,0.2748,0.2752,0.2755,0.2758,0.276,0.2762,0.2764,0.2766,0.2768,0.2769,0.2771,0.2772,0.2774,0.2775,0.2776,0.2778,0.2779,0.278
diff --git a/tests/data/Hydropower/Market/20/df_lcoe.csv b/tests/data/Hydropower/Market/20/df_lcoe.csv
index e9ed877..1664198 100644
--- a/tests/data/Hydropower/Market/20/df_lcoe.csv
+++ b/tests/data/Hydropower/Market/20/df_lcoe.csv
@@ -1,37 +1,37 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Hydropower - NPD 1/Advanced,114.99449143721586,98.26269213656914,98.58197154806679,93.87063287016619,93.25934683517197,92.62768459901123,92.016398564017,91.38473632785629,90.77345029286204,88.51404404523745,87.98426281490912,87.43410538341429,86.90432415308597,86.37454292275761,85.84476169242927,85.31498046210095,84.76482303060612,84.23504180027778,83.70526056994944,80.93891767085533,80.93891767085533,80.93891767085533,80.93891767085533,80.93891767085533,78.77432648668255,78.77432648668255,78.77432648668255,78.77432648668255,78.77432648668255
-Hydropower - NPD 1/Moderate,114.99449143721586,98.26269213656914,98.58197154806679,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,92.48815632897295,92.48815632897295,92.48815632897295,92.48815632897295,92.48815632897295,89.98295672585394,89.98295672585394,89.98295672585394,89.98295672585394,89.98295672585394
-Hydropower - NPD 1/Conservative,114.99449143721586,98.26269213656914,98.58197154806679,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,91.38473632785629,91.38591078123483,91.38591078123483,91.38591078123483,91.38591078123483,91.38591078123483,88.98108370737053,88.98108370737053,88.98108370737053,88.98108370737053,88.98108370737053
-Hydropower - NPD 2/Advanced,159.88503864569554,130.76983719523346,131.27384063389988,123.83668430977046,114.24247544345845,104.64826657714643,95.05405771083441,85.45984884452243,81.02336187098486,79.2731788644079,78.8131056907017,78.3530325169955,77.8752642212237,77.41519104751751,76.95511787381133,76.49504470010513,76.03497152639895,75.55720323062712,75.09713005692095,72.53555599637434,72.53555599637434,72.53555599637434,72.53555599637434,72.53555599637434,70.58933352015298,70.58933352015298,70.58933352015298,70.58933352015298,70.58933352015298
-Hydropower - NPD 2/Moderate,159.88503864569554,130.76983719523346,131.27384063389988,123.83668430977046,119.29378541067912,114.75088651158781,110.20798761249647,105.66508871340514,180.0452649502094,170.75532586575753,161.46538678130557,152.1931428189193,142.90320373446738,133.61326465001548,133.61326465001548,133.61326465001548,133.61326465001548,133.61326465001548,133.61326465001548,132.71412278826574,132.71412278826574,132.71412278826574,132.71412278826574,132.71412278826574,128.447294363892,128.447294363892,128.447294363892,128.447294363892,128.447294363892
-Hydropower - NPD 2/Conservative,159.88503864569554,130.76983719523346,131.27384063389988,123.83668430977046,123.83668430977046,123.83668430977046,123.83668430977046,123.83668430977046,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,75.60323426562752,75.5386117625958,75.5386117625958,75.5386117625958,75.5386117625958,75.5386117625958,73.53415108291172,73.53415108291172,73.53415108291172,73.53415108291172,73.53415108291172
-Hydropower - NPD 3/Advanced,210.24438015549055,172.07380195334156,172.71288504466443,163.282471500558,152.034808456664,140.8075216139365,129.5598585700425,118.31219552614853,109.77991039873719,106.92505888643356,106.31568312029867,105.70630735416381,105.09693158802892,104.46654286444112,103.85716709830622,103.24779133217135,102.63841556603647,102.0290397999016,101.39865107631377,97.68545266493662,97.68545266493662,97.68545266493662,97.68545266493662,97.68545266493662,95.13844831474584,95.13844831474584,95.13844831474584,95.13844831474584,95.13844831474584
-Hydropower - NPD 3/Moderate,210.24438015549055,172.07380195334156,172.71288504466443,163.282471500558,158.00503539844107,152.74797549749061,147.4705393953737,142.19310329325677,216.06344919564162,206.52356651201285,196.98368382838396,187.46481410220807,177.92493141857923,168.3850487349504,168.3850487349504,168.3850487349504,168.3850487349504,168.3850487349504,168.3850487349504,166.60389841995857,166.60389841995857,166.60389841995857,166.60389841995857,166.60389841995857,161.4326820593947,161.4326820593947,161.4326820593947,161.4326820593947,161.4326820593947
-Hydropower - NPD 3/Conservative,210.24438015549055,172.07380195334156,172.71288504466443,163.282471500558,163.282471500558,163.282471500558,163.282471500558,163.282471500558,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,107.14603728692045,107.06587287789974,107.06587287789974,107.06587287789974,107.06587287789974,107.06587287789974,104.3212601107388,104.3212601107388,104.3212601107388,104.3212601107388,104.3212601107388
-Hydropower - NPD 4/Advanced,386.92482821311046,309.9404414200976,311.1585126558674,293.1844563313396,274.14450498872964,255.1222487681852,236.0822974255752,217.0600412050308,197.20611424740216,193.13991284762824,191.883559180969,190.6272055143098,189.3708518476506,188.11449818099138,186.85814451433217,185.61948596973855,184.36313230307937,183.10677863642016,181.85042496976098,176.8517634481664,176.8517634481664,176.8517634481664,176.8517634481664,176.8517634481664,171.68827231907252,171.68827231907252,171.68827231907252,171.68827231907252,171.68827231907252
-Hydropower - NPD 4/Moderate,386.92482821311046,309.9404414200976,311.1585126558674,293.1844563313396,284.38998066472516,275.61320012017626,266.8364195756274,258.04194390901296,363.3987006877304,349.348773767626,335.2988468475216,321.2666150494828,307.2166881293784,293.1844563313396,293.1844563313396,293.1844563313396,293.1844563313396,293.1844563313396,293.1844563313396,291.086264067742,291.086264067742,291.086264067742,291.086264067742,291.086264067742,281.5287684493818,281.5287684493818,281.5287684493818,281.5287684493818,281.5287684493818
-Hydropower - NPD 4/Conservative,386.92482821311046,309.9404414200976,311.1585126558674,293.1844563313396,293.1844563313396,293.1844563313396,293.1844563313396,293.1844563313396,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,198.6748093788488,198.58913601889205,198.58913601889205,198.58913601889205,198.58913601889205,198.58913601889205,192.85120918095754,192.85120918095754,192.85120918095754,192.85120918095754,192.85120918095754
-Hydropower - NPD 5/Advanced,115.72358753893276,93.31126494808471,93.71528110041476,87.75355335843327,89.08237276307551,90.42720204006285,91.75602144470507,93.1008507216924,70.85827480752742,70.12610035738676,69.54974495296364,68.9733895485405,68.40904154837617,67.83268614395303,67.2683381437887,66.69198273936556,66.12763473920124,65.5512793347781,64.97492393035496,64.29248068358369,64.29248068358369,64.29248068358369,64.29248068358369,64.29248068358369,61.94352549624682,61.94352549624682,61.94352549624682,61.94352549624682,61.94352549624682
-Hydropower - NPD 5/Moderate,115.72358753893276,93.31126494808471,93.71528110041476,87.75355335843327,88.85823455024429,89.97892561440041,91.08360680621142,92.18828799802245,62.17692152840389,62.89736578393281,63.629817443720555,64.36226910350828,65.08271335903721,65.81516501882494,65.81516501882494,65.81516501882494,65.81516501882494,65.81516501882494,65.81516501882494,65.6124774927417,65.6124774927417,65.6124774927417,65.6124774927417,65.6124774927417,63.23491789755078,63.23491789755078,63.23491789755078,63.23491789755078,63.23491789755078
-Hydropower - NPD 5/Conservative,115.72358753893276,93.31126494808471,93.71528110041476,87.75355335843327,87.75355335843327,87.75355335843327,87.75355335843327,87.75355335843327,98.91243438295905,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,95.4703118287653,95.42398161322326,95.42398161322326,95.42398161322326,95.42398161322326,95.42398161322326,91.94426347811921,91.94426347811921,91.94426347811921,91.94426347811921,91.94426347811921
-Hydropower - NPD 6/Advanced,165.18336034582745,130.93326703951874,131.51386799889977,122.94642626024459,124.8872594213513,126.81281043158315,128.73836144181502,130.66391245204684,98.91446841111431,97.7411182368029,96.92054444067504,96.11136750282674,95.29079370669888,94.47021991057102,93.64964611444317,92.8290723183153,92.00849852218744,91.18792472605958,90.36735092993172,89.5266753091653,89.5266753091653,89.5266753091653,89.5266753091653,89.5266753091653,86.16974549114268,86.16974549114268,86.16974549114268,86.16974549114268,86.16974549114268
-Hydropower - NPD 6/Moderate,165.18336034582745,130.93326703951874,131.51386799889977,122.94642626024459,124.55105210210446,126.15567794396435,127.76030378582422,129.3649296276841,86.46909916984178,87.50621327328116,88.5547242350001,89.60323519671901,90.65174615843796,91.68886026187734,91.68886026187734,91.68886026187734,91.68886026187734,91.68886026187734,91.68886026187734,91.30355252040758,91.30355252040758,91.30355252040758,91.30355252040758,91.30355252040758,87.90612786702017,87.90612786702017,87.90612786702017,87.90612786702017,87.90612786702017
-Hydropower - NPD 6/Conservative,165.18336034582745,130.93326703951874,131.51386799889977,122.94642626024459,122.94642626024459,122.94642626024459,122.94642626024459,122.94642626024459,139.03853113146795,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,134.02598564451515,133.982581616959,133.982581616959,133.982581616959,133.982581616959,133.982581616959,128.9814380742793,128.9814380742793,128.9814380742793,128.9814380742793,128.9814380742793
-Hydropower - NPD 7/Advanced,235.52384977553388,184.67480174496077,185.5030104074886,173.28182932087657,167.90251221292726,162.53404050237305,157.15472339442374,151.77540628647446,141.82121139169624,139.78392475252713,138.60719913516323,137.44097999652578,136.27476085788834,135.10854171925087,133.94232258061345,132.776103441976,131.60988430333853,130.44366516470112,129.27744602606367,128.3143889555349,128.3143889555349,128.3143889555349,128.3143889555349,128.3143889555349,123.55127022736336,123.55127022736336,123.55127022736336,123.55127022736336,123.55127022736336
-Hydropower - NPD 7/Moderate,235.52384977553388,184.67480174496077,185.5030104074886,173.28182932087657,171.29712159758077,169.31241387428497,167.31686075359409,165.3321530302983,178.86705538120643,176.67120132737557,174.46484079481823,172.26898674098734,170.0731326871565,167.86677215459918,167.86677215459918,167.86677215459918,167.86677215459918,167.86677215459918,167.86677215459918,167.33474391724954,167.33474391724954,167.33474391724954,167.33474391724954,167.33474391724954,161.03935008699784,161.03935008699784,161.03935008699784,161.03935008699784,161.03935008699784
-Hydropower - NPD 7/Conservative,235.52384977553388,184.67480174496077,185.5030104074886,173.28182932087657,173.28182932087657,173.28182932087657,173.28182932087657,173.28182932087657,153.4022158957333,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,147.67584607114213,147.64597799419198,147.64597799419198,147.64597799419198,147.64597799419198,147.64597799419198,142.18270812713905,142.18270812713905,142.18270812713905,142.18270812713905,142.18270812713905
-Hydropower - NPD 8/Advanced,534.1989504547489,421.75389847604123,423.50093879477686,397.7213290576418,392.81270219663804,387.92088570159666,383.02906920655533,378.1372527115139,304.6489837702739,299.90408116789763,297.59865955020507,295.2795151847881,292.97409356709557,290.66867194940306,288.36325033171045,286.04410596629356,283.73868434860094,281.43326273090844,279.1278411132159,274.76059655651767,274.76059655651767,274.76059655651767,274.76059655651767,274.76059655651767,265.32238864589493,265.32238864589493,265.32238864589493,265.32238864589493,265.32238864589493
-Hydropower - NPD 8/Moderate,534.1989504547489,421.75389847604123,423.50093879477686,397.7213290576418,396.91443149144936,396.107533925257,395.3006363590646,394.5105491588345,328.01882314485977,327.34640850636606,326.6739938678724,326.0015792293787,325.3428873386094,324.6704727001158,324.6704727001158,324.6704727001158,324.6704727001158,324.6704727001158,324.6704727001158,322.81217849807916,322.81217849807916,322.81217849807916,322.81217849807916,322.81217849807916,311.6219679214127,311.6219679214127,311.6219679214127,311.6219679214127,311.6219679214127
-Hydropower - NPD 8/Conservative,534.1989504547489,421.75389847604123,423.50093879477686,397.7213290576418,397.7213290576418,397.7213290576418,397.7213290576418,397.7213290576418,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,376.4898368472044,376.3952486251746,376.3952486251746,376.3952486251746,376.3952486251746,376.3952486251746,363.54857271949555,363.54857271949555,363.54857271949555,363.54857271949555,363.54857271949555
-Hydropower - NSD 1/Advanced,139.66607004538878,113.91292795150223,113.66460894971837,106.42794363655372,105.56313112790559,105.04424362271672,104.35239361579822,103.83350611060933,103.14165610369083,102.62276859850196,102.10388109331309,101.41203108639459,101.06610608293533,100.37425607601683,100.02833107255759,99.50944356736872,99.50944356736872,99.50944356736872,99.33648106563909,99.33818066803094,99.33818066803094,98.9922556645717,98.9922556645717,98.81929316284207,95.33916366491319,95.33916366491319,95.16620116318356,95.16620116318356,95.16620116318356
-Hydropower - NSD 1/Moderate,147.26422208770504,121.44730090830696,121.90210368248464,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19270312327231,115.19270312327231,115.19270312327231,115.19270312327231,115.19270312327231,111.62413061800838,111.62413061800838,111.62413061800838,111.62413061800838,111.62413061800838
-Hydropower - NSD 1/Conservative,147.89887133367353,121.92730978187114,122.38441933669021,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.64098838847438,115.64098838847438,115.64098838847438,115.64098838847438,115.64098838847438,112.05431591891863,112.05431591891863,112.05431591891863,112.05431591891863,112.05431591891863
-Hydropower - NSD 2/Advanced,111.69456593155324,89.60935165363358,89.6599832131576,83.63536787733271,83.46240537560308,83.11648037214384,82.94351787041421,82.77055536868458,82.59759286695495,82.42463036522534,82.25166786349571,82.07870536176608,81.73278035830684,81.73278035830684,81.55981785657721,81.38685535484758,81.38685535484758,81.38685535484758,81.38685535484758,81.21541245033923,81.21541245033923,81.21541245033923,81.21541245033923,81.21541245033923,78.10386404344396,78.10386404344396,78.10386404344396,78.10386404344396,77.93090154171435
-Hydropower - NSD 2/Moderate,115.84764447325271,93.26059834475309,93.66722085962596,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.6685913798276,87.6685913798276,87.6685913798276,87.6685913798276,87.6685913798276,84.478061310568,84.478061310568,84.478061310568,84.478061310568,84.478061310568
-Hydropower - NSD 2/Conservative,116.41017448672478,93.68606075541227,94.0947279167627,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06593513762033,88.06593513762033,88.06593513762033,88.06593513762033,88.06593513762033,84.85936191819297,84.85936191819297,84.85936191819297,84.85936191819297,84.85936191819297
-Hydropower - NSD 3/Advanced,131.3984382225436,107.79113881365784,107.28413399799538,100.62859110376787,99.89210561253205,99.33974149410518,98.4191346300604,98.05089188444249,97.49852776601563,96.7620422747798,96.20967815635294,95.84143541073502,95.1049499194992,94.73670717388129,94.36846442826338,93.63197893702755,93.63197893702755,93.63197893702755,93.4478575642186,93.44944247941632,93.44944247941632,93.26532110660737,93.26532110660737,93.26532110660737,89.83590532976433,89.83590532976433,89.83590532976433,89.65178395695537,89.65178395695537
-Hydropower - NSD 3/Moderate,138.6886271940579,114.93406892844737,115.35810729892489,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10255337194323,109.10255337194323,109.10255337194323,109.10255337194323,109.10255337194323,105.77537122623401,105.77537122623401,105.77537122623401,105.77537122623401,105.77537122623401
-Hydropower - NSD 3/Conservative,139.28744946646364,115.38698052689101,115.81319545652205,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52553221088391,109.52553221088391,109.52553221088391,109.52553221088391,109.52553221088391,106.18127187306064,106.18127187306064,106.18127187306064,106.18127187306064,106.18127187306064
-Hydropower - NSD 4/Advanced,96.89718329842955,77.911805576432,77.91619666946326,72.74687564389154,72.57391314216191,72.40095064043228,72.22798813870267,72.22798813870267,72.05502563697304,71.88206313524341,71.88206313524341,71.70910063351378,71.36317563005454,71.36317563005454,71.19021312832491,71.19021312832491,71.01725062659528,71.01725062659528,71.01725062659528,71.01859303122676,71.01859303122676,71.01859303122676,71.01859303122676,71.01859303122676,68.2698666358177,68.2698666358177,68.2698666358177,68.2698666358177,68.2698666358177
-Hydropower - NSD 4/Moderate,100.1996258654566,80.79325103299954,81.15242726422618,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85374101279524,75.85374101279524,75.85374101279524,75.85374101279524,75.85374101279524,73.03549429999255,73.03549429999255,73.03549429999255,73.03549429999255,73.03549429999255
-Hydropower - NSD 4/Conservative,100.70446049293153,81.1750762733347,81.5360874437079,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.2103315646605,76.2103315646605,76.2103315646605,76.2103315646605,76.2103315646605,73.37768715298932,73.37768715298932,73.37768715298932,73.37768715298932,73.37768715298932
+Hydropower - NPD 1/Advanced,114.99449143721586,98.26269213656914,98.58197154806679,93.87063287016619,93.25934683517197,92.62768459901123,92.016398564017,91.38473632785629,90.77345029286204,88.51404404523745,87.98426281490912,87.43410538341429,86.90432415308597,86.37454292275761,85.84476169242927,85.31498046210095,84.76482303060612,84.23504180027778,83.70526056994944,80.93891767085533,80.93891767085533,80.93891767085533,80.93891767085533,80.93891767085533,80.93891767085533,80.93891767085533,80.93891767085533,80.93891767085533,80.93891767085533
+Hydropower - NPD 1/Moderate,114.99449143721586,98.26269213656914,98.58197154806679,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,92.48815632897295,92.48815632897295,92.48815632897295,92.48815632897295,92.48815632897295,92.48815632897295,92.48815632897295,92.48815632897295,92.48815632897295,92.48815632897295
+Hydropower - NPD 1/Conservative,114.99449143721586,98.26269213656914,98.58197154806679,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,93.87063287016619,91.38473632785629,91.38591078123483,91.38591078123483,91.38591078123483,91.38591078123483,91.38591078123483,91.38591078123483,91.38591078123483,91.38591078123483,91.38591078123483,91.38591078123483
+Hydropower - NPD 2/Advanced,159.88503864569554,130.76983719523346,131.27384063389988,123.83668430977046,114.24247544345845,104.64826657714643,95.05405771083441,85.45984884452243,81.02336187098486,79.2731788644079,78.8131056907017,78.3530325169955,77.8752642212237,77.41519104751751,76.95511787381133,76.49504470010513,76.03497152639895,75.55720323062712,75.09713005692095,72.53555599637434,72.53555599637434,72.53555599637434,72.53555599637434,72.53555599637434,72.53555599637434,72.53555599637434,72.53555599637434,72.53555599637434,72.53555599637434
+Hydropower - NPD 2/Moderate,159.88503864569554,130.76983719523346,131.27384063389988,123.83668430977046,119.29378541067912,114.75088651158781,110.20798761249647,105.66508871340514,180.0452649502094,170.75532586575753,161.46538678130557,152.1931428189193,142.90320373446738,133.61326465001548,133.61326465001548,133.61326465001548,133.61326465001548,133.61326465001548,133.61326465001548,132.71412278826574,132.71412278826574,132.71412278826574,132.71412278826574,132.71412278826574,132.71412278826574,132.71412278826574,132.71412278826574,132.71412278826574,132.71412278826574
+Hydropower - NPD 2/Conservative,159.88503864569554,130.76983719523346,131.27384063389988,123.83668430977046,123.83668430977046,123.83668430977046,123.83668430977046,123.83668430977046,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,77.60407782407208,75.60323426562752,75.5386117625958,75.5386117625958,75.5386117625958,75.5386117625958,75.5386117625958,75.5386117625958,75.5386117625958,75.5386117625958,75.5386117625958,75.5386117625958
+Hydropower - NPD 3/Advanced,210.24438015549055,172.07380195334156,172.71288504466443,163.282471500558,152.034808456664,140.8075216139365,129.5598585700425,118.31219552614853,109.77991039873719,106.92505888643356,106.31568312029867,105.70630735416381,105.09693158802892,104.46654286444112,103.85716709830622,103.24779133217135,102.63841556603647,102.0290397999016,101.39865107631377,97.68545266493662,97.68545266493662,97.68545266493662,97.68545266493662,97.68545266493662,97.68545266493662,97.68545266493662,97.68545266493662,97.68545266493662,97.68545266493662
+Hydropower - NPD 3/Moderate,210.24438015549055,172.07380195334156,172.71288504466443,163.282471500558,158.00503539844107,152.74797549749061,147.4705393953737,142.19310329325677,216.06344919564162,206.52356651201285,196.98368382838396,187.46481410220807,177.92493141857923,168.3850487349504,168.3850487349504,168.3850487349504,168.3850487349504,168.3850487349504,168.3850487349504,166.60389841995857,166.60389841995857,166.60389841995857,166.60389841995857,166.60389841995857,166.60389841995857,166.60389841995857,166.60389841995857,166.60389841995857,166.60389841995857
+Hydropower - NPD 3/Conservative,210.24438015549055,172.07380195334156,172.71288504466443,163.282471500558,163.282471500558,163.282471500558,163.282471500558,163.282471500558,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,109.89682444439451,107.14603728692045,107.06587287789974,107.06587287789974,107.06587287789974,107.06587287789974,107.06587287789974,107.06587287789974,107.06587287789974,107.06587287789974,107.06587287789974,107.06587287789974
+Hydropower - NPD 4/Advanced,386.92482821311046,309.9404414200976,311.1585126558674,293.1844563313396,274.14450498872964,255.1222487681852,236.0822974255752,217.0600412050308,197.20611424740216,193.13991284762824,191.883559180969,190.6272055143098,189.3708518476506,188.11449818099138,186.85814451433217,185.61948596973855,184.36313230307937,183.10677863642016,181.85042496976098,176.8517634481664,176.8517634481664,176.8517634481664,176.8517634481664,176.8517634481664,176.8517634481664,176.8517634481664,176.8517634481664,176.8517634481664,176.8517634481664
+Hydropower - NPD 4/Moderate,386.92482821311046,309.9404414200976,311.1585126558674,293.1844563313396,284.38998066472516,275.61320012017626,266.8364195756274,258.04194390901296,363.3987006877304,349.348773767626,335.2988468475216,321.2666150494828,307.2166881293784,293.1844563313396,293.1844563313396,293.1844563313396,293.1844563313396,293.1844563313396,293.1844563313396,291.086264067742,291.086264067742,291.086264067742,291.086264067742,291.086264067742,291.086264067742,291.086264067742,291.086264067742,291.086264067742,291.086264067742
+Hydropower - NPD 4/Conservative,386.92482821311046,309.9404414200976,311.1585126558674,293.1844563313396,293.1844563313396,293.1844563313396,293.1844563313396,293.1844563313396,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,204.4965045384387,198.6748093788488,198.58913601889205,198.58913601889205,198.58913601889205,198.58913601889205,198.58913601889205,198.58913601889205,198.58913601889205,198.58913601889205,198.58913601889205,198.58913601889205
+Hydropower - NPD 5/Advanced,115.72358753893276,93.31126494808471,93.71528110041476,87.75355335843327,89.08237276307551,90.42720204006285,91.75602144470507,93.1008507216924,70.85827480752742,70.12610035738676,69.54974495296364,68.9733895485405,68.40904154837617,67.83268614395303,67.2683381437887,66.69198273936556,66.12763473920124,65.5512793347781,64.97492393035496,64.29248068358369,64.29248068358369,64.29248068358369,64.29248068358369,64.29248068358369,64.29248068358369,64.29248068358369,64.29248068358369,64.29248068358369,64.29248068358369
+Hydropower - NPD 5/Moderate,115.72358753893276,93.31126494808471,93.71528110041476,87.75355335843327,88.85823455024429,89.97892561440041,91.08360680621142,92.18828799802245,62.17692152840389,62.89736578393281,63.629817443720555,64.36226910350828,65.08271335903721,65.81516501882494,65.81516501882494,65.81516501882494,65.81516501882494,65.81516501882494,65.81516501882494,65.6124774927417,65.6124774927417,65.6124774927417,65.6124774927417,65.6124774927417,65.6124774927417,65.6124774927417,65.6124774927417,65.6124774927417,65.6124774927417
+Hydropower - NPD 5/Conservative,115.72358753893276,93.31126494808471,93.71528110041476,87.75355335843327,87.75355335843327,87.75355335843327,87.75355335843327,87.75355335843327,98.91243438295905,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,99.02450348937467,95.4703118287653,95.42398161322326,95.42398161322326,95.42398161322326,95.42398161322326,95.42398161322326,95.42398161322326,95.42398161322326,95.42398161322326,95.42398161322326,95.42398161322326
+Hydropower - NPD 6/Advanced,165.18336034582745,130.93326703951874,131.51386799889977,122.94642626024459,124.8872594213513,126.81281043158315,128.73836144181502,130.66391245204684,98.91446841111431,97.7411182368029,96.92054444067504,96.11136750282674,95.29079370669888,94.47021991057102,93.64964611444317,92.8290723183153,92.00849852218744,91.18792472605958,90.36735092993172,89.5266753091653,89.5266753091653,89.5266753091653,89.5266753091653,89.5266753091653,89.5266753091653,89.5266753091653,89.5266753091653,89.5266753091653,89.5266753091653
+Hydropower - NPD 6/Moderate,165.18336034582745,130.93326703951874,131.51386799889977,122.94642626024459,124.55105210210446,126.15567794396435,127.76030378582422,129.3649296276841,86.46909916984178,87.50621327328116,88.5547242350001,89.60323519671901,90.65174615843796,91.68886026187734,91.68886026187734,91.68886026187734,91.68886026187734,91.68886026187734,91.68886026187734,91.30355252040758,91.30355252040758,91.30355252040758,91.30355252040758,91.30355252040758,91.30355252040758,91.30355252040758,91.30355252040758,91.30355252040758,91.30355252040758
+Hydropower - NPD 6/Conservative,165.18336034582745,130.93326703951874,131.51386799889977,122.94642626024459,122.94642626024459,122.94642626024459,122.94642626024459,122.94642626024459,139.03853113146795,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,139.1455061875919,134.02598564451515,133.982581616959,133.982581616959,133.982581616959,133.982581616959,133.982581616959,133.982581616959,133.982581616959,133.982581616959,133.982581616959,133.982581616959
+Hydropower - NPD 7/Advanced,235.52384977553388,184.67480174496077,185.5030104074886,173.28182932087657,167.90251221292726,162.53404050237305,157.15472339442374,151.77540628647446,141.82121139169624,139.78392475252713,138.60719913516323,137.44097999652578,136.27476085788834,135.10854171925087,133.94232258061345,132.776103441976,131.60988430333853,130.44366516470112,129.27744602606367,128.3143889555349,128.3143889555349,128.3143889555349,128.3143889555349,128.3143889555349,128.3143889555349,128.3143889555349,128.3143889555349,128.3143889555349,128.3143889555349
+Hydropower - NPD 7/Moderate,235.52384977553388,184.67480174496077,185.5030104074886,173.28182932087657,171.29712159758077,169.31241387428497,167.31686075359409,165.3321530302983,178.86705538120643,176.67120132737557,174.46484079481823,172.26898674098734,170.0731326871565,167.86677215459918,167.86677215459918,167.86677215459918,167.86677215459918,167.86677215459918,167.86677215459918,167.33474391724954,167.33474391724954,167.33474391724954,167.33474391724954,167.33474391724954,167.33474391724954,167.33474391724954,167.33474391724954,167.33474391724954,167.33474391724954
+Hydropower - NPD 7/Conservative,235.52384977553388,184.67480174496077,185.5030104074886,173.28182932087657,173.28182932087657,173.28182932087657,173.28182932087657,173.28182932087657,153.4022158957333,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,153.28291652438764,147.67584607114213,147.64597799419198,147.64597799419198,147.64597799419198,147.64597799419198,147.64597799419198,147.64597799419198,147.64597799419198,147.64597799419198,147.64597799419198,147.64597799419198
+Hydropower - NPD 8/Advanced,534.1989504547489,421.75389847604123,423.50093879477686,397.7213290576418,392.81270219663804,387.92088570159666,383.02906920655533,378.1372527115139,304.6489837702739,299.90408116789763,297.59865955020507,295.2795151847881,292.97409356709557,290.66867194940306,288.36325033171045,286.04410596629356,283.73868434860094,281.43326273090844,279.1278411132159,274.76059655651767,274.76059655651767,274.76059655651767,274.76059655651767,274.76059655651767,274.76059655651767,274.76059655651767,274.76059655651767,274.76059655651767,274.76059655651767
+Hydropower - NPD 8/Moderate,534.1989504547489,421.75389847604123,423.50093879477686,397.7213290576418,396.91443149144936,396.107533925257,395.3006363590646,394.5105491588345,328.01882314485977,327.34640850636606,326.6739938678724,326.0015792293787,325.3428873386094,324.6704727001158,324.6704727001158,324.6704727001158,324.6704727001158,324.6704727001158,324.6704727001158,322.81217849807916,322.81217849807916,322.81217849807916,322.81217849807916,322.81217849807916,322.81217849807916,322.81217849807916,322.81217849807916,322.81217849807916,322.81217849807916
+Hydropower - NPD 8/Conservative,534.1989504547489,421.75389847604123,423.50093879477686,397.7213290576418,397.7213290576418,397.7213290576418,397.7213290576418,397.7213290576418,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,389.63554302975547,376.4898368472044,376.3952486251746,376.3952486251746,376.3952486251746,376.3952486251746,376.3952486251746,376.3952486251746,376.3952486251746,376.3952486251746,376.3952486251746,376.3952486251746
+Hydropower - NSD 1/Advanced,139.66607004538878,113.91292795150223,113.66460894971837,106.42794363655372,105.56313112790559,105.04424362271672,104.35239361579822,103.83350611060933,103.14165610369083,102.62276859850196,102.10388109331309,101.41203108639459,101.06610608293533,100.37425607601683,100.02833107255759,99.50944356736872,99.50944356736872,99.50944356736872,99.33648106563909,99.33818066803094,99.33818066803094,98.9922556645717,98.9922556645717,98.81929316284207,98.81929316284207,98.81929316284207,98.64633066111244,98.64633066111244,98.64633066111244
+Hydropower - NSD 1/Moderate,147.26422208770504,121.44730090830696,121.90210368248464,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19096032767548,115.19270312327231,115.19270312327231,115.19270312327231,115.19270312327231,115.19270312327231,115.19270312327231,115.19270312327231,115.19270312327231,115.19270312327231,115.19270312327231
+Hydropower - NSD 1/Conservative,147.89887133367353,121.92730978187114,122.38441933669021,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.63923675333794,115.64098838847438,115.64098838847438,115.64098838847438,115.64098838847438,115.64098838847438,115.64098838847438,115.64098838847438,115.64098838847438,115.64098838847438,115.64098838847438
+Hydropower - NSD 2/Advanced,111.69456593155324,89.60935165363358,89.6599832131576,83.63536787733271,83.46240537560308,83.11648037214384,82.94351787041421,82.77055536868458,82.59759286695495,82.42463036522534,82.25166786349571,82.07870536176608,81.73278035830684,81.73278035830684,81.55981785657721,81.38685535484758,81.38685535484758,81.38685535484758,81.38685535484758,81.21541245033923,81.21541245033923,81.21541245033923,81.21541245033923,81.21541245033923,81.21541245033923,81.21541245033923,81.21541245033923,81.21541245033923,81.0424499486096
+Hydropower - NSD 2/Moderate,115.84764447325271,93.26059834475309,93.66722085962596,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.66703321006977,87.6685913798276,87.6685913798276,87.6685913798276,87.6685913798276,87.6685913798276,87.6685913798276,87.6685913798276,87.6685913798276,87.6685913798276,87.6685913798276
+Hydropower - NSD 2/Conservative,116.41017448672478,93.68606075541227,94.0947279167627,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06436913281604,88.06593513762033,88.06593513762033,88.06593513762033,88.06593513762033,88.06593513762033,88.06593513762033,88.06593513762033,88.06593513762033,88.06593513762033,88.06593513762033
+Hydropower - NSD 3/Advanced,131.3984382225436,107.79113881365784,107.28413399799538,100.62859110376787,99.89210561253205,99.33974149410518,98.4191346300604,98.05089188444249,97.49852776601563,96.7620422747798,96.20967815635294,95.84143541073502,95.1049499194992,94.73670717388129,94.36846442826338,93.63197893702755,93.63197893702755,93.63197893702755,93.4478575642186,93.44944247941632,93.44944247941632,93.26532110660737,93.26532110660737,93.26532110660737,93.08119973379841,93.08119973379841,93.08119973379841,92.89707836098945,92.89707836098945
+Hydropower - NSD 3/Moderate,138.6886271940579,114.93406892844737,115.35810729892489,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10092846495738,109.10255337194323,109.10255337194323,109.10255337194323,109.10255337194323,109.10255337194323,109.10255337194323,109.10255337194323,109.10255337194323,109.10255337194323,109.10255337194323
+Hydropower - NSD 3/Conservative,139.28744946646364,115.38698052689101,115.81319545652205,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52389896336467,109.52553221088391,109.52553221088391,109.52553221088391,109.52553221088391,109.52553221088391,109.52553221088391,109.52553221088391,109.52553221088391,109.52553221088391,109.52553221088391
+Hydropower - NSD 4/Advanced,96.89718329842955,77.911805576432,77.91619666946326,72.74687564389154,72.57391314216191,72.40095064043228,72.22798813870267,72.22798813870267,72.05502563697304,71.88206313524341,71.88206313524341,71.70910063351378,71.36317563005454,71.36317563005454,71.19021312832491,71.19021312832491,71.01725062659528,71.01725062659528,71.01725062659528,71.01859303122676,71.01859303122676,71.01859303122676,71.01859303122676,71.01859303122676,71.01859303122676,71.01859303122676,71.01859303122676,71.01859303122676,71.01859303122676
+Hydropower - NSD 4/Moderate,100.1996258654566,80.79325103299954,81.15242726422618,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85236465629563,75.85374101279524,75.85374101279524,75.85374101279524,75.85374101279524,75.85374101279524,75.85374101279524,75.85374101279524,75.85374101279524,75.85374101279524,75.85374101279524
+Hydropower - NSD 4/Conservative,100.70446049293153,81.1750762733347,81.5360874437079,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.20894817670896,76.2103315646605,76.2103315646605,76.2103315646605,76.2103315646605,76.2103315646605,76.2103315646605,76.2103315646605,76.2103315646605,76.2103315646605,76.2103315646605
diff --git a/tests/data/Hydropower/Market/20/df_tc.csv b/tests/data/Hydropower/Market/20/df_tc.csv
index 7a932d6..5affca4 100644
--- a/tests/data/Hydropower/Market/20/df_tc.csv
+++ b/tests/data/Hydropower/Market/20/df_tc.csv
@@ -1,31 +1,31 @@
 Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-10 year CRF/Advanced,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493
-10 year CRF/Moderate,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493
-10 year CRF/Conservative,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493
+10 year CRF/Advanced,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486
+10 year CRF/Moderate,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486
+10 year CRF/Conservative,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486
 ITC Schedule/*,0,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
 PTC/Advanced,4.671834061672767,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0
 PTC/Moderate,4.671834061672767,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0
 PTC/Conservative,4.671834061672767,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0
-PVD/Advanced,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152
-PVD/Moderate,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152
-PVD/Conservative,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152
-PFF/Advanced,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323
-PFF/Moderate,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323
-PFF/Conservative,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323
+PVD/Advanced,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361
+PVD/Moderate,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361
+PVD/Conservative,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361
+PFF/Advanced,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597
+PFF/Moderate,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597
+PFF/Conservative,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597
 Year/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047.0,2048.0,2049.0,2050
-1/nan,0.9431147648255134,0.9346182957536857,0.9346172116889923,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9346153040412843,0.9346153040412843,0.9346153040412843,0.9346153040412843,0.9346153040412843
-2/nan,0.8894654596318834,0.8735113587575238,0.8735093323853067,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8735057665481825,0.8735057665481825,0.8735057665481825,0.8735057665481825,0.8735057665481825
-3/nan,0.8388680077811409,0.8163996974434432,0.8163968566182686,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8163918575842446,0.8163918575842446,0.8163918575842446,0.8163918575842446,0.8163918575842446
-4/nan,0.7911488038781574,0.7630220938784156,0.7630185537642242,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7630123241929277,0.7630123241929277,0.7630123241929277,0.7630123241929277,0.7630123241929277
-5/nan,0.7461441181115347,0.7131344090030536,0.7131302731860868,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.7131229953628202,0.7131229953628202,0.7131229953628202,0.7131229953628202,0.7131229953628202
-6/nan,0.7036995344787,0.6665084659857458,0.6665038274961897,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6664956651298536,0.6664956651298536,0.6664956651298536,0.6664956651298536,0.6664956651298536
-7/nan,0.6636694209677025,0.6229310065850011,0.62292594883453,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6229170487075361,0.6229170487075361,0.6229170487075361,0.6229170487075361,0.6229170487075361
-8/nan,0.6259164298778394,0.5822027157466018,0.5821973133884484,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5821878068702935,0.5821878068702935,0.5821878068702935,0.5821878068702935,0.5821878068702935
-9/nan,0.5903110265646634,0.5441373099742565,0.5441316296919341,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5441216341272078,0.5441216341272078,0.5441216341272078,0.5441216341272078,0.5441216341272078
-10/nan,0.5567310449924399,0.5085606853041345,0.5085547865344627,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.5085444065152409,0.5085444065152409,0.5085444065152409,0.5085444065152409,0.5085444065152409
-11/nan,0.5250612685691072,0.4753101209862767,0.4753040565819302,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4752933851137363,0.4752933851137363,0.4752933851137363,0.4752933851137363,0.4752933851137363
-12/nan,0.4951930348255392,0.444233535230672,0.4442273520670707,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.4442164716368859,0.4442164716368859,0.4442164716368859,0.4442164716368859,0.4442164716368859
-13/nan,0.46702386258272066,0.4151887896139256,0.41518252914490994,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.41517151269905467,0.41517151269905467,0.41517151269905467,0.41517151269905467,0.41517151269905467
-14/nan,0.4404571003276054,0.3880430389650027,0.3880367377313995,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.38802564957050695,0.38802564957050695,0.38802564957050695,0.38802564957050695,0.38802564957050695
-15/nan,0.4154015945911972,0.36267212375655183,0.36266581385141344,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3626547104491562,0.3626547104491562,0.3626547104491562,0.3626547104491562,0.3626547104491562
-16/nan,0.3917713771910201,0.33896000222271827,0.33895371171672717,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3389426424684421,0.3389426424684421,0.3389426424684421,0.3389426424684421,0.3389426424684421
+1/nan,0.9431147648255134,0.9346182957536857,0.9346172116889923,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549
+2/nan,0.8894654596318834,0.8735113587575238,0.8735093323853067,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459
+3/nan,0.8388680077811409,0.8163996974434432,0.8163968566182686,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863
+4/nan,0.7911488038781574,0.7630220938784156,0.7630185537642242,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286
+5/nan,0.7461441181115347,0.7131344090030536,0.7131302731860868,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612
+6/nan,0.7036995344787,0.6665084659857458,0.6665038274961897,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467
+7/nan,0.6636694209677025,0.6229310065850011,0.62292594883453,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854
+8/nan,0.6259164298778394,0.5822027157466018,0.5821973133884484,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878
+9/nan,0.5903110265646634,0.5441373099742565,0.5441316296919341,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173
+10/nan,0.5567310449924399,0.5085606853041345,0.5085547865344627,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584
+11/nan,0.5250612685691072,0.4753101209862767,0.4753040565819302,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447
+12/nan,0.4951930348255392,0.444233535230672,0.4442273520670707,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316
+13/nan,0.46702386258272066,0.4151887896139256,0.41518252914490994,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104
+14/nan,0.4404571003276054,0.3880430389650027,0.3880367377313995,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102
+15/nan,0.4154015945911972,0.36267212375655183,0.36266581385141344,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041
+16/nan,0.3917713771910201,0.33896000222271827,0.33895371171672717,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271
diff --git a/tests/data/Hydropower/Market/30/df_lcoe.csv b/tests/data/Hydropower/Market/30/df_lcoe.csv
index 0d012aa..2b87f1a 100644
--- a/tests/data/Hydropower/Market/30/df_lcoe.csv
+++ b/tests/data/Hydropower/Market/30/df_lcoe.csv
@@ -1,37 +1,37 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Hydropower - NPD 1/Advanced,95.42626618718367,84.59791661262773,84.94349490704519,81.85696881536627,81.36404400258682,80.85468836271471,80.36176354993525,79.85240791006314,79.35948309728367,77.20265657557856,76.7754550711697,76.33182273966817,75.90462123525931,75.47741973085044,75.05021822644159,74.62301672203272,74.1793843905312,73.75218288612233,73.32498138171347,70.55870385408132,70.55870385408132,70.55870385408132,70.55870385408132,70.55870385408132,68.26627786486961,68.26627786486961,68.26627786486961,68.26627786486961,68.26627786486961
-Hydropower - NPD 1/Moderate,95.42626618718367,84.59791661262773,84.94349490704519,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,80.47456793213642,80.47456793213642,80.47456793213642,80.47456793213642,80.47456793213642,77.82141812706244,77.82141812706244,77.82141812706244,77.82141812706244,77.82141812706244
-Hydropower - NPD 1/Conservative,95.42626618718367,84.59791661262773,84.94349490704519,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,79.85240791006314,79.85365499011722,79.85365499011722,79.85365499011722,79.85365499011722,79.85365499011722,77.30680543995918,77.30680543995918,77.30680543995918,77.30680543995918,77.30680543995918
-Hydropower - NPD 2/Advanced,128.35935784387124,109.19909506574265,109.74461301160045,104.8723296518847,97.13581460252902,89.39929955317334,81.66278450381765,73.92626945446197,70.74462415233313,69.10065476884891,68.72966398870436,68.35867320855982,67.97341355225588,67.60242277211134,67.2314319919668,66.86044121182225,66.48945043167771,66.10419077537377,65.73319999522923,63.20252092448403,63.20252092448403,63.20252092448403,63.20252092448403,63.20252092448403,61.14135989883619,61.14135989883619,61.14135989883619,61.14135989883619,61.14135989883619
-Hydropower - NPD 2/Moderate,128.35935784387124,109.19909506574265,109.74461301160045,104.8723296518847,101.20905671398467,97.54578377608462,93.88251083818459,90.21923790028453,150.593255140366,143.10209515667816,135.61093517299028,128.13404406546184,120.64288408177397,113.1517240980861,113.1517240980861,113.1517240980861,113.1517240980861,113.1517240980861,113.1517240980861,112.25271109614789,112.25271109614789,112.25271109614789,112.25271109614789,112.25271109614789,107.733895514221,107.733895514221,107.733895514221,107.733895514221,107.733895514221
-Hydropower - NPD 2/Conservative,128.35935784387124,109.19909506574265,109.74461301160045,104.8723296518847,104.8723296518847,104.8723296518847,104.8723296518847,104.8723296518847,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,65.97815741230339,65.92629762467762,65.92629762467762,65.92629762467762,65.92629762467762,65.92629762467762,63.803459007362974,63.803459007362974,63.803459007362974,63.803459007362974,63.803459007362974
-Hydropower - NPD 3/Advanced,169.9747965309155,144.72181285041123,145.41353689128954,139.23541652058904,130.16559996544694,121.11221423739752,112.04239768225546,102.97258112711339,96.32889725166658,93.61238041782647,93.12099599508696,92.62961157234743,92.13822714960791,91.62989843642909,91.13851401368956,90.64712959095003,90.1557451682105,89.66436074547099,89.15603203229216,85.47139121049277,85.47139121049277,85.47139121049277,85.47139121049277,85.47139121049277,82.77396778490308,82.77396778490308,82.77396778490308,82.77396778490308,82.77396778490308
-Hydropower - NPD 3/Moderate,169.9747965309155,144.72181285041123,145.41353689128954,139.23541652058904,134.97983230359304,130.74067891368966,126.48509469669365,122.22951047969765,182.03311829361544,174.340410434176,166.64770257473654,158.97193900573637,151.27923114629692,143.58652328685744,143.58652328685744,143.58652328685744,143.58652328685744,143.58652328685744,143.58652328685744,141.80552914453045,141.80552914453045,141.80552914453045,141.80552914453045,141.80552914453045,136.3289149609964,136.3289149609964,136.3289149609964,136.3289149609964,136.3289149609964
-Hydropower - NPD 3/Conservative,169.9747965309155,144.72181285041123,145.41353689128954,139.23541652058904,139.23541652058904,139.23541652058904,139.23541652058904,139.23541652058904,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,93.9684878803419,93.9041878559468,93.9041878559468,93.9041878559468,93.9041878559468,93.9041878559468,90.99748580349137,90.99748580349137,90.99748580349137,90.99748580349137,90.99748580349137
-Hydropower - NPD 4/Advanced,309.17649800450863,257.80845479781584,259.1268579424528,247.35156484387159,231.99825409635133,216.65921222499045,201.3059014774702,185.96685960610935,169.95718055525646,166.15480009026123,165.14170988294345,164.12861967562566,163.1155294683079,162.1024392609901,161.08934905367232,160.0905277225139,159.07743751519612,158.06434730787834,157.05125710056055,152.09044022329442,152.09044022329442,152.09044022329442,152.09044022329442,152.09044022329442,146.62200750216485,146.62200750216485,146.62200750216485,146.62200750216485,146.62200750216485
-Hydropower - NPD 4/Moderate,309.17649800450863,257.80845479781584,259.1268579424528,247.35156484387159,240.25993339264707,233.18257081758193,226.10520824251682,219.01357679129237,303.9704654443924,292.64097777382443,281.3114901032565,269.996271308848,258.6667836382801,247.35156484387159,247.35156484387159,247.35156484387159,247.35156484387159,247.35156484387159,247.35156484387159,245.25366122021015,245.25366122021015,245.25366122021015,245.25366122021015,245.25366122021015,235.131726183466,235.131726183466,235.131726183466,235.131726183466,235.131726183466
-Hydropower - NPD 4/Conservative,309.17649800450863,257.80845479781584,259.1268579424528,247.35156484387159,247.35156484387159,247.35156484387159,247.35156484387159,247.35156484387159,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,171.1414972764871,171.07312843359432,171.07312843359432,171.07312843359432,171.07312843359432,171.07312843359432,164.9963354097405,164.9963354097405,164.9963354097405,164.9963354097405,164.9963354097405
-Hydropower - NPD 5/Advanced,90.67022953364116,76.01985864117655,76.45715339871948,72.55146342711434,73.62298807965635,74.70742266777118,75.7789473203132,76.86338190842801,58.4802272757663,57.85035073911129,57.38559305849065,56.920835377870006,56.46576014892898,56.00100246830834,55.545927239367316,55.08116955874667,54.62609432980563,54.16133664918499,53.69657896856436,53.02815637659209,53.02815637659209,53.02815637659209,53.02815637659209,53.02815637659209,50.540478352992196,50.540478352992196,50.540478352992196,50.540478352992196,50.540478352992196
-Hydropower - NPD 5/Moderate,90.67022953364116,76.01985864117655,76.45715339871948,72.55146342711434,73.44224898163722,74.3459444717329,75.23673002625578,76.12751558077868,51.479814711417994,52.06076181219379,52.651391364649186,53.24202091710456,53.822968017880356,54.413597570335746,54.413597570335746,54.413597570335746,54.413597570335746,54.413597570335746,54.413597570335746,54.21098184743999,54.21098184743999,54.21098184743999,54.21098184743999,54.21098184743999,51.69301011828954,51.69301011828954,51.69301011828954,51.69301011828954,51.69301011828954
-Hydropower - NPD 5/Conservative,90.67022953364116,76.01985864117655,76.45715339871948,72.55146342711434,72.55146342711434,72.55146342711434,72.55146342711434,72.55146342711434,81.54968852135273,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,78.77405237320173,78.73712705676346,78.73712705676346,78.73712705676346,78.73712705676346,78.73712705676346,75.05190633408353,75.05190633408353,75.05190633408353,75.05190633408353,75.05190633408353
-Hydropower - NPD 6/Advanced,128.69941037154788,106.08424297713955,106.712667742579,101.09990366995204,102.66493995052683,104.21765311078214,105.77036627103745,107.32307943129274,81.22307671034383,80.20199122698331,79.5403023257607,78.8878035481662,78.22611464694361,77.56442574572101,76.9027368444984,76.24104794327582,75.57935904205321,74.91767014083061,74.25598123960802,73.42864740728425,73.42864740728425,73.42864740728425,73.42864740728425,73.42864740728425,69.87346654215672,69.87346654215672,69.87346654215672,69.87346654215672,69.87346654215672
-Hydropower - NPD 6/Moderate,128.69941037154788,106.08424297713955,106.712667742579,101.09990366995204,102.39383130349813,103.68775893704422,104.98168657059031,106.2756142041364,71.18746170846777,72.0237629586241,72.86925433240853,73.71474570619297,74.5602370799774,75.39653833013374,75.39653833013374,75.39653833013374,75.39653833013374,75.39653833013374,75.39653833013374,75.01133319215701,75.01133319215701,75.01133319215701,75.01133319215701,75.01133319215701,71.41326597800534,71.41326597800534,71.41326597800534,71.41326597800534,71.41326597800534
-Hydropower - NPD 6/Conservative,128.69941037154788,106.08424297713955,106.712667742579,101.09990366995204,101.09990366995204,101.09990366995204,101.09990366995204,101.09990366995204,114.07614936637135,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,110.03416590157978,109.999790002092,109.999790002092,109.999790002092,109.999790002092,109.999790002092,104.70329266954899,104.70329266954899,104.70329266954899,104.70329266954899,104.70329266954899
-Hydropower - NPD 7/Advanced,183.01189223755256,149.2284652356934,150.1248930249943,142.11846494290842,137.78072659044918,133.45173367821664,129.11399532575737,124.77625697329812,116.67481491393764,114.8938542966274,113.94497403202695,113.00456591264613,112.06415779326532,111.12374967388449,110.18334155450367,109.24293343512286,108.30252531574206,107.36211719636125,106.42170907698043,105.47303618896339,105.47303618896339,105.47303618896339,105.47303618896339,105.47303618896339,100.42862076216106,100.42862076216106,100.42862076216106,100.42862076216106,100.42862076216106
-Hydropower - NPD 7/Moderate,183.01189223755256,149.2284652356934,150.1248930249943,142.11846494290842,140.51804938141638,138.91763381992436,137.30847281820562,135.70805725671357,146.5475989584129,144.77692060750667,142.9977701113808,141.22709176047456,139.45641340956837,137.6772629134425,137.6772629134425,137.6772629134425,137.6772629134425,137.6772629134425,137.6772629134425,137.14542479933704,137.14542479933704,137.14542479933704,137.14542479933704,137.14542479933704,130.47824231503475,130.47824231503475,130.47824231503475,130.47824231503475,130.47824231503475
-Hydropower - NPD 7/Conservative,183.01189223755256,149.2284652356934,150.1248930249943,142.11846494290842,142.11846494290842,142.11846494290842,142.11846494290842,142.11846494290842,126.08807300730797,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,121.47048056759328,121.44707735493793,121.44707735493793,121.44707735493793,121.44707735493793,121.44707735493793,115.6611617876547,115.6611617876547,115.6611617876547,115.6611617876547,115.6611617876547
-Hydropower - NPD 8/Advanced,422.2096804248354,346.9826701189789,348.87361326121055,331.9846898517765,328.02650360515753,324.08187279088986,320.13724197662225,316.1926111623546,254.86311351104712,250.5858585131765,248.726827790694,246.85673140914903,244.99770068666655,243.138669964184,241.27963924170146,239.40954286015648,237.55051213767396,235.69148141519142,233.8324506927089,229.50003332601906,229.50003332601906,229.50003332601906,229.50003332601906,229.50003332601906,219.50443080111845,219.50443080111845,219.50443080111845,219.50443080111845,219.50443080111845
-Hydropower - NPD 8/Moderate,422.2096804248354,346.9826701189789,348.87361326121055,331.9846898517765,331.33402909890765,330.68336834603883,330.0327075931699,329.3956022726524,273.70793089430754,273.1657136002502,272.6234963061927,272.0812790121353,271.5501273771403,271.0079100830829,271.0079100830829,271.0079100830829,271.0079100830829,271.0079100830829,271.0079100830829,269.14995382958386,269.14995382958386,269.14995382958386,269.14995382958386,269.14995382958386,257.2988801773064,257.2988801773064,257.2988801773064,257.2988801773064,257.2988801773064
-Hydropower - NPD 8/Conservative,422.2096804248354,346.9826701189789,348.87361326121055,331.9846898517765,331.9846898517765,331.9846898517765,331.9846898517765,331.9846898517765,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,314.8641787919139,314.7895081459585,314.7895081459585,314.7895081459585,314.7895081459585,314.7895081459585,301.18414287583556,301.18414287583556,301.18414287583556,301.18414287583556,301.18414287583556
-Hydropower - NSD 1/Advanced,112.05485801705063,94.93033338129788,94.71854780307754,89.7390113042701,88.87419879562198,88.35531129043311,87.66346128351461,87.14457377832574,86.45272377140724,85.93383626621835,85.41494876102948,84.72309875411098,84.37717375065174,83.68532374373324,83.33939874027398,82.8205112350851,82.8205112350851,82.8205112350851,82.64754873335548,82.64935343695754,82.64935343695754,82.30342843349828,82.30342843349828,82.13046593176865,78.44480955230628,78.44480955230628,78.27184705057665,78.27184705057665,78.27184705057665
-Hydropower - NSD 1/Moderate,118.9233720182969,101.98228815458087,102.47455280221168,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.07975085027448,98.07975085027448,98.07975085027448,98.07975085027448,98.07975085027448,94.30042826258702,94.30042826258702,94.30042826258702,94.30042826258702,94.30042826258702
-Hydropower - NSD 1/Conservative,119.4086999907441,102.363569585936,102.85833102255765,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.44123843247806,98.44123843247806,98.44123843247806,98.44123843247806,98.44123843247806,94.6427469463631,94.6427469463631,94.6427469463631,94.6427469463631,94.6427469463631
-Hydropower - NSD 2/Advanced,87.12407801855777,72.63720681568729,72.72050253783948,68.71396313012312,68.54100062839349,68.19507562493425,68.02211312320462,67.84915062147499,67.67618811974538,67.50322561801575,67.33026311628612,67.15730061455649,66.81137561109725,66.81137561109725,66.63841310936762,66.46545060763799,66.46545060763799,66.46545060763799,66.46545060763799,66.29410167305328,66.29410167305328,66.29410167305328,66.29410167305328,66.29410167305328,62.99879377065924,62.99879377065924,62.99879377065924,62.99879377065924,62.82583126892962
-Hydropower - NSD 2/Moderate,90.62557282125522,75.85764284989436,76.29775865473867,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36852707673005,72.36852707673005,72.36852707673005,72.36852707673005,72.36852707673005,68.98957307210709,68.98957307210709,68.98957307210709,68.98957307210709,68.98957307210709
-Hydropower - NSD 2/Conservative,91.05574988774251,76.19559684586821,76.63792571368168,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68893652459231,72.68893652459231,72.68893652459231,72.68893652459231,72.68893652459231,69.2929919054541,69.2929919054541,69.2929919054541,69.2929919054541,69.2929919054541
-Hydropower - NSD 3/Advanced,105.72457119237724,90.08946766337614,89.61653103831445,85.06580852929872,84.3293230380629,83.77695891963603,82.85635205559124,82.48810930997334,81.93574519154647,81.19925970031065,80.64689558188378,80.27865283626588,79.54216734503005,79.17392459941213,78.80568185379423,78.0691963625584,78.0691963625584,78.0691963625584,77.88507498974946,77.88675791404988,77.88675791404988,77.70263654124092,77.70263654124092,77.70263654124092,74.08156259796579,74.08156259796579,74.08156259796579,73.89744122515684,73.89744122515684
-Hydropower - NSD 3/Moderate,112.33920182158954,96.78573572107452,97.24470191670173,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14717928914008,93.14717928914008,93.14717928914008,93.14717928914008,93.14717928914008,89.62350291207868,89.62350291207868,89.62350291207868,89.62350291207868,89.62350291207868
-Hydropower - NSD 3/Conservative,112.79713224720503,97.14549320065954,97.60681523751205,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48826031428378,93.48826031428378,93.48826031428378,93.48826031428378,93.48826031428378,89.94649715402872,89.94649715402872,89.94649715402872,89.94649715402872,89.94649715402872
-Hydropower - NSD 4/Advanced,75.31990818647452,62.91869719367723,62.95194364560344,59.56538086323917,59.39241836150954,59.21945585977992,59.04649335805029,59.04649335805029,58.87353085632067,58.70056835459104,58.70056835459104,58.52760585286142,58.18168084940217,58.18168084940217,58.00871834767254,58.00871834767254,57.83575584594292,57.83575584594292,57.83575584594292,57.837181263137836,57.837181263137836,57.837181263137836,57.837181263137836,57.837181263137836,54.92612264285796,54.92612264285796,54.92612264285796,54.92612264285796,54.92612264285796
-Hydropower - NSD 4/Moderate,78.04882131656753,65.42093951994163,65.80970091486019,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33894723500754,62.33894723500754,62.33894723500754,62.33894723500754,62.33894723500754,59.354262618494914,59.354262618494914,59.354262618494914,59.354262618494914,59.354262618494914
-Hydropower - NSD 4/Conservative,78.43487765828688,65.72423156761047,66.11497904468084,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.62649417539676,62.62649417539676,62.62649417539676,62.62649417539676,62.62649417539676,59.62656157149864,59.62656157149864,59.62656157149864,59.62656157149864,59.62656157149864
+Hydropower - NPD 1/Advanced,95.42626618718367,84.59791661262773,84.94349490704519,81.85696881536627,81.36404400258682,80.85468836271471,80.36176354993525,79.85240791006314,79.35948309728367,77.20265657557856,76.7754550711697,76.33182273966817,75.90462123525931,75.47741973085044,75.05021822644159,74.62301672203272,74.1793843905312,73.75218288612233,73.32498138171347,70.55870385408132,70.55870385408132,70.55870385408132,70.55870385408132,70.55870385408132,70.55870385408132,70.55870385408132,70.55870385408132,70.55870385408132,70.55870385408132
+Hydropower - NPD 1/Moderate,95.42626618718367,84.59791661262773,84.94349490704519,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,80.47456793213642,80.47456793213642,80.47456793213642,80.47456793213642,80.47456793213642,80.47456793213642,80.47456793213642,80.47456793213642,80.47456793213642,80.47456793213642
+Hydropower - NPD 1/Conservative,95.42626618718367,84.59791661262773,84.94349490704519,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,81.85696881536627,79.85240791006314,79.85365499011722,79.85365499011722,79.85365499011722,79.85365499011722,79.85365499011722,79.85365499011722,79.85365499011722,79.85365499011722,79.85365499011722,79.85365499011722
+Hydropower - NPD 2/Advanced,128.35935784387124,109.19909506574265,109.74461301160045,104.8723296518847,97.13581460252902,89.39929955317334,81.66278450381765,73.92626945446197,70.74462415233313,69.10065476884891,68.72966398870436,68.35867320855982,67.97341355225588,67.60242277211134,67.2314319919668,66.86044121182225,66.48945043167771,66.10419077537377,65.73319999522923,63.20252092448403,63.20252092448403,63.20252092448403,63.20252092448403,63.20252092448403,63.20252092448403,63.20252092448403,63.20252092448403,63.20252092448403,63.20252092448403
+Hydropower - NPD 2/Moderate,128.35935784387124,109.19909506574265,109.74461301160045,104.8723296518847,101.20905671398467,97.54578377608462,93.88251083818459,90.21923790028453,150.593255140366,143.10209515667816,135.61093517299028,128.13404406546184,120.64288408177397,113.1517240980861,113.1517240980861,113.1517240980861,113.1517240980861,113.1517240980861,113.1517240980861,112.25271109614789,112.25271109614789,112.25271109614789,112.25271109614789,112.25271109614789,112.25271109614789,112.25271109614789,112.25271109614789,112.25271109614789,112.25271109614789
+Hydropower - NPD 2/Conservative,128.35935784387124,109.19909506574265,109.74461301160045,104.8723296518847,104.8723296518847,104.8723296518847,104.8723296518847,104.8723296518847,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,67.59158448242543,65.97815741230339,65.92629762467762,65.92629762467762,65.92629762467762,65.92629762467762,65.92629762467762,65.92629762467762,65.92629762467762,65.92629762467762,65.92629762467762,65.92629762467762
+Hydropower - NPD 3/Advanced,169.9747965309155,144.72181285041123,145.41353689128954,139.23541652058904,130.16559996544694,121.11221423739752,112.04239768225546,102.97258112711339,96.32889725166658,93.61238041782647,93.12099599508696,92.62961157234743,92.13822714960791,91.62989843642909,91.13851401368956,90.64712959095003,90.1557451682105,89.66436074547099,89.15603203229216,85.47139121049277,85.47139121049277,85.47139121049277,85.47139121049277,85.47139121049277,85.47139121049277,85.47139121049277,85.47139121049277,85.47139121049277,85.47139121049277
+Hydropower - NPD 3/Moderate,169.9747965309155,144.72181285041123,145.41353689128954,139.23541652058904,134.97983230359304,130.74067891368966,126.48509469669365,122.22951047969765,182.03311829361544,174.340410434176,166.64770257473654,158.97193900573637,151.27923114629692,143.58652328685744,143.58652328685744,143.58652328685744,143.58652328685744,143.58652328685744,143.58652328685744,141.80552914453045,141.80552914453045,141.80552914453045,141.80552914453045,141.80552914453045,141.80552914453045,141.80552914453045,141.80552914453045,141.80552914453045,141.80552914453045
+Hydropower - NPD 3/Conservative,169.9747965309155,144.72181285041123,145.41353689128954,139.23541652058904,139.23541652058904,139.23541652058904,139.23541652058904,139.23541652058904,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,96.18664953784946,93.9684878803419,93.9041878559468,93.9041878559468,93.9041878559468,93.9041878559468,93.9041878559468,93.9041878559468,93.9041878559468,93.9041878559468,93.9041878559468,93.9041878559468
+Hydropower - NPD 4/Advanced,309.17649800450863,257.80845479781584,259.1268579424528,247.35156484387159,231.99825409635133,216.65921222499045,201.3059014774702,185.96685960610935,169.95718055525646,166.15480009026123,165.14170988294345,164.12861967562566,163.1155294683079,162.1024392609901,161.08934905367232,160.0905277225139,159.07743751519612,158.06434730787834,157.05125710056055,152.09044022329442,152.09044022329442,152.09044022329442,152.09044022329442,152.09044022329442,152.09044022329442,152.09044022329442,152.09044022329442,152.09044022329442,152.09044022329442
+Hydropower - NPD 4/Moderate,309.17649800450863,257.80845479781584,259.1268579424528,247.35156484387159,240.25993339264707,233.18257081758193,226.10520824251682,219.01357679129237,303.9704654443924,292.64097777382443,281.3114901032565,269.996271308848,258.6667836382801,247.35156484387159,247.35156484387159,247.35156484387159,247.35156484387159,247.35156484387159,247.35156484387159,245.25366122021015,245.25366122021015,245.25366122021015,245.25366122021015,245.25366122021015,245.25366122021015,245.25366122021015,245.25366122021015,245.25366122021015,245.25366122021015
+Hydropower - NPD 4/Conservative,309.17649800450863,257.80845479781584,259.1268579424528,247.35156484387159,247.35156484387159,247.35156484387159,247.35156484387159,247.35156484387159,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,175.8359575329315,171.1414972764871,171.07312843359432,171.07312843359432,171.07312843359432,171.07312843359432,171.07312843359432,171.07312843359432,171.07312843359432,171.07312843359432,171.07312843359432,171.07312843359432
+Hydropower - NPD 5/Advanced,90.67022953364116,76.01985864117655,76.45715339871948,72.55146342711434,73.62298807965635,74.70742266777118,75.7789473203132,76.86338190842801,58.4802272757663,57.85035073911129,57.38559305849065,56.920835377870006,56.46576014892898,56.00100246830834,55.545927239367316,55.08116955874667,54.62609432980563,54.16133664918499,53.69657896856436,53.02815637659209,53.02815637659209,53.02815637659209,53.02815637659209,53.02815637659209,53.02815637659209,53.02815637659209,53.02815637659209,53.02815637659209,53.02815637659209
+Hydropower - NPD 5/Moderate,90.67022953364116,76.01985864117655,76.45715339871948,72.55146342711434,73.44224898163722,74.3459444717329,75.23673002625578,76.12751558077868,51.479814711417994,52.06076181219379,52.651391364649186,53.24202091710456,53.822968017880356,54.413597570335746,54.413597570335746,54.413597570335746,54.413597570335746,54.413597570335746,54.413597570335746,54.21098184743999,54.21098184743999,54.21098184743999,54.21098184743999,54.21098184743999,54.21098184743999,54.21098184743999,54.21098184743999,54.21098184743999,54.21098184743999
+Hydropower - NPD 5/Conservative,90.67022953364116,76.01985864117655,76.45715339871948,72.55146342711434,72.55146342711434,72.55146342711434,72.55146342711434,72.55146342711434,81.54968852135273,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,81.64005807036231,78.77405237320173,78.73712705676346,78.73712705676346,78.73712705676346,78.73712705676346,78.73712705676346,78.73712705676346,78.73712705676346,78.73712705676346,78.73712705676346,78.73712705676346
+Hydropower - NPD 6/Advanced,128.69941037154788,106.08424297713955,106.712667742579,101.09990366995204,102.66493995052683,104.21765311078214,105.77036627103745,107.32307943129274,81.22307671034383,80.20199122698331,79.5403023257607,78.8878035481662,78.22611464694361,77.56442574572101,76.9027368444984,76.24104794327582,75.57935904205321,74.91767014083061,74.25598123960802,73.42864740728425,73.42864740728425,73.42864740728425,73.42864740728425,73.42864740728425,73.42864740728425,73.42864740728425,73.42864740728425,73.42864740728425,73.42864740728425
+Hydropower - NPD 6/Moderate,128.69941037154788,106.08424297713955,106.712667742579,101.09990366995204,102.39383130349813,103.68775893704422,104.98168657059031,106.2756142041364,71.18746170846777,72.0237629586241,72.86925433240853,73.71474570619297,74.5602370799774,75.39653833013374,75.39653833013374,75.39653833013374,75.39653833013374,75.39653833013374,75.39653833013374,75.01133319215701,75.01133319215701,75.01133319215701,75.01133319215701,75.01133319215701,75.01133319215701,75.01133319215701,75.01133319215701,75.01133319215701,75.01133319215701
+Hydropower - NPD 6/Conservative,128.69941037154788,106.08424297713955,106.712667742579,101.09990366995204,101.09990366995204,101.09990366995204,101.09990366995204,101.09990366995204,114.07614936637135,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,114.16241120860776,110.03416590157978,109.999790002092,109.999790002092,109.999790002092,109.999790002092,109.999790002092,109.999790002092,109.999790002092,109.999790002092,109.999790002092,109.999790002092
+Hydropower - NPD 7/Advanced,183.01189223755256,149.2284652356934,150.1248930249943,142.11846494290842,137.78072659044918,133.45173367821664,129.11399532575737,124.77625697329812,116.67481491393764,114.8938542966274,113.94497403202695,113.00456591264613,112.06415779326532,111.12374967388449,110.18334155450367,109.24293343512286,108.30252531574206,107.36211719636125,106.42170907698043,105.47303618896339,105.47303618896339,105.47303618896339,105.47303618896339,105.47303618896339,105.47303618896339,105.47303618896339,105.47303618896339,105.47303618896339,105.47303618896339
+Hydropower - NPD 7/Moderate,183.01189223755256,149.2284652356934,150.1248930249943,142.11846494290842,140.51804938141638,138.91763381992436,137.30847281820562,135.70805725671357,146.5475989584129,144.77692060750667,142.9977701113808,141.22709176047456,139.45641340956837,137.6772629134425,137.6772629134425,137.6772629134425,137.6772629134425,137.6772629134425,137.6772629134425,137.14542479933704,137.14542479933704,137.14542479933704,137.14542479933704,137.14542479933704,137.14542479933704,137.14542479933704,137.14542479933704,137.14542479933704,137.14542479933704
+Hydropower - NPD 7/Conservative,183.01189223755256,149.2284652356934,150.1248930249943,142.11846494290842,142.11846494290842,142.11846494290842,142.11846494290842,142.11846494290842,126.08807300730797,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,125.99187316481392,121.47048056759328,121.44707735493793,121.44707735493793,121.44707735493793,121.44707735493793,121.44707735493793,121.44707735493793,121.44707735493793,121.44707735493793,121.44707735493793,121.44707735493793
+Hydropower - NPD 8/Advanced,422.2096804248354,346.9826701189789,348.87361326121055,331.9846898517765,328.02650360515753,324.08187279088986,320.13724197662225,316.1926111623546,254.86311351104712,250.5858585131765,248.726827790694,246.85673140914903,244.99770068666655,243.138669964184,241.27963924170146,239.40954286015648,237.55051213767396,235.69148141519142,233.8324506927089,229.50003332601906,229.50003332601906,229.50003332601906,229.50003332601906,229.50003332601906,229.50003332601906,229.50003332601906,229.50003332601906,229.50003332601906,229.50003332601906
+Hydropower - NPD 8/Moderate,422.2096804248354,346.9826701189789,348.87361326121055,331.9846898517765,331.33402909890765,330.68336834603883,330.0327075931699,329.3956022726524,273.70793089430754,273.1657136002502,272.6234963061927,272.0812790121353,271.5501273771403,271.0079100830829,271.0079100830829,271.0079100830829,271.0079100830829,271.0079100830829,271.0079100830829,269.14995382958386,269.14995382958386,269.14995382958386,269.14995382958386,269.14995382958386,269.14995382958386,269.14995382958386,269.14995382958386,269.14995382958386,269.14995382958386
+Hydropower - NPD 8/Conservative,422.2096804248354,346.9826701189789,348.87361326121055,331.9846898517765,331.9846898517765,331.9846898517765,331.9846898517765,331.9846898517765,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,325.46452689073624,314.8641787919139,314.7895081459585,314.7895081459585,314.7895081459585,314.7895081459585,314.7895081459585,314.7895081459585,314.7895081459585,314.7895081459585,314.7895081459585,314.7895081459585
+Hydropower - NSD 1/Advanced,112.05485801705063,94.93033338129788,94.71854780307754,89.7390113042701,88.87419879562198,88.35531129043311,87.66346128351461,87.14457377832574,86.45272377140724,85.93383626621835,85.41494876102948,84.72309875411098,84.37717375065174,83.68532374373324,83.33939874027398,82.8205112350851,82.8205112350851,82.8205112350851,82.64754873335548,82.64935343695754,82.64935343695754,82.30342843349828,82.30342843349828,82.13046593176865,82.13046593176865,82.13046593176865,81.95750343003904,81.95750343003904,81.95750343003904
+Hydropower - NSD 1/Moderate,118.9233720182969,101.98228815458087,102.47455280221168,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.0779002824556,98.07975085027448,98.07975085027448,98.07975085027448,98.07975085027448,98.07975085027448,98.07975085027448,98.07975085027448,98.07975085027448,98.07975085027448,98.07975085027448
+Hydropower - NSD 1/Conservative,119.4086999907441,102.363569585936,102.85833102255765,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.43937847849386,98.44123843247806,98.44123843247806,98.44123843247806,98.44123843247806,98.44123843247806,98.44123843247806,98.44123843247806,98.44123843247806,98.44123843247806,98.44123843247806
+Hydropower - NSD 2/Advanced,87.12407801855777,72.63720681568729,72.72050253783948,68.71396313012312,68.54100062839349,68.19507562493425,68.02211312320462,67.84915062147499,67.67618811974538,67.50322561801575,67.33026311628612,67.15730061455649,66.81137561109725,66.81137561109725,66.63841310936762,66.46545060763799,66.46545060763799,66.46545060763799,66.46545060763799,66.29410167305328,66.29410167305328,66.29410167305328,66.29410167305328,66.29410167305328,66.29410167305328,66.29410167305328,66.29410167305328,66.29410167305328,66.12113917132365
+Hydropower - NSD 2/Moderate,90.62557282125522,75.85764284989436,76.29775865473867,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36687255177289,72.36852707673005,72.36852707673005,72.36852707673005,72.36852707673005,72.36852707673005,72.36852707673005,72.36852707673005,72.36852707673005,72.36852707673005,72.36852707673005
+Hydropower - NSD 2/Conservative,91.05574988774251,76.19559684586821,76.63792571368168,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68727368007953,72.68893652459231,72.68893652459231,72.68893652459231,72.68893652459231,72.68893652459231,72.68893652459231,72.68893652459231,72.68893652459231,72.68893652459231,72.68893652459231
+Hydropower - NSD 3/Advanced,105.72457119237724,90.08946766337614,89.61653103831445,85.06580852929872,84.3293230380629,83.77695891963603,82.85635205559124,82.48810930997334,81.93574519154647,81.19925970031065,80.64689558188378,80.27865283626588,79.54216734503005,79.17392459941213,78.80568185379423,78.0691963625584,78.0691963625584,78.0691963625584,77.88507498974946,77.88675791404988,77.88675791404988,77.70263654124092,77.70263654124092,77.70263654124092,77.51851516843196,77.51851516843196,77.51851516843196,77.33439379562301,77.33439379562301
+Hydropower - NSD 3/Moderate,112.33920182158954,96.78573572107452,97.24470191670173,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14545390001112,93.14717928914008,93.14717928914008,93.14717928914008,93.14717928914008,93.14717928914008,93.14717928914008,93.14717928914008,93.14717928914008,93.14717928914008,93.14717928914008
+Hydropower - NSD 3/Conservative,112.79713224720503,97.14549320065954,97.60681523751205,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48652606885369,93.48826031428378,93.48826031428378,93.48826031428378,93.48826031428378,93.48826031428378,93.48826031428378,93.48826031428378,93.48826031428378,93.48826031428378,93.48826031428378
+Hydropower - NSD 4/Advanced,75.31990818647452,62.91869719367723,62.95194364560344,59.56538086323917,59.39241836150954,59.21945585977992,59.04649335805029,59.04649335805029,58.87353085632067,58.70056835459104,58.70056835459104,58.52760585286142,58.18168084940217,58.18168084940217,58.00871834767254,58.00871834767254,57.83575584594292,57.83575584594292,57.83575584594292,57.837181263137836,57.837181263137836,57.837181263137836,57.837181263137836,57.837181263137836,57.837181263137836,57.837181263137836,57.837181263137836,57.837181263137836,57.837181263137836
+Hydropower - NSD 4/Moderate,78.04882131656753,65.42093951994163,65.80970091486019,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33748576640498,62.33894723500754,62.33894723500754,62.33894723500754,62.33894723500754,62.33894723500754,62.33894723500754,62.33894723500754,62.33894723500754,62.33894723500754,62.33894723500754
+Hydropower - NSD 4/Conservative,78.43487765828688,65.72423156761047,66.11497904468084,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.625025240526334,62.62649417539676,62.62649417539676,62.62649417539676,62.62649417539676,62.62649417539676,62.62649417539676,62.62649417539676,62.62649417539676,62.62649417539676,62.62649417539676
diff --git a/tests/data/Hydropower/Market/30/df_tc.csv b/tests/data/Hydropower/Market/30/df_tc.csv
index 3fbbb42..e8ad49e 100644
--- a/tests/data/Hydropower/Market/30/df_tc.csv
+++ b/tests/data/Hydropower/Market/30/df_tc.csv
@@ -1,31 +1,31 @@
 Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-10 year CRF/Advanced,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493
-10 year CRF/Moderate,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493
-10 year CRF/Conservative,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493
+10 year CRF/Advanced,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486
+10 year CRF/Moderate,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486
+10 year CRF/Conservative,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486
 ITC Schedule/*,0,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
 PTC/Advanced,3.5726375902351,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0
 PTC/Moderate,3.5726375902351,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0
 PTC/Conservative,3.5726375902351,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0
-PVD/Advanced,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152
-PVD/Moderate,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152
-PVD/Conservative,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152
-PFF/Advanced,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323
-PFF/Moderate,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323
-PFF/Conservative,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323
+PVD/Advanced,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361
+PVD/Moderate,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361
+PVD/Conservative,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361
+PFF/Advanced,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597
+PFF/Moderate,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597
+PFF/Conservative,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597
 Year/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047.0,2048.0,2049.0,2050
-1/nan,0.9431147648255134,0.9346182957536857,0.9346172116889923,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9346153040412843,0.9346153040412843,0.9346153040412843,0.9346153040412843,0.9346153040412843
-2/nan,0.8894654596318834,0.8735113587575238,0.8735093323853067,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8735057665481825,0.8735057665481825,0.8735057665481825,0.8735057665481825,0.8735057665481825
-3/nan,0.8388680077811409,0.8163996974434432,0.8163968566182686,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8163918575842446,0.8163918575842446,0.8163918575842446,0.8163918575842446,0.8163918575842446
-4/nan,0.7911488038781574,0.7630220938784156,0.7630185537642242,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7630123241929277,0.7630123241929277,0.7630123241929277,0.7630123241929277,0.7630123241929277
-5/nan,0.7461441181115347,0.7131344090030536,0.7131302731860868,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.7131229953628202,0.7131229953628202,0.7131229953628202,0.7131229953628202,0.7131229953628202
-6/nan,0.7036995344787,0.6665084659857458,0.6665038274961897,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6664956651298536,0.6664956651298536,0.6664956651298536,0.6664956651298536,0.6664956651298536
-7/nan,0.6636694209677025,0.6229310065850011,0.62292594883453,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6229170487075361,0.6229170487075361,0.6229170487075361,0.6229170487075361,0.6229170487075361
-8/nan,0.6259164298778394,0.5822027157466018,0.5821973133884484,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5821878068702935,0.5821878068702935,0.5821878068702935,0.5821878068702935,0.5821878068702935
-9/nan,0.5903110265646634,0.5441373099742565,0.5441316296919341,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5441216341272078,0.5441216341272078,0.5441216341272078,0.5441216341272078,0.5441216341272078
-10/nan,0.5567310449924399,0.5085606853041345,0.5085547865344627,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.5085444065152409,0.5085444065152409,0.5085444065152409,0.5085444065152409,0.5085444065152409
-11/nan,0.5250612685691072,0.4753101209862767,0.4753040565819302,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4752933851137363,0.4752933851137363,0.4752933851137363,0.4752933851137363,0.4752933851137363
-12/nan,0.4951930348255392,0.444233535230672,0.4442273520670707,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.4442164716368859,0.4442164716368859,0.4442164716368859,0.4442164716368859,0.4442164716368859
-13/nan,0.46702386258272066,0.4151887896139256,0.41518252914490994,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.41517151269905467,0.41517151269905467,0.41517151269905467,0.41517151269905467,0.41517151269905467
-14/nan,0.4404571003276054,0.3880430389650027,0.3880367377313995,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.38802564957050695,0.38802564957050695,0.38802564957050695,0.38802564957050695,0.38802564957050695
-15/nan,0.4154015945911972,0.36267212375655183,0.36266581385141344,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3626547104491562,0.3626547104491562,0.3626547104491562,0.3626547104491562,0.3626547104491562
-16/nan,0.3917713771910201,0.33896000222271827,0.33895371171672717,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3389426424684421,0.3389426424684421,0.3389426424684421,0.3389426424684421,0.3389426424684421
+1/nan,0.9431147648255134,0.9346182957536857,0.9346172116889923,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549
+2/nan,0.8894654596318834,0.8735113587575238,0.8735093323853067,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459
+3/nan,0.8388680077811409,0.8163996974434432,0.8163968566182686,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863
+4/nan,0.7911488038781574,0.7630220938784156,0.7630185537642242,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286
+5/nan,0.7461441181115347,0.7131344090030536,0.7131302731860868,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612
+6/nan,0.7036995344787,0.6665084659857458,0.6665038274961897,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467
+7/nan,0.6636694209677025,0.6229310065850011,0.62292594883453,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854
+8/nan,0.6259164298778394,0.5822027157466018,0.5821973133884484,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878
+9/nan,0.5903110265646634,0.5441373099742565,0.5441316296919341,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173
+10/nan,0.5567310449924399,0.5085606853041345,0.5085547865344627,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584
+11/nan,0.5250612685691072,0.4753101209862767,0.4753040565819302,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447
+12/nan,0.4951930348255392,0.444233535230672,0.4442273520670707,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316
+13/nan,0.46702386258272066,0.4151887896139256,0.41518252914490994,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104
+14/nan,0.4404571003276054,0.3880430389650027,0.3880367377313995,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102
+15/nan,0.4154015945911972,0.36267212375655183,0.36266581385141344,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041
+16/nan,0.3917713771910201,0.33896000222271827,0.33895371171672717,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271
diff --git a/tests/data/Hydropower/Market/TechLife/df_lcoe.csv b/tests/data/Hydropower/Market/TechLife/df_lcoe.csv
index e2d6fa9..1a1b4e9 100644
--- a/tests/data/Hydropower/Market/TechLife/df_lcoe.csv
+++ b/tests/data/Hydropower/Market/TechLife/df_lcoe.csv
@@ -1,37 +1,37 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Hydropower - NPD 1/Advanced,72.47374803770022,70.35565638059728,70.81560077061047,70.0120436567172,69.63581761397367,69.24705070313871,68.87082466039521,68.48205774956025,68.10583170681674,66.05014411914279,65.72408154876507,65.38547811029592,65.0594155399182,64.73335296954049,64.40729039916279,64.08122782878507,63.74262439031592,63.41656181993822,63.0904992495605,60.32453268247199,60.32453268247199,60.32453268247199,60.32453268247199,60.32453268247199,57.38347365597836,57.38347365597836,57.38347365597836,57.38347365597836,57.38347365597836
-Hydropower - NPD 1/Moderate,72.47374803770022,70.35565638059728,70.81560077061047,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,68.63000266510855,68.63000266510855,68.63000266510855,68.63000266510855,68.63000266510855,65.22615441893859,65.22615441893859,65.22615441893859,65.22615441893859,65.22615441893859
-Hydropower - NPD 1/Conservative,72.47374803770022,70.35565638059728,70.81560077061047,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,68.48205774956025,68.4836503019325,68.4836503019325,68.4836503019325,68.4836503019325,68.4836503019325,65.21617955528069,65.21617955528069,65.21617955528069,65.21617955528069,65.21617955528069
-Hydropower - NPD 2/Advanced,91.38136154972571,86.71675554483569,87.44280785454966,86.17434038066095,80.26942675857686,74.36451313649273,68.45959951440865,62.55468589232455,60.610257280789966,59.07100968831168,58.78785008772052,58.504690487129345,58.2106401326693,57.92748053207812,57.64432093148696,57.36116133089579,57.07800173030462,56.783951375844566,56.50079177525339,54.00079539528455,54.00079539528455,54.00079539528455,54.00079539528455,54.00079539528455,51.35643685631032,51.35643685631032,51.35643685631032,51.35643685631032,51.35643685631032
-Hydropower - NPD 2/Moderate,91.38136154972571,86.71675554483569,87.44280785454966,86.17434038066095,83.37833854593055,80.58233671120011,77.7863348764697,74.99033304173926,121.55491593110432,115.83727014993651,110.1196243687687,104.4128693414698,98.695223560302,92.97757777913418,92.97757777913418,92.97757777913418,92.97757777913418,92.97757777913418,92.97757777913418,92.0791777406489,92.0791777406489,92.0791777406489,92.0791777406489,92.0791777406489,86.28178082627512,86.28178082627512,86.28178082627512,86.28178082627512,86.28178082627512
-Hydropower - NPD 2/Conservative,91.38136154972571,86.71675554483569,87.44280785454966,86.17434038066095,86.17434038066095,86.17434038066095,86.17434038066095,86.17434038066095,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,56.48827035920908,56.449222298563775,56.449222298563775,56.449222298563775,56.449222298563775,56.449222298563775,53.72573473271682,53.72573473271682,53.72573473271682,53.72573473271682,53.72573473271682
-Hydropower - NPD 3/Advanced,122.74065356674045,116.2139060805506,117.1345501058808,115.52611640828486,108.6035572218043,101.69353890341519,94.77097971693462,87.84842053045405,83.0668114043934,80.48668625803282,80.11163592167287,79.73658558531294,79.361535248953,78.97355214237376,78.59850180601384,78.2234514696539,77.84840113329396,77.47335079693403,77.08536769035477,73.42917340729711,73.42917340729711,73.42917340729711,73.42917340729711,73.42917340729711,69.96852449150205,69.96852449150205,69.96852449150205,69.96852449150205,69.96852449150205
-Hydropower - NPD 3/Moderate,122.74065356674045,116.2139060805506,117.1345501058808,115.52611640828486,112.27803157259925,109.04248760500506,105.79440276931945,102.54631793363379,148.4807631736539,142.60928549408803,136.73780781452214,130.87926290517555,125.00778522560967,119.13630754604377,119.13630754604377,119.13630754604377,119.13630754604377,119.13630754604377,119.13630754604377,117.35605628960788,117.35605628960788,117.35605628960788,117.35605628960788,117.35605628960788,110.3298553762931,110.3298553762931,110.3298553762931,110.3298553762931,110.3298553762931
-Hydropower - NPD 3/Conservative,122.74065356674045,116.2139060805506,117.1345501058808,115.52611640828486,115.52611640828486,115.52611640828486,115.52611640828486,115.52611640828486,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,80.97602481633928,80.9276789131537,80.9276789131537,80.9276789131537,80.9276789131537,80.9276789131537,77.19853679518229,77.19853679518229,77.19853679518229,77.19853679518229,77.19853679518229
-Hydropower - NPD 4/Advanced,217.98171986784388,203.47332733184274,205.22804439581137,202.1624229636606,190.4439718007338,178.73641139167592,167.01796022874916,155.31039981969124,143.0909739787955,139.5487089301699,138.77546540547863,138.00222188078737,137.22897835609612,136.45573483140484,135.6824913067136,134.9201385358912,134.14689501119994,133.3736514865087,132.6004079618174,127.6774922058478,127.6774922058478,127.6774922058478,127.6774922058478,127.6774922058478,120.66178766797451,120.66178766797451,120.66178766797451,120.66178766797451,120.66178766797451
-Hydropower - NPD 4/Moderate,217.98171986784388,203.47332733184274,205.22804439581137,202.1624229636606,196.74971829082173,191.34790437185177,185.94609045288183,180.53338578004295,245.3769343154203,236.7296757435208,228.0824171716213,219.4460493535907,210.7987907816912,202.1624229636606,202.1624229636606,202.1624229636606,202.1624229636606,202.1624229636606,202.1624229636606,200.06589234939466,200.06589234939466,200.06589234939466,200.06589234939466,200.06589234939466,187.07999507485044,187.07999507485044,187.07999507485044,187.07999507485044,187.07999507485044
-Hydropower - NPD 4/Conservative,217.98171986784388,203.47332733184274,205.22804439581137,202.1624229636606,202.1624229636606,202.1624229636606,202.1624229636606,202.1624229636606,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,143.99490654991345,143.94425261678043,143.94425261678043,143.94425261678043,143.94425261678043,143.94425261678043,136.14805458943016,136.14805458943016,136.14805458943016,136.14805458943016,136.14805458943016
-Hydropower - NPD 5/Advanced,61.283933792742694,57.997703211745396,58.57971682128964,57.56289568706821,58.380739441889226,59.20843673592494,60.026280490745954,60.85397778478168,46.276036617935105,45.747021161096875,45.39229374936727,45.037566337637685,44.69022908031912,44.33550166858953,43.988164411270965,43.63343699954137,43.28609974222281,42.93137233049322,42.57664491876362,41.922313556285054,41.922313556285054,41.922313556285054,41.922313556285054,41.922313556285054,38.73075669000027,38.73075669000027,38.73075669000027,38.73075669000027,38.73075669000027
-Hydropower - NPD 5/Moderate,61.283933792742694,57.997703211745396,58.57971682128964,57.56289568706821,58.242789892883266,58.932537637913036,59.61243184372809,60.29232604954314,40.93295497875809,41.37636424342008,41.82716366249311,42.277963081566135,42.72137234622813,43.17217176530116,43.17217176530116,43.17217176530116,43.17217176530116,43.17217176530116,43.17217176530116,42.96989759753583,42.96989759753583,42.96989759753583,42.96989759753583,42.96989759753583,39.739475539277706,39.739475539277706,39.739475539277706,39.739475539277706,39.739475539277706
-Hydropower - NPD 5/Conservative,61.283933792742694,57.997703211745396,58.57971682128964,57.56289568706821,57.56289568706821,57.56289568706821,57.56289568706821,57.56289568706821,64.43081251972174,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,62.31230158855889,62.28504535006577,62.28504535006577,62.28504535006577,62.28504535006577,62.28504535006577,57.5571057253775,57.5571057253775,57.5571057253775,57.5571057253775,57.5571057253775
-Hydropower - NPD 6/Advanced,85.90562027307585,80.18507861923791,81.02147503092937,79.56022819056628,80.75474587627693,81.93985791091899,83.12496994556103,84.3100819802031,63.780170891427794,62.90921145291012,62.404175815871376,61.906154562680385,61.40111892564165,60.8960832886029,60.391047651564165,59.88601201452542,59.38097637748666,58.87594074044792,58.37090510340918,57.557107959131066,57.557107959131066,57.557107959131066,57.557107959131066,57.557107959131066,52.99600246503558,52.99600246503558,52.99600246503558,52.99600246503558,52.99600246503558
-Hydropower - NPD 6/Moderate,85.90562027307585,80.18507861923791,81.02147503092937,79.56022819056628,80.54782155276799,81.53541491496972,82.52300827717141,83.51060163937312,56.12046372967351,56.7587726598197,57.40409597381365,58.049419287807595,58.69474260180155,59.33305153194774,59.33305153194774,59.33305153194774,59.33305153194774,59.33305153194774,59.33305153194774,58.94833446073619,58.94833446073619,58.94833446073619,58.94833446073619,58.94833446073619,54.332208091591994,54.332208091591994,54.332208091591994,54.332208091591994,54.332208091591994
-Hydropower - NPD 6/Conservative,85.90562027307585,80.18507861923791,81.02147503092937,79.56022819056628,79.56022819056628,79.56022819056628,79.56022819056628,79.56022819056628,89.46437876578916,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,86.37932521529238,86.35442017715086,86.35442017715086,86.35442017715086,86.35442017715086,86.35442017715086,79.55929947882392,79.55929947882392,79.55929947882392,79.55929947882392,79.55929947882392
-Hydropower - NPD 7/Advanced,121.41807659740199,112.28413724782355,113.47722992581105,111.39280813537817,108.0820189592353,104.77790476127014,101.46711558512726,98.15632640898437,91.88161419431518,90.35337935086406,89.62914421858281,88.91137547141119,88.1936067242396,87.475837977068,86.7580692298964,86.04030048272479,85.32253173555318,84.6047629883816,83.88699424120999,82.95304593342027,82.95304593342027,82.95304593342027,82.95304593342027,82.95304593342027,76.48133273779284,76.48133273779284,76.48133273779284,76.48133273779284,76.48133273779284
-Hydropower - NPD 7/Moderate,121.41807659740199,112.28413724782355,113.47722992581105,111.39280813537817,110.17128712885774,108.94976612233727,107.72157013763909,106.50004913111864,114.6820880909554,113.3306136030377,111.97267273001034,110.62119824209266,109.26972375417495,107.91178288114759,107.91178288114759,107.91178288114759,107.91178288114759,107.91178288114759,107.91178288114759,107.38084914986611,107.38084914986611,107.38084914986611,107.38084914986611,107.38084914986611,98.82721325539592,98.82721325539592,98.82721325539592,98.82721325539592,98.82721325539592
-Hydropower - NPD 7/Conservative,121.41807659740199,112.28413724782355,113.47722992581105,111.39280813537817,111.39280813537817,111.39280813537817,111.39280813537817,111.39280813537817,99.15757313564046,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,95.63318465781097,95.6167776729764,95.6167776729764,95.6167776729764,95.6167776729764,95.6167776729764,88.19375974970642,88.19375974970642,88.19375974970642,88.19375974970642,88.19375974970642
-Hydropower - NPD 8/Advanced,290.85204731987284,269.0515478503347,271.568281985994,267.1713599615094,264.15026483827904,261.1395159312241,258.1287670241691,255.11801811711422,205.7765147441085,201.96033896825762,200.54142932133922,199.1140737836654,197.695164136747,196.2762544898286,194.85734484291024,193.42998930523638,192.011079658318,190.59217001139965,189.17326036448125,184.87625585855983,184.87625585855983,184.87625585855983,184.87625585855983,184.87625585855983,172.05243638981855,172.05243638981855,172.05243638981855,172.05243638981855,172.05243638981855
-Hydropower - NPD 8/Moderate,290.85204731987284,269.0515478503347,271.568281985994,267.1713599615094,266.674741585088,266.17812320866653,265.6815048322451,265.1952326719991,220.15986670066803,219.74601805365018,219.33216940663235,218.91832075961446,218.51291800335207,218.0990693563342,218.0990693563342,218.0990693563342,218.0990693563342,218.0990693563342,218.0990693563342,216.2427206645723,216.2427206645723,216.2427206645723,216.2427206645723,216.2427206645723,201.03843171360955,201.03843171360955,201.03843171360955,201.03843171360955,201.03843171360955
-Hydropower - NPD 8/Conservative,290.85204731987284,269.0515478503347,271.568281985994,267.1713599615094,267.1713599615094,267.1713599615094,267.1713599615094,267.1713599615094,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,254.10408893192044,254.0505191090273,254.0505191090273,254.0505191090273,254.0505191090273,254.0505191090273,236.59556853494246,236.59556853494246,236.59556853494246,236.59556853494246,236.59556853494246
-Hydropower - NSD 1/Advanced,79.6683315379247,75.14551867473342,75.09260619482833,73.28448472920093,72.4196722205528,71.90078471536393,71.20893470844543,70.69004720325655,69.99819719633805,69.47930969114917,68.9604221859603,68.2685721790418,67.92264717558255,67.23079716866405,66.8848721652048,66.36598466001593,66.36598466001593,66.36598466001593,66.1930221582863,66.19532680985475,66.19532680985475,65.8494018063955,65.8494018063955,65.67643930466588,60.94794075579925,60.94794075579925,60.77497825406963,60.77497825406963,60.77497825406963
-Hydropower - NSD 1/Moderate,85.6810177793089,81.69466787332242,82.34984317436748,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2075663360763,81.2075663360763,81.2075663360763,81.2075663360763,81.2075663360763,76.35889908886377,76.35889908886377,76.35889908886377,76.35889908886377,76.35889908886377
-Hydropower - NSD 1/Conservative,85.99119960555176,81.97304955915875,82.63154793954051,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.4834774204557,81.4834774204557,81.4834774204557,81.4834774204557,81.4834774204557,76.61021750939564,76.61021750939564,76.61021750939564,76.61021750939564,76.61021750939564
-Hydropower - NSD 2/Advanced,58.304163971229165,54.947805108777885,55.173147653111705,54.002138187590816,53.82917568586119,53.48325068240194,53.310288180672316,53.13732567894269,52.964363177213066,52.79140067548344,52.618438173753816,52.44547567202419,52.09955066856494,52.09955066856494,51.926588166835316,51.75362566510569,51.75362566510569,51.75362566510569,51.75362566510569,51.58272372891551,51.58272372891551,51.58272372891551,51.58272372891551,51.58272372891551,47.35502124385321,47.35502124385321,47.35502124385321,47.35502124385321,47.18205874212358
-Hydropower - NSD 2/Moderate,61.041384681398625,57.719224071630315,58.30499232925631,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28372441481406,57.28372441481406,57.28372441481406,57.28372441481406,57.28372441481406,52.94870848750797,52.94870848750797,52.94870848750797,52.94870848750797,52.94870848750797
-Hydropower - NSD 2/Conservative,61.316318572841155,57.96597147498524,58.554685189296045,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.528281966877636,57.528281966877636,57.528281966877636,57.528281966877636,57.528281966877636,53.17146799661576,53.17146799661576,53.17146799661576,53.17146799661576,53.17146799661576
-Hydropower - NSD 3/Advanced,75.61045039461352,71.63970925919126,71.3149251604137,69.72161428397483,68.985128792739,68.43276467431214,67.51215781026735,67.14391506464945,66.59155094622258,65.85506545498676,65.30270133655989,64.93445859094199,64.19797309970616,63.82973035408825,63.461487608470335,62.72500211723451,62.72500211723451,62.72500211723451,62.54088074442556,62.54302988078465,62.54302988078465,62.35890850797569,62.35890850797569,62.35890850797569,57.765362172890875,57.765362172890875,57.765362172890875,57.581240800081915,57.581240800081915
-Hydropower - NSD 3/Moderate,81.43268595914333,77.8704389520829,78.48129597144604,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41628661652516,77.41628661652516,77.41628661652516,77.41628661652516,77.41628661652516,72.89559968313263,72.89559968313263,72.89559968313263,72.89559968313263,72.89559968313263
-Hydropower - NSD 3/Conservative,81.7253575210015,78.13310554275104,78.74709804826254,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67662207517346,77.67662207517346,77.67662207517346,77.67662207517346,77.67662207517346,73.13273077347317,73.13273077347317,73.13273077347317,73.13273077347317,73.13273077347317
-Hydropower - NSD 4/Advanced,50.010878251696404,47.29196765830328,47.450697566842074,46.56902784023535,46.39606533850572,46.2231028367761,46.05014033504647,46.05014033504647,45.87717783331685,45.70421533158722,45.70421533158722,45.5312528298576,45.18532782639835,45.18532782639835,45.01236532466872,45.01236532466872,44.8394028229391,44.8394028229391,44.8394028229391,44.84122311629376,44.84122311629376,44.84122311629376,44.84122311629376,44.84122311629376,41.106491756538816,41.106491756538816,41.106491756538816,41.106491756538816,41.106491756538816
-Hydropower - NSD 4/Moderate,52.067070956595494,49.39898141655238,49.916399974184614,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01429753970243,49.01429753970243,49.01429753970243,49.01429753970243,49.01429753970243,45.18510799380583,45.18510799380583,45.18510799380583,45.18510799380583,45.18510799380583
-Hydropower - NSD 4/Conservative,52.31380650019777,49.62042139392217,50.140483310117716,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.23377226591332,49.23377226591332,49.23377226591332,49.23377226591332,49.23377226591332,45.38502037377437,45.38502037377437,45.38502037377437,45.38502037377437,45.38502037377437
+Hydropower - NPD 1/Advanced,72.47374803770022,70.35565638059728,70.81560077061047,70.0120436567172,69.63581761397367,69.24705070313871,68.87082466039521,68.48205774956025,68.10583170681674,66.05014411914279,65.72408154876507,65.38547811029592,65.0594155399182,64.73335296954049,64.40729039916279,64.08122782878507,63.74262439031592,63.41656181993822,63.0904992495605,60.32453268247199,60.32453268247199,60.32453268247199,60.32453268247199,60.32453268247199,60.32453268247199,60.32453268247199,60.32453268247199,60.32453268247199,60.32453268247199
+Hydropower - NPD 1/Moderate,72.47374803770022,70.35565638059728,70.81560077061047,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,68.63000266510855,68.63000266510855,68.63000266510855,68.63000266510855,68.63000266510855,68.63000266510855,68.63000266510855,68.63000266510855,68.63000266510855,68.63000266510855
+Hydropower - NPD 1/Conservative,72.47374803770022,70.35565638059728,70.81560077061047,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,70.0120436567172,68.48205774956025,68.4836503019325,68.4836503019325,68.4836503019325,68.4836503019325,68.4836503019325,68.4836503019325,68.4836503019325,68.4836503019325,68.4836503019325,68.4836503019325
+Hydropower - NPD 2/Advanced,91.38136154972571,86.71675554483569,87.44280785454966,86.17434038066095,80.26942675857686,74.36451313649273,68.45959951440865,62.55468589232455,60.610257280789966,59.07100968831168,58.78785008772052,58.504690487129345,58.2106401326693,57.92748053207812,57.64432093148696,57.36116133089579,57.07800173030462,56.783951375844566,56.50079177525339,54.00079539528455,54.00079539528455,54.00079539528455,54.00079539528455,54.00079539528455,54.00079539528455,54.00079539528455,54.00079539528455,54.00079539528455,54.00079539528455
+Hydropower - NPD 2/Moderate,91.38136154972571,86.71675554483569,87.44280785454966,86.17434038066095,83.37833854593055,80.58233671120011,77.7863348764697,74.99033304173926,121.55491593110432,115.83727014993651,110.1196243687687,104.4128693414698,98.695223560302,92.97757777913418,92.97757777913418,92.97757777913418,92.97757777913418,92.97757777913418,92.97757777913418,92.0791777406489,92.0791777406489,92.0791777406489,92.0791777406489,92.0791777406489,92.0791777406489,92.0791777406489,92.0791777406489,92.0791777406489,92.0791777406489
+Hydropower - NPD 2/Conservative,91.38136154972571,86.71675554483569,87.44280785454966,86.17434038066095,86.17434038066095,86.17434038066095,86.17434038066095,86.17434038066095,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,57.71972243082322,56.48827035920908,56.449222298563775,56.449222298563775,56.449222298563775,56.449222298563775,56.449222298563775,56.449222298563775,56.449222298563775,56.449222298563775,56.449222298563775,56.449222298563775
+Hydropower - NPD 3/Advanced,122.74065356674045,116.2139060805506,117.1345501058808,115.52611640828486,108.6035572218043,101.69353890341519,94.77097971693462,87.84842053045405,83.0668114043934,80.48668625803282,80.11163592167287,79.73658558531294,79.361535248953,78.97355214237376,78.59850180601384,78.2234514696539,77.84840113329396,77.47335079693403,77.08536769035477,73.42917340729711,73.42917340729711,73.42917340729711,73.42917340729711,73.42917340729711,73.42917340729711,73.42917340729711,73.42917340729711,73.42917340729711,73.42917340729711
+Hydropower - NPD 3/Moderate,122.74065356674045,116.2139060805506,117.1345501058808,115.52611640828486,112.27803157259925,109.04248760500506,105.79440276931945,102.54631793363379,148.4807631736539,142.60928549408803,136.73780781452214,130.87926290517555,125.00778522560967,119.13630754604377,119.13630754604377,119.13630754604377,119.13630754604377,119.13630754604377,119.13630754604377,117.35605628960788,117.35605628960788,117.35605628960788,117.35605628960788,117.35605628960788,117.35605628960788,117.35605628960788,117.35605628960788,117.35605628960788,117.35605628960788
+Hydropower - NPD 3/Conservative,122.74065356674045,116.2139060805506,117.1345501058808,115.52611640828486,115.52611640828486,115.52611640828486,115.52611640828486,115.52611640828486,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,82.66904200868507,80.97602481633928,80.9276789131537,80.9276789131537,80.9276789131537,80.9276789131537,80.9276789131537,80.9276789131537,80.9276789131537,80.9276789131537,80.9276789131537,80.9276789131537
+Hydropower - NPD 4/Advanced,217.98171986784388,203.47332733184274,205.22804439581137,202.1624229636606,190.4439718007338,178.73641139167592,167.01796022874916,155.31039981969124,143.0909739787955,139.5487089301699,138.77546540547863,138.00222188078737,137.22897835609612,136.45573483140484,135.6824913067136,134.9201385358912,134.14689501119994,133.3736514865087,132.6004079618174,127.6774922058478,127.6774922058478,127.6774922058478,127.6774922058478,127.6774922058478,127.6774922058478,127.6774922058478,127.6774922058478,127.6774922058478,127.6774922058478
+Hydropower - NPD 4/Moderate,217.98171986784388,203.47332733184274,205.22804439581137,202.1624229636606,196.74971829082173,191.34790437185177,185.94609045288183,180.53338578004295,245.3769343154203,236.7296757435208,228.0824171716213,219.4460493535907,210.7987907816912,202.1624229636606,202.1624229636606,202.1624229636606,202.1624229636606,202.1624229636606,202.1624229636606,200.06589234939466,200.06589234939466,200.06589234939466,200.06589234939466,200.06589234939466,200.06589234939466,200.06589234939466,200.06589234939466,200.06589234939466,200.06589234939466
+Hydropower - NPD 4/Conservative,217.98171986784388,203.47332733184274,205.22804439581137,202.1624229636606,202.1624229636606,202.1624229636606,202.1624229636606,202.1624229636606,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,147.5779645727786,143.99490654991345,143.94425261678043,143.94425261678043,143.94425261678043,143.94425261678043,143.94425261678043,143.94425261678043,143.94425261678043,143.94425261678043,143.94425261678043,143.94425261678043
+Hydropower - NPD 5/Advanced,61.283933792742694,57.997703211745396,58.57971682128964,57.56289568706821,58.380739441889226,59.20843673592494,60.026280490745954,60.85397778478168,46.276036617935105,45.747021161096875,45.39229374936727,45.037566337637685,44.69022908031912,44.33550166858953,43.988164411270965,43.63343699954137,43.28609974222281,42.93137233049322,42.57664491876362,41.922313556285054,41.922313556285054,41.922313556285054,41.922313556285054,41.922313556285054,41.922313556285054,41.922313556285054,41.922313556285054,41.922313556285054,41.922313556285054
+Hydropower - NPD 5/Moderate,61.283933792742694,57.997703211745396,58.57971682128964,57.56289568706821,58.242789892883266,58.932537637913036,59.61243184372809,60.29232604954314,40.93295497875809,41.37636424342008,41.82716366249311,42.277963081566135,42.72137234622813,43.17217176530116,43.17217176530116,43.17217176530116,43.17217176530116,43.17217176530116,43.17217176530116,42.96989759753583,42.96989759753583,42.96989759753583,42.96989759753583,42.96989759753583,42.96989759753583,42.96989759753583,42.96989759753583,42.96989759753583,42.96989759753583
+Hydropower - NPD 5/Conservative,61.283933792742694,57.997703211745396,58.57971682128964,57.56289568706821,57.56289568706821,57.56289568706821,57.56289568706821,57.56289568706821,64.43081251972174,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,64.49978729422473,62.31230158855889,62.28504535006577,62.28504535006577,62.28504535006577,62.28504535006577,62.28504535006577,62.28504535006577,62.28504535006577,62.28504535006577,62.28504535006577,62.28504535006577
+Hydropower - NPD 6/Advanced,85.90562027307585,80.18507861923791,81.02147503092937,79.56022819056628,80.75474587627693,81.93985791091899,83.12496994556103,84.3100819802031,63.780170891427794,62.90921145291012,62.404175815871376,61.906154562680385,61.40111892564165,60.8960832886029,60.391047651564165,59.88601201452542,59.38097637748666,58.87594074044792,58.37090510340918,57.557107959131066,57.557107959131066,57.557107959131066,57.557107959131066,57.557107959131066,57.557107959131066,57.557107959131066,57.557107959131066,57.557107959131066,57.557107959131066
+Hydropower - NPD 6/Moderate,85.90562027307585,80.18507861923791,81.02147503092937,79.56022819056628,80.54782155276799,81.53541491496972,82.52300827717141,83.51060163937312,56.12046372967351,56.7587726598197,57.40409597381365,58.049419287807595,58.69474260180155,59.33305153194774,59.33305153194774,59.33305153194774,59.33305153194774,59.33305153194774,59.33305153194774,58.94833446073619,58.94833446073619,58.94833446073619,58.94833446073619,58.94833446073619,58.94833446073619,58.94833446073619,58.94833446073619,58.94833446073619,58.94833446073619
+Hydropower - NPD 6/Conservative,85.90562027307585,80.18507861923791,81.02147503092937,79.56022819056628,79.56022819056628,79.56022819056628,79.56022819056628,79.56022819056628,89.46437876578916,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,89.53021832326928,86.37932521529238,86.35442017715086,86.35442017715086,86.35442017715086,86.35442017715086,86.35442017715086,86.35442017715086,86.35442017715086,86.35442017715086,86.35442017715086,86.35442017715086
+Hydropower - NPD 7/Advanced,121.41807659740199,112.28413724782355,113.47722992581105,111.39280813537817,108.0820189592353,104.77790476127014,101.46711558512726,98.15632640898437,91.88161419431518,90.35337935086406,89.62914421858281,88.91137547141119,88.1936067242396,87.475837977068,86.7580692298964,86.04030048272479,85.32253173555318,84.6047629883816,83.88699424120999,82.95304593342027,82.95304593342027,82.95304593342027,82.95304593342027,82.95304593342027,82.95304593342027,82.95304593342027,82.95304593342027,82.95304593342027,82.95304593342027
+Hydropower - NPD 7/Moderate,121.41807659740199,112.28413724782355,113.47722992581105,111.39280813537817,110.17128712885774,108.94976612233727,107.72157013763909,106.50004913111864,114.6820880909554,113.3306136030377,111.97267273001034,110.62119824209266,109.26972375417495,107.91178288114759,107.91178288114759,107.91178288114759,107.91178288114759,107.91178288114759,107.91178288114759,107.38084914986611,107.38084914986611,107.38084914986611,107.38084914986611,107.38084914986611,107.38084914986611,107.38084914986611,107.38084914986611,107.38084914986611,107.38084914986611
+Hydropower - NPD 7/Conservative,121.41807659740199,112.28413724782355,113.47722992581105,111.39280813537817,111.39280813537817,111.39280813537817,111.39280813537817,111.39280813537817,99.15757313564046,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,99.08414837568569,95.63318465781097,95.6167776729764,95.6167776729764,95.6167776729764,95.6167776729764,95.6167776729764,95.6167776729764,95.6167776729764,95.6167776729764,95.6167776729764,95.6167776729764
+Hydropower - NPD 8/Advanced,290.85204731987284,269.0515478503347,271.568281985994,267.1713599615094,264.15026483827904,261.1395159312241,258.1287670241691,255.11801811711422,205.7765147441085,201.96033896825762,200.54142932133922,199.1140737836654,197.695164136747,196.2762544898286,194.85734484291024,193.42998930523638,192.011079658318,190.59217001139965,189.17326036448125,184.87625585855983,184.87625585855983,184.87625585855983,184.87625585855983,184.87625585855983,184.87625585855983,184.87625585855983,184.87625585855983,184.87625585855983,184.87625585855983
+Hydropower - NPD 8/Moderate,290.85204731987284,269.0515478503347,271.568281985994,267.1713599615094,266.674741585088,266.17812320866653,265.6815048322451,265.1952326719991,220.15986670066803,219.74601805365018,219.33216940663235,218.91832075961446,218.51291800335207,218.0990693563342,218.0990693563342,218.0990693563342,218.0990693563342,218.0990693563342,218.0990693563342,216.2427206645723,216.2427206645723,216.2427206645723,216.2427206645723,216.2427206645723,216.2427206645723,216.2427206645723,216.2427206645723,216.2427206645723,216.2427206645723
+Hydropower - NPD 8/Conservative,290.85204731987284,269.0515478503347,271.568281985994,267.1713599615094,267.1713599615094,267.1713599615094,267.1713599615094,267.1713599615094,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,262.1948299811196,254.10408893192044,254.0505191090273,254.0505191090273,254.0505191090273,254.0505191090273,254.0505191090273,254.0505191090273,254.0505191090273,254.0505191090273,254.0505191090273,254.0505191090273
+Hydropower - NSD 1/Advanced,79.6683315379247,75.14551867473342,75.09260619482833,73.28448472920093,72.4196722205528,71.90078471536393,71.20893470844543,70.69004720325655,69.99819719633805,69.47930969114917,68.9604221859603,68.2685721790418,67.92264717558255,67.23079716866405,66.8848721652048,66.36598466001593,66.36598466001593,66.36598466001593,66.1930221582863,66.19532680985475,66.19532680985475,65.8494018063955,65.8494018063955,65.67643930466588,65.67643930466588,65.67643930466588,65.50347680293625,65.50347680293625,65.50347680293625
+Hydropower - NSD 1/Moderate,85.6810177793089,81.69466787332242,82.34984317436748,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2052031147576,81.2075663360763,81.2075663360763,81.2075663360763,81.2075663360763,81.2075663360763,81.2075663360763,81.2075663360763,81.2075663360763,81.2075663360763,81.2075663360763
+Hydropower - NSD 1/Conservative,85.99119960555176,81.97304955915875,82.63154793954051,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.48110221276949,81.4834774204557,81.4834774204557,81.4834774204557,81.4834774204557,81.4834774204557,81.4834774204557,81.4834774204557,81.4834774204557,81.4834774204557,81.4834774204557
+Hydropower - NSD 2/Advanced,58.304163971229165,54.947805108777885,55.173147653111705,54.002138187590816,53.82917568586119,53.48325068240194,53.310288180672316,53.13732567894269,52.964363177213066,52.79140067548344,52.618438173753816,52.44547567202419,52.09955066856494,52.09955066856494,51.926588166835316,51.75362566510569,51.75362566510569,51.75362566510569,51.75362566510569,51.58272372891551,51.58272372891551,51.58272372891551,51.58272372891551,51.58272372891551,51.58272372891551,51.58272372891551,51.58272372891551,51.58272372891551,51.40976122718589
+Hydropower - NSD 2/Moderate,61.041384681398625,57.719224071630315,58.30499232925631,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28161154512554,57.28372441481406,57.28372441481406,57.28372441481406,57.28372441481406,57.28372441481406,57.28372441481406,57.28372441481406,57.28372441481406,57.28372441481406,57.28372441481406
+Hydropower - NSD 2/Conservative,61.316318572841155,57.96597147498524,58.554685189296045,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.52615847290883,57.528281966877636,57.528281966877636,57.528281966877636,57.528281966877636,57.528281966877636,57.528281966877636,57.528281966877636,57.528281966877636,57.528281966877636,57.528281966877636
+Hydropower - NSD 3/Advanced,75.61045039461352,71.63970925919126,71.3149251604137,69.72161428397483,68.985128792739,68.43276467431214,67.51215781026735,67.14391506464945,66.59155094622258,65.85506545498676,65.30270133655989,64.93445859094199,64.19797309970616,63.82973035408825,63.461487608470335,62.72500211723451,62.72500211723451,62.72500211723451,62.54088074442556,62.54302988078465,62.54302988078465,62.35890850797569,62.35890850797569,62.35890850797569,62.17478713516674,62.17478713516674,62.17478713516674,61.99066576235778,61.99066576235778
+Hydropower - NSD 3/Moderate,81.43268595914333,77.8704389520829,78.48129597144604,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41408325151957,77.41628661652516,77.41628661652516,77.41628661652516,77.41628661652516,77.41628661652516,77.41628661652516,77.41628661652516,77.41628661652516,77.41628661652516,77.41628661652516
+Hydropower - NSD 3/Conservative,81.7253575210015,78.13310554275104,78.74709804826254,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67440740045016,77.67662207517346,77.67662207517346,77.67662207517346,77.67662207517346,77.67662207517346,77.67662207517346,77.67662207517346,77.67662207517346,77.67662207517346,77.67662207517346
+Hydropower - NSD 4/Advanced,50.010878251696404,47.29196765830328,47.450697566842074,46.56902784023535,46.39606533850572,46.2231028367761,46.05014033504647,46.05014033504647,45.87717783331685,45.70421533158722,45.70421533158722,45.5312528298576,45.18532782639835,45.18532782639835,45.01236532466872,45.01236532466872,44.8394028229391,44.8394028229391,44.8394028229391,44.84122311629376,44.84122311629376,44.84122311629376,44.84122311629376,44.84122311629376,44.84122311629376,44.84122311629376,44.84122311629376,44.84122311629376,44.84122311629376
+Hydropower - NSD 4/Moderate,52.067070956595494,49.39898141655238,49.916399974184614,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01243120779991,49.01429753970243,49.01429753970243,49.01429753970243,49.01429753970243,49.01429753970243,49.01429753970243,49.01429753970243,49.01429753970243,49.01429753970243,49.01429753970243
+Hydropower - NSD 4/Conservative,52.31380650019777,49.62042139392217,50.140483310117716,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.231896399400284,49.23377226591332,49.23377226591332,49.23377226591332,49.23377226591332,49.23377226591332,49.23377226591332,49.23377226591332,49.23377226591332,49.23377226591332,49.23377226591332
diff --git a/tests/data/Hydropower/Market/TechLife/df_tc.csv b/tests/data/Hydropower/Market/TechLife/df_tc.csv
index 7ef58fd..cb1f25d 100644
--- a/tests/data/Hydropower/Market/TechLife/df_tc.csv
+++ b/tests/data/Hydropower/Market/TechLife/df_tc.csv
@@ -1,31 +1,31 @@
 Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-10 year CRF/Advanced,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493
-10 year CRF/Moderate,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493
-10 year CRF/Conservative,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493,0.12567291189101493
+10 year CRF/Advanced,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486
+10 year CRF/Moderate,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486
+10 year CRF/Conservative,0.11845953476211457,0.12532073757459747,0.12566107453612888,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837107777016643,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486,0.12837238859736486
 ITC Schedule/*,0,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
 PTC/Advanced,2.283336867346102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0
 PTC/Moderate,2.283336867346102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0
 PTC/Conservative,2.283336867346102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0
-PVD/Advanced,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152
-PVD/Moderate,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152
-PVD/Conservative,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152,0.831633081884152
-PFF/Advanced,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323
-PFF/Moderate,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323
-PFF/Conservative,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323,0.6976124257602323
+PVD/Advanced,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361
+PVD/Moderate,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361
+PVD/Conservative,0.5852800428006577,0.5442658346546491,0.5442608548722967,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225508399555361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361,0.8225464906399361
+PFF/Advanced,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597
+PFF/Moderate,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597
+PFF/Conservative,1.1437502248627938,0.782278571168874,0.7822800383471303,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.700288299309421,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597,0.7002895807351597
 Year/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047.0,2048.0,2049.0,2050
-1/nan,0.9431147648255134,0.9346182957536857,0.9346172116889923,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9346153040412843,0.9346153040412843,0.9346153040412843,0.9346153040412843,0.9346153040412843
-2/nan,0.8894654596318834,0.8735113587575238,0.8735093323853067,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8735057665481825,0.8735057665481825,0.8735057665481825,0.8735057665481825,0.8735057665481825
-3/nan,0.8388680077811409,0.8163996974434432,0.8163968566182686,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8163918575842446,0.8163918575842446,0.8163918575842446,0.8163918575842446,0.8163918575842446
-4/nan,0.7911488038781574,0.7630220938784156,0.7630185537642242,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7630123241929277,0.7630123241929277,0.7630123241929277,0.7630123241929277,0.7630123241929277
-5/nan,0.7461441181115347,0.7131344090030536,0.7131302731860868,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.7131229953628202,0.7131229953628202,0.7131229953628202,0.7131229953628202,0.7131229953628202
-6/nan,0.7036995344787,0.6665084659857458,0.6665038274961897,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6664956651298536,0.6664956651298536,0.6664956651298536,0.6664956651298536,0.6664956651298536
-7/nan,0.6636694209677025,0.6229310065850011,0.62292594883453,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6229170487075361,0.6229170487075361,0.6229170487075361,0.6229170487075361,0.6229170487075361
-8/nan,0.6259164298778394,0.5822027157466018,0.5821973133884484,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5821878068702935,0.5821878068702935,0.5821878068702935,0.5821878068702935,0.5821878068702935
-9/nan,0.5903110265646634,0.5441373099742565,0.5441316296919341,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5441216341272078,0.5441216341272078,0.5441216341272078,0.5441216341272078,0.5441216341272078
-10/nan,0.5567310449924399,0.5085606853041345,0.5085547865344627,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.5085444065152409,0.5085444065152409,0.5085444065152409,0.5085444065152409,0.5085444065152409
-11/nan,0.5250612685691072,0.4753101209862767,0.4753040565819302,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4752933851137363,0.4752933851137363,0.4752933851137363,0.4752933851137363,0.4752933851137363
-12/nan,0.4951930348255392,0.444233535230672,0.4442273520670707,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.4442164716368859,0.4442164716368859,0.4442164716368859,0.4442164716368859,0.4442164716368859
-13/nan,0.46702386258272066,0.4151887896139256,0.41518252914490994,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.41517151269905467,0.41517151269905467,0.41517151269905467,0.41517151269905467,0.41517151269905467
-14/nan,0.4404571003276054,0.3880430389650027,0.3880367377313995,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.38802564957050695,0.38802564957050695,0.38802564957050695,0.38802564957050695,0.38802564957050695
-15/nan,0.4154015945911972,0.36267212375655183,0.36266581385141344,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3626547104491562,0.3626547104491562,0.3626547104491562,0.3626547104491562,0.3626547104491562
-16/nan,0.3917713771910201,0.33896000222271827,0.33895371171672717,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3389426424684421,0.3389426424684421,0.3389426424684421,0.3389426424684421,0.3389426424684421
+1/nan,0.9431147648255134,0.9346182957536857,0.9346172116889923,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307532321057459,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549,0.9307513733411549
+2/nan,0.8894654596318834,0.8735113587575238,0.8735093323853067,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8663015790752926,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459,0.8662981189764459
+3/nan,0.8388680077811409,0.8163996974434432,0.8163968566182686,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063129947026401,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863,0.8063081639601863
+4/nan,0.7911488038781574,0.7630220938784156,0.7630185537642242,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504784259083455,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286,0.7504724309421286
+5/nan,0.7461441181115347,0.7131344090030536,0.7131302731860868,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.698510220539825,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612,0.6985032457540612
+6/nan,0.7036995344787,0.6665084659857458,0.6665038274961897,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501406454263395,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467,0.6501328552688467
+7/nan,0.6636694209677025,0.6229310065850011,0.62292594883453,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051205070538814,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854,0.6051120478956854
+8/nan,0.6259164298778394,0.5822027157466018,0.5821973133884484,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.563217867753868,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878,0.5632088696041878
+9/nan,0.5903110265646634,0.5441373099742565,0.5441316296919341,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242168507916192,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173,0.5242074288620173
+10/nan,0.5567310449924399,0.5085606853041345,0.5085547865344627,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879165281985951,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584,0.4879067843289584
+11/nan,0.5250612685691072,0.4753101209862767,0.4753040565819302,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.45412988561865675,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447,0.4541199095766447
+12/nan,0.4951930348255392,0.444233535230672,0.4442273520670707,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42268285883537743,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316,0.42267272950002316
+13/nan,0.46702386258272066,0.4151887896139256,0.41518252914490994,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.3934134370167243,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104,0.39340322345600104
+14/nan,0.4404571003276054,0.3880430389650027,0.3880367377313995,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.36617082805714646,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102,0.3661605905085102
+15/nan,0.4154015945911972,0.36267212375655183,0.36266581385141344,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408146817170265,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041,0.3408044724792041
+16/nan,0.3917713771910201,0.33896000222271827,0.33895371171672717,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172143665572134,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271,0.3172042308008271
diff --git a/tests/data/Hydropower/Market/df_just_wacc.csv b/tests/data/Hydropower/Market/df_just_wacc.csv
index a517a71..b044bc0 100644
--- a/tests/data/Hydropower/Market/df_just_wacc.csv
+++ b/tests/data/Hydropower/Market/df_just_wacc.csv
@@ -1,7 +1,7 @@
 WACC Type,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
+WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
diff --git a/tests/data/Hydropower/Market/df_wacc.csv b/tests/data/Hydropower/Market/df_wacc.csv
index 42f0cb2..59520c3 100644
--- a/tests/data/Hydropower/Market/df_wacc.csv
+++ b/tests/data/Hydropower/Market/df_wacc.csv
@@ -13,13 +13,13 @@ Rate of Return on Equity Nominal - Conservative,0.0975,0.0975,0.0975,0.0975,0.09
 Calculated Rate of Return on Equity Real - Advanced,0.06824116572981875,0.07015175428284248,0.0707142973284951,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323
 Calculated Rate of Return on Equity Real - Moderate,0.06824116572981875,0.07015175428284248,0.0707142973284951,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323
 Calculated Rate of Return on Equity Real - Conservative,0.06824116572981875,0.07015175428284248,0.0707142973284951,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323
-Debt Fraction - Advanced,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468
-Debt Fraction - Moderate,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468
-Debt Fraction - Conservative,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468
+Debt Fraction - Advanced,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286
+Debt Fraction - Moderate,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286
+Debt Fraction - Conservative,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286
 Tax Rate (Federal and State),0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996
-WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
+WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
diff --git a/tests/data/Land-Based_Wind/Market/20/df_lcoe.csv b/tests/data/Land-Based_Wind/Market/20/df_lcoe.csv
index f8e3ff1..d6ac4d4 100644
--- a/tests/data/Land-Based_Wind/Market/20/df_lcoe.csv
+++ b/tests/data/Land-Based_Wind/Market/20/df_lcoe.csv
@@ -1,31 +1,31 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Land-Based Wind - Class 1 - Technology 1/Advanced,15.790192158004903,17.331662068887844,14.66305925268789,12.01952490849521,10.679956718343668,9.372459653247741,8.095790604999475,6.848746595242183,5.630161425741697,5.236541131691865,4.843148757712122,4.449971147983476,4.056994688044732,3.6642052819531514,3.2715883280783196,2.879128693435856,2.4868106864579005,2.0946180280845965,1.7025338210577914,1.3105405172887181,0.9186198831424122,0.5267529625044851,0.13492003744422476,-0.25689941369980573,-0.6487267610158938,-1.040584270711058,-1.4324951560375325,-1.8244836317117645,-2.216574972108173
-Land-Based Wind - Class 1 - Technology 1/Moderate,16.070948994846045,18.17112021929527,15.97685779013744,13.751822468033492,12.850100299987446,11.959838890916568,11.080686352221512,10.212293180094765,9.3543114051101,9.036985454977195,8.719859550202106,8.402924263269497,8.086169852571938,7.769586246951839,7.453163029338061,7.136889419409918,6.820754255225996,6.504745973738348,6.188852590117918,5.873061675809076,5.5573603352025245,5.241735180852377,4.926172307107311,4.610657262048104,4.295175017597202,3.979709937666147,3.664245744182079,3.348765480834434,3.0332514743553958
-Land-Based Wind - Class 1 - Technology 1/Conservative,16.314997469823485,19.178352448426708,17.661899406060986,16.048659598955485,15.809676044591413,15.572808017960863,15.338140744203002,15.105767095097075,14.875788424701245,14.615812679621659,14.356445950727643,14.097685810079756,13.83952985232715,13.581975696052261,13.325020985255186,13.068663390983325,12.81290061313161,12.557730382416459,12.303150462552317,12.04915865265098,11.79575278984808,11.542930752207461,11.29069046191005,11.039029888768866,10.787947054092704,10.537440034948464,10.287506968851673,10.038146058940107,9.789355579674865
-Land-Based Wind - Class 2 - Technology 1/Advanced,18.312625856666163,19.951826497285175,17.106786989586492,14.287269206577715,12.85446617697059,11.456569862221425,10.092229397600924,8.760138514761248,7.45903192371501,7.0443208546575455,6.629783203101759,6.21540558919903,5.801174158905301,5.387074560363725,4.973091918871361,4.559210810333262,4.145415233097452,3.731688578050626,3.3180135968508147,2.9043723681649283,2.490746261746505,2.0771159002157837,1.663461118347815,1.2497609196891588,0.8359934302896583,0.42213584932888537,0.00816439638723665,-0.40594574490447854,-0.8202204871314187
-Land-Based Wind - Class 2 - Technology 1/Moderate,18.621587490767542,20.866751865981684,18.535344387814416,16.168587622886424,15.209404684627245,14.262508107084546,13.327526796375842,12.404092501721028,11.491838938049629,11.15447444735177,10.817339227869926,10.480423683845128,10.143717901879373,9.807211635276403,9.470894287464255,9.134754894431993,8.7987821061161,8.462964166656977,8.127288893448277,7.79174365489925,7.456315346793172,7.120990367170258,6.785754589600749,6.450593334739683,6.11549134002631,5.780432727392359,5.445400968817253,5.110378849569383,4.77534842894325
-Land-Based Wind - Class 2 - Technology 1/Conservative,18.881708482294645,21.940318280047208,20.331359281736344,18.616689590853515,18.36389183008903,18.113419741629198,17.865368132716647,17.61984026207877,17.376948759624167,17.100711437224202,16.825139290821756,16.55023018521143,16.27598202640183,16.002392763867,15.729460392991108,15.457182957720818,15.185558553450562,14.914585330152711,14.644261495783027,14.374585319990793,14.105555138139913,13.83716935570304,13.569426453038755,13.302324990603324,13.035863614627317,12.770041063317255,12.504856173621135,12.24030788862489,11.976395265635642
-Land-Based Wind - Class 3 - Technology 1/Advanced,19.253289068002307,20.928619720548113,18.017512810127396,15.132140766735144,13.664346242819668,12.232538026055511,10.835323883818276,9.471357910652006,8.139336806590357,7.716876217165904,7.2945665203033485,6.8723942444314225,6.4503454379489185,6.02840564531326,5.606559881694974,5.184792606099865,4.7630876928508386,4.341428401307528,3.9197973436985087,3.498176450932366,3.0765469362197315,2.6548892563678876,2.23318307054992,1.8114071963665879,1.3895395629852239,0.9675571611309302,0.5454359896780119,0.12315099856990486,-0.29932397222897933
-Land-Based Wind - Class 3 - Technology 1/Moderate,19.573078475038397,21.872331140676465,19.48976303042488,17.070138454029003,16.08952033203282,15.121496553485446,14.165688860159612,13.221722007898787,12.28922287915876,11.944383205005561,11.599783704491596,11.255414719096326,10.911266271336938,10.567328049034074,10.223589388654922,9.880039257664585,9.53666623582253,9.19345849534239,8.850403779839006,8.507489381981529,8.164702119733974,7.822028311114487,7.479453747333814,7.136963664208203,6.794542711705212,6.452174921488208,6.109843672296083,5.767531652995899,5.42522082311697
-Land-Based Wind - Class 3 - Technology 1/Conservative,19.839195163178747,22.970642879888864,21.32717543076704,19.57466830423655,19.31671728758497,19.061170335634817,18.80812583013948,18.557690904576777,18.309982395202223,18.027678848899814,17.746061428468938,17.465128107905397,17.184876909367812,16.905305905765942,16.62641322356457,16.348197045816462,16.07065561545373,15.793787238847727,15.517590289674466,15.242063213112353,14.967204530384798,14.693012843709141,14.419486841666664,14.146625305047408,13.87442711320299,13.602891250971599,13.332016816217788,13.061803028057952,12.792249235832362
-Land-Based Wind - Class 4 - Technology 1/Advanced,20.39380291927961,22.112709786800146,19.121301914299142,16.15591960408992,14.64553782306293,13.172467544647983,11.735265497748863,10.332536886012033,8.962931537717726,8.53115873636159,8.09950795065929,7.667965590980238,7.236517580560463,6.805149331231409,6.373845717693591,5.942591050233084,5.511369045771694,5.080162797128089,4.648954740360153,4.217726620055629,3.786459452397292,3.3551334858649042,2.9237281593703273,2.4922220576419782,2.0605928636395774,1.6288173077694843,1.1968711136459191,0.7647289401201895,0.3323643192773069
-Land-Based Wind - Class 4 - Technology 1/Moderate,20.72694627227308,23.09179150532303,20.64718118256061,18.163444106759744,17.156831657280748,16.16318704018835,15.182123309094514,14.21325673901384,13.256205926699604,12.902301139360684,12.54864974696876,12.195242014892603,11.842067887934117,11.489116974503062,11.136378529863379,10.783841438381643,10.431494194713956,10.07932488384894,9.727321159930334,9.37547022377725,9.023758798983323,8.672173106523811,8.320698837733094,7.969321125543495,7.618024513846148,7.266792924836764,6.915609624181929,6.5644571838429755,6.213317442364918
-Land-Based Wind - Class 4 - Technology 1/Conservative,21.000333908176795,24.220111762000293,22.534796107502277,20.736403734295326,20.472203393039266,20.21050218250573,19.951402819237728,19.695017135601088,19.441467068864544,19.1518070467493,18.862858556300655,18.574619703942336,18.28708865268722,18.000263625134686,17.714142906710435,17.428724849160595,17.144007874335067,16.8599904782697,16.576671235608202,16.294048804392503,16.01212193123655,15.730889456948901,15.450350322621407,15.170503576241622,14.891348379865704,14.612884017420772,14.33510990318338,14.058025591010527,13.781630784389446
-Land-Based Wind - Class 5 - Technology 1/Advanced,21.847120340269637,23.62118991436497,20.52714465181337,17.45954677480017,15.894641562191282,14.368762407748147,12.88039957986198,11.428094638184948,10.01043641534746,9.566929783451126,9.123505926786816,8.680151093358667,8.2368510349309,7.793590982296404,7.350355619058831,6.907129053827987,6.463894790715663,6.020635698005599,5.577333974867734,5.1339711159779675,4.690527873868639,4.246984218867425,3.803319296417399,3.3595113815909485,2.9155378305722763,2.471375028876434,2.0269983360417747,1.58238202651469,1.1374992264175674
-Land-Based Wind - Class 5 - Technology 1/Moderate,22.197638786714602,24.646086749753998,22.12239889511338,19.556945548884382,18.51720134641038,17.490901016460636,16.477646538923445,15.477043379350373,14.488699573734817,14.123240608233754,13.758051889244822,13.393123585127935,13.028445541630955,12.664007265948364,12.299797909844415,11.935806251770245,11.572020677911247,11.208429162081103,10.845019244385718,10.481778008574594,10.118692057958768,9.755747489825268,9.39292986820811,9.030224194906445,8.667614878608909,8.30508570198619,7.9426197865855706,7.580199555363386,7.217806692660684
-Land-Based Wind - Class 5 - Technology 1/Conservative,22.480293800106583,25.812655150725398,24.074000766663243,22.2171241468449,21.944958564736986,21.675413282246407,21.408596540935925,21.14462616226262,20.883630585125683,20.584594173499948,20.286301675164236,19.988751365331904,19.69194158654518,19.395870752194718,19.100537350313495,18.80593994766045,18.512077194129773,18.218947827499264,17.926550678561235,17.63488467666842,17.343948855712192,17.053742360603835,16.764264454279168,16.47551452528935,16.18749209601905,15.900196831607037,15.613628549621069,15.327787230570607,15.0426730293302
-Land-Based Wind - Class 6 - Technology 1/Advanced,24.313672356432686,26.180427761130602,22.911386916772866,19.66964175919357,18.01154589870027,16.395452894563977,14.819736479536687,13.282826670370365,11.783205451931064,11.320121676429178,10.857047970606434,10.393970272590995,9.930874008651958,9.467744067673522,9.004564774093325,8.54131985920047,8.077992430676762,7.614564940250684,7.151019149329148,6.687336092464559,6.223496038474352,5.7594784490674265,5.29526193476153,4.830824207898971,4.3661420325260245,3.901191170896084,3.435946326324448,2.9703810821030814,2.504467836154724
-Land-Based Wind - Class 6 - Technology 1/Moderate,24.694599835090568,27.284989610080196,24.627042884218927,21.922850581835565,20.826854854395975,19.745111226672503,18.677202877440187,17.62271691980249,16.581243459556024,16.19616765876574,15.811390715296024,15.426902632803841,15.042693088861757,14.658751418819712,14.275066598718766,13.891627227185495,13.508421506242236,13.125437220948506,12.742661717795059,12.36008188176929,11.977684111964784,11.595454295669093,11.21337778078399,10.831439346468997,10.449623171864175,10.067912802752804,9.686291115994557,9.304740281563056,8.923241721989879
-Land-Based Wind - Class 6 - Technology 1/Conservative,24.992989123581918,28.51649621229855,26.687282633310364,24.731110692207455,24.445421619667158,24.162558568883693,23.88263916187084,23.605791388443432,23.33215472605414,23.017198957287423,22.703042079755686,22.389682655245803,22.077119331107202,21.76535084465832,21.454376027921718,21.144193812707762,20.834803236087247,20.526203446270593,20.218393708942585,19.911373414091003,19.60514208335062,19.299699377942297,18.995045107232766,18.691179237986532,18.388101904358784,18.085813418714377,17.78431428333421,17.483605203103885,17.183687099269225
-Land-Based Wind - Class 7 - Technology 1/Advanced,28.242944638683642,30.254920511189603,26.705031396786136,23.184135663912553,21.375894038277302,19.614572932319394,17.898350359538675,16.225469154980768,14.594232151100545,14.100829586787068,13.607306032001421,13.113646827830774,12.619836778063192,12.125860122366554,11.631700507852045,11.13734095890905,10.64276384519183,10.147950847617032,9.652882922231768,9.157540261802126,8.661902254926382,8.165947442523148,7.669653471463352,7.172997045143841,6.675953870754636,6.178498602986657,5.6806047838915,5.1822447785862735,4.6833897064631
-Land-Based Wind - Class 7 - Technology 1/Moderate,28.674708082536316,31.71447467153095,29.047250164899754,26.305618720974262,25.32038847560318,24.34917807873403,23.391659951850528,22.447514758599407,21.516431026397054,21.0210528136337,20.525958585080968,20.031132541111123,19.53655833721623,19.042219056580876,18.54809718100688,18.054174560066123,17.56043237836311,17.066851120763758,16.57341053544345,16.080089594602697,15.586866452650732,15.093718401699867,14.600621824139008,14.10755214207368,13.614483763383994,13.121390024135646,12.628243127051562,12.135014075729238,11.641672604254207
-Land-Based Wind - Class 7 - Technology 1/Conservative,28.998177505189705,32.826367251716285,30.85280404467073,28.738357256855824,28.43111199871185,28.127020679487973,27.826215873458132,27.528841778604995,27.2350554676249,26.89472454745454,26.555280152314513,26.216721300783586,25.87904712606832,25.54225688182172,25.206349948379483,24.871325839436757,24.53718420921654,24.20392486015095,23.87154775113514,23.540053006400335,23.209440925035054,22.879711991247575,22.55086688540518,22.222906495933422,21.895831932137995,21.56964453804982,21.244345907369436,20.919937899624074,20.596422657641103
-Land-Based Wind - Class 8 - Technology 2/Advanced,36.77398879448509,39.01120359537432,34.57797732610739,30.20127763048107,27.863747851102758,25.588406010745754,23.372760881924506,21.214409140397375,19.111028542552692,18.545931730453656,17.98105310090065,17.416376351944226,16.851884598789614,16.287560344544865,15.72338544919998,15.159341096719572,14.595407760108827,14.031565164307366,13.467792246749383,12.904067115431332,12.340367004267442,11.776668225572102,11.212946119412873,10.649174999614772,10.085328096139712,9.521377493565925,8.957294065348975,8.39304740352614,7.8286057434917
-Land-Based Wind - Class 8 - Technology 2/Moderate,37.30879759503301,40.77657610158989,37.38696445391801,33.921034803629325,32.54762084759116,31.19273862230649,29.8558898674385,28.536583591371507,27.234335109778396,26.75096393473967,26.268041717898793,25.785557822168602,25.303501274433092,24.8218607487984,24.340624548858422,23.85978058889721,23.379316373961757,22.89921897871654,22.419475024998512,21.940070657986425,21.46099152084993,20.9822227278135,20.50374883547617,20.02555381228241,19.54762100598029,19.069933108930254,18.59247212108705,18.115219310471474,17.63815517093433
-Land-Based Wind - Class 8 - Technology 2/Conservative,37.68667360913503,42.2681716765489,39.86466742206973,37.2896465862062,36.879149357256495,36.472360892755916,36.069427961008174,35.67051021903775,35.27578159435812,34.88507096320389,34.49544262630759,34.10689708526046,33.71943503770116,33.333057387152735,32.94776525351535,32.56355998427575,32.18044316648323,31.79841663955576,31.41748250897851,31.037643160988132,30.658901278271685,30.281259856833557,29.904722224071246,29.529292058194414,29.154973409083105,28.781770720724463,28.409688855357672,28.038733119478202,27.668909291873565
-Land-Based Wind - Class 9 - Technology 3/Advanced,40.58972929458375,43.29002264260896,39.308268919890594,35.31779397726169,33.39538683480435,31.526041946069487,29.70779806785535,27.938774836960416,26.217167977839157,25.554273831135415,24.891718819801245,24.22948607932319,23.567558150569223,22.90591694987952,22.244543737351826,21.583419083190137,20.92252283198416,20.26183406476096,19.60133105865158,18.940991244003165,18.280791158715118,17.620706399633775,16.96071157074255,16.30078022792135,15.640884819996096,14.980996625790706,14.321085686860037,13.66112073555432,13.001069118032927
-Land-Based Wind - Class 9 - Technology 3/Moderate,41.170512661819004,44.822714620288835,41.646559059819424,38.37371347008772,37.19558129495591,36.03454282328471,34.89021762422136,33.762236203320725,32.650239647449254,32.1112749287318,31.572852942446875,31.03496294418839,30.497593858616145,29.960734262927218,29.424372369350337,28.88849600659357,28.353092600179835,27.818149151576257,27.283652216045276,26.74958787912813,26.215941731627588,25.68269884302854,25.149843733199678,24.617360342266622,24.08523199850712,23.553441384120728,23.021970498706494,22.49080062026534,21.959912263531375
-Land-Based Wind - Class 9 - Technology 3/Conservative,41.57272277086231,46.277020269416,44.03139217510268,41.599812369155146,41.333640773321264,41.07197893665149,40.81504290232608,40.56306720594034,40.31630684648802,39.88424077968338,39.453328629595745,39.02356975827021,38.59496369358041,38.16751013741033,37.74120897439888,37.31606028128572,36.89206433691108,36.46922163291667,36.04753288520458,35.62699904623549,35.20762131818757,34.789401167107705,34.37234033809709,33.95644087163572,33.5417051211375,33.12813577185322,32.71573586122831,32.30450880085722,31.89445840016882
-Land-Based Wind - Class 10 - Technology 4/Advanced,75.23812406879857,78.72162213577963,70.78769570972226,62.99478906191271,58.66295087510413,54.45762104906926,50.37346760043366,46.405363292433165,42.54837028168633,41.66605255970272,40.784154255097434,39.90265183501643,39.021520924311346,38.14073626281092,37.26027165998549,36.38009994681912,35.50019292469907,34.62052131108317,33.741054681721096,32.86176140918651,31.982608597386452,31.103562011814752,30.22458600516369,29.345643437960405,28.46669559381749,27.587702088886235,26.708620775030376,25.829407636209076,24.95001667751789
-Land-Based Wind - Class 10 - Technology 4/Moderate,76.28241533177939,81.75179225147825,75.4542356441802,69.06612215354596,66.20686931014073,63.38323490951964,60.59406024439141,57.838189438261026,55.11446618158496,54.36702857758323,53.62042858521336,52.874653445289255,52.12969001964487,51.38552477192481,50.642143747230875,49.89953255053952,49.15767632381028,48.4165597216777,47.6761668856334,46.93648141660889,46.197486345772624,45.45916410349651,44.72149648628893,43.98446462156712,43.248048930087165,42.51222908586182,41.776983973361716,41.04229164177959,40.30812925612372
-Land-Based Wind - Class 10 - Technology 4/Conservative,76.9058785261401,84.78891054834591,80.63612657027174,76.17307340871672,75.408420373448,74.65030000194741,73.89895980073993,73.15466881011135,72.41771988533422,71.78595682327942,71.15614812730186,70.52829968436302,69.9024178966032,69.27850970679052,68.65658262539311,68.03664475939794,67.41870484301468,66.80277227039964,66.18885713055212,65.57697024458696,64.96712320548932,64.35932842065102,63.75359915733647,63.14994959135179,62.548394859157156,61.94895111373695,61.351635584518824,60.756466641696996,60.16346386534224
+Land-Based Wind - Class 1 - Technology 1/Advanced,15.791925807329193,17.33326819081896,14.664533108314245,12.020897448038944,10.681259670702314,9.373694448904661,8.096958607043714,6.849849100749513,5.631199666939281,5.237041568833789,4.843112408541398,4.449399373181393,4.0558892167225515,3.662568238987319,3.2694222634336896,2.87643661363499,2.483596088365932,2.0908849351965593,1.6982868224909033,1.3057848096994853,0.9133613158104374,0.5209980858448695,0.1286761552360396,-0.26362418805506493,-0.6559234438628181,-1.048242942759309,-1.4406048918192944,-1.8330324234255642,-2.225549647352249
+Land-Based Wind - Class 1 - Technology 1/Moderate,16.072700494619532,18.17277010591695,15.97839966604635,13.753286940309685,12.85151839125238,11.961211103798558,11.082013168632276,10.213575061115876,9.355548790816908,9.037584490126214,8.719815842149831,8.402233501760566,8.084827820807412,7.767588833569935,7.450506241382726,7.133569396370003,6.816767284232782,6.500088506019765,6.1835212588153325,5.867053315271335,5.550672001885101,5.234364175958454,4.918116201122373,4.601913921333221,4.2857426332216555,3.9695870566781686,3.6534313035348553,3.3372588442062217,3.0210524721263177
+Land-Based Wind - Class 1 - Technology 1/Conservative,16.31676448613773,19.18006053749345,17.663540337304525,16.050264499915095,15.811276213170483,15.574403794805736,15.339732489700989,15.107355191101263,14.877373276443617,14.616584141213075,14.3563893439493,14.096786003452536,13.837771241597508,13.579342183581446,13.321495958235595,13.064229698400847,12.807540541382735,12.551425629484598,12.29588211063821,12.040907139141382,11.786497876500487,11.532651492413596,11.279365165891623,11.026636086544205,10.774461456038033,10.522838489762012,10.271764418709381,10.021236491612147,9.77125197734993
+Land-Based Wind - Class 2 - Technology 1/Advanced,18.314519881691666,19.953577238262337,17.10839695223629,14.288772513806826,12.855895095748526,11.45792595769252,10.093514162005928,8.761353369011026,7.460178218732345,7.0448738692261905,6.629742997762364,6.214772550127787,5.799949023165681,5.385258443012944,4.970686342068362,4.556217734608616,4.14183709095737,3.727528310105015,3.3132746906713457,2.899058900096623,2.4848629419191433,2.0706681210217326,1.6564550066790638,1.2422033932535612,0.8278922583560799,0.41349971828530485,-0.0009970194677464406,-0.4156217068751751,-0.8303991094361187
+Land-Based Wind - Class 2 - Technology 1/Moderate,18.623501159496172,20.86855036785315,18.537028423001352,16.17019093186577,15.210958750812896,14.264013472788353,13.328983982165251,12.405502006320802,11.493201238178866,11.155134281555014,10.817291059148818,10.479662026650836,10.142237332077919,9.80500680097807,9.46795992078983,9.131085824296076,8.794373272112345,8.457810634140664,8.12138586991908,7.785086507795313,7.448899622821106,7.112811813303971,6.776809175896837,6.440877279130323,6.105001135265958,5.7691651703522595,5.433353192339968,5.097548357116917,4.761733132295777
+Land-Based Wind - Class 2 - Technology 1/Conservative,18.8836386894506,21.942178817453705,20.333148895832814,18.61844257685246,18.36563996481574,18.115163394745775,17.8671076952628,17.621576148332956,17.378681409167402,17.101555053510758,16.825077373891762,16.549245715629354,16.274057442625427,15.999509938338718,15.725600606863445,15.452326874120995,15.17968618917864,14.907676025701974,14.636293883560441,14.365537290603157,14.095403804603617,13.825891015418268,13.556996547358072,13.288718061807632,13.021053260104992,12.753999886724191,12.48755573277736,12.221718639880674,11.956486504414602
+Land-Based Wind - Class 3 - Technology 1/Advanced,19.255242900158606,20.930424375280683,18.019173496996082,15.13369279281605,13.665822076864654,12.233939284586445,10.836652108341763,9.472614569308256,8.140523295564165,7.7174487923202975,7.294524880134013,6.8717384064791425,6.449075763958373,6.0265228682506695,5.604065134772178,5.181687453966205,4.7593741651259975,4.33710902864642,3.9148751965954247,3.4926551814893436,3.0704308231270474,2.64818325336503,2.225892858661865,1.8035392402376154,1.3811011716624861,0.9585565536846801,0.5358823660820526,0.11305461630743707,-0.3099517153226756
+Land-Based Wind - Class 3 - Technology 1/Moderate,19.575052639324902,21.874185082027306,19.49150009675347,17.07179355469563,16.09112512234552,15.123051590559644,14.167194678982906,13.223179121238367,12.290631777403316,11.945065719707053,11.599733871761192,11.254626614953338,10.90973402126275,10.56504583837205,10.220551473928097,9.876239978890535,9.532100029909039,9.188119910658394,8.844287492062342,8.50059021133351,8.157015049724023,7.8135485089263454,7.4701765859995675,7.1268847467296155,6.783657897296834,6.4404803541347135,6.097335811834043,5.75420730895166,5.411077191555577
+Land-Based Wind - Class 3 - Technology 1/Conservative,19.84118624709747,22.972560286671825,21.329020509561587,19.576476531924996,19.318520619649785,19.062969152562157,18.809920534403627,18.559481922552166,18.311770179283425,18.028549381796466,17.745997530638302,17.4641120556281,17.18289041095401,16.90233007641654,16.62242855879427,16.343183393339086,16.064592145418374,15.786652412308825,15.509361825167154,15.232718051191824,14.95671879598024,14.68136180612478,14.406644872051228,14.132565831135285,13.859122571112593,13.586313033827214,13.314135219338255,13.042587190431544,12.771667077570708
+Land-Based Wind - Class 4 - Technology 1/Advanced,20.39582926502021,22.114579796963834,19.12302407833127,16.157530665569574,14.647070496221449,13.17392350915149,11.736646355645231,10.333844163473309,8.96416668653745,8.531754994091322,8.099464573150826,7.667282145037554,7.235193968983204,6.803185819722181,6.371242963777647,5.939350134352857,5.5074915047305275,5.075650660075684,4.643810567528515,4.21195354447206,3.780061224824486,3.3481145232385003,2.916093597031292,2.4839778056887347,2.051745667755174,1.6193748149141705,1.186841943042534,0.754122760001831,0.3211919299136454
+Land-Based Wind - Class 4 - Technology 1/Moderate,20.728993799184416,23.09371267782058,20.648982559458204,18.165162014915985,17.158497960458757,16.16480231345574,15.183688104926116,14.214771587206023,13.257671334218092,12.903011158575609,12.548597896303587,12.194421838682779,11.840472965482107,11.48674092995735,11.133215042992298,10.77988425632007,10.42673714476534,10.073761887435737,9.72094624779303,9.368277552530373,9.015742669150217,8.663327982179908,8.311019367902212,7.9588021675047,7.606661158523703,7.254580524463449,6.9025438224437075,6.550533948734312,6.198533102007126
+Land-Based Wind - Class 4 - Technology 1/Conservative,21.00239881700538,24.22209813395816,22.536708448026104,20.738278953271795,20.47407366260742,20.212367896277986,19.95326439355502,19.696875011506556,19.443321714291717,19.152710221268542,18.862792256242887,18.573565351507106,18.285027070738778,17.997175010571347,17.71000680230835,17.42352011378632,17.137712651408798,16.852582162355283,16.568126436993516,16.284343311510483,16.001230670768553,15.71878645143293,15.437008645375965,15.155895303396793,14.875444539274305,14.595654534202179,14.316523541628278,14.03804989254969,13.760232001301329
+Land-Based Wind - Class 5 - Technology 1/Advanced,21.849239087566957,23.62314318455412,20.528945116331897,17.461233008911883,15.896246594255718,14.370287999253133,12.88184741129108,11.42946631088327,10.01173345313273,9.567556165523797,9.12346033914022,8.679432522461124,8.235458792618061,7.791524732533649,7.34761540672352,6.903715335675482,6.459808468705003,6.015878155179092,5.57190711399527,5.127877401194777,4.683770375559082,4.2395666620678725,3.795246113038811,3.350787766789445,2.906169803627037,2.4613694989696064,2.016363173372767,1.5711261392238889,1.1256326438420174
+Land-Based Wind - Class 5 - Technology 1/Moderate,22.199779819886743,24.64809361347581,22.124282240736214,19.558743509976544,18.51894605242688,17.492593065350537,16.47928650545038,15.478631815015696,14.490237006632949,14.12398568404884,13.757997466567868,13.392262530622766,13.026770738453315,12.66151162296108,12.296474371697947,11.931647809925256,11.567020382683957,11.202580135802883,10.838314695775196,10.474211248428844,10.110256516283268,9.746436734530295,9.382737625513723,9.019144371611258,8.655641586392608,8.292213283933378,7.928842846136021,7.565512987914985,7.20220572007425
+Land-Based Wind - Class 5 - Technology 1/Conservative,22.482452804413505,25.81472942405873,24.07599883739116,22.219084751327465,21.946914151258557,21.67736426114981,21.4105433462362,21.14656925369931,20.885570450437886,20.58553895225679,20.286232313284774,19.98764819642419,19.689784304905125,19.39263838427395,19.096208224550224,18.800491662559946,18.50548658446796,18.2111909285164,17.91760268799952,17.624719914493113,17.33254072134638,17.04106328748689,16.750285861545994,16.460206766347238,16.17082440377891,15.88213726010402,15.594143911733724,15.30684303152081,15.020233395615808
+Land-Based Wind - Class 6 - Technology 1/Advanced,24.31594792648788,26.182522287544746,22.913320175183678,19.671455436688476,18.013273560196456,16.39709644392857,14.821297733704089,13.284307361428162,11.784607228934423,11.320799048297296,10.856998641382742,10.393192228581881,9.92936554305151,9.4655038070686,9.001591707001047,8.53761336680429,8.073552319939747,7.609391479603264,7.145113107145523,6.680698778560178,6.216129348881434,5.751384914366227,5.286444772273303,4.821287378074953,4.3558902998984586,3.8902301699934476,3.4242826329917655,2.9580222907117957,2.4914226432353317
+Land-Based Wind - Class 6 - Technology 1/Moderate,24.696899624419217,27.287141961486956,24.629065397419005,21.924784457852724,20.828732673780404,19.746933626221686,18.67897046976,17.624430293245283,16.582903178088788,16.19697225413659,15.811331925823733,15.425972174592452,15.04088266314001,14.656052720029045,14.271471323416868,13.88712708383942,13.503008225989134,13.119102569412377,12.735397508055065,12.351879988582496,11.968536487360051,11.58535298603572,11.202314945593695,10.819407278782226,10.43661432078634,10.053919798023468,9.67130679490986,9.288757718452349,8.906254260490403
+Land-Based Wind - Class 6 - Technology 1/Conservative,24.99530788442661,28.51871972574052,26.68942625790369,24.73321626532264,24.44752205843169,24.164654312045545,23.88473067345237,23.607879159927172,23.334239278805338,23.018214372264772,22.702967519475177,22.388496605090573,22.07479956927503,21.76187441040109,21.449719187958742,21.138332025686392,20.827711114949985,20.517854718380256,20.20876117380282,19.900428898483355,19.592856393699055,19.286042249693683,18.979985151027375,18.674683882370307,18.37013733476671,18.066344512430252,17.763304540103462,17.46101667104617,17.15948029570426
+Land-Based Wind - Class 7 - Technology 1/Advanced,28.245470030883965,30.25723992778553,26.707175947825995,23.186152001925045,21.37781659195328,19.616403841575366,17.900091667422647,16.22712281013831,14.595800009941097,14.10158783270446,13.607250766779455,13.112774405354465,12.618143828486922,12.123343578178435,11.62835763198985,11.133169375097875,10.637761570686237,10.142116328549832,9.646215071789094,9.150038501463108,8.653566559031415,8.156778386455919,7.659652283761275,7.162165663880792,6.664295004572793,6.1660157971918,5.667302492066177,5.168128440220624,4.668465831153725
+Land-Based Wind - Class 7 - Technology 1/Moderate,28.677260926147994,31.7168738688931,29.04952358811623,26.30781258060364,25.322536254623554,24.35128049502355,23.39371771126657,22.4495285557198,21.518401545283606,21.022006426910586,20.525889031631653,20.030033750531523,19.534424451913992,19.039044455686614,18.54387650624875,18.04890274377424,17.554104673781637,17.05946313486902,16.564958264482904,16.07056946258775,15.576275353063163,15.082053742690956,14.58788157753089,14.09373489650105,13.599588781946743,13.105417306970875,12.611193479272721,12.116889181225485,11.622475105893582
+Land-Based Wind - Class 7 - Technology 1/Conservative,29.000750914906057,32.828828651042656,30.855179679347074,28.74069390720414,28.433443329186627,28.129347174114432,27.828538044089715,27.531160167321964,27.237370649391966,26.895852555219022,26.555197305881958,26.21540313950191,25.876468373911443,25.538391410483072,25.2011707382378,24.864804938246724,24.5292926883606,24.19463276827934,23.860824065004998,23.527865578705985,23.19575642900936,22.864495861788843,22.534083256466868,22.20451813388831,21.875800164802605,21.54792917902694,21.22090517533352,20.89472833213988,20.569399019067237
+Land-Based Wind - Class 8 - Technology 2/Advanced,36.777155435999695,39.01408610683568,34.58063460916787,30.20376916145078,27.866111098026845,25.590643907780827,23.37487622162283,21.216404576966085,19.112906594643537,18.54684013545304,17.98098687975641,17.41533078021186,16.849855232278756,16.284543047007155,15.719376422227057,15.15433691203582,14.589405394457494,14.024562037149813,13.45978626101629,12.895056701585027,12.330351167962963,11.765646599227242,11.200919018030259,10.636143481230729,10.071294027310834,9.506343620345636,8.941264090249874,8.376026069014195,7.810598922613664
+Land-Based Wind - Class 8 - Technology 2/Moderate,37.311999129047116,40.779559677349326,37.38978454864967,33.9237500360447,32.55026722653518,31.195317009371703,29.858401097282854,28.539028471909646,27.236714422311298,26.752118889598457,26.26795721487151,25.784218545874367,25.300891694418937,24.817965120045393,24.335426912744985,23.853264774673857,23.371466000793028,22.890017458356184,22.408905565168865,21.928116266538083,21.447635010791476,20.967446723304118,20.48753577888849,20.007885972452133,19.528480487771816,19.049301864262393,18.570331961576983,18.091551921873265,17.6129421295679
+Land-Based Wind - Class 8 - Technology 2/Conservative,37.68989979689195,42.27124025834662,39.86763028873935,37.29256306226461,36.88205576162785,36.4752577695057,36.072315884627415,35.67338979705983,35.27865347025703,34.886470878645916,34.4953397593779,34.105259567795336,33.71622990764726,33.32825053818886,32.94132138174718,32.55544253180008,32.17061426159694,31.786837033370773,31.40411150818271,31.02243855646619,30.64181926928268,30.26225497040821,29.88374722926721,29.506297874813537,29.129909010419134,28.754583029871238,28.38032263456312,28.00713085198208,27.635011055614353
+Land-Based Wind - Class 9 - Technology 3/Advanced,40.59287813613056,43.29293185702612,39.3109946875004,35.32039509954385,33.397900203195576,31.528469885619334,29.710142817393166,27.94103855263446,26.21935273645278,25.555331506312207,24.891641648006708,24.228266478729225,23.565188744203986,22.902390590715044,22.239853535492927,21.57755843534453,20.915485453406454,20.2536140238849,19.591922814643524,18.93038968748909,18.268991655962896,17.607704840493543,16.946504420681205,16.28536458451833,15.624258474303346,14.963158129000877,14.30203442277017,13.640856999361699,12.979594202055512
+Land-Based Wind - Class 9 - Technology 3/Moderate,41.173696945920376,44.82569660825233,41.64939282017737,38.376457423789084,37.1982711917412,36.03717953974932,34.89280202395834,33.76476913789228,32.65272195739314,32.11248009569799,31.57276474944661,31.03356492319581,30.494869289130413,29.95666617086149,29.418943526290548,28.881688929475356,28.344889551433205,27.80853213979755,27.272602997260165,26.737087958714092,26.20197236697734,25.667241047038186,25.13287827867929,24.59886776737942,24.065192613354803,23.53183527860696,22.99877755182328,22.466000510963926,21.933484483357926
+Land-Based Wind - Class 9 - Technology 3/Conservative,41.57593160000843,46.28008427211151,44.0343631463153,41.60274956253552,41.33658035606119,41.07492161282363,40.817989417751264,40.56601835174255,40.31926346303047,39.88568159580389,39.45322278767233,39.02188537550776,38.5916678161284,38.16256869187852,37.734586716592744,37.307720741970144,36.88196976439067,36.45733293220889,36.0338095535613,35.611399104744066,35.19010123916779,34.769915796987874,34.350842815430624,33.932882539887345,33.51603543583502,33.10030220166503,32.685683782485434,32.272181384994425,31.85979649351083
+Land-Based Wind - Class 10 - Technology 4/Advanced,75.24399676733105,78.72690736749122,70.7925655572264,62.99935728137578,58.66726898380614,54.46169533680877,50.377304041569204,46.4089675541977,42.55174773141759,41.667688580051085,40.78403481425126,39.90076307398897,39.017849186995875,38.135268128694726,37.252993979753576,36.37099988110208,35.48925798623743,34.60773941061243,33.72641417790802,32.84525116297564,31.964218031158065,31.083281173786002,30.202405639513554,29.32155506120321,28.44069157800309,27.559775752263807,26.678766480876362,25.79762090059256,24.91629428685714
+Land-Based Wind - Class 10 - Technology 4/Moderate,76.28835825953398,81.75725037953741,75.4593728974875,69.07104957584987,66.21163458763216,63.3878395150448,60.598505563646825,57.842476767820216,55.118596726527684,54.36903597702065,53.620281534932374,52.872319982550735,52.125137507238044,51.37871988191209,50.63305244439334,49.88812007553756,49.143907176071316,48.400397642032175,47.657574838722766,46.91542157308832,46.173920064346405,45.433051912819565,44.69279806678125,43.953138787192344,43.21405361015547,42.47552130692729,41.73751984129438,41.000026324104496,40.26301696473533
+Land-Based Wind - Class 10 - Technology 4/Conservative,76.91186338217342,84.79455422925344,80.64158619154982,76.17846140035398,75.41378543036544,74.65564301651472,73.90428171339532,73.15997061345286,72.42300262864612,71.78853390263379,71.15595861463558,70.52528050243716,69.89650371914755,69.26963285286878,68.64467294758968,68.02162952539582,67.40050861009277,66.78131675234579,66.16406105644452,65.54874920884328,64.93538950854557,64.32399089956255,63.714563005541876,63.107116166769586,62.501661479710556,61.89821083932269,61.29677698434366,60.69737354580688,60.100015099061224
diff --git a/tests/data/Land-Based_Wind/Market/20/df_tc.csv b/tests/data/Land-Based_Wind/Market/20/df_tc.csv
index 0d89f84..8a31294 100644
--- a/tests/data/Land-Based_Wind/Market/20/df_tc.csv
+++ b/tests/data/Land-Based_Wind/Market/20/df_tc.csv
@@ -1,31 +1,31 @@
 Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-10 year CRF/Advanced,0.12735376406238905,0.12810919820253852,0.12894790384654953,0.12949963144515403,0.1297209552854976,0.12995088556384843,0.13018993378390603,0.13043865276528402,0.1306976408972293,0.1307975282712223,0.13089937236464677,0.1310032312042341,0.13110916513251955,0.13121723692446208,0.1313275119111783,0.13144005811129691,0.13155494637050372,0.13167225050985193,0.13179204748350742,0.13191441754665498,0.13203944443425455,0.1321672155515916,0.13229782217744518,0.13243135968090727,0.13256792775290685,0.1327076306536393,0.1328505774771726,0.13299688243464383,0.13314666515758555
-10 year CRF/Moderate,0.12735376406238905,0.12810919820253852,0.12894790384654953,0.12949963144515403,0.1297209552854976,0.12995088556384843,0.13018993378390603,0.13043865276528402,0.1306976408972293,0.1307975282712223,0.13089937236464677,0.1310032312042341,0.13110916513251955,0.13121723692446208,0.1313275119111783,0.13144005811129691,0.13155494637050372,0.13167225050985193,0.13179204748350742,0.13191441754665498,0.13203944443425455,0.1321672155515916,0.13229782217744518,0.13243135968090727,0.13256792775290685,0.1327076306536393,0.1328505774771726,0.13299688243464383,0.13314666515758555
-10 year CRF/Conservative,0.12735376406238905,0.12810919820253852,0.12894790384654953,0.12949963144515403,0.1297209552854976,0.12995088556384843,0.13018993378390603,0.13043865276528402,0.1306976408972293,0.1307975282712223,0.13089937236464677,0.1310032312042341,0.13110916513251955,0.13121723692446208,0.1313275119111783,0.13144005811129691,0.13155494637050372,0.13167225050985193,0.13179204748350742,0.13191441754665498,0.13203944443425455,0.1321672155515916,0.13229782217744518,0.13243135968090727,0.13256792775290685,0.1327076306536393,0.1328505774771726,0.13299688243464383,0.13314666515758555
+10 year CRF/Advanced,0.1273590409765419,0.1281137319534173,0.1289525466627994,0.1295045010684045,0.12972585672986417,0.1299558200840618,0.13019490271022424,0.1304436575096646,0.1307026829601414,0.13080000928330002,0.13089918832411115,0.13100027345876547,0.1311033201323367,0.13120838595993717,0.13131553083386305,0.13142481703714687,0.1315363093639723,0.13165007524742808,0.13176618489514044,0.1318847114333716,0.1320057310601376,0.13212932320811346,0.13225557071797905,0.13238456002304086,0.1325163813459615,0.13265112890856515,0.13278890115571987,0.13292980099441967,0.13307393604928436
+10 year CRF/Moderate,0.1273590409765419,0.1281137319534173,0.1289525466627994,0.1295045010684045,0.12972585672986417,0.1299558200840618,0.13019490271022424,0.1304436575096646,0.1307026829601414,0.13080000928330002,0.13089918832411115,0.13100027345876547,0.1311033201323367,0.13120838595993717,0.13131553083386305,0.13142481703714687,0.1315363093639723,0.13165007524742808,0.13176618489514044,0.1318847114333716,0.1320057310601376,0.13212932320811346,0.13225557071797905,0.13238456002304086,0.1325163813459615,0.13265112890856515,0.13278890115571987,0.13292980099441967,0.13307393604928436
+10 year CRF/Conservative,0.1273590409765419,0.1281137319534173,0.1289525466627994,0.1295045010684045,0.12972585672986417,0.1299558200840618,0.13019490271022424,0.1304436575096646,0.1307026829601414,0.13080000928330002,0.13089918832411115,0.13100027345876547,0.1311033201323367,0.13120838595993717,0.13131553083386305,0.13142481703714687,0.1315363093639723,0.13165007524742808,0.13176618489514044,0.1318847114333716,0.1320057310601376,0.13212932320811346,0.13225557071797905,0.13238456002304086,0.1325163813459615,0.13265112890856515,0.13278890115571987,0.13292980099441967,0.13307393604928436
 ITC Schedule/*,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-PTC/Advanced,22.65848290375205,22.759918205390463,22.871741337746183,22.944848435917056,22.974074172043444,23.004375259844156,23.035811970858838,23.06844915091403,23.10235666083899,23.115413192394602,23.12871345017506,23.142264307049917,23.15607289612254,23.17014662313335,23.184493179577075,23.199120556582187,23.214037059606156,23.229251323999733,23.244772331503533,23.26060942774439,23.2767723407923,23.293271200869093,23.31011656127991,23.327319420663578,23.344891246655365,23.36284400107124,23.381190166725737,23.399942776009276,23.419115441360145
-PTC/Moderate,22.65848290375205,22.759918205390463,22.871741337746183,22.944848435917056,22.974074172043444,23.004375259844156,23.035811970858838,23.06844915091403,23.10235666083899,23.115413192394602,23.12871345017506,23.142264307049917,23.15607289612254,23.17014662313335,23.184493179577075,23.199120556582187,23.214037059606156,23.229251323999733,23.244772331503533,23.26060942774439,23.2767723407923,23.293271200869093,23.31011656127991,23.327319420663578,23.344891246655365,23.36284400107124,23.381190166725737,23.399942776009276,23.419115441360145
-PTC/Conservative,22.65848290375205,22.759918205390463,22.871741337746183,22.944848435917056,22.974074172043444,23.004375259844156,23.035811970858838,23.06844915091403,23.10235666083899,23.115413192394602,23.12871345017506,23.142264307049917,23.15607289612254,23.17014662313335,23.184493179577075,23.199120556582187,23.214037059606156,23.229251323999733,23.244772331503533,23.26060942774439,23.2767723407923,23.293271200869093,23.31011656127991,23.327319420663578,23.344891246655365,23.36284400107124,23.381190166725737,23.399942776009276,23.419115441360145
-PVD/Advanced,0.8208661102100666,0.8222405011013599,0.8206074233701499,0.8188284337154712,0.8181035755523601,0.8173523028366673,0.8165731452064288,0.8157645211300238,0.8149247271997729,0.8146014348828481,0.8142721536272319,0.8139367154850528,0.8135949461704516,0.813246664757798,0.8128916833625043,0.8125298068032627,0.8121608322443914,0.8117845488169813,0.8114007372173021,0.8110091692808032,0.8106096075302214,0.8102018046955577,0.8097855032041732,0.8093604346386432,0.8089263191600662,0.8084828648941413,0.8080297672772488,0.8075667083594282,0.8070933560609111
-PVD/Moderate,0.8208661102100666,0.8222405011013599,0.8206074233701499,0.8188284337154712,0.8181035755523601,0.8173523028366673,0.8165731452064288,0.8157645211300238,0.8149247271997729,0.8146014348828481,0.8142721536272319,0.8139367154850528,0.8135949461704516,0.813246664757798,0.8128916833625043,0.8125298068032627,0.8121608322443914,0.8117845488169813,0.8114007372173021,0.8110091692808032,0.8106096075302214,0.8102018046955577,0.8097855032041732,0.8093604346386432,0.8089263191600662,0.8084828648941413,0.8080297672772488,0.8075667083594282,0.8070933560609111
-PVD/Conservative,0.8208661102100666,0.8222405011013599,0.8206074233701499,0.8188284337154712,0.8181035755523601,0.8173523028366673,0.8165731452064288,0.8157645211300238,0.8149247271997729,0.8146014348828481,0.8142721536272319,0.8139367154850528,0.8135949461704516,0.813246664757798,0.8128916833625043,0.8125298068032627,0.8121608322443914,0.8117845488169813,0.8114007372173021,0.8110091692808032,0.8106096075302214,0.8102018046955577,0.8097855032041732,0.8093604346386432,0.8089263191600662,0.8084828648941413,0.8080297672772488,0.8075667083594282,0.8070933560609111
-PFF/Advanced,1.0620913859842833,1.0616149946357527,1.0621810520125552,1.0627976853779122,1.0630489357026967,1.0633093418392698,1.0635794134444725,1.063859698708769,1.064150788067302,1.0642628476449703,1.0643769831084708,1.0644932526718924,1.0646117167461968,1.0647324380438228,1.0648554816893232,1.0649809153364398,1.0651088092920733,1.0652392366476018,1.0653722734180804,1.065507998689902,1.065646494777432,1.0657878473893934,1.0659321458056097,1.066079483064925,1.0662299561650943,1.0663836662755832,1.0665407189642284,1.0667012244388407,1.0668652978049036
-PFF/Moderate,1.0620913859842833,1.0616149946357527,1.0621810520125552,1.0627976853779122,1.0630489357026967,1.0633093418392698,1.0635794134444725,1.063859698708769,1.064150788067302,1.0642628476449703,1.0643769831084708,1.0644932526718924,1.0646117167461968,1.0647324380438228,1.0648554816893232,1.0649809153364398,1.0651088092920733,1.0652392366476018,1.0653722734180804,1.065507998689902,1.065646494777432,1.0657878473893934,1.0659321458056097,1.066079483064925,1.0662299561650943,1.0663836662755832,1.0665407189642284,1.0667012244388407,1.0668652978049036
-PFF/Conservative,1.0620913859842833,1.0616149946357527,1.0621810520125552,1.0627976853779122,1.0630489357026967,1.0633093418392698,1.0635794134444725,1.063859698708769,1.064150788067302,1.0642628476449703,1.0643769831084708,1.0644932526718924,1.0646117167461968,1.0647324380438228,1.0648554816893232,1.0649809153364398,1.0651088092920733,1.0652392366476018,1.0653722734180804,1.065507998689902,1.065646494777432,1.0657878473893934,1.0659321458056097,1.066079483064925,1.0662299561650943,1.0663836662755832,1.0665407189642284,1.0667012244388407,1.0668652978049036
+PTC/Advanced,22.65919381153435,22.76052492400891,22.872358038243178,22.94549208937042,22.974720752600863,23.005024867440742,23.0364647105396,23.069105133179576,23.103016002020194,23.115737342884678,23.12868942649278,23.14187857354689,23.155311337168477,23.168994513652677,23.18293515382416,23.197140575032858,23.21161837383398,23.226376439394883,23.241422967680947,23.256766476474333,23.27241582127476,23.288380212156373,23.30466923163723,23.321292853638642,23.338261463609008,23.35558587989939,23.373277376479685,23.391347707095566,23.409809130973105
+PTC/Moderate,22.65919381153435,22.76052492400891,22.872358038243178,22.94549208937042,22.974720752600863,23.005024867440742,23.0364647105396,23.069105133179576,23.103016002020194,23.115737342884678,23.12868942649278,23.14187857354689,23.155311337168477,23.168994513652677,23.18293515382416,23.197140575032858,23.21161837383398,23.226376439394883,23.241422967680947,23.256766476474333,23.27241582127476,23.288380212156373,23.30466923163723,23.321292853638642,23.338261463609008,23.35558587989939,23.373277376479685,23.391347707095566,23.409809130973105
+PTC/Conservative,22.65919381153435,22.76052492400891,22.872358038243178,22.94549208937042,22.974720752600863,23.005024867440742,23.0364647105396,23.069105133179576,23.103016002020194,23.115737342884678,23.12868942649278,23.14187857354689,23.155311337168477,23.168994513652677,23.18293515382416,23.197140575032858,23.21161837383398,23.226376439394883,23.241422967680947,23.256766476474333,23.27241582127476,23.288380212156373,23.30466923163723,23.321292853638642,23.338261463609008,23.35558587989939,23.373277376479685,23.391347707095566,23.409809130973105
+PVD/Advanced,0.8208485520855534,0.8222254445753295,0.8205921129677403,0.8188124671473862,0.8180875417894133,0.8173361995591585,0.816556969972909,0.8157482713686651,0.8149084001989623,0.8145934091741072,0.8142727483521742,0.8139462632818022,0.8136137938511782,0.8132751740263693,0.8129302315750025,0.8125787877743449,0.8122206571026993,0.8118556469130738,0.8114835570878475,0.8111041796731042,0.810717298491437,0.8103226887313989,0.8099201165122126,0.8095093384218368,0.8090901010265601,0.808662140349962,0.8082251813190588,0.8077789371751618,0.8073231088468013
+PVD/Moderate,0.8208485520855534,0.8222254445753295,0.8205921129677403,0.8188124671473862,0.8180875417894133,0.8173361995591585,0.816556969972909,0.8157482713686651,0.8149084001989623,0.8145934091741072,0.8142727483521742,0.8139462632818022,0.8136137938511782,0.8132751740263693,0.8129302315750025,0.8125787877743449,0.8122206571026993,0.8118556469130738,0.8114835570878475,0.8111041796731042,0.810717298491437,0.8103226887313989,0.8099201165122126,0.8095093384218368,0.8090901010265601,0.808662140349962,0.8082251813190588,0.8077789371751618,0.8073231088468013
+PVD/Conservative,0.8208485520855534,0.8222254445753295,0.8205921129677403,0.8188124671473862,0.8180875417894133,0.8173361995591585,0.816556969972909,0.8157482713686651,0.8149084001989623,0.8145934091741072,0.8142727483521742,0.8139462632818022,0.8136137938511782,0.8132751740263693,0.8129302315750025,0.8125787877743449,0.8122206571026993,0.8118556469130738,0.8114835570878475,0.8111041796731042,0.810717298491437,0.8103226887313989,0.8099201165122126,0.8095093384218368,0.8090901010265601,0.808662140349962,0.8082251813190588,0.8077789371751618,0.8073231088468013
+PFF/Advanced,1.0620974719811185,1.061620213528562,1.062186358903991,1.0628032197094839,1.06305449332535,1.0633149235570598,1.0635850201036536,1.0638653312007886,1.064156447332059,1.0642656295160042,1.064376776964921,1.0644899432147374,1.0646051837634078,1.0647225561616114,1.0648421201085299,1.0649639375530346,1.0650880728006533,1.065214592626683,1.0653435663958901,1.0654750661892578,1.0656091669381957,1.0657459465668433,1.0658854861429523,1.0660278700380006,1.0661731860971768,1.0663215258199836,1.066472984552214,1.0666276616901607,1.066785660897971
+PFF/Moderate,1.0620974719811185,1.061620213528562,1.062186358903991,1.0628032197094839,1.06305449332535,1.0633149235570598,1.0635850201036536,1.0638653312007886,1.064156447332059,1.0642656295160042,1.064376776964921,1.0644899432147374,1.0646051837634078,1.0647225561616114,1.0648421201085299,1.0649639375530346,1.0650880728006533,1.065214592626683,1.0653435663958901,1.0654750661892578,1.0656091669381957,1.0657459465668433,1.0658854861429523,1.0660278700380006,1.0661731860971768,1.0663215258199836,1.066472984552214,1.0666276616901607,1.066785660897971
+PFF/Conservative,1.0620974719811185,1.061620213528562,1.062186358903991,1.0628032197094839,1.06305449332535,1.0633149235570598,1.0635850201036536,1.0638653312007886,1.064156447332059,1.0642656295160042,1.064376776964921,1.0644899432147374,1.0646051837634078,1.0647225561616114,1.0648421201085299,1.0649639375530346,1.0650880728006533,1.065214592626683,1.0653435663958901,1.0654750661892578,1.0656091669381957,1.0657459465668433,1.0658854861429523,1.0660278700380006,1.0661731860971768,1.0663215258199836,1.066472984552214,1.0666276616901607,1.066785660897971
 Year (Advanced)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031.0,2032.0,2033.0,2034.0,2035.0,2036,2037.0,2038.0,2039.0,2040.0,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
-1/nan,0.9300325592016259,0.9306205802814714,0.9299217820249687,0.929159104560833,0.9288479150122555,0.9285251202870787,0.9281900588633314,0.9278420179674896,0.9274802285130835,0.9273408612804871,0.9271988605137609,0.9270541508545702,0.9269066540417314,0.9267562887700771,0.926602970541005,0.9264466115041425,0.9262871202894817,0.9261244018293425,0.9259583571694103,0.9257888832680354,0.925615872783042,0.9254392138449721,0.9252587898158745,0.9250744790324861,0.9248861545326525,0.9246936837636622,0.9244969282711111,0.9242957433667501,0.924089977773646
-2/nan,0.8649605611751258,0.8660546644434227,0.8647545206844933,0.8633366415882889,0.8627584492226142,0.862158899004134,0.8615367853727146,0.8608908103059831,0.8602195742826816,0.8599610730004356,0.8596977269380166,0.8594293986166882,0.8591559453068381,0.8588772187748867,0.8585930650154147,0.8583033239675077,0.8580078292141807,0.8577064076637574,0.8573988792118733,0.8570850563826761,0.8567647439479126,0.856437738522,0.8561038281315367,0.8557627917572255,0.8554143988461976,0.8550584087924118,0.8546945703827199,0.8543226212058932,0.8539422870216975
-3/nan,0.8044414843181766,0.8059682943798131,0.8041540648890717,0.8021771008327313,0.8013713867196322,0.8005361954043889,0.7996698795280253,0.7987706666839706,0.7978366473271289,0.7974770421039158,0.7971107528031993,0.7967375913540478,0.7963573625644221,0.7959698637809796,0.7955748845291895,0.7951722061324399,0.7947616013086329,0.7943428337427915,0.7939156576339199,0.7934798172142388,0.7930350462390866,0.7925810674449655,0.7921175919737231,0.7916443187602011,0.7911609338807204,0.7906671098593507,0.7901625049288215,0.7896467622425315,0.7891195090338567
-4/nan,0.7481567723883884,0.7500506818042094,0.7478003810442678,0.7453501567089457,0.7443521417050102,0.7433179671320205,0.7422456325503509,0.7411329872692921,0.7399777159790779,0.7395330470760605,0.7390801817023926,0.7386188912066423,0.7381489383560866,0.7376700769304845,0.737182051292564,0.7366845959336725,0.7361774349928308,0.7356602817474676,0.7351328380737765,0.7345947938744949,0.7340458264721323,0.7334855999646775,0.7329137645414717,0.7323299557561204,0.7317337937534015,0.7311248824466113,0.730502808641702,0.729867141104108,0.7292174295638472
-5/nan,0.6958101577084012,0.6980126007411467,0.6953958629396362,0.6925488841919605,0.6913899348576057,0.6901894048428061,0.6889450173679609,0.6876543264902137,0.6863147011108648,0.685799212820897,0.6852743023027618,0.6847397089927179,0.6841951626360966,0.683640382832833,0.6830750785572013,0.6824989476500494,0.6819116762816064,0.681312938382979,0.6807023950440803,0.6800796938755813,0.6794444683327522,0.6787963369979189,0.678134902819039,0.6774597523009767,0.6767704546461726,0.6760665608408315,0.6753476026826728,0.6746130917457863,0.6738625182778107
-6/nan,0.6471261016920312,0.649584891545505,0.6466637600776173,0.643488101100406,0.6421960994529462,0.6408582001525338,0.6394719162243664,0.6380345779547548,0.6365433158181933,0.6359696326828106,0.6353855522344832,0.6347907894766497,0.6341850489105626,0.6335680240475111,0.6329393968936331,0.6322988374055316,0.6316460029146624,0.630980537518528,0.6303020714362995,0.6296102203263417,0.6289045845634303,0.6281847484722007,0.6274502795142497,0.626700727425303,0.6259356232990135,0.6251544786133386,0.6243567841953898,0.623542009120113,0.6227095995378351
+1/nan,0.93002504131163,0.9306141433315013,0.9299152246713939,0.9291522526412035,0.9288410287038338,0.9285181983333807,0.9281830999377587,0.9278350206680175,0.9274731913564348,0.9273374008582824,0.9271991170328132,0.9270582705715987,0.9269147895733791,0.9267685994216703,0.9266196226553715,0.9264677788319079,0.9263129843823821,0.9261551524582183,0.9259941927686782,0.9258300114085943,0.925662510675724,0.9254915888768391,0.9253171401218531,0.9251390541050499,0.9249572158725075,0.9247715055746398,0.9245817982027771,0.9243879633085441,0.9241898647047215
+2/nan,0.864946577466699,0.8660426837686239,0.864742325075649,0.8633239085882229,0.8627456566035963,0.8621460446362673,0.8615238670100676,0.8608778255780204,0.86020652068489,0.8599546550305948,0.8596982026264284,0.8594370370352036,0.8591710271298617,0.8589000368740045,0.8586239250899831,0.8583425452137289,0.8580557450353951,0.8577633664249057,0.8574652450413159,0.857161210024838,0.8568510836704849,0.8565346810817763,0.8562118098032849,0.8558822694303866,0.8555458511946203,0.8552023375227861,0.8548515015678808,0.8544931067097182,0.8541269060229315
+3/nan,0.8044219764408197,0.8059515702438522,0.8041370535055856,0.8021593544237557,0.8013535631894488,0.8005182920659174,0.7996518935517699,0.7987525950878204,0.79781848696523,0.7974681146520526,0.797111414389921,0.7967482132190349,0.7963783318196198,0.7960015842169422,0.7956177774697542,0.7952267113410898,0.7948281779501851,0.7944219614043331,0.7940078374092302,0.7935855728563004,0.793154925385636,0.79271564292249,0.7922674631857315,0.7918101131661114,0.7913433085722505,0.790866753241898,0.7903801385159752,0.7898831425725868,0.7893754297179956
+4/nan,0.7481325818713565,0.7500299301091607,0.7477792887772393,0.7453281711400463,0.7443300679883703,0.7432958022819606,0.7422233734279804,0.7411106305719405,0.739955258228804,0.7395220087087891,0.7390809995991117,0.7386320206278498,0.7381748538593816,0.7377092733421663,0.7372350447369288,0.7367519249239821,0.7362596615882468,0.7357579927805871,0.735246646453764,0.7347253399712445,0.7341937795872844,0.7336516598958603,0.7330986632466165,0.7325344591253089,0.7319587034963274,0.7313710381044373,0.7307710897328605,0.730158469414426,0.7295327715923057
+5/nan,0.6957820353614846,0.6979884608815224,0.6953713453279017,0.6925233491717224,0.6913643060455125,0.6901636791636109,0.6889191915946437,0.6876283972340038,0.6862886648104437,0.6857864174335045,0.6852752502440252,0.6847549236320599,0.6842251893334286,0.6836857900356977,0.6831364589624489,0.6825769194344543,0.6820068844061715,0.6814260559760573,0.680834124868831,0.6802307698877607,0.6796156573352647,0.6789884403991502,0.6783487585025126,0.6776962366145426,0.6770304845196132,0.6763510960415278,0.6756576482198111,0.6749497004344852,0.6742267934755536
+6/nan,0.6470947161809548,0.649557933578531,0.6466364008206451,0.6434596298895368,0.6421675332364261,0.6408295359321333,0.6394431508609311,0.6380057081595277,0.6365143381434888,0.6359553938866992,0.6353866069507004,0.6348077152677246,0.6342184473918006,0.6336185220758818,0.6330076478259111,0.6323855224303649,0.6317518324636111,0.6311062527615078,0.6304484458672825,0.6297780614456624,0.6290947356634938,0.6283980905340165,0.6276877332227545,0.62696325531213,0.6262242320220761,0.6254702213833814,0.6247007633605324,0.6239153789203458,0.62311356904247
 Year (Moderate)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031.0,2032.0,2033.0,2034.0,2035.0,2036,2037.0,2038.0,2039.0,2040.0,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
-1/nan,0.9300325592016259,0.9306205802814714,0.9299217820249687,0.929159104560833,0.9288479150122555,0.9285251202870787,0.9281900588633314,0.9278420179674896,0.9274802285130835,0.9273408612804871,0.9271988605137609,0.9270541508545702,0.9269066540417314,0.9267562887700771,0.926602970541005,0.9264466115041425,0.9262871202894817,0.9261244018293425,0.9259583571694103,0.9257888832680354,0.925615872783042,0.9254392138449721,0.9252587898158745,0.9250744790324861,0.9248861545326525,0.9246936837636622,0.9244969282711111,0.9242957433667501,0.924089977773646
-2/nan,0.8649605611751258,0.8660546644434227,0.8647545206844933,0.8633366415882889,0.8627584492226142,0.862158899004134,0.8615367853727146,0.8608908103059831,0.8602195742826816,0.8599610730004356,0.8596977269380166,0.8594293986166882,0.8591559453068381,0.8588772187748867,0.8585930650154147,0.8583033239675077,0.8580078292141807,0.8577064076637574,0.8573988792118733,0.8570850563826761,0.8567647439479126,0.856437738522,0.8561038281315367,0.8557627917572255,0.8554143988461976,0.8550584087924118,0.8546945703827199,0.8543226212058932,0.8539422870216975
-3/nan,0.8044414843181766,0.8059682943798131,0.8041540648890717,0.8021771008327313,0.8013713867196322,0.8005361954043889,0.7996698795280253,0.7987706666839706,0.7978366473271289,0.7974770421039158,0.7971107528031993,0.7967375913540478,0.7963573625644221,0.7959698637809796,0.7955748845291895,0.7951722061324399,0.7947616013086329,0.7943428337427915,0.7939156576339199,0.7934798172142388,0.7930350462390866,0.7925810674449655,0.7921175919737231,0.7916443187602011,0.7911609338807204,0.7906671098593507,0.7901625049288215,0.7896467622425315,0.7891195090338567
-4/nan,0.7481567723883884,0.7500506818042094,0.7478003810442678,0.7453501567089457,0.7443521417050102,0.7433179671320205,0.7422456325503509,0.7411329872692921,0.7399777159790779,0.7395330470760605,0.7390801817023926,0.7386188912066423,0.7381489383560866,0.7376700769304845,0.737182051292564,0.7366845959336725,0.7361774349928308,0.7356602817474676,0.7351328380737765,0.7345947938744949,0.7340458264721323,0.7334855999646775,0.7329137645414717,0.7323299557561204,0.7317337937534015,0.7311248824466113,0.730502808641702,0.729867141104108,0.7292174295638472
-5/nan,0.6958101577084012,0.6980126007411467,0.6953958629396362,0.6925488841919605,0.6913899348576057,0.6901894048428061,0.6889450173679609,0.6876543264902137,0.6863147011108648,0.685799212820897,0.6852743023027618,0.6847397089927179,0.6841951626360966,0.683640382832833,0.6830750785572013,0.6824989476500494,0.6819116762816064,0.681312938382979,0.6807023950440803,0.6800796938755813,0.6794444683327522,0.6787963369979189,0.678134902819039,0.6774597523009767,0.6767704546461726,0.6760665608408315,0.6753476026826728,0.6746130917457863,0.6738625182778107
-6/nan,0.6471261016920312,0.649584891545505,0.6466637600776173,0.643488101100406,0.6421960994529462,0.6408582001525338,0.6394719162243664,0.6380345779547548,0.6365433158181933,0.6359696326828106,0.6353855522344832,0.6347907894766497,0.6341850489105626,0.6335680240475111,0.6329393968936331,0.6322988374055316,0.6316460029146624,0.630980537518528,0.6303020714362995,0.6296102203263417,0.6289045845634303,0.6281847484722007,0.6274502795142497,0.626700727425303,0.6259356232990135,0.6251544786133386,0.6243567841953898,0.623542009120113,0.6227095995378351
+1/nan,0.93002504131163,0.9306141433315013,0.9299152246713939,0.9291522526412035,0.9288410287038338,0.9285181983333807,0.9281830999377587,0.9278350206680175,0.9274731913564348,0.9273374008582824,0.9271991170328132,0.9270582705715987,0.9269147895733791,0.9267685994216703,0.9266196226553715,0.9264677788319079,0.9263129843823821,0.9261551524582183,0.9259941927686782,0.9258300114085943,0.925662510675724,0.9254915888768391,0.9253171401218531,0.9251390541050499,0.9249572158725075,0.9247715055746398,0.9245817982027771,0.9243879633085441,0.9241898647047215
+2/nan,0.864946577466699,0.8660426837686239,0.864742325075649,0.8633239085882229,0.8627456566035963,0.8621460446362673,0.8615238670100676,0.8608778255780204,0.86020652068489,0.8599546550305948,0.8596982026264284,0.8594370370352036,0.8591710271298617,0.8589000368740045,0.8586239250899831,0.8583425452137289,0.8580557450353951,0.8577633664249057,0.8574652450413159,0.857161210024838,0.8568510836704849,0.8565346810817763,0.8562118098032849,0.8558822694303866,0.8555458511946203,0.8552023375227861,0.8548515015678808,0.8544931067097182,0.8541269060229315
+3/nan,0.8044219764408197,0.8059515702438522,0.8041370535055856,0.8021593544237557,0.8013535631894488,0.8005182920659174,0.7996518935517699,0.7987525950878204,0.79781848696523,0.7974681146520526,0.797111414389921,0.7967482132190349,0.7963783318196198,0.7960015842169422,0.7956177774697542,0.7952267113410898,0.7948281779501851,0.7944219614043331,0.7940078374092302,0.7935855728563004,0.793154925385636,0.79271564292249,0.7922674631857315,0.7918101131661114,0.7913433085722505,0.790866753241898,0.7903801385159752,0.7898831425725868,0.7893754297179956
+4/nan,0.7481325818713565,0.7500299301091607,0.7477792887772393,0.7453281711400463,0.7443300679883703,0.7432958022819606,0.7422233734279804,0.7411106305719405,0.739955258228804,0.7395220087087891,0.7390809995991117,0.7386320206278498,0.7381748538593816,0.7377092733421663,0.7372350447369288,0.7367519249239821,0.7362596615882468,0.7357579927805871,0.735246646453764,0.7347253399712445,0.7341937795872844,0.7336516598958603,0.7330986632466165,0.7325344591253089,0.7319587034963274,0.7313710381044373,0.7307710897328605,0.730158469414426,0.7295327715923057
+5/nan,0.6957820353614846,0.6979884608815224,0.6953713453279017,0.6925233491717224,0.6913643060455125,0.6901636791636109,0.6889191915946437,0.6876283972340038,0.6862886648104437,0.6857864174335045,0.6852752502440252,0.6847549236320599,0.6842251893334286,0.6836857900356977,0.6831364589624489,0.6825769194344543,0.6820068844061715,0.6814260559760573,0.680834124868831,0.6802307698877607,0.6796156573352647,0.6789884403991502,0.6783487585025126,0.6776962366145426,0.6770304845196132,0.6763510960415278,0.6756576482198111,0.6749497004344852,0.6742267934755536
+6/nan,0.6470947161809548,0.649557933578531,0.6466364008206451,0.6434596298895368,0.6421675332364261,0.6408295359321333,0.6394431508609311,0.6380057081595277,0.6365143381434888,0.6359553938866992,0.6353866069507004,0.6348077152677246,0.6342184473918006,0.6336185220758818,0.6330076478259111,0.6323855224303649,0.6317518324636111,0.6311062527615078,0.6304484458672825,0.6297780614456624,0.6290947356634938,0.6283980905340165,0.6276877332227545,0.62696325531213,0.6262242320220761,0.6254702213833814,0.6247007633605324,0.6239153789203458,0.62311356904247
 Year (Conservative)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031.0,2032.0,2033.0,2034.0,2035.0,2036,2037.0,2038.0,2039.0,2040.0,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
-1/nan,0.9300325592016259,0.9306205802814714,0.9299217820249687,0.929159104560833,0.9288479150122555,0.9285251202870787,0.9281900588633314,0.9278420179674896,0.9274802285130835,0.9273408612804871,0.9271988605137609,0.9270541508545702,0.9269066540417314,0.9267562887700771,0.926602970541005,0.9264466115041425,0.9262871202894817,0.9261244018293425,0.9259583571694103,0.9257888832680354,0.925615872783042,0.9254392138449721,0.9252587898158745,0.9250744790324861,0.9248861545326525,0.9246936837636622,0.9244969282711111,0.9242957433667501,0.924089977773646
-2/nan,0.8649605611751258,0.8660546644434227,0.8647545206844933,0.8633366415882889,0.8627584492226142,0.862158899004134,0.8615367853727146,0.8608908103059831,0.8602195742826816,0.8599610730004356,0.8596977269380166,0.8594293986166882,0.8591559453068381,0.8588772187748867,0.8585930650154147,0.8583033239675077,0.8580078292141807,0.8577064076637574,0.8573988792118733,0.8570850563826761,0.8567647439479126,0.856437738522,0.8561038281315367,0.8557627917572255,0.8554143988461976,0.8550584087924118,0.8546945703827199,0.8543226212058932,0.8539422870216975
+1/nan,0.93002504131163,0.9306141433315013,0.9299152246713939,0.9291522526412035,0.9288410287038338,0.9285181983333807,0.9281830999377587,0.9278350206680175,0.9274731913564348,0.9273374008582824,0.9271991170328132,0.9270582705715987,0.9269147895733791,0.9267685994216703,0.9266196226553715,0.9264677788319079,0.9263129843823821,0.9261551524582183,0.9259941927686782,0.9258300114085943,0.925662510675724,0.9254915888768391,0.9253171401218531,0.9251390541050499,0.9249572158725075,0.9247715055746398,0.9245817982027771,0.9243879633085441,0.9241898647047215
+2/nan,0.864946577466699,0.8660426837686239,0.864742325075649,0.8633239085882229,0.8627456566035963,0.8621460446362673,0.8615238670100676,0.8608778255780204,0.86020652068489,0.8599546550305948,0.8596982026264284,0.8594370370352036,0.8591710271298617,0.8589000368740045,0.8586239250899831,0.8583425452137289,0.8580557450353951,0.8577633664249057,0.8574652450413159,0.857161210024838,0.8568510836704849,0.8565346810817763,0.8562118098032849,0.8558822694303866,0.8555458511946203,0.8552023375227861,0.8548515015678808,0.8544931067097182,0.8541269060229315
diff --git a/tests/data/Land-Based_Wind/Market/30/df_lcoe.csv b/tests/data/Land-Based_Wind/Market/30/df_lcoe.csv
index 3f42189..dbed62d 100644
--- a/tests/data/Land-Based_Wind/Market/30/df_lcoe.csv
+++ b/tests/data/Land-Based_Wind/Market/30/df_lcoe.csv
@@ -1,31 +1,31 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Land-Based Wind - Class 1 - Technology 1/Advanced,14.117592308672553,15.329806849924566,13.15332267854005,10.976935500662702,9.846168340399,8.741017654787221,7.660407520019788,6.603291185973585,5.568647923045418,5.228526207857779,4.888409019514874,4.548279871930113,4.20812168188117,3.8679167394667537,3.5276466768053005,3.187292434855376,2.846834228225479,2.5062515078273897,2.1655229212200986,1.8246262704791754,1.4835384673982759,1.1422354858417982,0.8006923110205229,0.45888288546485256,0.11678005143889081,-0.22564451047776402,-0.5684203469420659,-0.9115783018601036,-1.2551505912171628
-Land-Based Wind - Class 1 - Technology 1/Moderate,14.353446281273936,16.042060566941686,14.275547701782237,12.463608846975827,11.711300397069365,10.967569115395005,10.232086631956768,9.504523235379995,8.784546861236489,8.518044071586065,8.251537351664545,7.98501425212028,7.718461884053305,7.451866897558702,7.185215459017719,6.918493227046422,6.65168532701373,6.38477632402283,6.117750194252206,5.850590294541572,5.583279330081293,5.315799320089628,5.048131561311514,4.780256589186241,4.512154136504179,4.243803089366697,3.9751814402369625,3.7062662378620104,3.4370335338161233
-Land-Based Wind - Class 1 - Technology 1/Conservative,14.55846284642104,16.88012425060257,15.681608139632822,14.385251159300964,14.188539796490911,13.993507848583292,13.800226143909804,13.608772162696717,13.419230792606026,13.203372184585248,12.987910940193895,12.772842500231754,12.558162230734716,12.343865419918714,12.129947275017297,11.916402919004423,11.703227387208894,11.490415623807202,11.27796247820276,11.06586270129052,10.85411094159046,10.64270174127391,10.431629532064644,10.220888631026998,10.010473236234532,9.800377422334233,9.590595136002065,9.381120191304927,9.171946264973077
-Land-Based Wind - Class 2 - Technology 1/Advanced,16.236600398186955,17.529628221599502,15.213716212527274,12.895297060128872,11.68698338693256,10.506620905964919,9.353044138436339,8.22512041335148,7.121746487335059,6.763854191880686,6.405918248365268,6.047921903479793,5.6898477902778275,5.331677897792748,4.973393538843627,4.614975315905763,4.256403084909792,3.8976559168186284,3.5387120568240533,3.1795488809933303,2.8201428501645864,2.4604694609060793,2.100503193302078,1.7402174553337844,1.3795845235885444,1.0185754800168851,0.6571601444239441,0.2953070023591273,-0.06701687196602535
-Land-Based Wind - Class 2 - Technology 1/Moderate,16.496148231835814,18.30573397522106,16.43365442082404,14.50943260732712,13.71039710507696,12.920607950949655,12.13972101329663,11.367391175886617,10.603271302366839,10.320477552862034,10.037703244522888,9.754935776044686,9.472162102925331,9.189368715799308,8.90654161750556,8.623666298798781,8.340727712613987,8.057710246777937,7.774597695060834,7.4913732264552095,7.208019352534681,6.924517892779246,6.640849937696391,6.35699580958444,6.072935020755477,5.78864622903,5.504107190287801,5.219294707852992,4.93418457845938
-Land-Based Wind - Class 2 - Technology 1/Conservative,16.714666754479627,19.19899076109874,17.932315026158683,16.557630219250782,16.350782253507216,16.145828611107042,15.94285064908717,15.741937259595076,15.543185717951292,15.314371468797113,15.086004383076709,14.85808026926582,14.630594881450584,14.403543917274906,14.176923015841279,13.950727755565119,13.724953651990162,13.49959615556024,13.274650649358211,13.050112446820272,12.825976789411943,12.602238844301546,12.378893702017379,12.155936374111487,11.933361790832095,11.711164798830815,11.489340158910977,11.267882543845069,11.046786536278375
-Land-Based Wind - Class 3 - Technology 1/Advanced,17.026818573351594,18.349718207156393,15.981581455264646,13.610002472490692,12.372581421555026,11.164000687022913,9.98306041690985,8.828594976341108,7.699469479774272,7.335048268097989,6.970563591256987,6.605998589102523,6.24133578165155,5.876557038386768,5.5116435457255974,5.146575772532302,4.781333433535671,4.415895450499569,4.050239910986541,3.68434402454308,3.318184076101904,2.9517353764155025,2.584972209279865,2.2178677753141507,1.85039413202691,1.4825221298841136,1.114221344062706,0.7454600015480999,0.37620490320254163
-Land-Based Wind - Class 3 - Technology 1/Moderate,17.29546243931728,19.150175413220033,17.238715227969394,15.272607344356217,14.456140767848584,13.649170170540003,12.851345541050083,12.062316016515126,11.281728838146826,10.992857903869993,10.704015129246837,10.4151878562881,10.126362982445826,9.837526938869175,9.548665667389375,9.259764596141995,8.970808613737336,8.681782041870708,8.392668606266739,8.103451405843543,7.814112879947658,7.524634773548872,7.234998100219581,6.945183102748107,6.655169211199226,6.364934998235356,6.07445813148118,5.7837153227082965,5.4926822735846095
-Land-Based Wind - Class 3 - Technology 1/Conservative,17.519017736419226,20.06402145125446,18.771919428817107,17.368015184923564,17.157385857643316,16.94873102321872,16.742135966318067,16.537693836195544,16.3355065292678,16.10185930368295,15.86867781886664,15.635958020452215,15.403695807284542,15.171887029740478,14.940527488027225,14.709612930457915,14.479139051716167,14.249101491103623,14.019495830787353,13.790317594053846,13.561562243561443,13.333225179627487,13.10530173854088,12.877787190925588,12.650676740160534,12.423965520886135,12.197648597608087,11.971720963430641,11.746177538941936
-Land-Based Wind - Class 4 - Technology 1/Advanced,17.984924262449578,19.343849188211834,16.912225200384682,14.476051598327764,13.20320196324922,11.960284207327717,10.74605607488888,9.559311276844078,8.398875914449615,8.026609702679664,7.654254680053153,7.281793850896392,6.909209592152777,6.5364836222950125,6.16359696838304,5.790529931138277,5.417262047895164,5.043772053276115,4.670037837425774,4.2960364016331845,3.921743811131666,3.5471351448906,3.1721844421524388,2.796864645478294,2.4211475400289615,2.045003688791393,1.6684023634311629,1.2913114704228654,0.9136974720807451
-Land-Based Wind - Class 4 - Technology 1/Moderate,18.26478631009657,20.174224824160284,18.21500796803418,16.198105081358733,15.360499938548852,14.532693501148593,13.714328627459786,12.905047485709389,12.10449049881312,11.808249796538195,11.512047826778705,11.21587186280426,10.91970873167504,10.623544792402758,10.327365912834797,10.031157445168908,9.734904200009115,9.438590418853622,9.14219974490862,8.845715192113001,8.549119112224417,8.25239315985408,7.955518255276079,7.658474544857043,7.361241358920921,7.06379716685964,6.766119529271386,6.4681850469021995,6.16996930613443
-Land-Based Wind - Class 4 - Technology 1/Conservative,18.49444967542532,21.11303933317928,19.79010299404166,18.35076450226942,18.135549538993732,17.922406289692837,17.711424802052,17.502703387894755,17.296349547615055,17.056841398531823,16.817821518847108,16.579286020524755,16.341230977957494,16.103652426740478,15.86654636245181,15.629908739438797,15.393735469626705,15.15802242134425,14.922765418186554,14.687960237924663,14.45360261145601,14.219688221836467,13.986212703387508,13.753171640908164,13.520560569001375,13.288374971550045,13.056610281357973,12.825261879993992,12.594325097867618
-Land-Based Wind - Class 5 - Technology 1/Advanced,19.205805260568386,20.6103295615042,18.097541077616306,15.578833889206315,14.26062157968111,12.973753692080624,11.716932761699702,10.488899586080802,9.288429506864162,8.906278975122024,8.52400527906769,8.141591239944034,7.7590190419291645,7.376270200552032,6.993325529220307,6.610165103732076,6.2267682246286995,5.843113377231216,5.459178189195466,5.074939385408943,4.690372740017246,4.305453025389902,3.9201539577747013,3.5344481393998635,3.1483069967445765,2.761700714684668,2.374598166185425,1.9869668371893106,1.5987727463119867
-Land-Based Wind - Class 5 - Technology 1/Moderate,19.500263514886473,21.47945390386724,19.45936752825243,17.377722535978926,16.513174678153316,15.658811373382001,14.814266391832867,13.979173019326531,13.153162988340409,12.847528954650965,12.541947129395655,12.236404698228316,11.930888398489301,11.62538449724564,11.319878768046664,11.014356466301589,10.70880230318949,10.403200417991236,10.097534348736914,9.79178700105313,9.485940615058539,9.179976730195708,8.87387614782267,8.567618891409456,8.26118416415271,7.954550303818124,7.64769473459042,7.3405939157053375,7.033223286604773
-Land-Based Wind - Class 5 - Technology 1/Conservative,19.737712079039927,22.45009263353095,21.087855605988985,19.603353462683195,19.382293756579383,19.16342968018199,18.94685735200448,18.732681663958864,18.521017259135636,18.274038916034208,18.027577556788412,17.78162950536307,17.536191059899977,17.29125849206947,17.04682804646433,16.80289594003834,16.559458361607753,16.316511471413826,16.074051400770113,15.83207425180764,15.590576097314997,15.349552980719945,15.109000916209133,14.868915889021714,14.629293855930882,14.39013074595574,14.151422461324092,13.91316487873252,13.675353850939164
-Land-Based Wind - Class 6 - Technology 1/Advanced,21.277869108364076,22.758998572310524,20.10778030026234,17.448427945473682,16.0526714322389,14.690712467698866,13.361156799020904,12.062652508249254,10.793886043336379,10.395246098968006,9.996419547629905,9.597388870063437,9.198135893331944,8.798641758379908,8.398886885650665,7.9988509386296975,7.59851278516695,7.197850456415676,6.7968411032177904,6.395460949754273,5.993685244240044,5.5914882064693,5.188842971951008,4.785721532387857,4.3820946722092025,3.9779319008559533,3.5732013804794995,3.1678698486908843,2.761902535961063
-Land-Based Wind - Class 6 - Technology 1/Moderate,21.597872924211753,23.695488961660025,21.57205751717173,19.380492528515006,18.470200975613064,17.57074907295926,16.681755160768496,15.802837444195426,14.933612900977192,14.612030745959721,14.290523678967975,13.969078736900578,13.647682504770373,13.326321093539523,13.004980116656867,12.683644665202799,12.362299281551397,12.040927931437672,11.719513974322133,11.39804013193756,11.076488454860392,10.754840286998384,10.433076227812307,10.111176092116732,9.789118867269906,9.46688266756075,9.144444685569468,8.82178114027369,8.49886722163792
-Land-Based Wind - Class 6 - Technology 1/Conservative,21.84853930108152,24.72015927070862,23.29119701871869,21.73001543523467,21.49903244806679,21.270455476360418,21.04439094576078,20.820954919940483,20.600274168953863,20.340612832429997,20.081517231543632,19.822984050197903,19.56500996641862,19.307591652687552,19.050725776378105,18.794409000300647,18.538637983380617,18.28340938147219,18.028719848337314,17.774566036809624,17.52094460014506,17.26785219361543,17.01528547634753,16.763241113452928,16.51171577847112,16.260706156179186,16.010208945799253,15.760220864662227,15.510738652376613
-Land-Based Wind - Class 7 - Technology 1/Advanced,24.578712954691316,26.17983588052359,23.306336521908243,20.42145714170706,18.900735694521384,17.417866137461445,15.971291708524788,14.559504953071702,13.181043327298259,12.756871586813677,12.33239935629014,11.907608484703793,11.48248014030176,11.056994776765535,10.631132097346136,10.204871016829163,9.778189621179067,9.351065124689413,8.923473824462803,8.495391052030637,8.066791121878374,7.637647276677161,7.207931628945314,6.7776150988823005,6.346667348071076,5.915056708732223,5.482750108174173,5.049712988058687,4.615909218061006
-Land-Based Wind - Class 7 - Technology 1/Moderate,24.941422282102376,27.40750294123376,25.285597436380627,23.068641150866036,22.2485914458555,21.43955280284105,20.64123097120909,19.853336550551504,19.07558450611602,18.664717827161,18.253864647844427,17.843005870294753,17.432121707064553,17.02119164665414,16.61019441697051,16.19910794657011,15.787909323535402,15.376574751808192,14.965079504797988,14.553397876072431,14.141503126891049,13.72936743037653,13.316961812044639,12.904256086425455,12.49121878946957,12.077817106411477,11.664016794728859,11.249782101808385,10.835075676887406
-Land-Based Wind - Class 7 - Technology 1/Conservative,25.2131576001315,28.33860215781683,26.80328117175275,25.119874024333114,24.873073516571434,24.629014375148785,24.387819455081896,24.149622627616253,23.914569992955226,23.634692207017224,23.3554578661269,23.07686422792147,22.798908575954847,22.521588221594445,22.24490050611818,21.968842803023144,21.693412520579905,21.41860710464008,21.144424041738443,20.87086086251812,20.597915145488937,20.325584521190283,20.053866676771328,19.782759361047304,19.51226039006947,19.24236765327875,18.973079120290944,18.704392848392,18.436306990813204
-Land-Based Wind - Class 8 - Technology 2/Advanced,31.496692330353046,33.29945337027856,29.73521501482582,26.168987152667427,24.221160321320728,22.323037732252374,20.472514658526023,18.66755260820645,16.90617318960616,16.4238621804556,15.941523504179084,15.459137372121674,14.976683265344832,14.494139898148756,14.01148517939929,13.528696171510823,13.045749046914722,12.5626190418321,12.079280407153917,11.595706356226824,11.11186900928588,10.627739334321376,10.143287084076636,9.658480728899583,9.173287385113923,8.687672738568544,8.201600962976759,7.715034632630161,7.227934629030937
-Land-Based Wind - Class 8 - Technology 2/Moderate,31.943728932523936,34.771077043631735,32.08565650251328,29.291062845895894,28.154995542118638,27.033317501283314,25.925583217762473,24.83135000114204,23.750176889971133,23.351294050947615,22.952604308316293,22.55409417097357,22.155749686344272,21.75755641760931,21.35949941959596,20.961563213230527,20.56373175846077,20.165988425531438,19.768315964502538,19.370696472890145,18.973111361263175,18.575541316690252,18.177966263839316,17.78036532357902,17.382716768872264,16.98499797777156,16.587185383282826,16.18925441985365,15.791179466220914
-Land-Based Wind - Class 8 - Technology 2/Conservative,32.259588374651614,36.015597983950876,34.161254085901376,32.12199549985706,31.79769735813144,31.476655056734806,31.15900762518836,30.844906511849388,30.534516941684235,30.216036239134944,29.898373204777766,29.581526878709738,29.265496416012695,28.950281093088027,28.63588031445732,28.32229362007626,28.00952069320099,27.69756136885406,27.38641564294068,27.076083682089482,26.76656583423355,26.45786264006342,26.149974845376036,25.842903414431653,25.5366495443929,25.231214680961006,24.92660053531227,24.622809102459538,24.31984268117856
-Land-Based Wind - Class 9 - Technology 3/Advanced,35.35720870856352,37.50065883642528,34.27262552532991,30.99269941128108,29.355116374914456,27.761663313368956,26.21065394379731,24.70046757473262,23.229544824005817,22.658698958793998,22.087934237356958,21.517230331727,20.94656617141284,20.3759199062299,19.80526886689459,19.234589523222333,18.663857439763945,18.09304722868763,17.52213249971202,16.95108580687888,16.379878591903253,15.808481123884288,15.236862435065383,14.6649902523599,14.09283092430357,13.520349343080152,12.947508861227117,12.374271202594514,11.800596367090264
-Land-Based Wind - Class 9 - Technology 3/Moderate,35.84883621205596,38.821830576924235,36.30676299942064,33.6670044995044,32.687673991772314,31.721961372394425,30.769531366626346,29.83005603218212,28.90321431882803,28.451410188925287,27.99988925105313,27.54863793351287,27.097642208811024,26.646887571135803,26.196359012507134,25.746040997506796,25.295917436497383,24.845971657209233,24.396186374592443,23.94654365881263,23.4970249012238,23.04761077821738,22.598281212751488,22.14901533340609,21.6997914307669,21.250586910939592,20.801378245970103,20.352140920928246,19.902849377391743
-Land-Based Wind - Class 9 - Technology 3/Conservative,36.189303179506624,40.03775598429893,38.30515306219898,36.37680911632166,36.16429680860902,35.95601376813294,35.75217345603379,35.553007859695235,35.35876949581353,35.00326222971701,34.648631925621984,34.29487646517252,33.941993811957715,33.589982016047045,33.23883921888782,32.888563658590975,32.53915367564461,32.190607719087176,31.842924353182955,31.49610226466214,31.150140270531413,30.805037326565728,30.46079253650283,30.11740516202314,29.7748746335825,29.43320056218864,29.092382752201434,28.75242121526755,28.413316185492707
-Land-Based Wind - Class 10 - Technology 4/Advanced,63.15373218721375,66.02623592322553,59.7134281763688,53.41403979660387,49.84178912380662,46.370289764376636,42.99511426096184,39.711991679280445,36.51679424823028,35.77354235738626,35.03037742818901,34.287272186388904,33.54419834804259,32.80112656843242,32.058026387875856,31.31486617420402,30.57161306167969,29.828232886075504,29.08469011564321,28.340947777681137,27.596967380316354,26.85270882920914,26.10813033873353,25.363188337232906,24.617837365867793,23.8720299705644,23.125716586495788,22.378845414491703,21.631362288720776
-Land-Based Wind - Class 10 - Technology 4/Moderate,64.02136160872826,68.55387348029669,63.626841726877124,58.525661229452,56.20112418227674,53.90340433928185,51.63147637533265,49.38430902703213,47.160861633300314,46.55006362496469,45.93976635678621,45.32995445628398,44.720612045741554,44.11172271689054,43.50326950408929,42.89523485588669,42.28760060486519,41.68034793562532,41.07345735078927,40.466908634897194,39.86068081597628,39.25475212469706,38.64909995087036,38.04370079711252,37.43853022944661,36.8335628246149,36.22877211383813,35.624130522738085,35.01960930711857
-Land-Based Wind - Class 10 - Technology 4/Conservative,64.53935407867839,71.05167241638863,67.90080985812506,64.4020716629585,63.81381494391873,63.23156771764593,62.65558117003317,62.086128429249584,61.5235069163643,61.016959150632346,60.51200073770481,60.008637349420106,59.50687512173694,59.00672067833926,58.508181155774565,58.0112642302434,57.51597814617512,57.02233174671567,56.53033450628,56.03999656536219,55.55132876770395,55.06434270011708,54.57905073509715,54.09546607649776,53.61360280849616,53.13347594815731,52.65510150187896,52.17849652606539,51.70367919240081
+Land-Based Wind - Class 1 - Technology 1/Advanced,14.119158340604681,15.331280439161056,13.154653674692753,10.978149138959054,9.84730698824816,8.742082766113274,7.661400475097331,6.604213292717812,5.56950041806299,5.228934712142575,4.888379529373552,4.547818962119955,4.207236543727394,3.8666152216033467,3.5259373287392286,3.1851845535713466,2.844337908065345,2.503377693900422,2.1622834666217265,1.8210339976195513,1.4796072337706363,1.1379802545880011,0.7961292266849327,0.45402935536301925,0.11165483310615087,-0.23102121524823005,-0.5740267909153367,-0.9173910834202346,-1.2611445370043555
+Land-Based Wind - Class 1 - Technology 1/Moderate,14.355031331802746,16.04358084427475,14.276951367588087,12.464920794664632,11.712562215803825,10.968781285974092,10.233249611106785,9.505637455495108,8.785612730044338,8.518558235246246,8.251499974379108,7.984425793803435,7.7173231227140136,7.450178953287239,7.182979819699973,6.91571177594059,6.648360372333638,6.380910630686753,6.113347017968817,5.84565341841887,5.577813103962935,5.309808702838872,5.0416221662845935,4.773234733158073,4.504626892333228,4.235778342713029,3.966667950675941,3.697273704768655,3.4275726674309546
+Land-Based Wind - Class 1 - Technology 1/Conservative,14.560064428905296,16.881706618203864,15.683117631473817,14.38671327612083,14.189996394077252,13.9949592697321,13.80167275182286,13.610214342806927,13.42066895460582,13.204071123483189,12.987859738238182,12.77202995475951,12.556576843226217,12.341495384456778,12.12678046610986,11.91242687872451,11.698429311600183,11.484782348501106,11.271480463186819,11.05851801476102,10.845889242819062,10.633588262407471,10.421609058772553,10.209945481900402,9.99859124083207,9.787539897759359,9.57678486188367,9.366319383040441,9.156136545078233
+Land-Based Wind - Class 2 - Technology 1/Advanced,16.238337300932823,17.531256090185423,15.215192618987249,12.896650536449808,11.688256788496872,10.507815828237579,9.354162097394347,8.226162846974066,7.122714756838022,6.764319039069672,6.405884625237459,6.04739532107266,5.688834356495061,5.330184357864635,4.971427318624002,4.612544568225328,4.253516739222729,3.8943237324020075,3.534944679811339,3.175357905547269,2.815540884124278,2.4554701962705288,2.0951214819473662,1.7344693903966757,1.3734875269890239,1.0121483966372757,0.6504233435102051,0.2882824867641567,-0.07430534801729394
+Land-Based Wind - Class 2 - Technology 1/Moderate,16.497906063784246,18.30741279504683,16.435209962879743,14.510893021743414,13.711804384211387,12.921962617162066,12.141023563778692,11.368642082416653,10.604471010987183,10.321056869868439,10.03766108635634,9.754271320677095,9.47087481101224,9.187458353382183,8.904008280384755,8.62051043870878,8.336950165342067,8.053312262381784,7.769580970353278,7.485739939938082,7.201772201982493,6.917660135688504,6.633385434838122,6.348929071918089,6.064271259986061,5.779391412117334,5.494268098244682,5.208878999201502,4.923200857749958
+Land-Based Wind - Class 2 - Technology 1/Conservative,16.716442207143135,19.200735760326516,17.933983363728448,16.559250692619592,16.352397139216873,16.14743828442583,15.944455507522893,15.743537724872048,15.544782238206029,15.315147729947746,15.085947489776327,14.85717696883658,14.628831549513123,14.400906542583705,14.173397184270453,13.94629863318385,13.719605967160007,13.493314179982875,13.267418177994646,13.041912776594,12.816792696603915,12.592052560532046,12.367686888703169,12.143690095274373,11.920056484122682,11.696780244619113,11.473855447278979,11.251276039300606,11.02903583999105
+Land-Based Wind - Class 3 - Technology 1/Advanced,17.028619197054123,18.351403590843802,15.983112053081296,13.611408046911968,12.373905011150143,11.165243941270269,9.98422490356241,8.829682182994734,7.700480815173815,7.335534076758037,6.970528430298948,6.605447567299532,6.240274597141891,5.874992019025694,5.509581692278573,5.144024804930456,4.778301840431389,4.412392542383014,4.046275877145735,3.679929994174387,3.313332183907388,2.9464588330514623,2.5792853770557933,2.2117862495773792,1.843934828708207,1.4757033797248909,1.107062994092928,0.7379835244385653,0.3684335151756635
+Land-Based Wind - Class 3 - Technology 1/Moderate,17.297284725700667,19.151913375786997,17.240327425988962,15.274123142847074,14.457602309576227,13.650577993368145,12.852700157265616,12.063617912588246,11.28297847441279,10.9934615257011,10.703971187618901,10.41449505095687,10.125020282640914,9.835533605517252,9.546021276986771,9.256469066407142,8.96686223118305,8.677185491450604,8.38742300326265,8.097558330174522,7.807574413099815,7.51745353834033,7.227177303636434,6.936726582107827,6.646081483921563,6.355221315527583,6.064124536272498,5.772768712200367,5.481130466820577
+Land-Based Wind - Class 3 - Technology 1/Conservative,17.52085804966892,20.06582711863517,18.773647022247335,17.36969473166905,17.159059791204125,16.95039973097662,16.743799858578395,16.539353348220764,16.337162123535617,16.102664409150982,15.868618802465253,15.635020864765362,15.4018660949015,15.16914992673938,14.936867726529481,14.70501479018749,14.473586340489717,14.242577524173655,14.011983408952563,13.781798980441248,13.552019138980231,13.322638696380572,13.093652372572837,12.865054792172664,12.636840480954895,12.409003862253641,12.181539253280992,11.954440861379723,11.727702780212567
+Land-Based Wind - Class 4 - Technology 1/Advanced,17.986802145082617,19.34560429296068,16.913821477495457,14.477520302975122,13.204586356999584,11.961586006051288,10.747276909972634,9.560452696857482,8.399939386540233,8.027120890008021,7.654217657039862,7.281213234544214,6.908090579620705,6.534832031115524,6.161419279526587,5.7878333351469635,5.414054494324866,5.040062303709302,4.665835522339329,4.29135208142991,3.916589041674076,3.5415225479035968,3.166127780896815,2.790378906133263,2.4142490192622574,2.0377100880414147,1.6607328904744172,1.2832869488550145,0.9053404594008079
+Land-Based Wind - Class 4 - Technology 1/Moderate,18.266686760012885,20.176034508798836,18.21668887242438,16.199688043807207,15.36202728421993,14.534165786707462,13.71574638349922,12.906411216516343,12.105800682055797,11.808882892694342,11.512001722357109,11.215144677630619,10.918298839029475,10.621450840662067,10.32458684873821,10.027692538836579,9.730753071851794,9.433753068526372,9.136676582473893,8.83950707159185,8.542227367733464,8.244819644540517,7.947265383284659,7.649545336583394,7.35163948982893,7.053527020167472,6.755186252838385,6.456594614681013,6.157728584587904
+Land-Based Wind - Class 4 - Technology 1/Conservative,18.496368644745278,21.11491857248989,19.7919024467226,18.352515686968538,18.137295079553528,17.92414658818501,17.713160284301384,17.504434505581457,17.298076780608273,17.057681483342293,16.817759927773015,16.578307808756268,16.33932076637921,16.100794383775494,15.862724184880431,15.625105632119109,15.38793412403568,15.151204992853863,14.91491350198039,14.679054843450547,14.443624135304542,14.208616418920641,13.974026656290295,13.739849727251034,13.506080426671904,13.27271346161281,13.0397434484536,12.807164910012794,12.574972272662716
+Land-Based Wind - Class 5 - Technology 1/Advanced,19.20778159158898,20.61217348790492,18.099221007263875,15.580382980627654,14.262083380024851,12.975130003259402,11.718225297556074,10.490109974181301,9.289559290013045,8.906822444231246,8.52396588725993,8.140972971188003,7.757826448431448,7.374508442798064,6.991000418869895,6.6072831495929165,6.223336681948798,5.839140300574382,5.454672489186322,5.069910889658409,4.684832258569951,4.299412421062971,3.913626221793276,3.5274474727713923,3.1408488978546494,2.753802073643598,2.366277366504246,1.978243865419536,1.5896693103454318
+Land-Based Wind - Class 5 - Technology 1/Moderate,19.50226359018713,21.48135500375637,19.461136004152333,17.37939110401404,16.514785895969244,15.660365821607833,14.815764624393605,13.980615563217967,13.154550343322903,12.848199618082422,12.541898268328584,12.23563369332333,11.929392863443454,11.62316229969418,11.316928052055374,11.010675676577222,10.704390211144904,10.398056149816238,10.09165741563805,9.785177331839094,9.478598591266532,9.17190322396862,8.865072562768503,8.55808720669463,8.25092698210415,7.943570901335672,7.635997118698626,7.32818288360556,7.020104490623613
+Land-Based Wind - Class 5 - Technology 1/Conservative,19.739731301520617,22.452065645877624,21.089746648765743,19.605195955418132,19.384130565720934,19.165261226525303,18.948684081155168,18.73450404852258,18.522835801148343,18.274923584684537,18.027512684097577,17.780598964487144,17.534178245957584,17.28824630189628,17.04279885721945,16.79783158658128,16.55334011255544,16.309320003782027,16.065766773094,15.822675875625283,15.58004270689094,15.337862600870174,15.096130828079492,14.854842593656166,14.613993035450346,14.373577222152115,14.133590151453419,13.894026748270704,13.654881863040018
+Land-Based Wind - Class 6 - Technology 1/Advanced,21.28001252474765,22.760993190608957,20.109602100624524,17.450113320036394,16.054264416525218,14.69221501337784,13.362570763412375,12.063979656347197,10.795128049533947,10.395844209647546,9.996376145653272,9.59670684875244,9.196818693538507,8.79669340821518,8.396312043080833,7.995654937164481,7.59470168288448,7.193431088591215,6.791821138846341,6.389848952282037,5.98749073685083,5.584721742300392,5.181516209649654,4.777847317456857,4.373687124631626,3.969006509536406,3.563775105089718,3.157961229564336,2.751531812744471
+Land-Based Wind - Class 6 - Technology 1/Moderate,21.60004214479716,23.697545267561075,21.573974673129843,19.382306438838377,18.471954592657024,17.57244301803913,16.68339002742307,15.804413797975819,14.935131279152134,14.612765191604119,14.290470137632052,13.968233334280743,13.646041564933576,13.323881158567787,13.001737967826461,12.67959734582277,12.357444121594842,12.03526257411361,11.713036404747779,11.390748708083915,11.068381940962826,10.745917889637802,10.423337634894157,10.10062151499482,9.777749086285144,9.45469908129122,9.131449364115433,8.807976882932728,8.484257619360182
+Land-Based Wind - Class 6 - Technology 1/Conservative,21.850728734693963,24.72229149214636,23.29324356436192,21.732012951950892,21.501024214203998,21.27244194450268,21.04637259509779,20.822932258605526,20.602247736617958,20.341573196108634,20.08144678728083,19.821864664276735,19.56282295283618,19.30431774936166,19.046345119997678,18.788901099723674,18.531981691473568,18.275582865278224,18.0197005574498,17.764330669814466,17.50946906898781,17.255111585730702,17.001254014377533,16.747892112363758,16.495021599857377,16.24263815952886,15.990737436466915,15.739315038275059,15.488366535370346
+Land-Based Wind - Class 7 - Technology 1/Advanced,24.581122541778473,26.182070411280925,23.30838405732315,20.423359233774235,18.90253716647791,17.41956918934087,15.972898435490738,14.561017347837627,13.182463282218759,12.75755636356065,12.332349592195378,11.906825293834672,11.480965149985277,11.054750166786182,10.628160642029052,10.201176130238618,9.773775405680475,9.345936423147563,8.917636276372182,8.488851153899123,8.059556292218069,7.629725925984761,7.199333235092666,6.768350288375959,6.336747983682567,5.904495984049621,5.471562649677512,5.037914965380512,4.603518463158682
+Land-Based Wind - Class 7 - Technology 1/Moderate,24.943861117042918,27.40982258197519,25.287782652734567,23.070733077846576,22.250633854659124,21.44154641233817,20.643176486027823,19.855234661767916,19.077435891963436,18.66561196303988,18.253799569831752,17.841980022793646,17.430133977002072,17.018241400257573,16.606281539329313,16.194232884209086,15.782073130242267,15.369779137983514,14.957326890617889,14.544691448779925,14.131846902564124,13.718766320549278,13.305421695596035,12.891783887187941,12.477822560052601,12.063506118783554,11.648801638153376,11.233674788787077,10.818089757830439
+Land-Based Wind - Class 7 - Technology 1/Conservative,25.215618347038838,28.340988155506636,26.80557558599678,25.12211864631631,24.87531228120181,24.631247785681325,24.39004804423868,24.151846960160952,23.916790668548405,23.635773227126066,23.355378540884725,23.075603224694117,22.79644389147139,22.517897152498904,22.23995961783275,21.962627896803767,21.685898598632903,21.409768333160258,21.134233711715698,20.859291348144414,20.584937859987196,20.311169869865296,20.037984007068882,19.765376909386198,19.493345225188737,19.22188561582005,18.950994758306855,18.680669348442777,18.410906104281125
+Land-Based Wind - Class 8 - Technology 2/Advanced,31.49978513061595,33.30228860966926,29.73781032888414,26.171397398138403,24.223433228861108,22.32517632864785,20.474521817856544,18.669431055047284,16.907925501716857,16.42470787034147,15.941461997683373,15.458168572879753,14.974807592854418,14.49135832867001,14.007799289910803,13.524108186967325,13.040261891071985,12.556236391930945,12.072006752779973,11.587547062690422,11.10283038590115,10.617828707994814,10.132512878656605,9.646852550779297,9.160816115627114,8.674370633769794,8.187481761454428,7.700113672063928,7.212228972276499
+Land-Based Wind - Class 8 - Technology 2/Moderate,31.946858908679044,34.7740200982417,32.088425756861625,29.293712309245258,28.157571332695444,27.035820478559536,25.928014210631193,24.833709807975517,23.752466278604057,23.352403948041264,22.952523207559548,22.552810533383163,22.15325195043731,21.753833010617036,21.35453876981249,20.955353763598644,20.556261981503816,20.15724683975389,19.758291152391752,19.359377100662496,18.960486200516062,18.561599268131417,18.162696383286008,17.7637568504356,17.364759157315948,16.965680930899474,16.566498890497364,16.167188797791567,15.767725403563176
+Land-Based Wind - Class 8 - Technology 2/Conservative,32.262744617909945,36.01863172285616,34.16417587103645,32.12486016555873,31.800551313258527,31.4794988708682,31.161841900273206,30.847731885009054,30.537334088339524,30.217408640339812,29.8982724218528,29.5799235397259,29.26236017395179,28.94558058160173,28.62958310105783,28.314366156577698,27.999928263212894,27.686268032115088,27.37338417626123,27.061275516649278,26.749940988964074,26.439379650814388,26.129590689543473,25.82057343069325,25.512327347164284,25.204852069151656,24.89814739491873,24.592213302490343,24.28704996235745
+Land-Based Wind - Class 9 - Technology 3/Advanced,35.360282544014694,37.50352256248325,34.27529400504204,30.995226849563124,29.357549876250662,27.764005286817465,26.212906705563118,24.702633351779106,23.231625757445446,22.659704609252834,22.087860994110716,21.516074981213865,20.944325932513046,20.37259246825822,19.800852430526586,19.22908284459404,18.65725987800456,18.085358797170436,17.513353921333813,16.94121857370472,16.36892502954871,15.796444461037176,15.223746878590664,14.650801068471537,14.077574526333766,13.504033386428581,12.93014234612832,12.355864585405385,11.781161680869612
+Land-Based Wind - Class 9 - Technology 3/Moderate,35.85194780945044,38.8247719376762,36.309546853477826,33.6696846763124,32.690296335953036,31.724526771815334,30.7720406939896,29.83251014596319,28.905614064246866,28.45257389420493,27.99980419543606,27.54729132419438,27.09502118941763,26.642979231153774,26.191150397749215,25.739519121712803,25.288069294170903,24.836784237805617,24.385646678183083,23.93463871335958,23.483741781617756,23.03293662724004,22.58220326414426,22.13152093724222,21.680868081344155,21.230222277432873,20.77956020610643,20.328857597973467,19.87808918076844
+Land-Based Wind - Class 9 - Technology 3/Conservative,36.19244092819298,40.040784838225875,38.30808350584452,36.37969593634512,36.16718625659563,35.95890659525461,35.75507045855116,35.55590988282344,35.36167743800404,35.004678460815285,34.6485279541413,34.293222888655066,33.93876027702756,33.58513717620867,33.23235068991569,32.880397971342404,32.52927622611202,32.178982715493454,31.82951475990635,31.480869742755292,31.133045114585595,30.786038397642187,30.439847190833635,30.094469175154984,29.74990211960696,29.40614388767102,29.063192444382345,28.721045864071876,28.379702338836914
+Land-Based Wind - Class 10 - Technology 4/Advanced,63.15970813100256,66.03163438044407,59.71838728964519,53.41867077432792,49.84615326239624,46.374393603813154,42.99896400344093,39.715593197598736,36.52015309299861,35.775167772801716,35.03025888157718,34.28539952537709,33.540561843051485,32.79571695865525,32.05083493103923,31.305884700430752,30.560834031800155,29.8156494547706,29.070296199835607,28.324738130627534,27.578937671903827,26.832855732998084,26.086451626348452,25.33968298075782,24.592505648967414,23.844873609125237,23.09673885965873,22.3480513070366,21.598758645861956
+Land-Based Wind - Class 10 - Technology 4/Moderate,64.02741237759491,68.5594563830413,63.63208652386781,58.53067632512952,56.20596668371908,53.90807570682404,51.635977972803516,49.38864211931955,47.16502738346777,46.552087016807214,45.939618218776644,45.327605094633384,44.716031236697845,44.10487969927377,43.4941329721149,42.88377295233396,42.27378091465149,41.66413747985825,41.054822581376044,40.445815429795346,39.83709447518923,39.22863736711895,38.62042091210594,38.012421028407644,37.40461269788133,36.79696991473115,36.18946563089101,35.58207169778395,34.974758804178535
+Land-Based Wind - Class 10 - Technology 4/Conservative,64.54544951964344,71.05745326659252,67.90639905781075,64.4075792740887,63.81929906482108,63.23702930549798,62.661021234111516,62.091548035375475,61.5289071918226,61.01959302159076,60.511807089117426,60.00555292701635,59.50083443282546,58.997655886860656,58.49602197120525,57.995937789919246,57.49740889056436,57.00044128713717,56.50504148451873,56.01121650458167,55.51897391401647,55.028321854102614,54.539269072510976,54.05182495733374,53.56599957349873,53.08180370179473,52.59924888069688,52.11834745124075,51.63911260520655
diff --git a/tests/data/Land-Based_Wind/Market/30/df_tc.csv b/tests/data/Land-Based_Wind/Market/30/df_tc.csv
index 767bb88..e8dad50 100644
--- a/tests/data/Land-Based_Wind/Market/30/df_tc.csv
+++ b/tests/data/Land-Based_Wind/Market/30/df_tc.csv
@@ -1,31 +1,31 @@
 Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-10 year CRF/Advanced,0.12735376406238905,0.12810919820253852,0.12894790384654953,0.12949963144515403,0.1297209552854976,0.12995088556384843,0.13018993378390603,0.13043865276528402,0.1306976408972293,0.1307975282712223,0.13089937236464677,0.1310032312042341,0.13110916513251955,0.13121723692446208,0.1313275119111783,0.13144005811129691,0.13155494637050372,0.13167225050985193,0.13179204748350742,0.13191441754665498,0.13203944443425455,0.1321672155515916,0.13229782217744518,0.13243135968090727,0.13256792775290685,0.1327076306536393,0.1328505774771726,0.13299688243464383,0.13314666515758555
-10 year CRF/Moderate,0.12735376406238905,0.12810919820253852,0.12894790384654953,0.12949963144515403,0.1297209552854976,0.12995088556384843,0.13018993378390603,0.13043865276528402,0.1306976408972293,0.1307975282712223,0.13089937236464677,0.1310032312042341,0.13110916513251955,0.13121723692446208,0.1313275119111783,0.13144005811129691,0.13155494637050372,0.13167225050985193,0.13179204748350742,0.13191441754665498,0.13203944443425455,0.1321672155515916,0.13229782217744518,0.13243135968090727,0.13256792775290685,0.1327076306536393,0.1328505774771726,0.13299688243464383,0.13314666515758555
-10 year CRF/Conservative,0.12735376406238905,0.12810919820253852,0.12894790384654953,0.12949963144515403,0.1297209552854976,0.12995088556384843,0.13018993378390603,0.13043865276528402,0.1306976408972293,0.1307975282712223,0.13089937236464677,0.1310032312042341,0.13110916513251955,0.13121723692446208,0.1313275119111783,0.13144005811129691,0.13155494637050372,0.13167225050985193,0.13179204748350742,0.13191441754665498,0.13203944443425455,0.1321672155515916,0.13229782217744518,0.13243135968090727,0.13256792775290685,0.1327076306536393,0.1328505774771726,0.13299688243464383,0.13314666515758555
+10 year CRF/Advanced,0.1273590409765419,0.1281137319534173,0.1289525466627994,0.1295045010684045,0.12972585672986417,0.1299558200840618,0.13019490271022424,0.1304436575096646,0.1307026829601414,0.13080000928330002,0.13089918832411115,0.13100027345876547,0.1311033201323367,0.13120838595993717,0.13131553083386305,0.13142481703714687,0.1315363093639723,0.13165007524742808,0.13176618489514044,0.1318847114333716,0.1320057310601376,0.13212932320811346,0.13225557071797905,0.13238456002304086,0.1325163813459615,0.13265112890856515,0.13278890115571987,0.13292980099441967,0.13307393604928436
+10 year CRF/Moderate,0.1273590409765419,0.1281137319534173,0.1289525466627994,0.1295045010684045,0.12972585672986417,0.1299558200840618,0.13019490271022424,0.1304436575096646,0.1307026829601414,0.13080000928330002,0.13089918832411115,0.13100027345876547,0.1311033201323367,0.13120838595993717,0.13131553083386305,0.13142481703714687,0.1315363093639723,0.13165007524742808,0.13176618489514044,0.1318847114333716,0.1320057310601376,0.13212932320811346,0.13225557071797905,0.13238456002304086,0.1325163813459615,0.13265112890856515,0.13278890115571987,0.13292980099441967,0.13307393604928436
+10 year CRF/Conservative,0.1273590409765419,0.1281137319534173,0.1289525466627994,0.1295045010684045,0.12972585672986417,0.1299558200840618,0.13019490271022424,0.1304436575096646,0.1307026829601414,0.13080000928330002,0.13089918832411115,0.13100027345876547,0.1311033201323367,0.13120838595993717,0.13131553083386305,0.13142481703714687,0.1315363093639723,0.13165007524742808,0.13176618489514044,0.1318847114333716,0.1320057310601376,0.13212932320811346,0.13225557071797905,0.13238456002304086,0.1325163813459615,0.13265112890856515,0.13278890115571987,0.13292980099441967,0.13307393604928436
 ITC Schedule/*,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-PTC/Advanced,18.18179123120567,18.330033027195014,18.49359905840435,18.600609829936886,18.643404879782903,18.687783729737077,18.733835421545933,18.78165575599644,18.831347942241845,18.850485367788494,18.869981600421415,18.88984678220553,18.910091439345678,18.930726500462317,18.951763315915226,18.973213678245173,18.995089843811932,19.017404555705987,19.040171068026115,19.063403171620777,19.08711522138201,19.111322165223793,19.13603957484829,19.161283678439077,19.187071395416872,19.213420373415513,19.240349027640274,19.267876582790418,19.29602311774067
-PTC/Moderate,18.18179123120567,18.330033027195014,18.49359905840435,18.600609829936886,18.643404879782903,18.687783729737077,18.733835421545933,18.78165575599644,18.831347942241845,18.850485367788494,18.869981600421415,18.88984678220553,18.910091439345678,18.930726500462317,18.951763315915226,18.973213678245173,18.995089843811932,19.017404555705987,19.040171068026115,19.063403171620777,19.08711522138201,19.111322165223793,19.13603957484829,19.161283678439077,19.187071395416872,19.213420373415513,19.240349027640274,19.267876582790418,19.29602311774067
-PTC/Conservative,18.18179123120567,18.330033027195014,18.49359905840435,18.600609829936886,18.643404879782903,18.687783729737077,18.733835421545933,18.78165575599644,18.831347942241845,18.850485367788494,18.869981600421415,18.88984678220553,18.910091439345678,18.930726500462317,18.951763315915226,18.973213678245173,18.995089843811932,19.017404555705987,19.040171068026115,19.063403171620777,19.08711522138201,19.111322165223793,19.13603957484829,19.161283678439077,19.187071395416872,19.213420373415513,19.240349027640274,19.267876582790418,19.29602311774067
-PVD/Advanced,0.8208661102100666,0.8222405011013599,0.8206074233701499,0.8188284337154712,0.8181035755523601,0.8173523028366673,0.8165731452064288,0.8157645211300238,0.8149247271997729,0.8146014348828481,0.8142721536272319,0.8139367154850528,0.8135949461704516,0.813246664757798,0.8128916833625043,0.8125298068032627,0.8121608322443914,0.8117845488169813,0.8114007372173021,0.8110091692808032,0.8106096075302214,0.8102018046955577,0.8097855032041732,0.8093604346386432,0.8089263191600662,0.8084828648941413,0.8080297672772488,0.8075667083594282,0.8070933560609111
-PVD/Moderate,0.8208661102100666,0.8222405011013599,0.8206074233701499,0.8188284337154712,0.8181035755523601,0.8173523028366673,0.8165731452064288,0.8157645211300238,0.8149247271997729,0.8146014348828481,0.8142721536272319,0.8139367154850528,0.8135949461704516,0.813246664757798,0.8128916833625043,0.8125298068032627,0.8121608322443914,0.8117845488169813,0.8114007372173021,0.8110091692808032,0.8106096075302214,0.8102018046955577,0.8097855032041732,0.8093604346386432,0.8089263191600662,0.8084828648941413,0.8080297672772488,0.8075667083594282,0.8070933560609111
-PVD/Conservative,0.8208661102100666,0.8222405011013599,0.8206074233701499,0.8188284337154712,0.8181035755523601,0.8173523028366673,0.8165731452064288,0.8157645211300238,0.8149247271997729,0.8146014348828481,0.8142721536272319,0.8139367154850528,0.8135949461704516,0.813246664757798,0.8128916833625043,0.8125298068032627,0.8121608322443914,0.8117845488169813,0.8114007372173021,0.8110091692808032,0.8106096075302214,0.8102018046955577,0.8097855032041732,0.8093604346386432,0.8089263191600662,0.8084828648941413,0.8080297672772488,0.8075667083594282,0.8070933560609111
-PFF/Advanced,1.0620913859842833,1.0616149946357527,1.0621810520125552,1.0627976853779122,1.0630489357026967,1.0633093418392698,1.0635794134444725,1.063859698708769,1.064150788067302,1.0642628476449703,1.0643769831084708,1.0644932526718924,1.0646117167461968,1.0647324380438228,1.0648554816893232,1.0649809153364398,1.0651088092920733,1.0652392366476018,1.0653722734180804,1.065507998689902,1.065646494777432,1.0657878473893934,1.0659321458056097,1.066079483064925,1.0662299561650943,1.0663836662755832,1.0665407189642284,1.0667012244388407,1.0668652978049036
-PFF/Moderate,1.0620913859842833,1.0616149946357527,1.0621810520125552,1.0627976853779122,1.0630489357026967,1.0633093418392698,1.0635794134444725,1.063859698708769,1.064150788067302,1.0642628476449703,1.0643769831084708,1.0644932526718924,1.0646117167461968,1.0647324380438228,1.0648554816893232,1.0649809153364398,1.0651088092920733,1.0652392366476018,1.0653722734180804,1.065507998689902,1.065646494777432,1.0657878473893934,1.0659321458056097,1.066079483064925,1.0662299561650943,1.0663836662755832,1.0665407189642284,1.0667012244388407,1.0668652978049036
-PFF/Conservative,1.0620913859842833,1.0616149946357527,1.0621810520125552,1.0627976853779122,1.0630489357026967,1.0633093418392698,1.0635794134444725,1.063859698708769,1.064150788067302,1.0642628476449703,1.0643769831084708,1.0644932526718924,1.0646117167461968,1.0647324380438228,1.0648554816893232,1.0649809153364398,1.0651088092920733,1.0652392366476018,1.0653722734180804,1.065507998689902,1.065646494777432,1.0657878473893934,1.0659321458056097,1.066079483064925,1.0662299561650943,1.0663836662755832,1.0665407189642284,1.0667012244388407,1.0668652978049036
+PTC/Advanced,18.182829730127462,18.330920092448515,18.494501513550166,18.601552232294395,18.64435176238487,18.688735242853475,18.734791722885138,18.782617011181635,18.83231432532372,18.850960506253863,18.86994638380153,18.889281285304474,18.908974881182786,18.92903720078523,18.94947864911808,18.970310024512422,18.99154253729506,19.013187829524604,19.035257995868836,19.057765605701842,19.080723726491964,19.104145948588453,19.1280464114887,19.152439831698025,19.17734153229009,19.202767474294383,19.228734290038915,19.255259318593204,19.28236064346548
+PTC/Moderate,18.182829730127462,18.330920092448515,18.494501513550166,18.601552232294395,18.64435176238487,18.688735242853475,18.734791722885138,18.782617011181635,18.83231432532372,18.850960506253863,18.86994638380153,18.889281285304474,18.908974881182786,18.92903720078523,18.94947864911808,18.970310024512422,18.99154253729506,19.013187829524604,19.035257995868836,19.057765605701842,19.080723726491964,19.104145948588453,19.1280464114887,19.152439831698025,19.17734153229009,19.202767474294383,19.228734290038915,19.255259318593204,19.28236064346548
+PTC/Conservative,18.182829730127462,18.330920092448515,18.494501513550166,18.601552232294395,18.64435176238487,18.688735242853475,18.734791722885138,18.782617011181635,18.83231432532372,18.850960506253863,18.86994638380153,18.889281285304474,18.908974881182786,18.92903720078523,18.94947864911808,18.970310024512422,18.99154253729506,19.013187829524604,19.035257995868836,19.057765605701842,19.080723726491964,19.104145948588453,19.1280464114887,19.152439831698025,19.17734153229009,19.202767474294383,19.228734290038915,19.255259318593204,19.28236064346548
+PVD/Advanced,0.8208485520855534,0.8222254445753295,0.8205921129677403,0.8188124671473862,0.8180875417894133,0.8173361995591585,0.816556969972909,0.8157482713686651,0.8149084001989623,0.8145934091741072,0.8142727483521742,0.8139462632818022,0.8136137938511782,0.8132751740263693,0.8129302315750025,0.8125787877743449,0.8122206571026993,0.8118556469130738,0.8114835570878475,0.8111041796731042,0.810717298491437,0.8103226887313989,0.8099201165122126,0.8095093384218368,0.8090901010265601,0.808662140349962,0.8082251813190588,0.8077789371751618,0.8073231088468013
+PVD/Moderate,0.8208485520855534,0.8222254445753295,0.8205921129677403,0.8188124671473862,0.8180875417894133,0.8173361995591585,0.816556969972909,0.8157482713686651,0.8149084001989623,0.8145934091741072,0.8142727483521742,0.8139462632818022,0.8136137938511782,0.8132751740263693,0.8129302315750025,0.8125787877743449,0.8122206571026993,0.8118556469130738,0.8114835570878475,0.8111041796731042,0.810717298491437,0.8103226887313989,0.8099201165122126,0.8095093384218368,0.8090901010265601,0.808662140349962,0.8082251813190588,0.8077789371751618,0.8073231088468013
+PVD/Conservative,0.8208485520855534,0.8222254445753295,0.8205921129677403,0.8188124671473862,0.8180875417894133,0.8173361995591585,0.816556969972909,0.8157482713686651,0.8149084001989623,0.8145934091741072,0.8142727483521742,0.8139462632818022,0.8136137938511782,0.8132751740263693,0.8129302315750025,0.8125787877743449,0.8122206571026993,0.8118556469130738,0.8114835570878475,0.8111041796731042,0.810717298491437,0.8103226887313989,0.8099201165122126,0.8095093384218368,0.8090901010265601,0.808662140349962,0.8082251813190588,0.8077789371751618,0.8073231088468013
+PFF/Advanced,1.0620974719811185,1.061620213528562,1.062186358903991,1.0628032197094839,1.06305449332535,1.0633149235570598,1.0635850201036536,1.0638653312007886,1.064156447332059,1.0642656295160042,1.064376776964921,1.0644899432147374,1.0646051837634078,1.0647225561616114,1.0648421201085299,1.0649639375530346,1.0650880728006533,1.065214592626683,1.0653435663958901,1.0654750661892578,1.0656091669381957,1.0657459465668433,1.0658854861429523,1.0660278700380006,1.0661731860971768,1.0663215258199836,1.066472984552214,1.0666276616901607,1.066785660897971
+PFF/Moderate,1.0620974719811185,1.061620213528562,1.062186358903991,1.0628032197094839,1.06305449332535,1.0633149235570598,1.0635850201036536,1.0638653312007886,1.064156447332059,1.0642656295160042,1.064376776964921,1.0644899432147374,1.0646051837634078,1.0647225561616114,1.0648421201085299,1.0649639375530346,1.0650880728006533,1.065214592626683,1.0653435663958901,1.0654750661892578,1.0656091669381957,1.0657459465668433,1.0658854861429523,1.0660278700380006,1.0661731860971768,1.0663215258199836,1.066472984552214,1.0666276616901607,1.066785660897971
+PFF/Conservative,1.0620974719811185,1.061620213528562,1.062186358903991,1.0628032197094839,1.06305449332535,1.0633149235570598,1.0635850201036536,1.0638653312007886,1.064156447332059,1.0642656295160042,1.064376776964921,1.0644899432147374,1.0646051837634078,1.0647225561616114,1.0648421201085299,1.0649639375530346,1.0650880728006533,1.065214592626683,1.0653435663958901,1.0654750661892578,1.0656091669381957,1.0657459465668433,1.0658854861429523,1.0660278700380006,1.0661731860971768,1.0663215258199836,1.066472984552214,1.0666276616901607,1.066785660897971
 Year (Advanced)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031.0,2032.0,2033.0,2034.0,2035.0,2036,2037.0,2038.0,2039.0,2040.0,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
-1/nan,0.9300325592016259,0.9306205802814714,0.9299217820249687,0.929159104560833,0.9288479150122555,0.9285251202870787,0.9281900588633314,0.9278420179674896,0.9274802285130835,0.9273408612804871,0.9271988605137609,0.9270541508545702,0.9269066540417314,0.9267562887700771,0.926602970541005,0.9264466115041425,0.9262871202894817,0.9261244018293425,0.9259583571694103,0.9257888832680354,0.925615872783042,0.9254392138449721,0.9252587898158745,0.9250744790324861,0.9248861545326525,0.9246936837636622,0.9244969282711111,0.9242957433667501,0.924089977773646
-2/nan,0.8649605611751258,0.8660546644434227,0.8647545206844933,0.8633366415882889,0.8627584492226142,0.862158899004134,0.8615367853727146,0.8608908103059831,0.8602195742826816,0.8599610730004356,0.8596977269380166,0.8594293986166882,0.8591559453068381,0.8588772187748867,0.8585930650154147,0.8583033239675077,0.8580078292141807,0.8577064076637574,0.8573988792118733,0.8570850563826761,0.8567647439479126,0.856437738522,0.8561038281315367,0.8557627917572255,0.8554143988461976,0.8550584087924118,0.8546945703827199,0.8543226212058932,0.8539422870216975
-3/nan,0.8044414843181766,0.8059682943798131,0.8041540648890717,0.8021771008327313,0.8013713867196322,0.8005361954043889,0.7996698795280253,0.7987706666839706,0.7978366473271289,0.7974770421039158,0.7971107528031993,0.7967375913540478,0.7963573625644221,0.7959698637809796,0.7955748845291895,0.7951722061324399,0.7947616013086329,0.7943428337427915,0.7939156576339199,0.7934798172142388,0.7930350462390866,0.7925810674449655,0.7921175919737231,0.7916443187602011,0.7911609338807204,0.7906671098593507,0.7901625049288215,0.7896467622425315,0.7891195090338567
-4/nan,0.7481567723883884,0.7500506818042094,0.7478003810442678,0.7453501567089457,0.7443521417050102,0.7433179671320205,0.7422456325503509,0.7411329872692921,0.7399777159790779,0.7395330470760605,0.7390801817023926,0.7386188912066423,0.7381489383560866,0.7376700769304845,0.737182051292564,0.7366845959336725,0.7361774349928308,0.7356602817474676,0.7351328380737765,0.7345947938744949,0.7340458264721323,0.7334855999646775,0.7329137645414717,0.7323299557561204,0.7317337937534015,0.7311248824466113,0.730502808641702,0.729867141104108,0.7292174295638472
-5/nan,0.6958101577084012,0.6980126007411467,0.6953958629396362,0.6925488841919605,0.6913899348576057,0.6901894048428061,0.6889450173679609,0.6876543264902137,0.6863147011108648,0.685799212820897,0.6852743023027618,0.6847397089927179,0.6841951626360966,0.683640382832833,0.6830750785572013,0.6824989476500494,0.6819116762816064,0.681312938382979,0.6807023950440803,0.6800796938755813,0.6794444683327522,0.6787963369979189,0.678134902819039,0.6774597523009767,0.6767704546461726,0.6760665608408315,0.6753476026826728,0.6746130917457863,0.6738625182778107
-6/nan,0.6471261016920312,0.649584891545505,0.6466637600776173,0.643488101100406,0.6421960994529462,0.6408582001525338,0.6394719162243664,0.6380345779547548,0.6365433158181933,0.6359696326828106,0.6353855522344832,0.6347907894766497,0.6341850489105626,0.6335680240475111,0.6329393968936331,0.6322988374055316,0.6316460029146624,0.630980537518528,0.6303020714362995,0.6296102203263417,0.6289045845634303,0.6281847484722007,0.6274502795142497,0.626700727425303,0.6259356232990135,0.6251544786133386,0.6243567841953898,0.623542009120113,0.6227095995378351
+1/nan,0.93002504131163,0.9306141433315013,0.9299152246713939,0.9291522526412035,0.9288410287038338,0.9285181983333807,0.9281830999377587,0.9278350206680175,0.9274731913564348,0.9273374008582824,0.9271991170328132,0.9270582705715987,0.9269147895733791,0.9267685994216703,0.9266196226553715,0.9264677788319079,0.9263129843823821,0.9261551524582183,0.9259941927686782,0.9258300114085943,0.925662510675724,0.9254915888768391,0.9253171401218531,0.9251390541050499,0.9249572158725075,0.9247715055746398,0.9245817982027771,0.9243879633085441,0.9241898647047215
+2/nan,0.864946577466699,0.8660426837686239,0.864742325075649,0.8633239085882229,0.8627456566035963,0.8621460446362673,0.8615238670100676,0.8608778255780204,0.86020652068489,0.8599546550305948,0.8596982026264284,0.8594370370352036,0.8591710271298617,0.8589000368740045,0.8586239250899831,0.8583425452137289,0.8580557450353951,0.8577633664249057,0.8574652450413159,0.857161210024838,0.8568510836704849,0.8565346810817763,0.8562118098032849,0.8558822694303866,0.8555458511946203,0.8552023375227861,0.8548515015678808,0.8544931067097182,0.8541269060229315
+3/nan,0.8044219764408197,0.8059515702438522,0.8041370535055856,0.8021593544237557,0.8013535631894488,0.8005182920659174,0.7996518935517699,0.7987525950878204,0.79781848696523,0.7974681146520526,0.797111414389921,0.7967482132190349,0.7963783318196198,0.7960015842169422,0.7956177774697542,0.7952267113410898,0.7948281779501851,0.7944219614043331,0.7940078374092302,0.7935855728563004,0.793154925385636,0.79271564292249,0.7922674631857315,0.7918101131661114,0.7913433085722505,0.790866753241898,0.7903801385159752,0.7898831425725868,0.7893754297179956
+4/nan,0.7481325818713565,0.7500299301091607,0.7477792887772393,0.7453281711400463,0.7443300679883703,0.7432958022819606,0.7422233734279804,0.7411106305719405,0.739955258228804,0.7395220087087891,0.7390809995991117,0.7386320206278498,0.7381748538593816,0.7377092733421663,0.7372350447369288,0.7367519249239821,0.7362596615882468,0.7357579927805871,0.735246646453764,0.7347253399712445,0.7341937795872844,0.7336516598958603,0.7330986632466165,0.7325344591253089,0.7319587034963274,0.7313710381044373,0.7307710897328605,0.730158469414426,0.7295327715923057
+5/nan,0.6957820353614846,0.6979884608815224,0.6953713453279017,0.6925233491717224,0.6913643060455125,0.6901636791636109,0.6889191915946437,0.6876283972340038,0.6862886648104437,0.6857864174335045,0.6852752502440252,0.6847549236320599,0.6842251893334286,0.6836857900356977,0.6831364589624489,0.6825769194344543,0.6820068844061715,0.6814260559760573,0.680834124868831,0.6802307698877607,0.6796156573352647,0.6789884403991502,0.6783487585025126,0.6776962366145426,0.6770304845196132,0.6763510960415278,0.6756576482198111,0.6749497004344852,0.6742267934755536
+6/nan,0.6470947161809548,0.649557933578531,0.6466364008206451,0.6434596298895368,0.6421675332364261,0.6408295359321333,0.6394431508609311,0.6380057081595277,0.6365143381434888,0.6359553938866992,0.6353866069507004,0.6348077152677246,0.6342184473918006,0.6336185220758818,0.6330076478259111,0.6323855224303649,0.6317518324636111,0.6311062527615078,0.6304484458672825,0.6297780614456624,0.6290947356634938,0.6283980905340165,0.6276877332227545,0.62696325531213,0.6262242320220761,0.6254702213833814,0.6247007633605324,0.6239153789203458,0.62311356904247
 Year (Moderate)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031.0,2032.0,2033.0,2034.0,2035.0,2036,2037.0,2038.0,2039.0,2040.0,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
-1/nan,0.9300325592016259,0.9306205802814714,0.9299217820249687,0.929159104560833,0.9288479150122555,0.9285251202870787,0.9281900588633314,0.9278420179674896,0.9274802285130835,0.9273408612804871,0.9271988605137609,0.9270541508545702,0.9269066540417314,0.9267562887700771,0.926602970541005,0.9264466115041425,0.9262871202894817,0.9261244018293425,0.9259583571694103,0.9257888832680354,0.925615872783042,0.9254392138449721,0.9252587898158745,0.9250744790324861,0.9248861545326525,0.9246936837636622,0.9244969282711111,0.9242957433667501,0.924089977773646
-2/nan,0.8649605611751258,0.8660546644434227,0.8647545206844933,0.8633366415882889,0.8627584492226142,0.862158899004134,0.8615367853727146,0.8608908103059831,0.8602195742826816,0.8599610730004356,0.8596977269380166,0.8594293986166882,0.8591559453068381,0.8588772187748867,0.8585930650154147,0.8583033239675077,0.8580078292141807,0.8577064076637574,0.8573988792118733,0.8570850563826761,0.8567647439479126,0.856437738522,0.8561038281315367,0.8557627917572255,0.8554143988461976,0.8550584087924118,0.8546945703827199,0.8543226212058932,0.8539422870216975
-3/nan,0.8044414843181766,0.8059682943798131,0.8041540648890717,0.8021771008327313,0.8013713867196322,0.8005361954043889,0.7996698795280253,0.7987706666839706,0.7978366473271289,0.7974770421039158,0.7971107528031993,0.7967375913540478,0.7963573625644221,0.7959698637809796,0.7955748845291895,0.7951722061324399,0.7947616013086329,0.7943428337427915,0.7939156576339199,0.7934798172142388,0.7930350462390866,0.7925810674449655,0.7921175919737231,0.7916443187602011,0.7911609338807204,0.7906671098593507,0.7901625049288215,0.7896467622425315,0.7891195090338567
-4/nan,0.7481567723883884,0.7500506818042094,0.7478003810442678,0.7453501567089457,0.7443521417050102,0.7433179671320205,0.7422456325503509,0.7411329872692921,0.7399777159790779,0.7395330470760605,0.7390801817023926,0.7386188912066423,0.7381489383560866,0.7376700769304845,0.737182051292564,0.7366845959336725,0.7361774349928308,0.7356602817474676,0.7351328380737765,0.7345947938744949,0.7340458264721323,0.7334855999646775,0.7329137645414717,0.7323299557561204,0.7317337937534015,0.7311248824466113,0.730502808641702,0.729867141104108,0.7292174295638472
-5/nan,0.6958101577084012,0.6980126007411467,0.6953958629396362,0.6925488841919605,0.6913899348576057,0.6901894048428061,0.6889450173679609,0.6876543264902137,0.6863147011108648,0.685799212820897,0.6852743023027618,0.6847397089927179,0.6841951626360966,0.683640382832833,0.6830750785572013,0.6824989476500494,0.6819116762816064,0.681312938382979,0.6807023950440803,0.6800796938755813,0.6794444683327522,0.6787963369979189,0.678134902819039,0.6774597523009767,0.6767704546461726,0.6760665608408315,0.6753476026826728,0.6746130917457863,0.6738625182778107
-6/nan,0.6471261016920312,0.649584891545505,0.6466637600776173,0.643488101100406,0.6421960994529462,0.6408582001525338,0.6394719162243664,0.6380345779547548,0.6365433158181933,0.6359696326828106,0.6353855522344832,0.6347907894766497,0.6341850489105626,0.6335680240475111,0.6329393968936331,0.6322988374055316,0.6316460029146624,0.630980537518528,0.6303020714362995,0.6296102203263417,0.6289045845634303,0.6281847484722007,0.6274502795142497,0.626700727425303,0.6259356232990135,0.6251544786133386,0.6243567841953898,0.623542009120113,0.6227095995378351
+1/nan,0.93002504131163,0.9306141433315013,0.9299152246713939,0.9291522526412035,0.9288410287038338,0.9285181983333807,0.9281830999377587,0.9278350206680175,0.9274731913564348,0.9273374008582824,0.9271991170328132,0.9270582705715987,0.9269147895733791,0.9267685994216703,0.9266196226553715,0.9264677788319079,0.9263129843823821,0.9261551524582183,0.9259941927686782,0.9258300114085943,0.925662510675724,0.9254915888768391,0.9253171401218531,0.9251390541050499,0.9249572158725075,0.9247715055746398,0.9245817982027771,0.9243879633085441,0.9241898647047215
+2/nan,0.864946577466699,0.8660426837686239,0.864742325075649,0.8633239085882229,0.8627456566035963,0.8621460446362673,0.8615238670100676,0.8608778255780204,0.86020652068489,0.8599546550305948,0.8596982026264284,0.8594370370352036,0.8591710271298617,0.8589000368740045,0.8586239250899831,0.8583425452137289,0.8580557450353951,0.8577633664249057,0.8574652450413159,0.857161210024838,0.8568510836704849,0.8565346810817763,0.8562118098032849,0.8558822694303866,0.8555458511946203,0.8552023375227861,0.8548515015678808,0.8544931067097182,0.8541269060229315
+3/nan,0.8044219764408197,0.8059515702438522,0.8041370535055856,0.8021593544237557,0.8013535631894488,0.8005182920659174,0.7996518935517699,0.7987525950878204,0.79781848696523,0.7974681146520526,0.797111414389921,0.7967482132190349,0.7963783318196198,0.7960015842169422,0.7956177774697542,0.7952267113410898,0.7948281779501851,0.7944219614043331,0.7940078374092302,0.7935855728563004,0.793154925385636,0.79271564292249,0.7922674631857315,0.7918101131661114,0.7913433085722505,0.790866753241898,0.7903801385159752,0.7898831425725868,0.7893754297179956
+4/nan,0.7481325818713565,0.7500299301091607,0.7477792887772393,0.7453281711400463,0.7443300679883703,0.7432958022819606,0.7422233734279804,0.7411106305719405,0.739955258228804,0.7395220087087891,0.7390809995991117,0.7386320206278498,0.7381748538593816,0.7377092733421663,0.7372350447369288,0.7367519249239821,0.7362596615882468,0.7357579927805871,0.735246646453764,0.7347253399712445,0.7341937795872844,0.7336516598958603,0.7330986632466165,0.7325344591253089,0.7319587034963274,0.7313710381044373,0.7307710897328605,0.730158469414426,0.7295327715923057
+5/nan,0.6957820353614846,0.6979884608815224,0.6953713453279017,0.6925233491717224,0.6913643060455125,0.6901636791636109,0.6889191915946437,0.6876283972340038,0.6862886648104437,0.6857864174335045,0.6852752502440252,0.6847549236320599,0.6842251893334286,0.6836857900356977,0.6831364589624489,0.6825769194344543,0.6820068844061715,0.6814260559760573,0.680834124868831,0.6802307698877607,0.6796156573352647,0.6789884403991502,0.6783487585025126,0.6776962366145426,0.6770304845196132,0.6763510960415278,0.6756576482198111,0.6749497004344852,0.6742267934755536
+6/nan,0.6470947161809548,0.649557933578531,0.6466364008206451,0.6434596298895368,0.6421675332364261,0.6408295359321333,0.6394431508609311,0.6380057081595277,0.6365143381434888,0.6359553938866992,0.6353866069507004,0.6348077152677246,0.6342184473918006,0.6336185220758818,0.6330076478259111,0.6323855224303649,0.6317518324636111,0.6311062527615078,0.6304484458672825,0.6297780614456624,0.6290947356634938,0.6283980905340165,0.6276877332227545,0.62696325531213,0.6262242320220761,0.6254702213833814,0.6247007633605324,0.6239153789203458,0.62311356904247
 Year (Conservative)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031.0,2032.0,2033.0,2034.0,2035.0,2036,2037.0,2038.0,2039.0,2040.0,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
-1/nan,0.9300325592016259,0.9306205802814714,0.9299217820249687,0.929159104560833,0.9288479150122555,0.9285251202870787,0.9281900588633314,0.9278420179674896,0.9274802285130835,0.9273408612804871,0.9271988605137609,0.9270541508545702,0.9269066540417314,0.9267562887700771,0.926602970541005,0.9264466115041425,0.9262871202894817,0.9261244018293425,0.9259583571694103,0.9257888832680354,0.925615872783042,0.9254392138449721,0.9252587898158745,0.9250744790324861,0.9248861545326525,0.9246936837636622,0.9244969282711111,0.9242957433667501,0.924089977773646
-2/nan,0.8649605611751258,0.8660546644434227,0.8647545206844933,0.8633366415882889,0.8627584492226142,0.862158899004134,0.8615367853727146,0.8608908103059831,0.8602195742826816,0.8599610730004356,0.8596977269380166,0.8594293986166882,0.8591559453068381,0.8588772187748867,0.8585930650154147,0.8583033239675077,0.8580078292141807,0.8577064076637574,0.8573988792118733,0.8570850563826761,0.8567647439479126,0.856437738522,0.8561038281315367,0.8557627917572255,0.8554143988461976,0.8550584087924118,0.8546945703827199,0.8543226212058932,0.8539422870216975
+1/nan,0.93002504131163,0.9306141433315013,0.9299152246713939,0.9291522526412035,0.9288410287038338,0.9285181983333807,0.9281830999377587,0.9278350206680175,0.9274731913564348,0.9273374008582824,0.9271991170328132,0.9270582705715987,0.9269147895733791,0.9267685994216703,0.9266196226553715,0.9264677788319079,0.9263129843823821,0.9261551524582183,0.9259941927686782,0.9258300114085943,0.925662510675724,0.9254915888768391,0.9253171401218531,0.9251390541050499,0.9249572158725075,0.9247715055746398,0.9245817982027771,0.9243879633085441,0.9241898647047215
+2/nan,0.864946577466699,0.8660426837686239,0.864742325075649,0.8633239085882229,0.8627456566035963,0.8621460446362673,0.8615238670100676,0.8608778255780204,0.86020652068489,0.8599546550305948,0.8596982026264284,0.8594370370352036,0.8591710271298617,0.8589000368740045,0.8586239250899831,0.8583425452137289,0.8580557450353951,0.8577633664249057,0.8574652450413159,0.857161210024838,0.8568510836704849,0.8565346810817763,0.8562118098032849,0.8558822694303866,0.8555458511946203,0.8552023375227861,0.8548515015678808,0.8544931067097182,0.8541269060229315
diff --git a/tests/data/Land-Based_Wind/Market/TechLife/df_lcoe.csv b/tests/data/Land-Based_Wind/Market/TechLife/df_lcoe.csv
index 3f42189..dbed62d 100644
--- a/tests/data/Land-Based_Wind/Market/TechLife/df_lcoe.csv
+++ b/tests/data/Land-Based_Wind/Market/TechLife/df_lcoe.csv
@@ -1,31 +1,31 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Land-Based Wind - Class 1 - Technology 1/Advanced,14.117592308672553,15.329806849924566,13.15332267854005,10.976935500662702,9.846168340399,8.741017654787221,7.660407520019788,6.603291185973585,5.568647923045418,5.228526207857779,4.888409019514874,4.548279871930113,4.20812168188117,3.8679167394667537,3.5276466768053005,3.187292434855376,2.846834228225479,2.5062515078273897,2.1655229212200986,1.8246262704791754,1.4835384673982759,1.1422354858417982,0.8006923110205229,0.45888288546485256,0.11678005143889081,-0.22564451047776402,-0.5684203469420659,-0.9115783018601036,-1.2551505912171628
-Land-Based Wind - Class 1 - Technology 1/Moderate,14.353446281273936,16.042060566941686,14.275547701782237,12.463608846975827,11.711300397069365,10.967569115395005,10.232086631956768,9.504523235379995,8.784546861236489,8.518044071586065,8.251537351664545,7.98501425212028,7.718461884053305,7.451866897558702,7.185215459017719,6.918493227046422,6.65168532701373,6.38477632402283,6.117750194252206,5.850590294541572,5.583279330081293,5.315799320089628,5.048131561311514,4.780256589186241,4.512154136504179,4.243803089366697,3.9751814402369625,3.7062662378620104,3.4370335338161233
-Land-Based Wind - Class 1 - Technology 1/Conservative,14.55846284642104,16.88012425060257,15.681608139632822,14.385251159300964,14.188539796490911,13.993507848583292,13.800226143909804,13.608772162696717,13.419230792606026,13.203372184585248,12.987910940193895,12.772842500231754,12.558162230734716,12.343865419918714,12.129947275017297,11.916402919004423,11.703227387208894,11.490415623807202,11.27796247820276,11.06586270129052,10.85411094159046,10.64270174127391,10.431629532064644,10.220888631026998,10.010473236234532,9.800377422334233,9.590595136002065,9.381120191304927,9.171946264973077
-Land-Based Wind - Class 2 - Technology 1/Advanced,16.236600398186955,17.529628221599502,15.213716212527274,12.895297060128872,11.68698338693256,10.506620905964919,9.353044138436339,8.22512041335148,7.121746487335059,6.763854191880686,6.405918248365268,6.047921903479793,5.6898477902778275,5.331677897792748,4.973393538843627,4.614975315905763,4.256403084909792,3.8976559168186284,3.5387120568240533,3.1795488809933303,2.8201428501645864,2.4604694609060793,2.100503193302078,1.7402174553337844,1.3795845235885444,1.0185754800168851,0.6571601444239441,0.2953070023591273,-0.06701687196602535
-Land-Based Wind - Class 2 - Technology 1/Moderate,16.496148231835814,18.30573397522106,16.43365442082404,14.50943260732712,13.71039710507696,12.920607950949655,12.13972101329663,11.367391175886617,10.603271302366839,10.320477552862034,10.037703244522888,9.754935776044686,9.472162102925331,9.189368715799308,8.90654161750556,8.623666298798781,8.340727712613987,8.057710246777937,7.774597695060834,7.4913732264552095,7.208019352534681,6.924517892779246,6.640849937696391,6.35699580958444,6.072935020755477,5.78864622903,5.504107190287801,5.219294707852992,4.93418457845938
-Land-Based Wind - Class 2 - Technology 1/Conservative,16.714666754479627,19.19899076109874,17.932315026158683,16.557630219250782,16.350782253507216,16.145828611107042,15.94285064908717,15.741937259595076,15.543185717951292,15.314371468797113,15.086004383076709,14.85808026926582,14.630594881450584,14.403543917274906,14.176923015841279,13.950727755565119,13.724953651990162,13.49959615556024,13.274650649358211,13.050112446820272,12.825976789411943,12.602238844301546,12.378893702017379,12.155936374111487,11.933361790832095,11.711164798830815,11.489340158910977,11.267882543845069,11.046786536278375
-Land-Based Wind - Class 3 - Technology 1/Advanced,17.026818573351594,18.349718207156393,15.981581455264646,13.610002472490692,12.372581421555026,11.164000687022913,9.98306041690985,8.828594976341108,7.699469479774272,7.335048268097989,6.970563591256987,6.605998589102523,6.24133578165155,5.876557038386768,5.5116435457255974,5.146575772532302,4.781333433535671,4.415895450499569,4.050239910986541,3.68434402454308,3.318184076101904,2.9517353764155025,2.584972209279865,2.2178677753141507,1.85039413202691,1.4825221298841136,1.114221344062706,0.7454600015480999,0.37620490320254163
-Land-Based Wind - Class 3 - Technology 1/Moderate,17.29546243931728,19.150175413220033,17.238715227969394,15.272607344356217,14.456140767848584,13.649170170540003,12.851345541050083,12.062316016515126,11.281728838146826,10.992857903869993,10.704015129246837,10.4151878562881,10.126362982445826,9.837526938869175,9.548665667389375,9.259764596141995,8.970808613737336,8.681782041870708,8.392668606266739,8.103451405843543,7.814112879947658,7.524634773548872,7.234998100219581,6.945183102748107,6.655169211199226,6.364934998235356,6.07445813148118,5.7837153227082965,5.4926822735846095
-Land-Based Wind - Class 3 - Technology 1/Conservative,17.519017736419226,20.06402145125446,18.771919428817107,17.368015184923564,17.157385857643316,16.94873102321872,16.742135966318067,16.537693836195544,16.3355065292678,16.10185930368295,15.86867781886664,15.635958020452215,15.403695807284542,15.171887029740478,14.940527488027225,14.709612930457915,14.479139051716167,14.249101491103623,14.019495830787353,13.790317594053846,13.561562243561443,13.333225179627487,13.10530173854088,12.877787190925588,12.650676740160534,12.423965520886135,12.197648597608087,11.971720963430641,11.746177538941936
-Land-Based Wind - Class 4 - Technology 1/Advanced,17.984924262449578,19.343849188211834,16.912225200384682,14.476051598327764,13.20320196324922,11.960284207327717,10.74605607488888,9.559311276844078,8.398875914449615,8.026609702679664,7.654254680053153,7.281793850896392,6.909209592152777,6.5364836222950125,6.16359696838304,5.790529931138277,5.417262047895164,5.043772053276115,4.670037837425774,4.2960364016331845,3.921743811131666,3.5471351448906,3.1721844421524388,2.796864645478294,2.4211475400289615,2.045003688791393,1.6684023634311629,1.2913114704228654,0.9136974720807451
-Land-Based Wind - Class 4 - Technology 1/Moderate,18.26478631009657,20.174224824160284,18.21500796803418,16.198105081358733,15.360499938548852,14.532693501148593,13.714328627459786,12.905047485709389,12.10449049881312,11.808249796538195,11.512047826778705,11.21587186280426,10.91970873167504,10.623544792402758,10.327365912834797,10.031157445168908,9.734904200009115,9.438590418853622,9.14219974490862,8.845715192113001,8.549119112224417,8.25239315985408,7.955518255276079,7.658474544857043,7.361241358920921,7.06379716685964,6.766119529271386,6.4681850469021995,6.16996930613443
-Land-Based Wind - Class 4 - Technology 1/Conservative,18.49444967542532,21.11303933317928,19.79010299404166,18.35076450226942,18.135549538993732,17.922406289692837,17.711424802052,17.502703387894755,17.296349547615055,17.056841398531823,16.817821518847108,16.579286020524755,16.341230977957494,16.103652426740478,15.86654636245181,15.629908739438797,15.393735469626705,15.15802242134425,14.922765418186554,14.687960237924663,14.45360261145601,14.219688221836467,13.986212703387508,13.753171640908164,13.520560569001375,13.288374971550045,13.056610281357973,12.825261879993992,12.594325097867618
-Land-Based Wind - Class 5 - Technology 1/Advanced,19.205805260568386,20.6103295615042,18.097541077616306,15.578833889206315,14.26062157968111,12.973753692080624,11.716932761699702,10.488899586080802,9.288429506864162,8.906278975122024,8.52400527906769,8.141591239944034,7.7590190419291645,7.376270200552032,6.993325529220307,6.610165103732076,6.2267682246286995,5.843113377231216,5.459178189195466,5.074939385408943,4.690372740017246,4.305453025389902,3.9201539577747013,3.5344481393998635,3.1483069967445765,2.761700714684668,2.374598166185425,1.9869668371893106,1.5987727463119867
-Land-Based Wind - Class 5 - Technology 1/Moderate,19.500263514886473,21.47945390386724,19.45936752825243,17.377722535978926,16.513174678153316,15.658811373382001,14.814266391832867,13.979173019326531,13.153162988340409,12.847528954650965,12.541947129395655,12.236404698228316,11.930888398489301,11.62538449724564,11.319878768046664,11.014356466301589,10.70880230318949,10.403200417991236,10.097534348736914,9.79178700105313,9.485940615058539,9.179976730195708,8.87387614782267,8.567618891409456,8.26118416415271,7.954550303818124,7.64769473459042,7.3405939157053375,7.033223286604773
-Land-Based Wind - Class 5 - Technology 1/Conservative,19.737712079039927,22.45009263353095,21.087855605988985,19.603353462683195,19.382293756579383,19.16342968018199,18.94685735200448,18.732681663958864,18.521017259135636,18.274038916034208,18.027577556788412,17.78162950536307,17.536191059899977,17.29125849206947,17.04682804646433,16.80289594003834,16.559458361607753,16.316511471413826,16.074051400770113,15.83207425180764,15.590576097314997,15.349552980719945,15.109000916209133,14.868915889021714,14.629293855930882,14.39013074595574,14.151422461324092,13.91316487873252,13.675353850939164
-Land-Based Wind - Class 6 - Technology 1/Advanced,21.277869108364076,22.758998572310524,20.10778030026234,17.448427945473682,16.0526714322389,14.690712467698866,13.361156799020904,12.062652508249254,10.793886043336379,10.395246098968006,9.996419547629905,9.597388870063437,9.198135893331944,8.798641758379908,8.398886885650665,7.9988509386296975,7.59851278516695,7.197850456415676,6.7968411032177904,6.395460949754273,5.993685244240044,5.5914882064693,5.188842971951008,4.785721532387857,4.3820946722092025,3.9779319008559533,3.5732013804794995,3.1678698486908843,2.761902535961063
-Land-Based Wind - Class 6 - Technology 1/Moderate,21.597872924211753,23.695488961660025,21.57205751717173,19.380492528515006,18.470200975613064,17.57074907295926,16.681755160768496,15.802837444195426,14.933612900977192,14.612030745959721,14.290523678967975,13.969078736900578,13.647682504770373,13.326321093539523,13.004980116656867,12.683644665202799,12.362299281551397,12.040927931437672,11.719513974322133,11.39804013193756,11.076488454860392,10.754840286998384,10.433076227812307,10.111176092116732,9.789118867269906,9.46688266756075,9.144444685569468,8.82178114027369,8.49886722163792
-Land-Based Wind - Class 6 - Technology 1/Conservative,21.84853930108152,24.72015927070862,23.29119701871869,21.73001543523467,21.49903244806679,21.270455476360418,21.04439094576078,20.820954919940483,20.600274168953863,20.340612832429997,20.081517231543632,19.822984050197903,19.56500996641862,19.307591652687552,19.050725776378105,18.794409000300647,18.538637983380617,18.28340938147219,18.028719848337314,17.774566036809624,17.52094460014506,17.26785219361543,17.01528547634753,16.763241113452928,16.51171577847112,16.260706156179186,16.010208945799253,15.760220864662227,15.510738652376613
-Land-Based Wind - Class 7 - Technology 1/Advanced,24.578712954691316,26.17983588052359,23.306336521908243,20.42145714170706,18.900735694521384,17.417866137461445,15.971291708524788,14.559504953071702,13.181043327298259,12.756871586813677,12.33239935629014,11.907608484703793,11.48248014030176,11.056994776765535,10.631132097346136,10.204871016829163,9.778189621179067,9.351065124689413,8.923473824462803,8.495391052030637,8.066791121878374,7.637647276677161,7.207931628945314,6.7776150988823005,6.346667348071076,5.915056708732223,5.482750108174173,5.049712988058687,4.615909218061006
-Land-Based Wind - Class 7 - Technology 1/Moderate,24.941422282102376,27.40750294123376,25.285597436380627,23.068641150866036,22.2485914458555,21.43955280284105,20.64123097120909,19.853336550551504,19.07558450611602,18.664717827161,18.253864647844427,17.843005870294753,17.432121707064553,17.02119164665414,16.61019441697051,16.19910794657011,15.787909323535402,15.376574751808192,14.965079504797988,14.553397876072431,14.141503126891049,13.72936743037653,13.316961812044639,12.904256086425455,12.49121878946957,12.077817106411477,11.664016794728859,11.249782101808385,10.835075676887406
-Land-Based Wind - Class 7 - Technology 1/Conservative,25.2131576001315,28.33860215781683,26.80328117175275,25.119874024333114,24.873073516571434,24.629014375148785,24.387819455081896,24.149622627616253,23.914569992955226,23.634692207017224,23.3554578661269,23.07686422792147,22.798908575954847,22.521588221594445,22.24490050611818,21.968842803023144,21.693412520579905,21.41860710464008,21.144424041738443,20.87086086251812,20.597915145488937,20.325584521190283,20.053866676771328,19.782759361047304,19.51226039006947,19.24236765327875,18.973079120290944,18.704392848392,18.436306990813204
-Land-Based Wind - Class 8 - Technology 2/Advanced,31.496692330353046,33.29945337027856,29.73521501482582,26.168987152667427,24.221160321320728,22.323037732252374,20.472514658526023,18.66755260820645,16.90617318960616,16.4238621804556,15.941523504179084,15.459137372121674,14.976683265344832,14.494139898148756,14.01148517939929,13.528696171510823,13.045749046914722,12.5626190418321,12.079280407153917,11.595706356226824,11.11186900928588,10.627739334321376,10.143287084076636,9.658480728899583,9.173287385113923,8.687672738568544,8.201600962976759,7.715034632630161,7.227934629030937
-Land-Based Wind - Class 8 - Technology 2/Moderate,31.943728932523936,34.771077043631735,32.08565650251328,29.291062845895894,28.154995542118638,27.033317501283314,25.925583217762473,24.83135000114204,23.750176889971133,23.351294050947615,22.952604308316293,22.55409417097357,22.155749686344272,21.75755641760931,21.35949941959596,20.961563213230527,20.56373175846077,20.165988425531438,19.768315964502538,19.370696472890145,18.973111361263175,18.575541316690252,18.177966263839316,17.78036532357902,17.382716768872264,16.98499797777156,16.587185383282826,16.18925441985365,15.791179466220914
-Land-Based Wind - Class 8 - Technology 2/Conservative,32.259588374651614,36.015597983950876,34.161254085901376,32.12199549985706,31.79769735813144,31.476655056734806,31.15900762518836,30.844906511849388,30.534516941684235,30.216036239134944,29.898373204777766,29.581526878709738,29.265496416012695,28.950281093088027,28.63588031445732,28.32229362007626,28.00952069320099,27.69756136885406,27.38641564294068,27.076083682089482,26.76656583423355,26.45786264006342,26.149974845376036,25.842903414431653,25.5366495443929,25.231214680961006,24.92660053531227,24.622809102459538,24.31984268117856
-Land-Based Wind - Class 9 - Technology 3/Advanced,35.35720870856352,37.50065883642528,34.27262552532991,30.99269941128108,29.355116374914456,27.761663313368956,26.21065394379731,24.70046757473262,23.229544824005817,22.658698958793998,22.087934237356958,21.517230331727,20.94656617141284,20.3759199062299,19.80526886689459,19.234589523222333,18.663857439763945,18.09304722868763,17.52213249971202,16.95108580687888,16.379878591903253,15.808481123884288,15.236862435065383,14.6649902523599,14.09283092430357,13.520349343080152,12.947508861227117,12.374271202594514,11.800596367090264
-Land-Based Wind - Class 9 - Technology 3/Moderate,35.84883621205596,38.821830576924235,36.30676299942064,33.6670044995044,32.687673991772314,31.721961372394425,30.769531366626346,29.83005603218212,28.90321431882803,28.451410188925287,27.99988925105313,27.54863793351287,27.097642208811024,26.646887571135803,26.196359012507134,25.746040997506796,25.295917436497383,24.845971657209233,24.396186374592443,23.94654365881263,23.4970249012238,23.04761077821738,22.598281212751488,22.14901533340609,21.6997914307669,21.250586910939592,20.801378245970103,20.352140920928246,19.902849377391743
-Land-Based Wind - Class 9 - Technology 3/Conservative,36.189303179506624,40.03775598429893,38.30515306219898,36.37680911632166,36.16429680860902,35.95601376813294,35.75217345603379,35.553007859695235,35.35876949581353,35.00326222971701,34.648631925621984,34.29487646517252,33.941993811957715,33.589982016047045,33.23883921888782,32.888563658590975,32.53915367564461,32.190607719087176,31.842924353182955,31.49610226466214,31.150140270531413,30.805037326565728,30.46079253650283,30.11740516202314,29.7748746335825,29.43320056218864,29.092382752201434,28.75242121526755,28.413316185492707
-Land-Based Wind - Class 10 - Technology 4/Advanced,63.15373218721375,66.02623592322553,59.7134281763688,53.41403979660387,49.84178912380662,46.370289764376636,42.99511426096184,39.711991679280445,36.51679424823028,35.77354235738626,35.03037742818901,34.287272186388904,33.54419834804259,32.80112656843242,32.058026387875856,31.31486617420402,30.57161306167969,29.828232886075504,29.08469011564321,28.340947777681137,27.596967380316354,26.85270882920914,26.10813033873353,25.363188337232906,24.617837365867793,23.8720299705644,23.125716586495788,22.378845414491703,21.631362288720776
-Land-Based Wind - Class 10 - Technology 4/Moderate,64.02136160872826,68.55387348029669,63.626841726877124,58.525661229452,56.20112418227674,53.90340433928185,51.63147637533265,49.38430902703213,47.160861633300314,46.55006362496469,45.93976635678621,45.32995445628398,44.720612045741554,44.11172271689054,43.50326950408929,42.89523485588669,42.28760060486519,41.68034793562532,41.07345735078927,40.466908634897194,39.86068081597628,39.25475212469706,38.64909995087036,38.04370079711252,37.43853022944661,36.8335628246149,36.22877211383813,35.624130522738085,35.01960930711857
-Land-Based Wind - Class 10 - Technology 4/Conservative,64.53935407867839,71.05167241638863,67.90080985812506,64.4020716629585,63.81381494391873,63.23156771764593,62.65558117003317,62.086128429249584,61.5235069163643,61.016959150632346,60.51200073770481,60.008637349420106,59.50687512173694,59.00672067833926,58.508181155774565,58.0112642302434,57.51597814617512,57.02233174671567,56.53033450628,56.03999656536219,55.55132876770395,55.06434270011708,54.57905073509715,54.09546607649776,53.61360280849616,53.13347594815731,52.65510150187896,52.17849652606539,51.70367919240081
+Land-Based Wind - Class 1 - Technology 1/Advanced,14.119158340604681,15.331280439161056,13.154653674692753,10.978149138959054,9.84730698824816,8.742082766113274,7.661400475097331,6.604213292717812,5.56950041806299,5.228934712142575,4.888379529373552,4.547818962119955,4.207236543727394,3.8666152216033467,3.5259373287392286,3.1851845535713466,2.844337908065345,2.503377693900422,2.1622834666217265,1.8210339976195513,1.4796072337706363,1.1379802545880011,0.7961292266849327,0.45402935536301925,0.11165483310615087,-0.23102121524823005,-0.5740267909153367,-0.9173910834202346,-1.2611445370043555
+Land-Based Wind - Class 1 - Technology 1/Moderate,14.355031331802746,16.04358084427475,14.276951367588087,12.464920794664632,11.712562215803825,10.968781285974092,10.233249611106785,9.505637455495108,8.785612730044338,8.518558235246246,8.251499974379108,7.984425793803435,7.7173231227140136,7.450178953287239,7.182979819699973,6.91571177594059,6.648360372333638,6.380910630686753,6.113347017968817,5.84565341841887,5.577813103962935,5.309808702838872,5.0416221662845935,4.773234733158073,4.504626892333228,4.235778342713029,3.966667950675941,3.697273704768655,3.4275726674309546
+Land-Based Wind - Class 1 - Technology 1/Conservative,14.560064428905296,16.881706618203864,15.683117631473817,14.38671327612083,14.189996394077252,13.9949592697321,13.80167275182286,13.610214342806927,13.42066895460582,13.204071123483189,12.987859738238182,12.77202995475951,12.556576843226217,12.341495384456778,12.12678046610986,11.91242687872451,11.698429311600183,11.484782348501106,11.271480463186819,11.05851801476102,10.845889242819062,10.633588262407471,10.421609058772553,10.209945481900402,9.99859124083207,9.787539897759359,9.57678486188367,9.366319383040441,9.156136545078233
+Land-Based Wind - Class 2 - Technology 1/Advanced,16.238337300932823,17.531256090185423,15.215192618987249,12.896650536449808,11.688256788496872,10.507815828237579,9.354162097394347,8.226162846974066,7.122714756838022,6.764319039069672,6.405884625237459,6.04739532107266,5.688834356495061,5.330184357864635,4.971427318624002,4.612544568225328,4.253516739222729,3.8943237324020075,3.534944679811339,3.175357905547269,2.815540884124278,2.4554701962705288,2.0951214819473662,1.7344693903966757,1.3734875269890239,1.0121483966372757,0.6504233435102051,0.2882824867641567,-0.07430534801729394
+Land-Based Wind - Class 2 - Technology 1/Moderate,16.497906063784246,18.30741279504683,16.435209962879743,14.510893021743414,13.711804384211387,12.921962617162066,12.141023563778692,11.368642082416653,10.604471010987183,10.321056869868439,10.03766108635634,9.754271320677095,9.47087481101224,9.187458353382183,8.904008280384755,8.62051043870878,8.336950165342067,8.053312262381784,7.769580970353278,7.485739939938082,7.201772201982493,6.917660135688504,6.633385434838122,6.348929071918089,6.064271259986061,5.779391412117334,5.494268098244682,5.208878999201502,4.923200857749958
+Land-Based Wind - Class 2 - Technology 1/Conservative,16.716442207143135,19.200735760326516,17.933983363728448,16.559250692619592,16.352397139216873,16.14743828442583,15.944455507522893,15.743537724872048,15.544782238206029,15.315147729947746,15.085947489776327,14.85717696883658,14.628831549513123,14.400906542583705,14.173397184270453,13.94629863318385,13.719605967160007,13.493314179982875,13.267418177994646,13.041912776594,12.816792696603915,12.592052560532046,12.367686888703169,12.143690095274373,11.920056484122682,11.696780244619113,11.473855447278979,11.251276039300606,11.02903583999105
+Land-Based Wind - Class 3 - Technology 1/Advanced,17.028619197054123,18.351403590843802,15.983112053081296,13.611408046911968,12.373905011150143,11.165243941270269,9.98422490356241,8.829682182994734,7.700480815173815,7.335534076758037,6.970528430298948,6.605447567299532,6.240274597141891,5.874992019025694,5.509581692278573,5.144024804930456,4.778301840431389,4.412392542383014,4.046275877145735,3.679929994174387,3.313332183907388,2.9464588330514623,2.5792853770557933,2.2117862495773792,1.843934828708207,1.4757033797248909,1.107062994092928,0.7379835244385653,0.3684335151756635
+Land-Based Wind - Class 3 - Technology 1/Moderate,17.297284725700667,19.151913375786997,17.240327425988962,15.274123142847074,14.457602309576227,13.650577993368145,12.852700157265616,12.063617912588246,11.28297847441279,10.9934615257011,10.703971187618901,10.41449505095687,10.125020282640914,9.835533605517252,9.546021276986771,9.256469066407142,8.96686223118305,8.677185491450604,8.38742300326265,8.097558330174522,7.807574413099815,7.51745353834033,7.227177303636434,6.936726582107827,6.646081483921563,6.355221315527583,6.064124536272498,5.772768712200367,5.481130466820577
+Land-Based Wind - Class 3 - Technology 1/Conservative,17.52085804966892,20.06582711863517,18.773647022247335,17.36969473166905,17.159059791204125,16.95039973097662,16.743799858578395,16.539353348220764,16.337162123535617,16.102664409150982,15.868618802465253,15.635020864765362,15.4018660949015,15.16914992673938,14.936867726529481,14.70501479018749,14.473586340489717,14.242577524173655,14.011983408952563,13.781798980441248,13.552019138980231,13.322638696380572,13.093652372572837,12.865054792172664,12.636840480954895,12.409003862253641,12.181539253280992,11.954440861379723,11.727702780212567
+Land-Based Wind - Class 4 - Technology 1/Advanced,17.986802145082617,19.34560429296068,16.913821477495457,14.477520302975122,13.204586356999584,11.961586006051288,10.747276909972634,9.560452696857482,8.399939386540233,8.027120890008021,7.654217657039862,7.281213234544214,6.908090579620705,6.534832031115524,6.161419279526587,5.7878333351469635,5.414054494324866,5.040062303709302,4.665835522339329,4.29135208142991,3.916589041674076,3.5415225479035968,3.166127780896815,2.790378906133263,2.4142490192622574,2.0377100880414147,1.6607328904744172,1.2832869488550145,0.9053404594008079
+Land-Based Wind - Class 4 - Technology 1/Moderate,18.266686760012885,20.176034508798836,18.21668887242438,16.199688043807207,15.36202728421993,14.534165786707462,13.71574638349922,12.906411216516343,12.105800682055797,11.808882892694342,11.512001722357109,11.215144677630619,10.918298839029475,10.621450840662067,10.32458684873821,10.027692538836579,9.730753071851794,9.433753068526372,9.136676582473893,8.83950707159185,8.542227367733464,8.244819644540517,7.947265383284659,7.649545336583394,7.35163948982893,7.053527020167472,6.755186252838385,6.456594614681013,6.157728584587904
+Land-Based Wind - Class 4 - Technology 1/Conservative,18.496368644745278,21.11491857248989,19.7919024467226,18.352515686968538,18.137295079553528,17.92414658818501,17.713160284301384,17.504434505581457,17.298076780608273,17.057681483342293,16.817759927773015,16.578307808756268,16.33932076637921,16.100794383775494,15.862724184880431,15.625105632119109,15.38793412403568,15.151204992853863,14.91491350198039,14.679054843450547,14.443624135304542,14.208616418920641,13.974026656290295,13.739849727251034,13.506080426671904,13.27271346161281,13.0397434484536,12.807164910012794,12.574972272662716
+Land-Based Wind - Class 5 - Technology 1/Advanced,19.20778159158898,20.61217348790492,18.099221007263875,15.580382980627654,14.262083380024851,12.975130003259402,11.718225297556074,10.490109974181301,9.289559290013045,8.906822444231246,8.52396588725993,8.140972971188003,7.757826448431448,7.374508442798064,6.991000418869895,6.6072831495929165,6.223336681948798,5.839140300574382,5.454672489186322,5.069910889658409,4.684832258569951,4.299412421062971,3.913626221793276,3.5274474727713923,3.1408488978546494,2.753802073643598,2.366277366504246,1.978243865419536,1.5896693103454318
+Land-Based Wind - Class 5 - Technology 1/Moderate,19.50226359018713,21.48135500375637,19.461136004152333,17.37939110401404,16.514785895969244,15.660365821607833,14.815764624393605,13.980615563217967,13.154550343322903,12.848199618082422,12.541898268328584,12.23563369332333,11.929392863443454,11.62316229969418,11.316928052055374,11.010675676577222,10.704390211144904,10.398056149816238,10.09165741563805,9.785177331839094,9.478598591266532,9.17190322396862,8.865072562768503,8.55808720669463,8.25092698210415,7.943570901335672,7.635997118698626,7.32818288360556,7.020104490623613
+Land-Based Wind - Class 5 - Technology 1/Conservative,19.739731301520617,22.452065645877624,21.089746648765743,19.605195955418132,19.384130565720934,19.165261226525303,18.948684081155168,18.73450404852258,18.522835801148343,18.274923584684537,18.027512684097577,17.780598964487144,17.534178245957584,17.28824630189628,17.04279885721945,16.79783158658128,16.55334011255544,16.309320003782027,16.065766773094,15.822675875625283,15.58004270689094,15.337862600870174,15.096130828079492,14.854842593656166,14.613993035450346,14.373577222152115,14.133590151453419,13.894026748270704,13.654881863040018
+Land-Based Wind - Class 6 - Technology 1/Advanced,21.28001252474765,22.760993190608957,20.109602100624524,17.450113320036394,16.054264416525218,14.69221501337784,13.362570763412375,12.063979656347197,10.795128049533947,10.395844209647546,9.996376145653272,9.59670684875244,9.196818693538507,8.79669340821518,8.396312043080833,7.995654937164481,7.59470168288448,7.193431088591215,6.791821138846341,6.389848952282037,5.98749073685083,5.584721742300392,5.181516209649654,4.777847317456857,4.373687124631626,3.969006509536406,3.563775105089718,3.157961229564336,2.751531812744471
+Land-Based Wind - Class 6 - Technology 1/Moderate,21.60004214479716,23.697545267561075,21.573974673129843,19.382306438838377,18.471954592657024,17.57244301803913,16.68339002742307,15.804413797975819,14.935131279152134,14.612765191604119,14.290470137632052,13.968233334280743,13.646041564933576,13.323881158567787,13.001737967826461,12.67959734582277,12.357444121594842,12.03526257411361,11.713036404747779,11.390748708083915,11.068381940962826,10.745917889637802,10.423337634894157,10.10062151499482,9.777749086285144,9.45469908129122,9.131449364115433,8.807976882932728,8.484257619360182
+Land-Based Wind - Class 6 - Technology 1/Conservative,21.850728734693963,24.72229149214636,23.29324356436192,21.732012951950892,21.501024214203998,21.27244194450268,21.04637259509779,20.822932258605526,20.602247736617958,20.341573196108634,20.08144678728083,19.821864664276735,19.56282295283618,19.30431774936166,19.046345119997678,18.788901099723674,18.531981691473568,18.275582865278224,18.0197005574498,17.764330669814466,17.50946906898781,17.255111585730702,17.001254014377533,16.747892112363758,16.495021599857377,16.24263815952886,15.990737436466915,15.739315038275059,15.488366535370346
+Land-Based Wind - Class 7 - Technology 1/Advanced,24.581122541778473,26.182070411280925,23.30838405732315,20.423359233774235,18.90253716647791,17.41956918934087,15.972898435490738,14.561017347837627,13.182463282218759,12.75755636356065,12.332349592195378,11.906825293834672,11.480965149985277,11.054750166786182,10.628160642029052,10.201176130238618,9.773775405680475,9.345936423147563,8.917636276372182,8.488851153899123,8.059556292218069,7.629725925984761,7.199333235092666,6.768350288375959,6.336747983682567,5.904495984049621,5.471562649677512,5.037914965380512,4.603518463158682
+Land-Based Wind - Class 7 - Technology 1/Moderate,24.943861117042918,27.40982258197519,25.287782652734567,23.070733077846576,22.250633854659124,21.44154641233817,20.643176486027823,19.855234661767916,19.077435891963436,18.66561196303988,18.253799569831752,17.841980022793646,17.430133977002072,17.018241400257573,16.606281539329313,16.194232884209086,15.782073130242267,15.369779137983514,14.957326890617889,14.544691448779925,14.131846902564124,13.718766320549278,13.305421695596035,12.891783887187941,12.477822560052601,12.063506118783554,11.648801638153376,11.233674788787077,10.818089757830439
+Land-Based Wind - Class 7 - Technology 1/Conservative,25.215618347038838,28.340988155506636,26.80557558599678,25.12211864631631,24.87531228120181,24.631247785681325,24.39004804423868,24.151846960160952,23.916790668548405,23.635773227126066,23.355378540884725,23.075603224694117,22.79644389147139,22.517897152498904,22.23995961783275,21.962627896803767,21.685898598632903,21.409768333160258,21.134233711715698,20.859291348144414,20.584937859987196,20.311169869865296,20.037984007068882,19.765376909386198,19.493345225188737,19.22188561582005,18.950994758306855,18.680669348442777,18.410906104281125
+Land-Based Wind - Class 8 - Technology 2/Advanced,31.49978513061595,33.30228860966926,29.73781032888414,26.171397398138403,24.223433228861108,22.32517632864785,20.474521817856544,18.669431055047284,16.907925501716857,16.42470787034147,15.941461997683373,15.458168572879753,14.974807592854418,14.49135832867001,14.007799289910803,13.524108186967325,13.040261891071985,12.556236391930945,12.072006752779973,11.587547062690422,11.10283038590115,10.617828707994814,10.132512878656605,9.646852550779297,9.160816115627114,8.674370633769794,8.187481761454428,7.700113672063928,7.212228972276499
+Land-Based Wind - Class 8 - Technology 2/Moderate,31.946858908679044,34.7740200982417,32.088425756861625,29.293712309245258,28.157571332695444,27.035820478559536,25.928014210631193,24.833709807975517,23.752466278604057,23.352403948041264,22.952523207559548,22.552810533383163,22.15325195043731,21.753833010617036,21.35453876981249,20.955353763598644,20.556261981503816,20.15724683975389,19.758291152391752,19.359377100662496,18.960486200516062,18.561599268131417,18.162696383286008,17.7637568504356,17.364759157315948,16.965680930899474,16.566498890497364,16.167188797791567,15.767725403563176
+Land-Based Wind - Class 8 - Technology 2/Conservative,32.262744617909945,36.01863172285616,34.16417587103645,32.12486016555873,31.800551313258527,31.4794988708682,31.161841900273206,30.847731885009054,30.537334088339524,30.217408640339812,29.8982724218528,29.5799235397259,29.26236017395179,28.94558058160173,28.62958310105783,28.314366156577698,27.999928263212894,27.686268032115088,27.37338417626123,27.061275516649278,26.749940988964074,26.439379650814388,26.129590689543473,25.82057343069325,25.512327347164284,25.204852069151656,24.89814739491873,24.592213302490343,24.28704996235745
+Land-Based Wind - Class 9 - Technology 3/Advanced,35.360282544014694,37.50352256248325,34.27529400504204,30.995226849563124,29.357549876250662,27.764005286817465,26.212906705563118,24.702633351779106,23.231625757445446,22.659704609252834,22.087860994110716,21.516074981213865,20.944325932513046,20.37259246825822,19.800852430526586,19.22908284459404,18.65725987800456,18.085358797170436,17.513353921333813,16.94121857370472,16.36892502954871,15.796444461037176,15.223746878590664,14.650801068471537,14.077574526333766,13.504033386428581,12.93014234612832,12.355864585405385,11.781161680869612
+Land-Based Wind - Class 9 - Technology 3/Moderate,35.85194780945044,38.8247719376762,36.309546853477826,33.6696846763124,32.690296335953036,31.724526771815334,30.7720406939896,29.83251014596319,28.905614064246866,28.45257389420493,27.99980419543606,27.54729132419438,27.09502118941763,26.642979231153774,26.191150397749215,25.739519121712803,25.288069294170903,24.836784237805617,24.385646678183083,23.93463871335958,23.483741781617756,23.03293662724004,22.58220326414426,22.13152093724222,21.680868081344155,21.230222277432873,20.77956020610643,20.328857597973467,19.87808918076844
+Land-Based Wind - Class 9 - Technology 3/Conservative,36.19244092819298,40.040784838225875,38.30808350584452,36.37969593634512,36.16718625659563,35.95890659525461,35.75507045855116,35.55590988282344,35.36167743800404,35.004678460815285,34.6485279541413,34.293222888655066,33.93876027702756,33.58513717620867,33.23235068991569,32.880397971342404,32.52927622611202,32.178982715493454,31.82951475990635,31.480869742755292,31.133045114585595,30.786038397642187,30.439847190833635,30.094469175154984,29.74990211960696,29.40614388767102,29.063192444382345,28.721045864071876,28.379702338836914
+Land-Based Wind - Class 10 - Technology 4/Advanced,63.15970813100256,66.03163438044407,59.71838728964519,53.41867077432792,49.84615326239624,46.374393603813154,42.99896400344093,39.715593197598736,36.52015309299861,35.775167772801716,35.03025888157718,34.28539952537709,33.540561843051485,32.79571695865525,32.05083493103923,31.305884700430752,30.560834031800155,29.8156494547706,29.070296199835607,28.324738130627534,27.578937671903827,26.832855732998084,26.086451626348452,25.33968298075782,24.592505648967414,23.844873609125237,23.09673885965873,22.3480513070366,21.598758645861956
+Land-Based Wind - Class 10 - Technology 4/Moderate,64.02741237759491,68.5594563830413,63.63208652386781,58.53067632512952,56.20596668371908,53.90807570682404,51.635977972803516,49.38864211931955,47.16502738346777,46.552087016807214,45.939618218776644,45.327605094633384,44.716031236697845,44.10487969927377,43.4941329721149,42.88377295233396,42.27378091465149,41.66413747985825,41.054822581376044,40.445815429795346,39.83709447518923,39.22863736711895,38.62042091210594,38.012421028407644,37.40461269788133,36.79696991473115,36.18946563089101,35.58207169778395,34.974758804178535
+Land-Based Wind - Class 10 - Technology 4/Conservative,64.54544951964344,71.05745326659252,67.90639905781075,64.4075792740887,63.81929906482108,63.23702930549798,62.661021234111516,62.091548035375475,61.5289071918226,61.01959302159076,60.511807089117426,60.00555292701635,59.50083443282546,58.997655886860656,58.49602197120525,57.995937789919246,57.49740889056436,57.00044128713717,56.50504148451873,56.01121650458167,55.51897391401647,55.028321854102614,54.539269072510976,54.05182495733374,53.56599957349873,53.08180370179473,52.59924888069688,52.11834745124075,51.63911260520655
diff --git a/tests/data/Land-Based_Wind/Market/TechLife/df_tc.csv b/tests/data/Land-Based_Wind/Market/TechLife/df_tc.csv
index 767bb88..e8dad50 100644
--- a/tests/data/Land-Based_Wind/Market/TechLife/df_tc.csv
+++ b/tests/data/Land-Based_Wind/Market/TechLife/df_tc.csv
@@ -1,31 +1,31 @@
 Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-10 year CRF/Advanced,0.12735376406238905,0.12810919820253852,0.12894790384654953,0.12949963144515403,0.1297209552854976,0.12995088556384843,0.13018993378390603,0.13043865276528402,0.1306976408972293,0.1307975282712223,0.13089937236464677,0.1310032312042341,0.13110916513251955,0.13121723692446208,0.1313275119111783,0.13144005811129691,0.13155494637050372,0.13167225050985193,0.13179204748350742,0.13191441754665498,0.13203944443425455,0.1321672155515916,0.13229782217744518,0.13243135968090727,0.13256792775290685,0.1327076306536393,0.1328505774771726,0.13299688243464383,0.13314666515758555
-10 year CRF/Moderate,0.12735376406238905,0.12810919820253852,0.12894790384654953,0.12949963144515403,0.1297209552854976,0.12995088556384843,0.13018993378390603,0.13043865276528402,0.1306976408972293,0.1307975282712223,0.13089937236464677,0.1310032312042341,0.13110916513251955,0.13121723692446208,0.1313275119111783,0.13144005811129691,0.13155494637050372,0.13167225050985193,0.13179204748350742,0.13191441754665498,0.13203944443425455,0.1321672155515916,0.13229782217744518,0.13243135968090727,0.13256792775290685,0.1327076306536393,0.1328505774771726,0.13299688243464383,0.13314666515758555
-10 year CRF/Conservative,0.12735376406238905,0.12810919820253852,0.12894790384654953,0.12949963144515403,0.1297209552854976,0.12995088556384843,0.13018993378390603,0.13043865276528402,0.1306976408972293,0.1307975282712223,0.13089937236464677,0.1310032312042341,0.13110916513251955,0.13121723692446208,0.1313275119111783,0.13144005811129691,0.13155494637050372,0.13167225050985193,0.13179204748350742,0.13191441754665498,0.13203944443425455,0.1321672155515916,0.13229782217744518,0.13243135968090727,0.13256792775290685,0.1327076306536393,0.1328505774771726,0.13299688243464383,0.13314666515758555
+10 year CRF/Advanced,0.1273590409765419,0.1281137319534173,0.1289525466627994,0.1295045010684045,0.12972585672986417,0.1299558200840618,0.13019490271022424,0.1304436575096646,0.1307026829601414,0.13080000928330002,0.13089918832411115,0.13100027345876547,0.1311033201323367,0.13120838595993717,0.13131553083386305,0.13142481703714687,0.1315363093639723,0.13165007524742808,0.13176618489514044,0.1318847114333716,0.1320057310601376,0.13212932320811346,0.13225557071797905,0.13238456002304086,0.1325163813459615,0.13265112890856515,0.13278890115571987,0.13292980099441967,0.13307393604928436
+10 year CRF/Moderate,0.1273590409765419,0.1281137319534173,0.1289525466627994,0.1295045010684045,0.12972585672986417,0.1299558200840618,0.13019490271022424,0.1304436575096646,0.1307026829601414,0.13080000928330002,0.13089918832411115,0.13100027345876547,0.1311033201323367,0.13120838595993717,0.13131553083386305,0.13142481703714687,0.1315363093639723,0.13165007524742808,0.13176618489514044,0.1318847114333716,0.1320057310601376,0.13212932320811346,0.13225557071797905,0.13238456002304086,0.1325163813459615,0.13265112890856515,0.13278890115571987,0.13292980099441967,0.13307393604928436
+10 year CRF/Conservative,0.1273590409765419,0.1281137319534173,0.1289525466627994,0.1295045010684045,0.12972585672986417,0.1299558200840618,0.13019490271022424,0.1304436575096646,0.1307026829601414,0.13080000928330002,0.13089918832411115,0.13100027345876547,0.1311033201323367,0.13120838595993717,0.13131553083386305,0.13142481703714687,0.1315363093639723,0.13165007524742808,0.13176618489514044,0.1318847114333716,0.1320057310601376,0.13212932320811346,0.13225557071797905,0.13238456002304086,0.1325163813459615,0.13265112890856515,0.13278890115571987,0.13292980099441967,0.13307393604928436
 ITC Schedule/*,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-PTC/Advanced,18.18179123120567,18.330033027195014,18.49359905840435,18.600609829936886,18.643404879782903,18.687783729737077,18.733835421545933,18.78165575599644,18.831347942241845,18.850485367788494,18.869981600421415,18.88984678220553,18.910091439345678,18.930726500462317,18.951763315915226,18.973213678245173,18.995089843811932,19.017404555705987,19.040171068026115,19.063403171620777,19.08711522138201,19.111322165223793,19.13603957484829,19.161283678439077,19.187071395416872,19.213420373415513,19.240349027640274,19.267876582790418,19.29602311774067
-PTC/Moderate,18.18179123120567,18.330033027195014,18.49359905840435,18.600609829936886,18.643404879782903,18.687783729737077,18.733835421545933,18.78165575599644,18.831347942241845,18.850485367788494,18.869981600421415,18.88984678220553,18.910091439345678,18.930726500462317,18.951763315915226,18.973213678245173,18.995089843811932,19.017404555705987,19.040171068026115,19.063403171620777,19.08711522138201,19.111322165223793,19.13603957484829,19.161283678439077,19.187071395416872,19.213420373415513,19.240349027640274,19.267876582790418,19.29602311774067
-PTC/Conservative,18.18179123120567,18.330033027195014,18.49359905840435,18.600609829936886,18.643404879782903,18.687783729737077,18.733835421545933,18.78165575599644,18.831347942241845,18.850485367788494,18.869981600421415,18.88984678220553,18.910091439345678,18.930726500462317,18.951763315915226,18.973213678245173,18.995089843811932,19.017404555705987,19.040171068026115,19.063403171620777,19.08711522138201,19.111322165223793,19.13603957484829,19.161283678439077,19.187071395416872,19.213420373415513,19.240349027640274,19.267876582790418,19.29602311774067
-PVD/Advanced,0.8208661102100666,0.8222405011013599,0.8206074233701499,0.8188284337154712,0.8181035755523601,0.8173523028366673,0.8165731452064288,0.8157645211300238,0.8149247271997729,0.8146014348828481,0.8142721536272319,0.8139367154850528,0.8135949461704516,0.813246664757798,0.8128916833625043,0.8125298068032627,0.8121608322443914,0.8117845488169813,0.8114007372173021,0.8110091692808032,0.8106096075302214,0.8102018046955577,0.8097855032041732,0.8093604346386432,0.8089263191600662,0.8084828648941413,0.8080297672772488,0.8075667083594282,0.8070933560609111
-PVD/Moderate,0.8208661102100666,0.8222405011013599,0.8206074233701499,0.8188284337154712,0.8181035755523601,0.8173523028366673,0.8165731452064288,0.8157645211300238,0.8149247271997729,0.8146014348828481,0.8142721536272319,0.8139367154850528,0.8135949461704516,0.813246664757798,0.8128916833625043,0.8125298068032627,0.8121608322443914,0.8117845488169813,0.8114007372173021,0.8110091692808032,0.8106096075302214,0.8102018046955577,0.8097855032041732,0.8093604346386432,0.8089263191600662,0.8084828648941413,0.8080297672772488,0.8075667083594282,0.8070933560609111
-PVD/Conservative,0.8208661102100666,0.8222405011013599,0.8206074233701499,0.8188284337154712,0.8181035755523601,0.8173523028366673,0.8165731452064288,0.8157645211300238,0.8149247271997729,0.8146014348828481,0.8142721536272319,0.8139367154850528,0.8135949461704516,0.813246664757798,0.8128916833625043,0.8125298068032627,0.8121608322443914,0.8117845488169813,0.8114007372173021,0.8110091692808032,0.8106096075302214,0.8102018046955577,0.8097855032041732,0.8093604346386432,0.8089263191600662,0.8084828648941413,0.8080297672772488,0.8075667083594282,0.8070933560609111
-PFF/Advanced,1.0620913859842833,1.0616149946357527,1.0621810520125552,1.0627976853779122,1.0630489357026967,1.0633093418392698,1.0635794134444725,1.063859698708769,1.064150788067302,1.0642628476449703,1.0643769831084708,1.0644932526718924,1.0646117167461968,1.0647324380438228,1.0648554816893232,1.0649809153364398,1.0651088092920733,1.0652392366476018,1.0653722734180804,1.065507998689902,1.065646494777432,1.0657878473893934,1.0659321458056097,1.066079483064925,1.0662299561650943,1.0663836662755832,1.0665407189642284,1.0667012244388407,1.0668652978049036
-PFF/Moderate,1.0620913859842833,1.0616149946357527,1.0621810520125552,1.0627976853779122,1.0630489357026967,1.0633093418392698,1.0635794134444725,1.063859698708769,1.064150788067302,1.0642628476449703,1.0643769831084708,1.0644932526718924,1.0646117167461968,1.0647324380438228,1.0648554816893232,1.0649809153364398,1.0651088092920733,1.0652392366476018,1.0653722734180804,1.065507998689902,1.065646494777432,1.0657878473893934,1.0659321458056097,1.066079483064925,1.0662299561650943,1.0663836662755832,1.0665407189642284,1.0667012244388407,1.0668652978049036
-PFF/Conservative,1.0620913859842833,1.0616149946357527,1.0621810520125552,1.0627976853779122,1.0630489357026967,1.0633093418392698,1.0635794134444725,1.063859698708769,1.064150788067302,1.0642628476449703,1.0643769831084708,1.0644932526718924,1.0646117167461968,1.0647324380438228,1.0648554816893232,1.0649809153364398,1.0651088092920733,1.0652392366476018,1.0653722734180804,1.065507998689902,1.065646494777432,1.0657878473893934,1.0659321458056097,1.066079483064925,1.0662299561650943,1.0663836662755832,1.0665407189642284,1.0667012244388407,1.0668652978049036
+PTC/Advanced,18.182829730127462,18.330920092448515,18.494501513550166,18.601552232294395,18.64435176238487,18.688735242853475,18.734791722885138,18.782617011181635,18.83231432532372,18.850960506253863,18.86994638380153,18.889281285304474,18.908974881182786,18.92903720078523,18.94947864911808,18.970310024512422,18.99154253729506,19.013187829524604,19.035257995868836,19.057765605701842,19.080723726491964,19.104145948588453,19.1280464114887,19.152439831698025,19.17734153229009,19.202767474294383,19.228734290038915,19.255259318593204,19.28236064346548
+PTC/Moderate,18.182829730127462,18.330920092448515,18.494501513550166,18.601552232294395,18.64435176238487,18.688735242853475,18.734791722885138,18.782617011181635,18.83231432532372,18.850960506253863,18.86994638380153,18.889281285304474,18.908974881182786,18.92903720078523,18.94947864911808,18.970310024512422,18.99154253729506,19.013187829524604,19.035257995868836,19.057765605701842,19.080723726491964,19.104145948588453,19.1280464114887,19.152439831698025,19.17734153229009,19.202767474294383,19.228734290038915,19.255259318593204,19.28236064346548
+PTC/Conservative,18.182829730127462,18.330920092448515,18.494501513550166,18.601552232294395,18.64435176238487,18.688735242853475,18.734791722885138,18.782617011181635,18.83231432532372,18.850960506253863,18.86994638380153,18.889281285304474,18.908974881182786,18.92903720078523,18.94947864911808,18.970310024512422,18.99154253729506,19.013187829524604,19.035257995868836,19.057765605701842,19.080723726491964,19.104145948588453,19.1280464114887,19.152439831698025,19.17734153229009,19.202767474294383,19.228734290038915,19.255259318593204,19.28236064346548
+PVD/Advanced,0.8208485520855534,0.8222254445753295,0.8205921129677403,0.8188124671473862,0.8180875417894133,0.8173361995591585,0.816556969972909,0.8157482713686651,0.8149084001989623,0.8145934091741072,0.8142727483521742,0.8139462632818022,0.8136137938511782,0.8132751740263693,0.8129302315750025,0.8125787877743449,0.8122206571026993,0.8118556469130738,0.8114835570878475,0.8111041796731042,0.810717298491437,0.8103226887313989,0.8099201165122126,0.8095093384218368,0.8090901010265601,0.808662140349962,0.8082251813190588,0.8077789371751618,0.8073231088468013
+PVD/Moderate,0.8208485520855534,0.8222254445753295,0.8205921129677403,0.8188124671473862,0.8180875417894133,0.8173361995591585,0.816556969972909,0.8157482713686651,0.8149084001989623,0.8145934091741072,0.8142727483521742,0.8139462632818022,0.8136137938511782,0.8132751740263693,0.8129302315750025,0.8125787877743449,0.8122206571026993,0.8118556469130738,0.8114835570878475,0.8111041796731042,0.810717298491437,0.8103226887313989,0.8099201165122126,0.8095093384218368,0.8090901010265601,0.808662140349962,0.8082251813190588,0.8077789371751618,0.8073231088468013
+PVD/Conservative,0.8208485520855534,0.8222254445753295,0.8205921129677403,0.8188124671473862,0.8180875417894133,0.8173361995591585,0.816556969972909,0.8157482713686651,0.8149084001989623,0.8145934091741072,0.8142727483521742,0.8139462632818022,0.8136137938511782,0.8132751740263693,0.8129302315750025,0.8125787877743449,0.8122206571026993,0.8118556469130738,0.8114835570878475,0.8111041796731042,0.810717298491437,0.8103226887313989,0.8099201165122126,0.8095093384218368,0.8090901010265601,0.808662140349962,0.8082251813190588,0.8077789371751618,0.8073231088468013
+PFF/Advanced,1.0620974719811185,1.061620213528562,1.062186358903991,1.0628032197094839,1.06305449332535,1.0633149235570598,1.0635850201036536,1.0638653312007886,1.064156447332059,1.0642656295160042,1.064376776964921,1.0644899432147374,1.0646051837634078,1.0647225561616114,1.0648421201085299,1.0649639375530346,1.0650880728006533,1.065214592626683,1.0653435663958901,1.0654750661892578,1.0656091669381957,1.0657459465668433,1.0658854861429523,1.0660278700380006,1.0661731860971768,1.0663215258199836,1.066472984552214,1.0666276616901607,1.066785660897971
+PFF/Moderate,1.0620974719811185,1.061620213528562,1.062186358903991,1.0628032197094839,1.06305449332535,1.0633149235570598,1.0635850201036536,1.0638653312007886,1.064156447332059,1.0642656295160042,1.064376776964921,1.0644899432147374,1.0646051837634078,1.0647225561616114,1.0648421201085299,1.0649639375530346,1.0650880728006533,1.065214592626683,1.0653435663958901,1.0654750661892578,1.0656091669381957,1.0657459465668433,1.0658854861429523,1.0660278700380006,1.0661731860971768,1.0663215258199836,1.066472984552214,1.0666276616901607,1.066785660897971
+PFF/Conservative,1.0620974719811185,1.061620213528562,1.062186358903991,1.0628032197094839,1.06305449332535,1.0633149235570598,1.0635850201036536,1.0638653312007886,1.064156447332059,1.0642656295160042,1.064376776964921,1.0644899432147374,1.0646051837634078,1.0647225561616114,1.0648421201085299,1.0649639375530346,1.0650880728006533,1.065214592626683,1.0653435663958901,1.0654750661892578,1.0656091669381957,1.0657459465668433,1.0658854861429523,1.0660278700380006,1.0661731860971768,1.0663215258199836,1.066472984552214,1.0666276616901607,1.066785660897971
 Year (Advanced)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031.0,2032.0,2033.0,2034.0,2035.0,2036,2037.0,2038.0,2039.0,2040.0,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
-1/nan,0.9300325592016259,0.9306205802814714,0.9299217820249687,0.929159104560833,0.9288479150122555,0.9285251202870787,0.9281900588633314,0.9278420179674896,0.9274802285130835,0.9273408612804871,0.9271988605137609,0.9270541508545702,0.9269066540417314,0.9267562887700771,0.926602970541005,0.9264466115041425,0.9262871202894817,0.9261244018293425,0.9259583571694103,0.9257888832680354,0.925615872783042,0.9254392138449721,0.9252587898158745,0.9250744790324861,0.9248861545326525,0.9246936837636622,0.9244969282711111,0.9242957433667501,0.924089977773646
-2/nan,0.8649605611751258,0.8660546644434227,0.8647545206844933,0.8633366415882889,0.8627584492226142,0.862158899004134,0.8615367853727146,0.8608908103059831,0.8602195742826816,0.8599610730004356,0.8596977269380166,0.8594293986166882,0.8591559453068381,0.8588772187748867,0.8585930650154147,0.8583033239675077,0.8580078292141807,0.8577064076637574,0.8573988792118733,0.8570850563826761,0.8567647439479126,0.856437738522,0.8561038281315367,0.8557627917572255,0.8554143988461976,0.8550584087924118,0.8546945703827199,0.8543226212058932,0.8539422870216975
-3/nan,0.8044414843181766,0.8059682943798131,0.8041540648890717,0.8021771008327313,0.8013713867196322,0.8005361954043889,0.7996698795280253,0.7987706666839706,0.7978366473271289,0.7974770421039158,0.7971107528031993,0.7967375913540478,0.7963573625644221,0.7959698637809796,0.7955748845291895,0.7951722061324399,0.7947616013086329,0.7943428337427915,0.7939156576339199,0.7934798172142388,0.7930350462390866,0.7925810674449655,0.7921175919737231,0.7916443187602011,0.7911609338807204,0.7906671098593507,0.7901625049288215,0.7896467622425315,0.7891195090338567
-4/nan,0.7481567723883884,0.7500506818042094,0.7478003810442678,0.7453501567089457,0.7443521417050102,0.7433179671320205,0.7422456325503509,0.7411329872692921,0.7399777159790779,0.7395330470760605,0.7390801817023926,0.7386188912066423,0.7381489383560866,0.7376700769304845,0.737182051292564,0.7366845959336725,0.7361774349928308,0.7356602817474676,0.7351328380737765,0.7345947938744949,0.7340458264721323,0.7334855999646775,0.7329137645414717,0.7323299557561204,0.7317337937534015,0.7311248824466113,0.730502808641702,0.729867141104108,0.7292174295638472
-5/nan,0.6958101577084012,0.6980126007411467,0.6953958629396362,0.6925488841919605,0.6913899348576057,0.6901894048428061,0.6889450173679609,0.6876543264902137,0.6863147011108648,0.685799212820897,0.6852743023027618,0.6847397089927179,0.6841951626360966,0.683640382832833,0.6830750785572013,0.6824989476500494,0.6819116762816064,0.681312938382979,0.6807023950440803,0.6800796938755813,0.6794444683327522,0.6787963369979189,0.678134902819039,0.6774597523009767,0.6767704546461726,0.6760665608408315,0.6753476026826728,0.6746130917457863,0.6738625182778107
-6/nan,0.6471261016920312,0.649584891545505,0.6466637600776173,0.643488101100406,0.6421960994529462,0.6408582001525338,0.6394719162243664,0.6380345779547548,0.6365433158181933,0.6359696326828106,0.6353855522344832,0.6347907894766497,0.6341850489105626,0.6335680240475111,0.6329393968936331,0.6322988374055316,0.6316460029146624,0.630980537518528,0.6303020714362995,0.6296102203263417,0.6289045845634303,0.6281847484722007,0.6274502795142497,0.626700727425303,0.6259356232990135,0.6251544786133386,0.6243567841953898,0.623542009120113,0.6227095995378351
+1/nan,0.93002504131163,0.9306141433315013,0.9299152246713939,0.9291522526412035,0.9288410287038338,0.9285181983333807,0.9281830999377587,0.9278350206680175,0.9274731913564348,0.9273374008582824,0.9271991170328132,0.9270582705715987,0.9269147895733791,0.9267685994216703,0.9266196226553715,0.9264677788319079,0.9263129843823821,0.9261551524582183,0.9259941927686782,0.9258300114085943,0.925662510675724,0.9254915888768391,0.9253171401218531,0.9251390541050499,0.9249572158725075,0.9247715055746398,0.9245817982027771,0.9243879633085441,0.9241898647047215
+2/nan,0.864946577466699,0.8660426837686239,0.864742325075649,0.8633239085882229,0.8627456566035963,0.8621460446362673,0.8615238670100676,0.8608778255780204,0.86020652068489,0.8599546550305948,0.8596982026264284,0.8594370370352036,0.8591710271298617,0.8589000368740045,0.8586239250899831,0.8583425452137289,0.8580557450353951,0.8577633664249057,0.8574652450413159,0.857161210024838,0.8568510836704849,0.8565346810817763,0.8562118098032849,0.8558822694303866,0.8555458511946203,0.8552023375227861,0.8548515015678808,0.8544931067097182,0.8541269060229315
+3/nan,0.8044219764408197,0.8059515702438522,0.8041370535055856,0.8021593544237557,0.8013535631894488,0.8005182920659174,0.7996518935517699,0.7987525950878204,0.79781848696523,0.7974681146520526,0.797111414389921,0.7967482132190349,0.7963783318196198,0.7960015842169422,0.7956177774697542,0.7952267113410898,0.7948281779501851,0.7944219614043331,0.7940078374092302,0.7935855728563004,0.793154925385636,0.79271564292249,0.7922674631857315,0.7918101131661114,0.7913433085722505,0.790866753241898,0.7903801385159752,0.7898831425725868,0.7893754297179956
+4/nan,0.7481325818713565,0.7500299301091607,0.7477792887772393,0.7453281711400463,0.7443300679883703,0.7432958022819606,0.7422233734279804,0.7411106305719405,0.739955258228804,0.7395220087087891,0.7390809995991117,0.7386320206278498,0.7381748538593816,0.7377092733421663,0.7372350447369288,0.7367519249239821,0.7362596615882468,0.7357579927805871,0.735246646453764,0.7347253399712445,0.7341937795872844,0.7336516598958603,0.7330986632466165,0.7325344591253089,0.7319587034963274,0.7313710381044373,0.7307710897328605,0.730158469414426,0.7295327715923057
+5/nan,0.6957820353614846,0.6979884608815224,0.6953713453279017,0.6925233491717224,0.6913643060455125,0.6901636791636109,0.6889191915946437,0.6876283972340038,0.6862886648104437,0.6857864174335045,0.6852752502440252,0.6847549236320599,0.6842251893334286,0.6836857900356977,0.6831364589624489,0.6825769194344543,0.6820068844061715,0.6814260559760573,0.680834124868831,0.6802307698877607,0.6796156573352647,0.6789884403991502,0.6783487585025126,0.6776962366145426,0.6770304845196132,0.6763510960415278,0.6756576482198111,0.6749497004344852,0.6742267934755536
+6/nan,0.6470947161809548,0.649557933578531,0.6466364008206451,0.6434596298895368,0.6421675332364261,0.6408295359321333,0.6394431508609311,0.6380057081595277,0.6365143381434888,0.6359553938866992,0.6353866069507004,0.6348077152677246,0.6342184473918006,0.6336185220758818,0.6330076478259111,0.6323855224303649,0.6317518324636111,0.6311062527615078,0.6304484458672825,0.6297780614456624,0.6290947356634938,0.6283980905340165,0.6276877332227545,0.62696325531213,0.6262242320220761,0.6254702213833814,0.6247007633605324,0.6239153789203458,0.62311356904247
 Year (Moderate)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031.0,2032.0,2033.0,2034.0,2035.0,2036,2037.0,2038.0,2039.0,2040.0,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
-1/nan,0.9300325592016259,0.9306205802814714,0.9299217820249687,0.929159104560833,0.9288479150122555,0.9285251202870787,0.9281900588633314,0.9278420179674896,0.9274802285130835,0.9273408612804871,0.9271988605137609,0.9270541508545702,0.9269066540417314,0.9267562887700771,0.926602970541005,0.9264466115041425,0.9262871202894817,0.9261244018293425,0.9259583571694103,0.9257888832680354,0.925615872783042,0.9254392138449721,0.9252587898158745,0.9250744790324861,0.9248861545326525,0.9246936837636622,0.9244969282711111,0.9242957433667501,0.924089977773646
-2/nan,0.8649605611751258,0.8660546644434227,0.8647545206844933,0.8633366415882889,0.8627584492226142,0.862158899004134,0.8615367853727146,0.8608908103059831,0.8602195742826816,0.8599610730004356,0.8596977269380166,0.8594293986166882,0.8591559453068381,0.8588772187748867,0.8585930650154147,0.8583033239675077,0.8580078292141807,0.8577064076637574,0.8573988792118733,0.8570850563826761,0.8567647439479126,0.856437738522,0.8561038281315367,0.8557627917572255,0.8554143988461976,0.8550584087924118,0.8546945703827199,0.8543226212058932,0.8539422870216975
-3/nan,0.8044414843181766,0.8059682943798131,0.8041540648890717,0.8021771008327313,0.8013713867196322,0.8005361954043889,0.7996698795280253,0.7987706666839706,0.7978366473271289,0.7974770421039158,0.7971107528031993,0.7967375913540478,0.7963573625644221,0.7959698637809796,0.7955748845291895,0.7951722061324399,0.7947616013086329,0.7943428337427915,0.7939156576339199,0.7934798172142388,0.7930350462390866,0.7925810674449655,0.7921175919737231,0.7916443187602011,0.7911609338807204,0.7906671098593507,0.7901625049288215,0.7896467622425315,0.7891195090338567
-4/nan,0.7481567723883884,0.7500506818042094,0.7478003810442678,0.7453501567089457,0.7443521417050102,0.7433179671320205,0.7422456325503509,0.7411329872692921,0.7399777159790779,0.7395330470760605,0.7390801817023926,0.7386188912066423,0.7381489383560866,0.7376700769304845,0.737182051292564,0.7366845959336725,0.7361774349928308,0.7356602817474676,0.7351328380737765,0.7345947938744949,0.7340458264721323,0.7334855999646775,0.7329137645414717,0.7323299557561204,0.7317337937534015,0.7311248824466113,0.730502808641702,0.729867141104108,0.7292174295638472
-5/nan,0.6958101577084012,0.6980126007411467,0.6953958629396362,0.6925488841919605,0.6913899348576057,0.6901894048428061,0.6889450173679609,0.6876543264902137,0.6863147011108648,0.685799212820897,0.6852743023027618,0.6847397089927179,0.6841951626360966,0.683640382832833,0.6830750785572013,0.6824989476500494,0.6819116762816064,0.681312938382979,0.6807023950440803,0.6800796938755813,0.6794444683327522,0.6787963369979189,0.678134902819039,0.6774597523009767,0.6767704546461726,0.6760665608408315,0.6753476026826728,0.6746130917457863,0.6738625182778107
-6/nan,0.6471261016920312,0.649584891545505,0.6466637600776173,0.643488101100406,0.6421960994529462,0.6408582001525338,0.6394719162243664,0.6380345779547548,0.6365433158181933,0.6359696326828106,0.6353855522344832,0.6347907894766497,0.6341850489105626,0.6335680240475111,0.6329393968936331,0.6322988374055316,0.6316460029146624,0.630980537518528,0.6303020714362995,0.6296102203263417,0.6289045845634303,0.6281847484722007,0.6274502795142497,0.626700727425303,0.6259356232990135,0.6251544786133386,0.6243567841953898,0.623542009120113,0.6227095995378351
+1/nan,0.93002504131163,0.9306141433315013,0.9299152246713939,0.9291522526412035,0.9288410287038338,0.9285181983333807,0.9281830999377587,0.9278350206680175,0.9274731913564348,0.9273374008582824,0.9271991170328132,0.9270582705715987,0.9269147895733791,0.9267685994216703,0.9266196226553715,0.9264677788319079,0.9263129843823821,0.9261551524582183,0.9259941927686782,0.9258300114085943,0.925662510675724,0.9254915888768391,0.9253171401218531,0.9251390541050499,0.9249572158725075,0.9247715055746398,0.9245817982027771,0.9243879633085441,0.9241898647047215
+2/nan,0.864946577466699,0.8660426837686239,0.864742325075649,0.8633239085882229,0.8627456566035963,0.8621460446362673,0.8615238670100676,0.8608778255780204,0.86020652068489,0.8599546550305948,0.8596982026264284,0.8594370370352036,0.8591710271298617,0.8589000368740045,0.8586239250899831,0.8583425452137289,0.8580557450353951,0.8577633664249057,0.8574652450413159,0.857161210024838,0.8568510836704849,0.8565346810817763,0.8562118098032849,0.8558822694303866,0.8555458511946203,0.8552023375227861,0.8548515015678808,0.8544931067097182,0.8541269060229315
+3/nan,0.8044219764408197,0.8059515702438522,0.8041370535055856,0.8021593544237557,0.8013535631894488,0.8005182920659174,0.7996518935517699,0.7987525950878204,0.79781848696523,0.7974681146520526,0.797111414389921,0.7967482132190349,0.7963783318196198,0.7960015842169422,0.7956177774697542,0.7952267113410898,0.7948281779501851,0.7944219614043331,0.7940078374092302,0.7935855728563004,0.793154925385636,0.79271564292249,0.7922674631857315,0.7918101131661114,0.7913433085722505,0.790866753241898,0.7903801385159752,0.7898831425725868,0.7893754297179956
+4/nan,0.7481325818713565,0.7500299301091607,0.7477792887772393,0.7453281711400463,0.7443300679883703,0.7432958022819606,0.7422233734279804,0.7411106305719405,0.739955258228804,0.7395220087087891,0.7390809995991117,0.7386320206278498,0.7381748538593816,0.7377092733421663,0.7372350447369288,0.7367519249239821,0.7362596615882468,0.7357579927805871,0.735246646453764,0.7347253399712445,0.7341937795872844,0.7336516598958603,0.7330986632466165,0.7325344591253089,0.7319587034963274,0.7313710381044373,0.7307710897328605,0.730158469414426,0.7295327715923057
+5/nan,0.6957820353614846,0.6979884608815224,0.6953713453279017,0.6925233491717224,0.6913643060455125,0.6901636791636109,0.6889191915946437,0.6876283972340038,0.6862886648104437,0.6857864174335045,0.6852752502440252,0.6847549236320599,0.6842251893334286,0.6836857900356977,0.6831364589624489,0.6825769194344543,0.6820068844061715,0.6814260559760573,0.680834124868831,0.6802307698877607,0.6796156573352647,0.6789884403991502,0.6783487585025126,0.6776962366145426,0.6770304845196132,0.6763510960415278,0.6756576482198111,0.6749497004344852,0.6742267934755536
+6/nan,0.6470947161809548,0.649557933578531,0.6466364008206451,0.6434596298895368,0.6421675332364261,0.6408295359321333,0.6394431508609311,0.6380057081595277,0.6365143381434888,0.6359553938866992,0.6353866069507004,0.6348077152677246,0.6342184473918006,0.6336185220758818,0.6330076478259111,0.6323855224303649,0.6317518324636111,0.6311062527615078,0.6304484458672825,0.6297780614456624,0.6290947356634938,0.6283980905340165,0.6276877332227545,0.62696325531213,0.6262242320220761,0.6254702213833814,0.6247007633605324,0.6239153789203458,0.62311356904247
 Year (Conservative)/nan,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031.0,2032.0,2033.0,2034.0,2035.0,2036,2037.0,2038.0,2039.0,2040.0,2041.0,2042.0,2043.0,2044.0,2045.0,2046.0,2047.0,2048.0,2049.0,2050.0
-1/nan,0.9300325592016259,0.9306205802814714,0.9299217820249687,0.929159104560833,0.9288479150122555,0.9285251202870787,0.9281900588633314,0.9278420179674896,0.9274802285130835,0.9273408612804871,0.9271988605137609,0.9270541508545702,0.9269066540417314,0.9267562887700771,0.926602970541005,0.9264466115041425,0.9262871202894817,0.9261244018293425,0.9259583571694103,0.9257888832680354,0.925615872783042,0.9254392138449721,0.9252587898158745,0.9250744790324861,0.9248861545326525,0.9246936837636622,0.9244969282711111,0.9242957433667501,0.924089977773646
-2/nan,0.8649605611751258,0.8660546644434227,0.8647545206844933,0.8633366415882889,0.8627584492226142,0.862158899004134,0.8615367853727146,0.8608908103059831,0.8602195742826816,0.8599610730004356,0.8596977269380166,0.8594293986166882,0.8591559453068381,0.8588772187748867,0.8585930650154147,0.8583033239675077,0.8580078292141807,0.8577064076637574,0.8573988792118733,0.8570850563826761,0.8567647439479126,0.856437738522,0.8561038281315367,0.8557627917572255,0.8554143988461976,0.8550584087924118,0.8546945703827199,0.8543226212058932,0.8539422870216975
+1/nan,0.93002504131163,0.9306141433315013,0.9299152246713939,0.9291522526412035,0.9288410287038338,0.9285181983333807,0.9281830999377587,0.9278350206680175,0.9274731913564348,0.9273374008582824,0.9271991170328132,0.9270582705715987,0.9269147895733791,0.9267685994216703,0.9266196226553715,0.9264677788319079,0.9263129843823821,0.9261551524582183,0.9259941927686782,0.9258300114085943,0.925662510675724,0.9254915888768391,0.9253171401218531,0.9251390541050499,0.9249572158725075,0.9247715055746398,0.9245817982027771,0.9243879633085441,0.9241898647047215
+2/nan,0.864946577466699,0.8660426837686239,0.864742325075649,0.8633239085882229,0.8627456566035963,0.8621460446362673,0.8615238670100676,0.8608778255780204,0.86020652068489,0.8599546550305948,0.8596982026264284,0.8594370370352036,0.8591710271298617,0.8589000368740045,0.8586239250899831,0.8583425452137289,0.8580557450353951,0.8577633664249057,0.8574652450413159,0.857161210024838,0.8568510836704849,0.8565346810817763,0.8562118098032849,0.8558822694303866,0.8555458511946203,0.8552023375227861,0.8548515015678808,0.8544931067097182,0.8541269060229315
diff --git a/tests/data/Land-Based_Wind/Market/df_just_wacc.csv b/tests/data/Land-Based_Wind/Market/df_just_wacc.csv
index 16558ec..71c8966 100644
--- a/tests/data/Land-Based_Wind/Market/df_just_wacc.csv
+++ b/tests/data/Land-Based_Wind/Market/df_just_wacc.csv
@@ -1,7 +1,7 @@
 WACC Type,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-WACC Nominal - Advanced,0.07523117347465433,0.07455177887592414,0.07535926067075359,0.07624194294759659,0.07660251354152607,0.07697678625089098,0.07736555724870343,0.0777696856093866,0.07819009964576681,0.0783521375507858,0.07851728748447781,0.07868563996848241,0.07885728906956113,0.07903233257486346,0.07921087217769379,0.07939301367451597,0.07957886717401597,0.07976854731905722,0.0799621735225003,0.08015987021792623,0.08036176712625706,0.08056799953964151,0.08077870862377749,0.08099404174016009,0.08121415278975887,0.08143920257985104,0.08166935921581275,0.08190479851989459,0.08214570447916707
-WACC Nominal - Moderate,0.07523117347465433,0.07455177887592414,0.07535926067075359,0.07624194294759659,0.07660251354152607,0.07697678625089098,0.07736555724870343,0.0777696856093866,0.07819009964576681,0.0783521375507858,0.07851728748447781,0.07868563996848241,0.07885728906956113,0.07903233257486346,0.07921087217769379,0.07939301367451597,0.07957886717401597,0.07976854731905722,0.0799621735225003,0.08015987021792623,0.08036176712625706,0.08056799953964151,0.08077870862377749,0.08099404174016009,0.08121415278975887,0.08143920257985104,0.08166935921581275,0.08190479851989459,0.08214570447916707
-WACC Nominal - Conservative,0.07523117347465433,0.07455177887592414,0.07535926067075359,0.07624194294759659,0.07660251354152607,0.07697678625089098,0.07736555724870343,0.0777696856093866,0.07819009964576681,0.0783521375507858,0.07851728748447781,0.07868563996848241,0.07885728906956113,0.07903233257486346,0.07921087217769379,0.07939301367451597,0.07957886717401597,0.07976854731905722,0.0799621735225003,0.08015987021792623,0.08036176712625706,0.08056799953964151,0.08077870862377749,0.08099404174016009,0.08121415278975887,0.08143920257985104,0.08166935921581275,0.08190479851989459,0.08214570447916707
-WACC Real - Advanced,0.04656601565522145,0.04777537242079233,0.04911392725719921,0.04999213946107006,0.05034391565026941,0.05070905975696682,0.05108834853532063,0.05148262010671867,0.05189278014221155,0.052050865903205734,0.05221198778973446,0.05237623411559267,0.05254369665323044,0.052714470804744895,0.05288865578311608,0.05306635480440591,0.05324767529172281,0.05343272909176333,0.05362163270487841,0.05381450752968431,0.05401148012317769,0.05421268247769917,0.05441825231588049,0.054628333405034146,0.05484307589244786,0.055062636663269604,0.05528717972274433,0.055516876604775334,0.055751906808943597
-WACC Real - Moderate,0.04656601565522145,0.04777537242079233,0.04911392725719921,0.04999213946107006,0.05034391565026941,0.05070905975696682,0.05108834853532063,0.05148262010671867,0.05189278014221155,0.052050865903205734,0.05221198778973446,0.05237623411559267,0.05254369665323044,0.052714470804744895,0.05288865578311608,0.05306635480440591,0.05324767529172281,0.05343272909176333,0.05362163270487841,0.05381450752968431,0.05401148012317769,0.05421268247769917,0.05441825231588049,0.054628333405034146,0.05484307589244786,0.055062636663269604,0.05528717972274433,0.055516876604775334,0.055751906808943597
-WACC Real - Conservative,0.04656601565522145,0.04777537242079233,0.04911392725719921,0.04999213946107006,0.05034391565026941,0.05070905975696682,0.05108834853532063,0.05148262010671867,0.05189278014221155,0.052050865903205734,0.05221198778973446,0.05237623411559267,0.05254369665323044,0.052714470804744895,0.05288865578311608,0.05306635480440591,0.05324767529172281,0.05343272909176333,0.05362163270487841,0.05381450752968431,0.05401148012317769,0.05421268247769917,0.05441825231588049,0.054628333405034146,0.05484307589244786,0.055062636663269604,0.05528717972274433,0.055516876604775334,0.055751906808943597
+WACC Nominal - Advanced,0.07523986514350531,0.07455921142580611,0.07536684363176442,0.07624987956215465,0.0766104953346711,0.07698481493946349,0.0773736346493025,0.07777781364625107,0.07819828035945078,0.07835616149468996,0.07851698910171673,0.07868084644067458,0.07884781993850704,0.07901799934096614,0.07919147787346181,0.07936835241135057,0.07954872366033902,0.07973269634767063,0.07992037942489467,0.08011188628305599,0.08030733498109414,0.08050684848857773,0.08071055494369431,0.0809185879277014,0.08113108675702911,0.08134819679442243,0.08157006978054564,0.08179686418765926,0.0820287455970963
+WACC Nominal - Moderate,0.07523986514350531,0.07455921142580611,0.07536684363176442,0.07624987956215465,0.0766104953346711,0.07698481493946349,0.0773736346493025,0.07777781364625107,0.07819828035945078,0.07835616149468996,0.07851698910171673,0.07868084644067458,0.07884781993850704,0.07901799934096614,0.07919147787346181,0.07936835241135057,0.07954872366033902,0.07973269634767063,0.07992037942489467,0.08011188628305599,0.08030733498109414,0.08050684848857773,0.08071055494369431,0.0809185879277014,0.08113108675702911,0.08134819679442243,0.08157006978054564,0.08179686418765926,0.0820287455970963
+WACC Nominal - Conservative,0.07523986514350531,0.07455921142580611,0.07536684363176442,0.07624987956215465,0.0766104953346711,0.07698481493946349,0.0773736346493025,0.07777781364625107,0.07819828035945078,0.07835616149468996,0.07851698910171673,0.07868084644067458,0.07884781993850704,0.07901799934096614,0.07919147787346181,0.07936835241135057,0.07954872366033902,0.07973269634767063,0.07992037942489467,0.08011188628305599,0.08030733498109414,0.08050684848857773,0.08071055494369431,0.0809185879277014,0.08113108675702911,0.08134819679442243,0.08157006978054564,0.08179686418765926,0.0820287455970963
+WACC Real - Advanced,0.04657447560826533,0.04778261976137976,0.04912132514765055,0.04999988249966325,0.05035170276553291,0.050716892623866805,0.05109622892614896,0.05149054989878166,0.05190076132629362,0.05205479170213656,0.052211696684601794,0.05237155750309719,0.05253445847659233,0.05270048716191833,0.052869734510694544,0.05304229503546409,0.05321826698569665,0.05339775253431278,0.053580857975507046,0.05376769393468872,0.053958375591311336,0.05415302291568569,0.054351760920677616,0.05455471992946492,0.05476203586051631,0.0549738505311439,0.0551903119810202,0.05541157481722858,0.05563780058253309
+WACC Real - Moderate,0.04657447560826533,0.04778261976137976,0.04912132514765055,0.04999988249966325,0.05035170276553291,0.050716892623866805,0.05109622892614896,0.05149054989878166,0.05190076132629362,0.05205479170213656,0.052211696684601794,0.05237155750309719,0.05253445847659233,0.05270048716191833,0.052869734510694544,0.05304229503546409,0.05321826698569665,0.05339775253431278,0.053580857975507046,0.05376769393468872,0.053958375591311336,0.05415302291568569,0.054351760920677616,0.05455471992946492,0.05476203586051631,0.0549738505311439,0.0551903119810202,0.05541157481722858,0.05563780058253309
+WACC Real - Conservative,0.04657447560826533,0.04778261976137976,0.04912132514765055,0.04999988249966325,0.05035170276553291,0.050716892623866805,0.05109622892614896,0.05149054989878166,0.05190076132629362,0.05205479170213656,0.052211696684601794,0.05237155750309719,0.05253445847659233,0.05270048716191833,0.052869734510694544,0.05304229503546409,0.05321826698569665,0.05339775253431278,0.053580857975507046,0.05376769393468872,0.053958375591311336,0.05415302291568569,0.054351760920677616,0.05455471992946492,0.05476203586051631,0.0549738505311439,0.0551903119810202,0.05541157481722858,0.05563780058253309
diff --git a/tests/data/Land-Based_Wind/Market/df_wacc.csv b/tests/data/Land-Based_Wind/Market/df_wacc.csv
index 3f327d9..ea4c580 100644
--- a/tests/data/Land-Based_Wind/Market/df_wacc.csv
+++ b/tests/data/Land-Based_Wind/Market/df_wacc.csv
@@ -13,13 +13,13 @@ Rate of Return on Equity Nominal - Conservative,0.09,0.09,0.09,0.09,0.09,0.09,0.
 Calculated Rate of Return on Equity Real - Advanced,0.06094111220546927,0.06283864434469111,0.06339734313262868,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174
 Calculated Rate of Return on Equity Real - Moderate,0.06094111220546927,0.06283864434469111,0.06339734313262868,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174
 Calculated Rate of Return on Equity Real - Conservative,0.06094111220546927,0.06283864434469111,0.06339734313262868,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174,0.06341463414634174
-Debt Fraction - Advanced,0.388469317832229,0.406339658163919,0.385100198044253,0.361882714829907,0.352398507508915,0.342553888923905,0.332327917073401,0.321697995439355,0.310639706303151,0.306377569814672,0.302033576609032,0.297605345665674,0.293090402715526,0.288486175630926,0.283789989539329,0.278999061641434,0.274110495712137,0.26912127626237,0.264028262336254,0.258828180916244,0.25351761991012,0.248093020683847,0.242550670109488,0.236886692089008,0.231097038514418,0.225177479618837,0.219123593671083,0.212930755960477,0.206594127014386
-Debt Fraction - Moderate,0.388469317832229,0.406339658163919,0.385100198044253,0.361882714829907,0.352398507508915,0.342553888923905,0.332327917073401,0.321697995439355,0.310639706303151,0.306377569814672,0.302033576609032,0.297605345665674,0.293090402715526,0.288486175630926,0.283789989539329,0.278999061641434,0.274110495712137,0.26912127626237,0.264028262336254,0.258828180916244,0.25351761991012,0.248093020683847,0.242550670109488,0.236886692089008,0.231097038514418,0.225177479618837,0.219123593671083,0.212930755960477,0.206594127014386
-Debt Fraction - Conservative,0.388469317832229,0.406339658163919,0.385100198044253,0.361882714829907,0.352398507508915,0.342553888923905,0.332327917073401,0.321697995439355,0.310639706303151,0.306377569814672,0.302033576609032,0.297605345665674,0.293090402715526,0.288486175630926,0.283789989539329,0.278999061641434,0.274110495712137,0.26912127626237,0.264028262336254,0.258828180916244,0.25351761991012,0.248093020683847,0.242550670109488,0.236886692089008,0.231097038514418,0.225177479618837,0.219123593671083,0.212930755960477,0.206594127014386
+Debt Fraction - Advanced,0.388240697998177,0.40614415735162,0.384900740918396,0.361673955438091,0.352188559769817,0.342342707678902,0.332115454539889,0.321484201003444,0.310424526291473,0.306271726690253,0.302041425069264,0.297731431409475,0.29333947239447,0.288863187412117,0.284300124323694,0.279647734984729,0.274903370499789,0.270064276193628,0.265127586277693,0.26009031818991,0.254949366587034,0.249701496959921,0.244343338847538,0.238871378617986,0.23328195178523,0.227571234825019,0.221735236452585,0.215769788319763,0.209670535086109
+Debt Fraction - Moderate,0.388240697998177,0.40614415735162,0.384900740918396,0.361673955438091,0.352188559769817,0.342342707678902,0.332115454539889,0.321484201003444,0.310424526291473,0.306271726690253,0.302041425069264,0.297731431409475,0.29333947239447,0.288863187412117,0.284300124323694,0.279647734984729,0.274903370499789,0.270064276193628,0.265127586277693,0.26009031818991,0.254949366587034,0.249701496959921,0.244343338847538,0.238871378617986,0.23328195178523,0.227571234825019,0.221735236452585,0.215769788319763,0.209670535086109
+Debt Fraction - Conservative,0.388240697998177,0.40614415735162,0.384900740918396,0.361673955438091,0.352188559769817,0.342342707678902,0.332115454539889,0.321484201003444,0.310424526291473,0.306271726690253,0.302041425069264,0.297731431409475,0.29333947239447,0.288863187412117,0.284300124323694,0.279647734984729,0.274903370499789,0.270064276193628,0.265127586277693,0.26009031818991,0.254949366587034,0.249701496959921,0.244343338847538,0.238871378617986,0.23328195178523,0.227571234825019,0.221735236452585,0.215769788319763,0.209670535086109
 Tax Rate (Federal and State),0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996
-WACC Nominal - Advanced,0.07523117347465433,0.07455177887592414,0.07535926067075359,0.07624194294759659,0.07660251354152607,0.07697678625089098,0.07736555724870343,0.0777696856093866,0.07819009964576681,0.0783521375507858,0.07851728748447781,0.07868563996848241,0.07885728906956113,0.07903233257486346,0.07921087217769379,0.07939301367451597,0.07957886717401597,0.07976854731905722,0.0799621735225003,0.08015987021792623,0.08036176712625706,0.08056799953964151,0.08077870862377749,0.08099404174016009,0.08121415278975887,0.08143920257985104,0.08166935921581275,0.08190479851989459,0.08214570447916707
-WACC Nominal - Moderate,0.07523117347465433,0.07455177887592414,0.07535926067075359,0.07624194294759659,0.07660251354152607,0.07697678625089098,0.07736555724870343,0.0777696856093866,0.07819009964576681,0.0783521375507858,0.07851728748447781,0.07868563996848241,0.07885728906956113,0.07903233257486346,0.07921087217769379,0.07939301367451597,0.07957886717401597,0.07976854731905722,0.0799621735225003,0.08015987021792623,0.08036176712625706,0.08056799953964151,0.08077870862377749,0.08099404174016009,0.08121415278975887,0.08143920257985104,0.08166935921581275,0.08190479851989459,0.08214570447916707
-WACC Nominal - Conservative,0.07523117347465433,0.07455177887592414,0.07535926067075359,0.07624194294759659,0.07660251354152607,0.07697678625089098,0.07736555724870343,0.0777696856093866,0.07819009964576681,0.0783521375507858,0.07851728748447781,0.07868563996848241,0.07885728906956113,0.07903233257486346,0.07921087217769379,0.07939301367451597,0.07957886717401597,0.07976854731905722,0.0799621735225003,0.08015987021792623,0.08036176712625706,0.08056799953964151,0.08077870862377749,0.08099404174016009,0.08121415278975887,0.08143920257985104,0.08166935921581275,0.08190479851989459,0.08214570447916707
-WACC Real - Advanced,0.04656601565522145,0.04777537242079233,0.04911392725719921,0.04999213946107006,0.05034391565026941,0.05070905975696682,0.05108834853532063,0.05148262010671867,0.05189278014221155,0.052050865903205734,0.05221198778973446,0.05237623411559267,0.05254369665323044,0.052714470804744895,0.05288865578311608,0.05306635480440591,0.05324767529172281,0.05343272909176333,0.05362163270487841,0.05381450752968431,0.05401148012317769,0.05421268247769917,0.05441825231588049,0.054628333405034146,0.05484307589244786,0.055062636663269604,0.05528717972274433,0.055516876604775334,0.055751906808943597
-WACC Real - Moderate,0.04656601565522145,0.04777537242079233,0.04911392725719921,0.04999213946107006,0.05034391565026941,0.05070905975696682,0.05108834853532063,0.05148262010671867,0.05189278014221155,0.052050865903205734,0.05221198778973446,0.05237623411559267,0.05254369665323044,0.052714470804744895,0.05288865578311608,0.05306635480440591,0.05324767529172281,0.05343272909176333,0.05362163270487841,0.05381450752968431,0.05401148012317769,0.05421268247769917,0.05441825231588049,0.054628333405034146,0.05484307589244786,0.055062636663269604,0.05528717972274433,0.055516876604775334,0.055751906808943597
-WACC Real - Conservative,0.04656601565522145,0.04777537242079233,0.04911392725719921,0.04999213946107006,0.05034391565026941,0.05070905975696682,0.05108834853532063,0.05148262010671867,0.05189278014221155,0.052050865903205734,0.05221198778973446,0.05237623411559267,0.05254369665323044,0.052714470804744895,0.05288865578311608,0.05306635480440591,0.05324767529172281,0.05343272909176333,0.05362163270487841,0.05381450752968431,0.05401148012317769,0.05421268247769917,0.05441825231588049,0.054628333405034146,0.05484307589244786,0.055062636663269604,0.05528717972274433,0.055516876604775334,0.055751906808943597
+WACC Nominal - Advanced,0.07523986514350531,0.07455921142580611,0.07536684363176442,0.07624987956215465,0.0766104953346711,0.07698481493946349,0.0773736346493025,0.07777781364625107,0.07819828035945078,0.07835616149468996,0.07851698910171673,0.07868084644067458,0.07884781993850704,0.07901799934096614,0.07919147787346181,0.07936835241135057,0.07954872366033902,0.07973269634767063,0.07992037942489467,0.08011188628305599,0.08030733498109414,0.08050684848857773,0.08071055494369431,0.0809185879277014,0.08113108675702911,0.08134819679442243,0.08157006978054564,0.08179686418765926,0.0820287455970963
+WACC Nominal - Moderate,0.07523986514350531,0.07455921142580611,0.07536684363176442,0.07624987956215465,0.0766104953346711,0.07698481493946349,0.0773736346493025,0.07777781364625107,0.07819828035945078,0.07835616149468996,0.07851698910171673,0.07868084644067458,0.07884781993850704,0.07901799934096614,0.07919147787346181,0.07936835241135057,0.07954872366033902,0.07973269634767063,0.07992037942489467,0.08011188628305599,0.08030733498109414,0.08050684848857773,0.08071055494369431,0.0809185879277014,0.08113108675702911,0.08134819679442243,0.08157006978054564,0.08179686418765926,0.0820287455970963
+WACC Nominal - Conservative,0.07523986514350531,0.07455921142580611,0.07536684363176442,0.07624987956215465,0.0766104953346711,0.07698481493946349,0.0773736346493025,0.07777781364625107,0.07819828035945078,0.07835616149468996,0.07851698910171673,0.07868084644067458,0.07884781993850704,0.07901799934096614,0.07919147787346181,0.07936835241135057,0.07954872366033902,0.07973269634767063,0.07992037942489467,0.08011188628305599,0.08030733498109414,0.08050684848857773,0.08071055494369431,0.0809185879277014,0.08113108675702911,0.08134819679442243,0.08157006978054564,0.08179686418765926,0.0820287455970963
+WACC Real - Advanced,0.04657447560826533,0.04778261976137976,0.04912132514765055,0.04999988249966325,0.05035170276553291,0.050716892623866805,0.05109622892614896,0.05149054989878166,0.05190076132629362,0.05205479170213656,0.052211696684601794,0.05237155750309719,0.05253445847659233,0.05270048716191833,0.052869734510694544,0.05304229503546409,0.05321826698569665,0.05339775253431278,0.053580857975507046,0.05376769393468872,0.053958375591311336,0.05415302291568569,0.054351760920677616,0.05455471992946492,0.05476203586051631,0.0549738505311439,0.0551903119810202,0.05541157481722858,0.05563780058253309
+WACC Real - Moderate,0.04657447560826533,0.04778261976137976,0.04912132514765055,0.04999988249966325,0.05035170276553291,0.050716892623866805,0.05109622892614896,0.05149054989878166,0.05190076132629362,0.05205479170213656,0.052211696684601794,0.05237155750309719,0.05253445847659233,0.05270048716191833,0.052869734510694544,0.05304229503546409,0.05321826698569665,0.05339775253431278,0.053580857975507046,0.05376769393468872,0.053958375591311336,0.05415302291568569,0.054351760920677616,0.05455471992946492,0.05476203586051631,0.0549738505311439,0.0551903119810202,0.05541157481722858,0.05563780058253309
+WACC Real - Conservative,0.04657447560826533,0.04778261976137976,0.04912132514765055,0.04999988249966325,0.05035170276553291,0.050716892623866805,0.05109622892614896,0.05149054989878166,0.05190076132629362,0.05205479170213656,0.052211696684601794,0.05237155750309719,0.05253445847659233,0.05270048716191833,0.052869734510694544,0.05304229503546409,0.05321826698569665,0.05339775253431278,0.053580857975507046,0.05376769393468872,0.053958375591311336,0.05415302291568569,0.054351760920677616,0.05455471992946492,0.05476203586051631,0.0549738505311439,0.0551903119810202,0.05541157481722858,0.05563780058253309
diff --git a/tests/data/Natural_Gas_FE/Market/20/df_capex.csv b/tests/data/Natural_Gas_FE/Market/20/df_capex.csv
index 8faea65..ca6b387 100644
--- a/tests/data/Natural_Gas_FE/Market/20/df_capex.csv
+++ b/tests/data/Natural_Gas_FE/Market/20/df_capex.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1499.2530441159731,1490.11533416
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1536.02675487547,1518.4199479057713,1500.8131409360728,1483.2063339663744,1465.5995269966759,1447.9927200269774,1430.3859130572787,1412.7791060875804,1395.172299117882,1377.5654921481835,1360.070120665635,1342.4633136959364,1324.856506726238,1307.2496997565393,1296.2175865286904,1285.0740378136913,1274.041924585842,1263.0098113579932,1251.977698130144,1240.834149415145,1229.8020361872957,1218.7699229594468,1207.7378097315977,1196.5942610165987,1185.5621477887498,1174.5300345609005,1163.4979213330514,1152.3543726180524,1141.3222593902035
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1536.02675487547,1522.4316254431712,1508.9479314980222,1495.3528020657234,1481.8691081205745,1468.2739786882755,1454.790284743127,1441.1951553108279,1427.7114613656793,1414.1163319333803,1400.6326379882314,1387.0375085559326,1373.5538146107835,1359.958685178485,1349.7066203606857,1339.4545555428865,1329.2024907250875,1318.9504259072883,1308.6983610894893,1298.44629627169,1288.082795966741,1277.8307311489418,1267.5786663311426,1257.3266015133436,1247.0745366955443,1236.8224718777453,1226.570407059946,1216.2069067549971,1205.954841937198
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1536.02675487547,1526.5547384677209,1517.0827220599717,1507.4992701650724,1498.027253757323,1488.5552373495739,1479.0832209418247,1469.6112045340756,1460.1391881263264,1450.667171718577,1441.1951553108279,1431.7231389030787,1422.2511224953296,1412.7791060875804,1403.307089679831,1393.835073272082,1384.3630568643327,1374.8910404565836,1365.4190240488344,1355.947007641085,1346.474991233336,1337.0029748255868,1327.5309584178376,1318.0589420100882,1308.4754901151894,1299.00347370744,1289.5314572996908,1280.0594408919417,1270.5874244841925
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1772.6042940948998,1760.012084046951,1747.419873999002,1734.827663951053,1722.2354539031041,1709.6432438551553,1697.0510338072063,1684.4588237592573,1671.8666137113084,1659.2744036633594,1646.6821936154106,1634.0899835674618,1621.4977735195125,1608.9055634715637,1595.087563064965,1581.269562658366,1567.3401267646173,1553.5221263580183,1539.5926904642695,1525.7746900576708,1511.9566896510719,1498.027253757323,1484.2092533507243,1470.3912529441254,1456.4618170503766,1442.6438166437777,1428.714380750029,1414.8963803434303,1401.0783799368314
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1772.6042940948998,1760.680696969851,1748.868535331952,1737.0563736940528,1725.2442120561539,1713.432050418255,1701.619888780356,1689.807727142457,1677.9955655045578,1666.1834038666589,1654.37124222876,1642.559080590861,1630.746918952962,1618.8233218279129,1606.453982754264,1593.973208193465,1581.4924336326662,1569.0116590718671,1556.530884511068,1544.1615454374194,1531.6807708766203,1519.1999963158214,1506.7192217550223,1494.2384471942237,1481.7576726334246,1469.3883335597754,1456.9075589989768,1444.4267844381777,1431.9460098773789
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1772.6042940948998,1761.4607453799008,1750.4286321520517,1739.3965189242028,1728.3644056963537,1717.2208569813547,1706.1887437535054,1695.1566305256565,1684.1245172978074,1672.9809685828084,1661.9488553549593,1650.9167421271102,1639.884628899261,1628.741080184262,1617.7089669564132,1606.6768537285639,1595.644740500715,1584.501191785716,1573.4690785578669,1562.4369653300175,1551.4048521021687,1540.2613033871696,1529.2291901593205,1518.1970769314717,1507.1649637036223,1496.1328504757732,1484.9893017607742,1473.9571885329253,1462.925075305076
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1762.9094067128508,1750.6515031263518,1738.3935995398529,1725.021341081854,1712.763437495355,1700.505533908856,1688.247630322357,1674.8753718643582,1662.6174682778592,1650.3595646913602,1638.1016611048613,1624.7294026468624,1612.4714990603634,1600.2135954738644,1585.7269821443658,1572.354723686367,1558.982465228368,1544.4958518988692,1531.1235934408703,1517.7513349828714,1503.2647216533728,1489.892463195374,1476.520204737375,1462.0335914078762,1448.6613329498773,1434.1747196203785,1420.8024611623796,1407.430202704381,1392.943589374882
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1762.9094067128508,1751.7658579978518,1739.5079544113528,1727.2500508248538,1716.1065021098548,1703.8485985233558,1692.7050498083568,1680.4471462218578,1669.3035975068588,1657.0456939203598,1645.9021452053607,1633.6442416188618,1621.3863380323628,1610.2427893173638,1597.9848857308648,1585.7269821443658,1572.354723686367,1560.096820099868,1547.838916513369,1535.58101292687,1523.323109340371,1511.065205753872,1498.807302167373,1486.5493985808741,1474.2914949943752,1460.9192365363763,1448.6613329498773,1436.4034293633783,1424.1455257768794
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1762.9094067128508,1751.7658579978518,1740.6223092828527,1730.5931154393534,1719.4495667243543,1708.3060180093553,1697.1624692943562,1686.0189205793572,1674.8753718643582,1663.7318231493591,1652.58827443436,1642.559080590861,1631.415531875862,1620.2719831608629,1609.1284344458638,1597.9848857308648,1586.8413370158655,1575.6977883008665,1565.6685944573674,1554.5250457423683,1543.3814970273693,1532.2379483123702,1521.0943995973712,1509.9508508823722,1498.807302167373,1487.663753452374,1477.634559608875,1466.491010893876,1455.3474621788769
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,3071.8306387766397,2987.139668542647,2902.560133795804,2817.869163561811,2733.2896288149686,2648.7100940681257,2564.019123834133,2479.43958908729,2394.748618853297,2310.169084106454,2225.4781138724616,2140.8985791256187,2056.207608891626,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,3071.8306387766397,3015.332846791595,2958.835054806549,2902.3372628215043,2845.8394708364594,2789.3416788514137,2732.7324513792187,2676.2346593941734,2619.736867409128,2563.239075424083,2506.741283439038,2450.2434914539926,2393.7456994689474,2337.247907483902,2311.840616413704,2286.4333253435066,2260.914598786159,2235.5073077159605,2210.100016645763,2184.692725575565,2159.1739990182173,2133.7667079480193,2108.3594168778213,2082.952125807624,2057.544834737426,2032.026108180078,2006.6188171098802,1981.2115260396824,1955.8042349694842
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,3071.8306387766397,3043.414589553392,3015.1099758172945,2986.693926594047,2958.277877370799,2929.973263634702,2901.5572144114544,2873.1411651882067,2844.8365514521092,2816.4205022288616,2788.004453005614,2759.6998392695164,2731.2837900462687,2702.867740823021,2674.5631270869235,2646.147077863676,2617.731028640428,2589.4264149043306,2561.010365681083,2532.5943164578352,2504.289702721738,2475.8736534984905,2447.457604275243,2419.1529905391453,2390.7369413158976,2362.32089209265,2334.0162783565524,2305.6002291333048,2277.184179910057
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3429.76142350241,3360.7828569565654,3291.8042904107215,3222.714288377727,3153.735721831883,3084.645719798889,3015.6671532530445,2946.5771512200504,2877.5985846742064,2808.5085826412123,2739.530016095368,2670.440014062374,2601.46144751653,2532.3714454835354,2503.1753478502383,2473.8678147297906,2444.560281609343,2415.2527484888956,2385.945215368448,2356.6376822480006,2327.330149127553,2298.022616007105,2268.715082886658,2239.40754976621,2210.100016645763,2180.9039190124654,2151.5963858920177,2122.2888527715704,2092.9813196511227
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3429.76142350241,3379.3925833106136,3328.912307631668,3278.543467439872,3228.0631917609267,3177.582916081981,3127.2140758901855,3076.7338002112397,3026.364960019444,2975.884684340498,2925.404408661552,2875.0355684697565,2824.5552927908107,2774.186452599015,2743.541693632768,2713.00837015367,2682.4750466745727,2651.830287708325,2621.2969642292283,2590.763640750131,2560.1188817838834,2529.585558304786,2499.052234825688,2468.407475859441,2437.8741523803433,2407.3408289012464,2376.807505422149,2346.1627464559015,2315.629422976804
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3429.76142350241,3398.0023096646623,3366.1317603397647,3334.2612110148675,3302.50209717712,3270.631547852223,3238.7609985273257,3206.8904492024285,3175.1313353646815,3143.260786039784,3111.390236714886,3079.519687389989,3047.760573552242,3015.890024227345,2984.0194749024477,2952.14892557755,2920.3898117398026,2888.5192624149054,2856.648713090008,2824.8895992522607,2793.0190499273635,2761.1485006024664,2729.2779512775687,2697.5188374398213,2665.648288114924,2633.777738790027,2601.9071894651297,2570.1480756273827,2538.277526302485
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3419.9551006332103,3350.8650986002162,3281.775096567222,3212.685094534228,3143.595092501234,3074.50509046824,3005.4150884352457,2936.325086402251,2868.349439240757,2799.259437207763,2730.1694351747688,2661.0794331417746,2591.9894311087805,2522.8994290757864,2493.926202416789,2464.952975757791,2435.979749098794,2405.8921675682964,2376.9189409092987,2347.945714250301,2318.9724875913034,2289.9992609323062,2259.9116794018087,2230.938452742811,2201.9652260838134,2172.991999424816,2144.0187727658185,2113.931191235321,2084.9579645763233
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3419.9551006332103,3369.8091314157145,3318.548807326719,3268.4028381092235,3218.2568688917277,3168.110899674232,3117.964930456736,3066.7046063677403,3016.5586371502445,2966.4126679327487,2916.266698715253,2866.120729497757,2814.860405408762,2764.714436191266,2734.6268546607685,2704.539273130271,2673.337336728274,2643.2497551977763,2613.1621736672787,2581.960237265281,2551.872655734784,2521.7850742042865,2490.583137802289,2460.4955562717914,2430.4079747412943,2399.206038339297,2369.1184568087992,2339.030875278302,2307.8289388763046
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3419.9551006332103,3387.6388093597134,3356.436872957716,3324.1205816842185,3292.918645282221,3260.602354008724,3229.4004176067265,3197.0841263332295,3165.882189931232,3133.5658986577346,3102.3639622557375,3070.04767098224,3038.8457345802426,3006.5294433067456,2975.327506904748,2943.0112156312507,2911.8092792292537,2880.607342827256,2848.2910515537587,2817.0891151517617,2784.7728238782643,2753.5708874762668,2721.25459620277,2690.0526598007723,2657.736368527275,2626.534432125278,2594.2181408517804,2563.016204449783,2530.699913176286
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,3117.073446559536,3030.2652020696937,2943.345522092701,2856.537277602858,2769.7290331130152,2682.920788623173,2596.11254413333,2509.1928641563372,2422.384619666495,2335.576375176652,2248.7681306868094,2161.9598861969666,2075.1516417071243,1988.2319617301316,1965.6105578386837,1942.8777184600856,1920.2563145686374,1897.5234751900393,1874.9020712985912,1852.169231919993,1829.4363925413952,1806.814988649947,1784.082149271349,1761.4607453799008,1738.7279060013027,1716.1065021098548,1693.3736627312564,1670.6408233526586,1648.0194194612106
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,3117.073446559536,3059.2384287286914,3001.403410897846,2943.5683930670007,2885.7333752361556,2827.8983574053104,2770.0633395744658,2712.3397572307704,2654.5047393999253,2596.66972156908,2538.834703738235,2480.99968590739,2423.164668076545,2365.3296502456997,2339.588052714052,2313.846455182404,2288.1048576507565,2262.3632601191084,2236.6216625874604,2210.880065055813,2185.138467524165,2159.396869992517,2133.6552724608696,2107.9136749292215,2082.1720773975735,2056.430479865926,2030.688882334278,2004.8358493154801,1979.0942517838325
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,3117.073446559536,3088.2116553876886,3059.461299702991,3030.5995085311433,3001.7377173592954,2972.9873616745986,2944.1255705027506,2915.375214818053,2886.513423646206,2857.763067961508,2828.90127678966,2800.150921104963,2771.2891299331154,2742.427338761268,2713.67698307657,2684.8151919047227,2656.064836220025,2627.2030450481775,2598.45268936348,2569.5908981916327,2540.729107019785,2511.978751335087,2483.11696016324,2454.3666044785423,2425.5048133066944,2396.754457621997,2367.8926664501496,2339.142310765452,2310.2805195936044
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3476.8986345668554,3406.0256647394617,3335.1526949120675,3264.279725084674,3193.406755257279,3122.5337854298855,3051.6608156024918,2980.7878457750976,2909.914875947704,2838.9304706331595,2768.057500805766,2697.1845309783716,2626.311561150978,2555.4385913235833,2525.908187228836,2496.2663476469384,2466.735943552191,2437.2055394574436,2407.5636998755463,2378.0332957807987,2348.3914561989013,2318.8610521041537,2289.2192125222564,2259.688808427509,2230.158404332761,2200.516564750864,2170.986160656116,2141.3443210742184,2111.8139169794713
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3476.8986345668554,3425.30400401641,3373.7093734659643,3322.1147429155185,3270.520112365073,3218.9254818146273,3167.330851264182,3115.847656200886,3064.2530256504406,3012.658395099995,2961.063764549549,2909.4691339991036,2857.874503448658,2806.2798728982125,2775.300807470515,2744.433177529968,2713.4541121022703,2682.586482161723,2651.6074167340253,2620.628351306328,2589.7607213657807,2558.781655938083,2527.914025997536,2496.9349605698385,2465.9558951421413,2435.0882652015935,2404.1091997738963,2373.241569833349,2342.2625044056517
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3476.8986345668554,3444.582343293358,3412.266052019861,3380.061196233514,3347.7449049600164,3315.428613686519,3283.112322413022,3250.9074666266747,3218.5911753531777,3186.2748840796803,3153.9585928061833,3121.642301532686,3089.4374457463387,3057.121154472841,3024.804863199344,2992.488571925847,2960.1722806523494,2927.967424866002,2895.6511335925047,2863.3348423190077,2831.0185510455103,2798.702259772013,2766.4974039856656,2734.181112712168,2701.8648214386712,2669.548530165174,2637.2322388916764,2605.027383105329,2572.711091831832
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3466.7580052362064,3395.4392934602124,3325.2349365557184,3253.9162247797244,3183.7118678752304,3112.3931560992364,3042.1887991947424,2970.8700874187484,2900.6657305142544,2829.3470187382604,2758.0283069622665,2687.8239500577724,2616.5052382817785,2546.3008813772844,2516.213299846787,2487.240073187789,2457.152491657292,2428.1792649982945,2399.206038339297,2369.1184568087992,2340.145230149802,2310.0576486193045,2281.084421960307,2250.9968404298093,2222.023613770812,2193.0503871118144,2162.962805581317,2133.989578922319,2103.901997391822
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3466.7580052362064,3415.4976811472106,3364.237357058215,3311.8626780977197,3260.602354008724,3209.3420299197282,3158.0817058307325,3105.707026870237,3054.4467027812416,3003.186378692246,2951.92605460325,2900.6657305142544,2848.2910515537587,2797.030727464763,2765.828791062766,2735.7412095322684,2704.539273130271,2673.337336728274,2643.2497551977763,2612.0478187957788,2580.8458823937813,2550.758300863284,2519.5563644612866,2488.354428059289,2458.266846528792,2427.0649101267945,2395.862973724797,2365.7753921942995,2334.5734557923024
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3466.7580052362064,3434.4417139627094,3402.125422689212,3369.8091314157145,3337.4928401422176,3306.29090374022,3273.9746124667226,3241.6583211932257,3209.3420299197282,3177.025738646231,3144.709447372734,3112.3931560992364,3080.076864825739,3047.760573552242,3016.5586371502445,2984.242345876747,2951.92605460325,2919.6097633297527,2887.2934720562557,2854.9771807827583,2822.660889509261,2790.344598235764,2758.0283069622665,2725.712015688769,2694.510079286772,2662.1937880132746,2629.877496739777,2597.56120546628,2565.2449141927827
diff --git a/tests/data/Natural_Gas_FE/Market/20/df_fom.csv b/tests/data/Natural_Gas_FE/Market/20/df_fom.csv
index ffabb04..d75d001 100644
--- a/tests/data/Natural_Gas_FE/Market/20/df_fom.csv
+++ b/tests/data/Natural_Gas_FE/Market/20/df_fom.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,34.5,34.3,34.1,33.9,33.7,33.5,33
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,34.1,33.7,33.2,32.8,32.3,31.9,31.4,31,30.5,30.1,29.6,29.2,28.7,28.3,28.0,27.8,27.6,27.3,27.1,26.8,26.6,26.4,26.1,25.9,25.6,25.4,25.1,24.9,24.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,34.1,33.8,33.5,33.2,32.8,32.5,32.2,31.8,31.5,31.2,30.9,30.5,30.2,29.9,29.6,29.4,29.2,29.0,28.7,28.5,28.3,28.1,27.8,27.6,27.4,27.2,26.9,26.7,26.5
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,34.1,33.9,33.7,33.5,33.3,33.1,32.9,32.7,32.5,32.3,32.1,31.9,31.7,31.4,31.2,31.0,30.8,30.6,30.4,30.2,30.0,29.8,29.6,29.4,29.2,29.0,28.7,28.5,28.3
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,39.7,39.4,39,38.7,38.4,38.1,37.7,37.4,37.1,36.8,36.5,36.1,35.8,35.5,35.2,34.9,34.6,34.3,34.0,33.7,33.4,33.1,32.8,32.5,32.2,31.9,31.5,31.2
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,39.7,39.5,39.2,38.9,38.6,38.3,38,37.8,37.5,37.2,36.9,36.6,36.3,36.1,35.8,35.5,35.2,35.0,34.7,34.4,34.2,33.9,33.6,33.3,33.1,32.8,32.5,32.2
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,39.8,39.5,39.3,39,38.8,38.6,38.3,38.1,37.8,37.6,37.4,37.1,36.9,36.6,36.4,36.1,35.9,35.7,35.4,35.2,34.9,34.7,34.4,34.2,34.0,33.7,33.5,33.2
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,40,39,39,39,38,38,38,37,37.0,37.0,36.0,36.0,36.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0,33.0,32.0,32.0,32.0,31.0,31.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,40,39,39,39,38,38,38,38,37.0,37.0,37.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,33.0,33.0,33.0,33.0,32.0,32.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,40,39,39,39,39,38,38,38,38.0,37.0,37.0,37.0,37.0,36.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,70.7,68.6,66.4,64.3,62.2,60,57.9,55.8,53.6,51.5,49.3,47.2,45.1,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,70.7,69.3,67.9,66.6,65.2,63.8,62.4,61.1,59.7,58.3,56.9,55.5,54.2,52.8,52.2,51.7,51.1,50.5,50.0,49.4,48.9,48.3,47.8,47.2,46.6,46.1,45.5,45.0,44.4
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,70.7,70.1,69.5,68.8,68.2,67.6,67,66.4,65.7,65.1,64.5,63.9,63.2,62.6,62.0,61.4,60.8,60.1,59.5,58.9,58.3,57.6,57.0,56.4,55.8,55.2,54.5,53.9,53.3
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78.2,76.5,74.8,73.2,71.5,69.8,68.1,66.4,64.8,63.1,61.4,59.7,58.0,56.4,55.7,55.1,54.4,53.8,53.2,52.5,51.9,51.2,50.6,49.9,49.3,48.7,48.0,47.4,46.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78.2,77,75.8,74.6,73.4,72.3,71.1,69.9,68.7,67.5,66.3,65.1,63.9,62.7,62.1,61.4,60.7,60.1,59.4,58.7,58.1,57.4,56.7,56.0,55.4,54.7,54.0,53.4,52.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78.2,77.5,76.8,76.1,75.4,74.7,74,73.3,72.6,71.9,71.2,70.5,69.8,69.1,68.4,67.7,67.0,66.3,65.6,64.9,64.2,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78,76,75,73,71,70,68,66,65,63.0,61.0,60.0,58.0,56.0,56.0,55.0,54.0,54.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,49.0,48.0,47.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78,77,76,74,73,72,71,70,69,67.0,66.0,65.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78,77,77,76,75,75,74,73,72,72.0,71.0,70.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,71.7,69.5,67.4,65.2,63,60.8,58.6,56.4,54.2,52.1,49.9,47.7,45.5,43.3,42.8,42.3,41.8,41.3,40.8,40.3,39.8,39.3,38.8,38.3,37.8,37.3,36.8,36.3,35.8
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,71.7,70.3,68.9,67.5,66.1,64.7,63.3,61.9,60.5,59.0,57.6,56.2,54.8,53.4,52.8,52.3,51.7,51.2,50.6,50.0,49.5,48.9,48.3,47.8,47.2,46.6,46.1,45.5,44.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,71.7,71.1,70.5,69.8,69.2,68.6,67.9,67.3,66.7,66.0,65.4,64.8,64.2,63.5,62.9,62.3,61.6,61.0,60.4,59.7,59.1,58.5,57.8,57.2,56.6,55.9,55.3,54.7,54.0
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79.3,77.5,75.8,74.1,72.4,70.7,68.9,67.2,65.5,63.8,62.0,60.3,58.6,56.9,56.2,55.6,54.9,54.3,53.6,53.0,52.3,51.7,51.0,50.4,49.8,49.1,48.5,47.8,47.2
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79.3,78,76.8,75.6,74.4,73.2,72,70.8,69.5,68.3,67.1,65.9,64.7,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7,58.0,57.4,56.7,56.0,55.3,54.7,54.0,53.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79.3,78.5,77.8,77.1,76.4,75.7,75,74.3,73.6,72.9,72.2,71.5,70.8,70.1,69.3,68.6,67.9,67.2,66.5,65.8,65.1,64.4,63.7,63.0,62.3,61.6,60.9,60.1,59.4
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79,77,76,74,72,70,69,67,65,64.0,62.0,60.0,58.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,48.0,48.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79,78,77,75,74,73,72,71,69,68.0,67.0,66.0,65.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79,78,78,77,76,76,75,74,73,73.0,72.0,71.0,71.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0
diff --git a/tests/data/Natural_Gas_FE/Market/20/df_occ.csv b/tests/data/Natural_Gas_FE/Market/20/df_occ.csv
index dbf4193..dc391b8 100644
--- a/tests/data/Natural_Gas_FE/Market/20/df_occ.csv
+++ b/tests/data/Natural_Gas_FE/Market/20/df_occ.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1245.4,1237.2,1228.9,1220.6,1212
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1278.4,1262.6,1246.8,1231,1215.2,1199.4,1183.6,1167.8,1152,1136.2,1120.5,1104.7,1088.9,1073.1,1063.2,1053.2,1043.3,1033.4,1023.5,1013.5,1003.6,993.7,983.8,973.8,963.9,954.0,944.1,934.1,924.2
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1278.4,1266.2,1254.1,1241.9,1229.8,1217.6,1205.5,1193.3,1181.2,1169.0,1156.9,1144.7,1132.6,1120.4,1111.2,1102.0,1092.8,1083.6,1074.4,1065.2,1055.9,1046.7,1037.5,1028.3,1019.1,1009.9,1000.7,991.4,982.2
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1278.4,1269.9,1261.4,1252.8,1244.3,1235.8,1227.3,1218.8,1210.3,1201.8,1193.3,1184.8,1176.3,1167.8,1159.3,1150.8,1142.3,1133.8,1125.3,1116.8,1108.3,1099.8,1091.3,1082.8,1074.2,1065.7,1057.2,1048.7,1040.2
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1490.7,1479.4,1468.1,1456.8,1445.5,1434.2,1422.9,1411.6,1400.3,1389.0,1377.7,1366.4,1355.1,1343.8,1331.4,1319.0,1306.5,1294.1,1281.6,1269.2,1256.8,1244.3,1231.9,1219.5,1207.0,1194.6,1182.1,1169.7,1157.3
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1490.7,1480,1469.4,1458.8,1448.2,1437.6,1427,1416.4,1405.8,1395.2,1384.6,1374.0,1363.4,1352.7,1341.6,1330.4,1319.2,1308.0,1296.8,1285.7,1274.5,1263.3,1252.1,1240.9,1229.7,1218.6,1207.4,1196.2,1185.0
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1490.7,1480.7,1470.8,1460.9,1451,1441,1431.1,1421.2,1411.3,1401.3,1391.4,1381.5,1371.6,1361.6,1351.7,1341.8,1331.9,1321.9,1312.0,1302.1,1292.2,1282.2,1272.3,1262.4,1252.5,1242.6,1232.6,1222.7,1212.8
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1482,1471,1460,1448,1437,1426,1415,1403,1392,1381.0,1370.0,1358.0,1347.0,1336.0,1323.0,1311.0,1299.0,1286.0,1274.0,1262.0,1249.0,1237.0,1225.0,1212.0,1200.0,1187.0,1175.0,1163.0,1150.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1482,1472,1461,1450,1440,1429,1419,1408,1398,1387.0,1377.0,1366.0,1355.0,1345.0,1334.0,1323.0,1311.0,1300.0,1289.0,1278.0,1267.0,1256.0,1245.0,1234.0,1223.0,1211.0,1200.0,1189.0,1178.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1482,1472,1462,1453,1443,1433,1423,1413,1403,1393.0,1383.0,1374.0,1364.0,1354.0,1344.0,1334.0,1324.0,1314.0,1305.0,1295.0,1285.0,1275.0,1265.0,1255.0,1245.0,1235.0,1226.0,1216.0,1206.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,2656.6,2580.6,2504.7,2428.7,2352.8,2276.9,2200.9,2125,2049,1973.1,1897.1,1821.2,1745.2,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,2656.6,2605.9,2555.2,2504.5,2453.8,2403.1,2352.3,2301.6,2250.9,2200.2,2149.5,2098.8,2048.1,1997.4,1974.6,1951.8,1928.9,1906.1,1883.3,1860.5,1837.6,1814.8,1792.0,1769.2,1746.4,1723.5,1700.7,1677.9,1655.1
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,2656.6,2631.1,2605.7,2580.2,2554.7,2529.3,2503.8,2478.3,2452.9,2427.4,2401.9,2376.5,2351.0,2325.5,2300.1,2274.6,2249.1,2223.7,2198.2,2172.7,2147.3,2121.8,2096.3,2070.9,2045.4,2019.9,1994.5,1969.0,1943.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2977.8,2915.9,2854,2792,2730.1,2668.1,2606.2,2544.2,2482.3,2420.3,2358.4,2296.4,2234.5,2172.5,2146.3,2120.0,2093.7,2067.4,2041.1,2014.8,1988.5,1962.2,1935.9,1909.6,1883.3,1857.1,1830.8,1804.5,1778.2
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2977.8,2932.6,2887.3,2842.1,2796.8,2751.5,2706.3,2661,2615.8,2570.5,2525.2,2480.0,2434.7,2389.5,2362.0,2334.6,2307.2,2279.7,2252.3,2224.9,2197.4,2170.0,2142.6,2115.1,2087.7,2060.3,2032.9,2005.4,1978.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2977.8,2949.3,2920.7,2892.1,2863.6,2835,2806.4,2777.8,2749.3,2720.7,2692.1,2663.5,2635.0,2606.4,2577.8,2549.2,2520.7,2492.1,2463.5,2435.0,2406.4,2377.8,2349.2,2320.7,2292.1,2263.5,2234.9,2206.4,2177.8
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2969,2907,2845,2783,2721,2659,2597,2535,2474,2412.0,2350.0,2288.0,2226.0,2164.0,2138.0,2112.0,2086.0,2059.0,2033.0,2007.0,1981.0,1955.0,1928.0,1902.0,1876.0,1850.0,1824.0,1797.0,1771.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2969,2924,2878,2833,2788,2743,2698,2652,2607,2562.0,2517.0,2472.0,2426.0,2381.0,2354.0,2327.0,2299.0,2272.0,2245.0,2217.0,2190.0,2163.0,2135.0,2108.0,2081.0,2053.0,2026.0,1999.0,1971.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2969,2940,2912,2883,2855,2826,2798,2769,2741,2712.0,2684.0,2655.0,2627.0,2598.0,2570.0,2541.0,2513.0,2485.0,2456.0,2428.0,2399.0,2371.0,2342.0,2314.0,2285.0,2257.0,2228.0,2200.0,2171.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,2697.2,2619.3,2541.3,2463.4,2385.5,2307.6,2229.7,2151.7,2073.8,1995.9,1918.0,1840.1,1762.2,1684.2,1663.9,1643.5,1623.2,1602.8,1582.5,1562.1,1541.7,1521.4,1501.0,1480.7,1460.3,1440.0,1419.6,1399.2,1378.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,2697.2,2645.3,2593.4,2541.5,2489.6,2437.7,2385.8,2334,2282.1,2230.2,2178.3,2126.4,2074.5,2022.6,1999.5,1976.4,1953.3,1930.2,1907.1,1884.0,1860.9,1837.8,1814.7,1791.6,1768.5,1745.4,1722.3,1699.1,1676.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,2697.2,2671.3,2645.5,2619.6,2593.7,2567.9,2542,2516.2,2490.3,2464.5,2438.6,2412.8,2386.9,2361.0,2335.2,2309.3,2283.5,2257.6,2231.8,2205.9,2180.0,2154.2,2128.3,2102.5,2076.6,2050.8,2024.9,1999.1,1973.2
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3020.1,2956.5,2892.9,2829.3,2765.7,2702.1,2638.5,2574.9,2511.3,2447.6,2384.0,2320.4,2256.8,2193.2,2166.7,2140.1,2113.6,2087.1,2060.5,2034.0,2007.4,1980.9,1954.3,1927.8,1901.3,1874.7,1848.2,1821.6,1795.1
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3020.1,2973.8,2927.5,2881.2,2834.9,2788.6,2742.3,2696.1,2649.8,2603.5,2557.2,2510.9,2464.6,2418.3,2390.5,2362.8,2335.0,2307.3,2279.5,2251.7,2224.0,2196.2,2168.5,2140.7,2112.9,2085.2,2057.4,2029.7,2001.9
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3020.1,2991.1,2962.1,2933.2,2904.2,2875.2,2846.2,2817.3,2788.3,2759.3,2730.3,2701.3,2672.4,2643.4,2614.4,2585.4,2556.4,2527.5,2498.5,2469.5,2440.5,2411.5,2382.6,2353.6,2324.6,2295.6,2266.6,2237.7,2208.7
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3011,2947,2884,2820,2757,2693,2630,2566,2503,2439.0,2375.0,2312.0,2248.0,2185.0,2158.0,2132.0,2105.0,2079.0,2053.0,2026.0,2000.0,1973.0,1947.0,1920.0,1894.0,1868.0,1841.0,1815.0,1788.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3011,2965,2919,2872,2826,2780,2734,2687,2641,2595.0,2549.0,2503.0,2456.0,2410.0,2382.0,2355.0,2327.0,2299.0,2272.0,2244.0,2216.0,2189.0,2161.0,2133.0,2106.0,2078.0,2050.0,2023.0,1995.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3011,2982,2953,2924,2895,2867,2838,2809,2780,2751.0,2722.0,2693.0,2664.0,2635.0,2607.0,2578.0,2549.0,2520.0,2491.0,2462.0,2433.0,2404.0,2375.0,2346.0,2318.0,2289.0,2260.0,2231.0,2202.0
diff --git a/tests/data/Natural_Gas_FE/Market/20/df_vom.csv b/tests/data/Natural_Gas_FE/Market/20/df_vom.csv
index eed519d..953bc21 100644
--- a/tests/data/Natural_Gas_FE/Market/20/df_vom.csv
+++ b/tests/data/Natural_Gas_FE/Market/20/df_vom.csv
@@ -8,8 +8,8 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,2.17,2.16,2.15,2.14,2.13,2.12,2.
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,2.16,2.14,2.12,2.1,2.08,2.06,2.04,2.02,2,1.97,1.95,1.93,1.91,1.89,1.88,1.87,1.85,1.84,1.83,1.82,1.8,1.79,1.78,1.76,1.75,1.74,1.73,1.71,1.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,2.16,2.15,2.13,2.12,2.1,2.08,2.07,2.05,2.04,2.02,2.01,1.99,1.97,1.96,1.95,1.93,1.92,1.91,1.9,1.89,1.88,1.86,1.85,1.84,1.83,1.82,1.81,1.79,1.78
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,2.16,2.15,2.14,2.13,2.12,2.11,2.1,2.09,2.08,2.07,2.06,2.05,2.04,2.02,2.01,2.0,1.99,1.98,1.97,1.96,1.95,1.94,1.93,1.92,1.91,1.89,1.88,1.87,1.86
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.49,2.47,2.46,2.44,2.42,2.41,2.39,2.38,2.36,2.35,2.33,2.31,2.3,2.28,2.27,2.25,2.24,2.22,2.2,2.19,2.17,2.16,2.14,2.13,2.11,2.09
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.51,2.49,2.48,2.46,2.45,2.43,2.42,2.41,2.39,2.38,2.36,2.35,2.34,2.32,2.31,2.29,2.28,2.27,2.25,2.24,2.22,2.21,2.19,2.18,2.17,2.15,2.14
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.48,2.47,2.45,2.44,2.42,2.4,2.39,2.37,2.35,2.34,2.32,2.3,2.29,2.27,2.26,2.24,2.23,2.21,2.2,2.18,2.16,2.15,2.13,2.12,2.1,2.09
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.5,2.49,2.48,2.46,2.45,2.43,2.42,2.4,2.39,2.37,2.36,2.35,2.33,2.32,2.3,2.29,2.27,2.26,2.25,2.23,2.22,2.2,2.19,2.18,2.16,2.15,2.13
 NG 1-on-1 Combined Cycle (H-Frame)/Conservative,2.53,2.52,2.51,2.5,2.48,2.47,2.46,2.45,2.43,2.42,2.41,2.4,2.38,2.37,2.36,2.34,2.33,2.32,2.31,2.29,2.28,2.27,2.26,2.24,2.23,2.22,2.21,2.19,2.18
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,5.11,4.99,4.87,4.74,4.62,4.49,4.37,4.24,4.12,3.99,3.87,3.75,3.62,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,5.11,5.04,4.96,4.88,4.8,4.72,4.64,4.57,4.49,4.41,4.33,4.25,4.17,4.1,4.07,4.04,4.01,3.98,3.95,3.92,3.89,3.86,3.84,3.81,3.78,3.75,3.72,3.69,3.66
@@ -17,8 +17,8 @@ NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,5.11,5.08,5.05,5.02,4.99
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.71,4.61,4.51,4.41,4.31,4.21,4.11,4.01,3.97,3.94,3.91,3.87,3.84,3.81,3.77,3.74,3.71,3.67,3.64,3.61,3.57,3.54,3.51
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.9,4.83,4.76,4.69,4.62,4.56,4.49,4.42,4.39,4.35,4.32,4.28,4.25,4.21,4.18,4.14,4.11,4.07,4.04,4.0,3.97,3.93,3.9
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.7,4.6,4.5,4.4,4.3,4.2,4.1,4.0,3.96,3.93,3.9,3.86,3.83,3.8,3.76,3.73,3.7,3.67,3.63,3.6,3.57,3.53,3.5
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.89,4.82,4.76,4.69,4.62,4.55,4.48,4.41,4.38,4.34,4.31,4.28,4.24,4.21,4.17,4.14,4.1,4.07,4.03,4.0,3.96,3.93,3.89
 NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,5.3,5.27,5.23,5.19,5.16,5.12,5.09,5.05,5.01,4.98,4.94,4.9,4.87,4.83,4.8,4.76,4.72,4.69,4.65,4.61,4.58,4.54,4.51,4.47,4.43,4.4,4.36,4.32,4.29
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,5.21,5.08,4.95,4.82,4.7,4.57,4.44,4.31,4.18,4.05,3.93,3.8,3.67,3.54,3.52,3.49,3.46,3.44,3.41,3.39,3.36,3.34,3.31,3.28,3.26,3.23,3.21,3.18,3.16
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,5.21,5.13,5.05,4.97,4.89,4.81,4.72,4.64,4.56,4.48,4.4,4.32,4.24,4.16,4.13,4.1,4.07,4.04,4.02,3.99,3.96,3.93,3.9,3.87,3.84,3.81,3.78,3.75,3.72
@@ -26,6 +26,6 @@ NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,5.21,5.17,5.14,5.11,5.08
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.88,4.77,4.67,4.57,4.47,4.36,4.26,4.16,4.06,4.02,3.99,3.95,3.92,3.89,3.85,3.82,3.79,3.75,3.72,3.69,3.65,3.62,3.58,3.55
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.45,4.41,4.38,4.34,4.31,4.27,4.24,4.2,4.17,4.13,4.1,4.06,4.03,3.99,3.96
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.87,4.77,4.67,4.56,4.46,4.35,4.25,4.15,4.04,4.01,3.98,3.94,3.91,3.88,3.84,3.81,3.78,3.74,3.71,3.68,3.64,3.61,3.58,3.54
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.44,4.41,4.37,4.34,4.3,4.27,4.23,4.2,4.16,4.13,4.09,4.06,4.02,3.99,3.95
 NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,5.39,5.35,5.32,5.28,5.24,5.21,5.17,5.13,5.1,5.06,5.02,4.99,4.95,4.91,4.88,4.84,4.8,4.77,4.73,4.69,4.66,4.62,4.58,4.55,4.51,4.47,4.43,4.4,4.36
diff --git a/tests/data/Natural_Gas_FE/Market/30/df_capex.csv b/tests/data/Natural_Gas_FE/Market/30/df_capex.csv
index 8faea65..ca6b387 100644
--- a/tests/data/Natural_Gas_FE/Market/30/df_capex.csv
+++ b/tests/data/Natural_Gas_FE/Market/30/df_capex.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1499.2530441159731,1490.11533416
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1536.02675487547,1518.4199479057713,1500.8131409360728,1483.2063339663744,1465.5995269966759,1447.9927200269774,1430.3859130572787,1412.7791060875804,1395.172299117882,1377.5654921481835,1360.070120665635,1342.4633136959364,1324.856506726238,1307.2496997565393,1296.2175865286904,1285.0740378136913,1274.041924585842,1263.0098113579932,1251.977698130144,1240.834149415145,1229.8020361872957,1218.7699229594468,1207.7378097315977,1196.5942610165987,1185.5621477887498,1174.5300345609005,1163.4979213330514,1152.3543726180524,1141.3222593902035
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1536.02675487547,1522.4316254431712,1508.9479314980222,1495.3528020657234,1481.8691081205745,1468.2739786882755,1454.790284743127,1441.1951553108279,1427.7114613656793,1414.1163319333803,1400.6326379882314,1387.0375085559326,1373.5538146107835,1359.958685178485,1349.7066203606857,1339.4545555428865,1329.2024907250875,1318.9504259072883,1308.6983610894893,1298.44629627169,1288.082795966741,1277.8307311489418,1267.5786663311426,1257.3266015133436,1247.0745366955443,1236.8224718777453,1226.570407059946,1216.2069067549971,1205.954841937198
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1536.02675487547,1526.5547384677209,1517.0827220599717,1507.4992701650724,1498.027253757323,1488.5552373495739,1479.0832209418247,1469.6112045340756,1460.1391881263264,1450.667171718577,1441.1951553108279,1431.7231389030787,1422.2511224953296,1412.7791060875804,1403.307089679831,1393.835073272082,1384.3630568643327,1374.8910404565836,1365.4190240488344,1355.947007641085,1346.474991233336,1337.0029748255868,1327.5309584178376,1318.0589420100882,1308.4754901151894,1299.00347370744,1289.5314572996908,1280.0594408919417,1270.5874244841925
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1772.6042940948998,1760.012084046951,1747.419873999002,1734.827663951053,1722.2354539031041,1709.6432438551553,1697.0510338072063,1684.4588237592573,1671.8666137113084,1659.2744036633594,1646.6821936154106,1634.0899835674618,1621.4977735195125,1608.9055634715637,1595.087563064965,1581.269562658366,1567.3401267646173,1553.5221263580183,1539.5926904642695,1525.7746900576708,1511.9566896510719,1498.027253757323,1484.2092533507243,1470.3912529441254,1456.4618170503766,1442.6438166437777,1428.714380750029,1414.8963803434303,1401.0783799368314
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1772.6042940948998,1760.680696969851,1748.868535331952,1737.0563736940528,1725.2442120561539,1713.432050418255,1701.619888780356,1689.807727142457,1677.9955655045578,1666.1834038666589,1654.37124222876,1642.559080590861,1630.746918952962,1618.8233218279129,1606.453982754264,1593.973208193465,1581.4924336326662,1569.0116590718671,1556.530884511068,1544.1615454374194,1531.6807708766203,1519.1999963158214,1506.7192217550223,1494.2384471942237,1481.7576726334246,1469.3883335597754,1456.9075589989768,1444.4267844381777,1431.9460098773789
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1772.6042940948998,1761.4607453799008,1750.4286321520517,1739.3965189242028,1728.3644056963537,1717.2208569813547,1706.1887437535054,1695.1566305256565,1684.1245172978074,1672.9809685828084,1661.9488553549593,1650.9167421271102,1639.884628899261,1628.741080184262,1617.7089669564132,1606.6768537285639,1595.644740500715,1584.501191785716,1573.4690785578669,1562.4369653300175,1551.4048521021687,1540.2613033871696,1529.2291901593205,1518.1970769314717,1507.1649637036223,1496.1328504757732,1484.9893017607742,1473.9571885329253,1462.925075305076
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1762.9094067128508,1750.6515031263518,1738.3935995398529,1725.021341081854,1712.763437495355,1700.505533908856,1688.247630322357,1674.8753718643582,1662.6174682778592,1650.3595646913602,1638.1016611048613,1624.7294026468624,1612.4714990603634,1600.2135954738644,1585.7269821443658,1572.354723686367,1558.982465228368,1544.4958518988692,1531.1235934408703,1517.7513349828714,1503.2647216533728,1489.892463195374,1476.520204737375,1462.0335914078762,1448.6613329498773,1434.1747196203785,1420.8024611623796,1407.430202704381,1392.943589374882
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1762.9094067128508,1751.7658579978518,1739.5079544113528,1727.2500508248538,1716.1065021098548,1703.8485985233558,1692.7050498083568,1680.4471462218578,1669.3035975068588,1657.0456939203598,1645.9021452053607,1633.6442416188618,1621.3863380323628,1610.2427893173638,1597.9848857308648,1585.7269821443658,1572.354723686367,1560.096820099868,1547.838916513369,1535.58101292687,1523.323109340371,1511.065205753872,1498.807302167373,1486.5493985808741,1474.2914949943752,1460.9192365363763,1448.6613329498773,1436.4034293633783,1424.1455257768794
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1762.9094067128508,1751.7658579978518,1740.6223092828527,1730.5931154393534,1719.4495667243543,1708.3060180093553,1697.1624692943562,1686.0189205793572,1674.8753718643582,1663.7318231493591,1652.58827443436,1642.559080590861,1631.415531875862,1620.2719831608629,1609.1284344458638,1597.9848857308648,1586.8413370158655,1575.6977883008665,1565.6685944573674,1554.5250457423683,1543.3814970273693,1532.2379483123702,1521.0943995973712,1509.9508508823722,1498.807302167373,1487.663753452374,1477.634559608875,1466.491010893876,1455.3474621788769
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,3071.8306387766397,2987.139668542647,2902.560133795804,2817.869163561811,2733.2896288149686,2648.7100940681257,2564.019123834133,2479.43958908729,2394.748618853297,2310.169084106454,2225.4781138724616,2140.8985791256187,2056.207608891626,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,3071.8306387766397,3015.332846791595,2958.835054806549,2902.3372628215043,2845.8394708364594,2789.3416788514137,2732.7324513792187,2676.2346593941734,2619.736867409128,2563.239075424083,2506.741283439038,2450.2434914539926,2393.7456994689474,2337.247907483902,2311.840616413704,2286.4333253435066,2260.914598786159,2235.5073077159605,2210.100016645763,2184.692725575565,2159.1739990182173,2133.7667079480193,2108.3594168778213,2082.952125807624,2057.544834737426,2032.026108180078,2006.6188171098802,1981.2115260396824,1955.8042349694842
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,3071.8306387766397,3043.414589553392,3015.1099758172945,2986.693926594047,2958.277877370799,2929.973263634702,2901.5572144114544,2873.1411651882067,2844.8365514521092,2816.4205022288616,2788.004453005614,2759.6998392695164,2731.2837900462687,2702.867740823021,2674.5631270869235,2646.147077863676,2617.731028640428,2589.4264149043306,2561.010365681083,2532.5943164578352,2504.289702721738,2475.8736534984905,2447.457604275243,2419.1529905391453,2390.7369413158976,2362.32089209265,2334.0162783565524,2305.6002291333048,2277.184179910057
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3429.76142350241,3360.7828569565654,3291.8042904107215,3222.714288377727,3153.735721831883,3084.645719798889,3015.6671532530445,2946.5771512200504,2877.5985846742064,2808.5085826412123,2739.530016095368,2670.440014062374,2601.46144751653,2532.3714454835354,2503.1753478502383,2473.8678147297906,2444.560281609343,2415.2527484888956,2385.945215368448,2356.6376822480006,2327.330149127553,2298.022616007105,2268.715082886658,2239.40754976621,2210.100016645763,2180.9039190124654,2151.5963858920177,2122.2888527715704,2092.9813196511227
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3429.76142350241,3379.3925833106136,3328.912307631668,3278.543467439872,3228.0631917609267,3177.582916081981,3127.2140758901855,3076.7338002112397,3026.364960019444,2975.884684340498,2925.404408661552,2875.0355684697565,2824.5552927908107,2774.186452599015,2743.541693632768,2713.00837015367,2682.4750466745727,2651.830287708325,2621.2969642292283,2590.763640750131,2560.1188817838834,2529.585558304786,2499.052234825688,2468.407475859441,2437.8741523803433,2407.3408289012464,2376.807505422149,2346.1627464559015,2315.629422976804
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3429.76142350241,3398.0023096646623,3366.1317603397647,3334.2612110148675,3302.50209717712,3270.631547852223,3238.7609985273257,3206.8904492024285,3175.1313353646815,3143.260786039784,3111.390236714886,3079.519687389989,3047.760573552242,3015.890024227345,2984.0194749024477,2952.14892557755,2920.3898117398026,2888.5192624149054,2856.648713090008,2824.8895992522607,2793.0190499273635,2761.1485006024664,2729.2779512775687,2697.5188374398213,2665.648288114924,2633.777738790027,2601.9071894651297,2570.1480756273827,2538.277526302485
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3419.9551006332103,3350.8650986002162,3281.775096567222,3212.685094534228,3143.595092501234,3074.50509046824,3005.4150884352457,2936.325086402251,2868.349439240757,2799.259437207763,2730.1694351747688,2661.0794331417746,2591.9894311087805,2522.8994290757864,2493.926202416789,2464.952975757791,2435.979749098794,2405.8921675682964,2376.9189409092987,2347.945714250301,2318.9724875913034,2289.9992609323062,2259.9116794018087,2230.938452742811,2201.9652260838134,2172.991999424816,2144.0187727658185,2113.931191235321,2084.9579645763233
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3419.9551006332103,3369.8091314157145,3318.548807326719,3268.4028381092235,3218.2568688917277,3168.110899674232,3117.964930456736,3066.7046063677403,3016.5586371502445,2966.4126679327487,2916.266698715253,2866.120729497757,2814.860405408762,2764.714436191266,2734.6268546607685,2704.539273130271,2673.337336728274,2643.2497551977763,2613.1621736672787,2581.960237265281,2551.872655734784,2521.7850742042865,2490.583137802289,2460.4955562717914,2430.4079747412943,2399.206038339297,2369.1184568087992,2339.030875278302,2307.8289388763046
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3419.9551006332103,3387.6388093597134,3356.436872957716,3324.1205816842185,3292.918645282221,3260.602354008724,3229.4004176067265,3197.0841263332295,3165.882189931232,3133.5658986577346,3102.3639622557375,3070.04767098224,3038.8457345802426,3006.5294433067456,2975.327506904748,2943.0112156312507,2911.8092792292537,2880.607342827256,2848.2910515537587,2817.0891151517617,2784.7728238782643,2753.5708874762668,2721.25459620277,2690.0526598007723,2657.736368527275,2626.534432125278,2594.2181408517804,2563.016204449783,2530.699913176286
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,3117.073446559536,3030.2652020696937,2943.345522092701,2856.537277602858,2769.7290331130152,2682.920788623173,2596.11254413333,2509.1928641563372,2422.384619666495,2335.576375176652,2248.7681306868094,2161.9598861969666,2075.1516417071243,1988.2319617301316,1965.6105578386837,1942.8777184600856,1920.2563145686374,1897.5234751900393,1874.9020712985912,1852.169231919993,1829.4363925413952,1806.814988649947,1784.082149271349,1761.4607453799008,1738.7279060013027,1716.1065021098548,1693.3736627312564,1670.6408233526586,1648.0194194612106
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,3117.073446559536,3059.2384287286914,3001.403410897846,2943.5683930670007,2885.7333752361556,2827.8983574053104,2770.0633395744658,2712.3397572307704,2654.5047393999253,2596.66972156908,2538.834703738235,2480.99968590739,2423.164668076545,2365.3296502456997,2339.588052714052,2313.846455182404,2288.1048576507565,2262.3632601191084,2236.6216625874604,2210.880065055813,2185.138467524165,2159.396869992517,2133.6552724608696,2107.9136749292215,2082.1720773975735,2056.430479865926,2030.688882334278,2004.8358493154801,1979.0942517838325
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,3117.073446559536,3088.2116553876886,3059.461299702991,3030.5995085311433,3001.7377173592954,2972.9873616745986,2944.1255705027506,2915.375214818053,2886.513423646206,2857.763067961508,2828.90127678966,2800.150921104963,2771.2891299331154,2742.427338761268,2713.67698307657,2684.8151919047227,2656.064836220025,2627.2030450481775,2598.45268936348,2569.5908981916327,2540.729107019785,2511.978751335087,2483.11696016324,2454.3666044785423,2425.5048133066944,2396.754457621997,2367.8926664501496,2339.142310765452,2310.2805195936044
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3476.8986345668554,3406.0256647394617,3335.1526949120675,3264.279725084674,3193.406755257279,3122.5337854298855,3051.6608156024918,2980.7878457750976,2909.914875947704,2838.9304706331595,2768.057500805766,2697.1845309783716,2626.311561150978,2555.4385913235833,2525.908187228836,2496.2663476469384,2466.735943552191,2437.2055394574436,2407.5636998755463,2378.0332957807987,2348.3914561989013,2318.8610521041537,2289.2192125222564,2259.688808427509,2230.158404332761,2200.516564750864,2170.986160656116,2141.3443210742184,2111.8139169794713
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3476.8986345668554,3425.30400401641,3373.7093734659643,3322.1147429155185,3270.520112365073,3218.9254818146273,3167.330851264182,3115.847656200886,3064.2530256504406,3012.658395099995,2961.063764549549,2909.4691339991036,2857.874503448658,2806.2798728982125,2775.300807470515,2744.433177529968,2713.4541121022703,2682.586482161723,2651.6074167340253,2620.628351306328,2589.7607213657807,2558.781655938083,2527.914025997536,2496.9349605698385,2465.9558951421413,2435.0882652015935,2404.1091997738963,2373.241569833349,2342.2625044056517
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3476.8986345668554,3444.582343293358,3412.266052019861,3380.061196233514,3347.7449049600164,3315.428613686519,3283.112322413022,3250.9074666266747,3218.5911753531777,3186.2748840796803,3153.9585928061833,3121.642301532686,3089.4374457463387,3057.121154472841,3024.804863199344,2992.488571925847,2960.1722806523494,2927.967424866002,2895.6511335925047,2863.3348423190077,2831.0185510455103,2798.702259772013,2766.4974039856656,2734.181112712168,2701.8648214386712,2669.548530165174,2637.2322388916764,2605.027383105329,2572.711091831832
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3466.7580052362064,3395.4392934602124,3325.2349365557184,3253.9162247797244,3183.7118678752304,3112.3931560992364,3042.1887991947424,2970.8700874187484,2900.6657305142544,2829.3470187382604,2758.0283069622665,2687.8239500577724,2616.5052382817785,2546.3008813772844,2516.213299846787,2487.240073187789,2457.152491657292,2428.1792649982945,2399.206038339297,2369.1184568087992,2340.145230149802,2310.0576486193045,2281.084421960307,2250.9968404298093,2222.023613770812,2193.0503871118144,2162.962805581317,2133.989578922319,2103.901997391822
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3466.7580052362064,3415.4976811472106,3364.237357058215,3311.8626780977197,3260.602354008724,3209.3420299197282,3158.0817058307325,3105.707026870237,3054.4467027812416,3003.186378692246,2951.92605460325,2900.6657305142544,2848.2910515537587,2797.030727464763,2765.828791062766,2735.7412095322684,2704.539273130271,2673.337336728274,2643.2497551977763,2612.0478187957788,2580.8458823937813,2550.758300863284,2519.5563644612866,2488.354428059289,2458.266846528792,2427.0649101267945,2395.862973724797,2365.7753921942995,2334.5734557923024
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3466.7580052362064,3434.4417139627094,3402.125422689212,3369.8091314157145,3337.4928401422176,3306.29090374022,3273.9746124667226,3241.6583211932257,3209.3420299197282,3177.025738646231,3144.709447372734,3112.3931560992364,3080.076864825739,3047.760573552242,3016.5586371502445,2984.242345876747,2951.92605460325,2919.6097633297527,2887.2934720562557,2854.9771807827583,2822.660889509261,2790.344598235764,2758.0283069622665,2725.712015688769,2694.510079286772,2662.1937880132746,2629.877496739777,2597.56120546628,2565.2449141927827
diff --git a/tests/data/Natural_Gas_FE/Market/30/df_fom.csv b/tests/data/Natural_Gas_FE/Market/30/df_fom.csv
index ffabb04..d75d001 100644
--- a/tests/data/Natural_Gas_FE/Market/30/df_fom.csv
+++ b/tests/data/Natural_Gas_FE/Market/30/df_fom.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,34.5,34.3,34.1,33.9,33.7,33.5,33
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,34.1,33.7,33.2,32.8,32.3,31.9,31.4,31,30.5,30.1,29.6,29.2,28.7,28.3,28.0,27.8,27.6,27.3,27.1,26.8,26.6,26.4,26.1,25.9,25.6,25.4,25.1,24.9,24.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,34.1,33.8,33.5,33.2,32.8,32.5,32.2,31.8,31.5,31.2,30.9,30.5,30.2,29.9,29.6,29.4,29.2,29.0,28.7,28.5,28.3,28.1,27.8,27.6,27.4,27.2,26.9,26.7,26.5
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,34.1,33.9,33.7,33.5,33.3,33.1,32.9,32.7,32.5,32.3,32.1,31.9,31.7,31.4,31.2,31.0,30.8,30.6,30.4,30.2,30.0,29.8,29.6,29.4,29.2,29.0,28.7,28.5,28.3
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,39.7,39.4,39,38.7,38.4,38.1,37.7,37.4,37.1,36.8,36.5,36.1,35.8,35.5,35.2,34.9,34.6,34.3,34.0,33.7,33.4,33.1,32.8,32.5,32.2,31.9,31.5,31.2
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,39.7,39.5,39.2,38.9,38.6,38.3,38,37.8,37.5,37.2,36.9,36.6,36.3,36.1,35.8,35.5,35.2,35.0,34.7,34.4,34.2,33.9,33.6,33.3,33.1,32.8,32.5,32.2
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,39.8,39.5,39.3,39,38.8,38.6,38.3,38.1,37.8,37.6,37.4,37.1,36.9,36.6,36.4,36.1,35.9,35.7,35.4,35.2,34.9,34.7,34.4,34.2,34.0,33.7,33.5,33.2
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,40,39,39,39,38,38,38,37,37.0,37.0,36.0,36.0,36.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0,33.0,32.0,32.0,32.0,31.0,31.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,40,39,39,39,38,38,38,38,37.0,37.0,37.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,33.0,33.0,33.0,33.0,32.0,32.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,40,39,39,39,39,38,38,38,38.0,37.0,37.0,37.0,37.0,36.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,70.7,68.6,66.4,64.3,62.2,60,57.9,55.8,53.6,51.5,49.3,47.2,45.1,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,70.7,69.3,67.9,66.6,65.2,63.8,62.4,61.1,59.7,58.3,56.9,55.5,54.2,52.8,52.2,51.7,51.1,50.5,50.0,49.4,48.9,48.3,47.8,47.2,46.6,46.1,45.5,45.0,44.4
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,70.7,70.1,69.5,68.8,68.2,67.6,67,66.4,65.7,65.1,64.5,63.9,63.2,62.6,62.0,61.4,60.8,60.1,59.5,58.9,58.3,57.6,57.0,56.4,55.8,55.2,54.5,53.9,53.3
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78.2,76.5,74.8,73.2,71.5,69.8,68.1,66.4,64.8,63.1,61.4,59.7,58.0,56.4,55.7,55.1,54.4,53.8,53.2,52.5,51.9,51.2,50.6,49.9,49.3,48.7,48.0,47.4,46.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78.2,77,75.8,74.6,73.4,72.3,71.1,69.9,68.7,67.5,66.3,65.1,63.9,62.7,62.1,61.4,60.7,60.1,59.4,58.7,58.1,57.4,56.7,56.0,55.4,54.7,54.0,53.4,52.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78.2,77.5,76.8,76.1,75.4,74.7,74,73.3,72.6,71.9,71.2,70.5,69.8,69.1,68.4,67.7,67.0,66.3,65.6,64.9,64.2,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78,76,75,73,71,70,68,66,65,63.0,61.0,60.0,58.0,56.0,56.0,55.0,54.0,54.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,49.0,48.0,47.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78,77,76,74,73,72,71,70,69,67.0,66.0,65.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78,77,77,76,75,75,74,73,72,72.0,71.0,70.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,71.7,69.5,67.4,65.2,63,60.8,58.6,56.4,54.2,52.1,49.9,47.7,45.5,43.3,42.8,42.3,41.8,41.3,40.8,40.3,39.8,39.3,38.8,38.3,37.8,37.3,36.8,36.3,35.8
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,71.7,70.3,68.9,67.5,66.1,64.7,63.3,61.9,60.5,59.0,57.6,56.2,54.8,53.4,52.8,52.3,51.7,51.2,50.6,50.0,49.5,48.9,48.3,47.8,47.2,46.6,46.1,45.5,44.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,71.7,71.1,70.5,69.8,69.2,68.6,67.9,67.3,66.7,66.0,65.4,64.8,64.2,63.5,62.9,62.3,61.6,61.0,60.4,59.7,59.1,58.5,57.8,57.2,56.6,55.9,55.3,54.7,54.0
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79.3,77.5,75.8,74.1,72.4,70.7,68.9,67.2,65.5,63.8,62.0,60.3,58.6,56.9,56.2,55.6,54.9,54.3,53.6,53.0,52.3,51.7,51.0,50.4,49.8,49.1,48.5,47.8,47.2
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79.3,78,76.8,75.6,74.4,73.2,72,70.8,69.5,68.3,67.1,65.9,64.7,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7,58.0,57.4,56.7,56.0,55.3,54.7,54.0,53.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79.3,78.5,77.8,77.1,76.4,75.7,75,74.3,73.6,72.9,72.2,71.5,70.8,70.1,69.3,68.6,67.9,67.2,66.5,65.8,65.1,64.4,63.7,63.0,62.3,61.6,60.9,60.1,59.4
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79,77,76,74,72,70,69,67,65,64.0,62.0,60.0,58.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,48.0,48.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79,78,77,75,74,73,72,71,69,68.0,67.0,66.0,65.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79,78,78,77,76,76,75,74,73,73.0,72.0,71.0,71.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0
diff --git a/tests/data/Natural_Gas_FE/Market/30/df_occ.csv b/tests/data/Natural_Gas_FE/Market/30/df_occ.csv
index dbf4193..dc391b8 100644
--- a/tests/data/Natural_Gas_FE/Market/30/df_occ.csv
+++ b/tests/data/Natural_Gas_FE/Market/30/df_occ.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1245.4,1237.2,1228.9,1220.6,1212
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1278.4,1262.6,1246.8,1231,1215.2,1199.4,1183.6,1167.8,1152,1136.2,1120.5,1104.7,1088.9,1073.1,1063.2,1053.2,1043.3,1033.4,1023.5,1013.5,1003.6,993.7,983.8,973.8,963.9,954.0,944.1,934.1,924.2
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1278.4,1266.2,1254.1,1241.9,1229.8,1217.6,1205.5,1193.3,1181.2,1169.0,1156.9,1144.7,1132.6,1120.4,1111.2,1102.0,1092.8,1083.6,1074.4,1065.2,1055.9,1046.7,1037.5,1028.3,1019.1,1009.9,1000.7,991.4,982.2
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1278.4,1269.9,1261.4,1252.8,1244.3,1235.8,1227.3,1218.8,1210.3,1201.8,1193.3,1184.8,1176.3,1167.8,1159.3,1150.8,1142.3,1133.8,1125.3,1116.8,1108.3,1099.8,1091.3,1082.8,1074.2,1065.7,1057.2,1048.7,1040.2
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1490.7,1479.4,1468.1,1456.8,1445.5,1434.2,1422.9,1411.6,1400.3,1389.0,1377.7,1366.4,1355.1,1343.8,1331.4,1319.0,1306.5,1294.1,1281.6,1269.2,1256.8,1244.3,1231.9,1219.5,1207.0,1194.6,1182.1,1169.7,1157.3
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1490.7,1480,1469.4,1458.8,1448.2,1437.6,1427,1416.4,1405.8,1395.2,1384.6,1374.0,1363.4,1352.7,1341.6,1330.4,1319.2,1308.0,1296.8,1285.7,1274.5,1263.3,1252.1,1240.9,1229.7,1218.6,1207.4,1196.2,1185.0
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1490.7,1480.7,1470.8,1460.9,1451,1441,1431.1,1421.2,1411.3,1401.3,1391.4,1381.5,1371.6,1361.6,1351.7,1341.8,1331.9,1321.9,1312.0,1302.1,1292.2,1282.2,1272.3,1262.4,1252.5,1242.6,1232.6,1222.7,1212.8
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1482,1471,1460,1448,1437,1426,1415,1403,1392,1381.0,1370.0,1358.0,1347.0,1336.0,1323.0,1311.0,1299.0,1286.0,1274.0,1262.0,1249.0,1237.0,1225.0,1212.0,1200.0,1187.0,1175.0,1163.0,1150.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1482,1472,1461,1450,1440,1429,1419,1408,1398,1387.0,1377.0,1366.0,1355.0,1345.0,1334.0,1323.0,1311.0,1300.0,1289.0,1278.0,1267.0,1256.0,1245.0,1234.0,1223.0,1211.0,1200.0,1189.0,1178.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1482,1472,1462,1453,1443,1433,1423,1413,1403,1393.0,1383.0,1374.0,1364.0,1354.0,1344.0,1334.0,1324.0,1314.0,1305.0,1295.0,1285.0,1275.0,1265.0,1255.0,1245.0,1235.0,1226.0,1216.0,1206.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,2656.6,2580.6,2504.7,2428.7,2352.8,2276.9,2200.9,2125,2049,1973.1,1897.1,1821.2,1745.2,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,2656.6,2605.9,2555.2,2504.5,2453.8,2403.1,2352.3,2301.6,2250.9,2200.2,2149.5,2098.8,2048.1,1997.4,1974.6,1951.8,1928.9,1906.1,1883.3,1860.5,1837.6,1814.8,1792.0,1769.2,1746.4,1723.5,1700.7,1677.9,1655.1
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,2656.6,2631.1,2605.7,2580.2,2554.7,2529.3,2503.8,2478.3,2452.9,2427.4,2401.9,2376.5,2351.0,2325.5,2300.1,2274.6,2249.1,2223.7,2198.2,2172.7,2147.3,2121.8,2096.3,2070.9,2045.4,2019.9,1994.5,1969.0,1943.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2977.8,2915.9,2854,2792,2730.1,2668.1,2606.2,2544.2,2482.3,2420.3,2358.4,2296.4,2234.5,2172.5,2146.3,2120.0,2093.7,2067.4,2041.1,2014.8,1988.5,1962.2,1935.9,1909.6,1883.3,1857.1,1830.8,1804.5,1778.2
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2977.8,2932.6,2887.3,2842.1,2796.8,2751.5,2706.3,2661,2615.8,2570.5,2525.2,2480.0,2434.7,2389.5,2362.0,2334.6,2307.2,2279.7,2252.3,2224.9,2197.4,2170.0,2142.6,2115.1,2087.7,2060.3,2032.9,2005.4,1978.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2977.8,2949.3,2920.7,2892.1,2863.6,2835,2806.4,2777.8,2749.3,2720.7,2692.1,2663.5,2635.0,2606.4,2577.8,2549.2,2520.7,2492.1,2463.5,2435.0,2406.4,2377.8,2349.2,2320.7,2292.1,2263.5,2234.9,2206.4,2177.8
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2969,2907,2845,2783,2721,2659,2597,2535,2474,2412.0,2350.0,2288.0,2226.0,2164.0,2138.0,2112.0,2086.0,2059.0,2033.0,2007.0,1981.0,1955.0,1928.0,1902.0,1876.0,1850.0,1824.0,1797.0,1771.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2969,2924,2878,2833,2788,2743,2698,2652,2607,2562.0,2517.0,2472.0,2426.0,2381.0,2354.0,2327.0,2299.0,2272.0,2245.0,2217.0,2190.0,2163.0,2135.0,2108.0,2081.0,2053.0,2026.0,1999.0,1971.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2969,2940,2912,2883,2855,2826,2798,2769,2741,2712.0,2684.0,2655.0,2627.0,2598.0,2570.0,2541.0,2513.0,2485.0,2456.0,2428.0,2399.0,2371.0,2342.0,2314.0,2285.0,2257.0,2228.0,2200.0,2171.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,2697.2,2619.3,2541.3,2463.4,2385.5,2307.6,2229.7,2151.7,2073.8,1995.9,1918.0,1840.1,1762.2,1684.2,1663.9,1643.5,1623.2,1602.8,1582.5,1562.1,1541.7,1521.4,1501.0,1480.7,1460.3,1440.0,1419.6,1399.2,1378.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,2697.2,2645.3,2593.4,2541.5,2489.6,2437.7,2385.8,2334,2282.1,2230.2,2178.3,2126.4,2074.5,2022.6,1999.5,1976.4,1953.3,1930.2,1907.1,1884.0,1860.9,1837.8,1814.7,1791.6,1768.5,1745.4,1722.3,1699.1,1676.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,2697.2,2671.3,2645.5,2619.6,2593.7,2567.9,2542,2516.2,2490.3,2464.5,2438.6,2412.8,2386.9,2361.0,2335.2,2309.3,2283.5,2257.6,2231.8,2205.9,2180.0,2154.2,2128.3,2102.5,2076.6,2050.8,2024.9,1999.1,1973.2
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3020.1,2956.5,2892.9,2829.3,2765.7,2702.1,2638.5,2574.9,2511.3,2447.6,2384.0,2320.4,2256.8,2193.2,2166.7,2140.1,2113.6,2087.1,2060.5,2034.0,2007.4,1980.9,1954.3,1927.8,1901.3,1874.7,1848.2,1821.6,1795.1
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3020.1,2973.8,2927.5,2881.2,2834.9,2788.6,2742.3,2696.1,2649.8,2603.5,2557.2,2510.9,2464.6,2418.3,2390.5,2362.8,2335.0,2307.3,2279.5,2251.7,2224.0,2196.2,2168.5,2140.7,2112.9,2085.2,2057.4,2029.7,2001.9
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3020.1,2991.1,2962.1,2933.2,2904.2,2875.2,2846.2,2817.3,2788.3,2759.3,2730.3,2701.3,2672.4,2643.4,2614.4,2585.4,2556.4,2527.5,2498.5,2469.5,2440.5,2411.5,2382.6,2353.6,2324.6,2295.6,2266.6,2237.7,2208.7
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3011,2947,2884,2820,2757,2693,2630,2566,2503,2439.0,2375.0,2312.0,2248.0,2185.0,2158.0,2132.0,2105.0,2079.0,2053.0,2026.0,2000.0,1973.0,1947.0,1920.0,1894.0,1868.0,1841.0,1815.0,1788.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3011,2965,2919,2872,2826,2780,2734,2687,2641,2595.0,2549.0,2503.0,2456.0,2410.0,2382.0,2355.0,2327.0,2299.0,2272.0,2244.0,2216.0,2189.0,2161.0,2133.0,2106.0,2078.0,2050.0,2023.0,1995.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3011,2982,2953,2924,2895,2867,2838,2809,2780,2751.0,2722.0,2693.0,2664.0,2635.0,2607.0,2578.0,2549.0,2520.0,2491.0,2462.0,2433.0,2404.0,2375.0,2346.0,2318.0,2289.0,2260.0,2231.0,2202.0
diff --git a/tests/data/Natural_Gas_FE/Market/30/df_vom.csv b/tests/data/Natural_Gas_FE/Market/30/df_vom.csv
index eed519d..953bc21 100644
--- a/tests/data/Natural_Gas_FE/Market/30/df_vom.csv
+++ b/tests/data/Natural_Gas_FE/Market/30/df_vom.csv
@@ -8,8 +8,8 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,2.17,2.16,2.15,2.14,2.13,2.12,2.
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,2.16,2.14,2.12,2.1,2.08,2.06,2.04,2.02,2,1.97,1.95,1.93,1.91,1.89,1.88,1.87,1.85,1.84,1.83,1.82,1.8,1.79,1.78,1.76,1.75,1.74,1.73,1.71,1.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,2.16,2.15,2.13,2.12,2.1,2.08,2.07,2.05,2.04,2.02,2.01,1.99,1.97,1.96,1.95,1.93,1.92,1.91,1.9,1.89,1.88,1.86,1.85,1.84,1.83,1.82,1.81,1.79,1.78
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,2.16,2.15,2.14,2.13,2.12,2.11,2.1,2.09,2.08,2.07,2.06,2.05,2.04,2.02,2.01,2.0,1.99,1.98,1.97,1.96,1.95,1.94,1.93,1.92,1.91,1.89,1.88,1.87,1.86
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.49,2.47,2.46,2.44,2.42,2.41,2.39,2.38,2.36,2.35,2.33,2.31,2.3,2.28,2.27,2.25,2.24,2.22,2.2,2.19,2.17,2.16,2.14,2.13,2.11,2.09
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.51,2.49,2.48,2.46,2.45,2.43,2.42,2.41,2.39,2.38,2.36,2.35,2.34,2.32,2.31,2.29,2.28,2.27,2.25,2.24,2.22,2.21,2.19,2.18,2.17,2.15,2.14
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.48,2.47,2.45,2.44,2.42,2.4,2.39,2.37,2.35,2.34,2.32,2.3,2.29,2.27,2.26,2.24,2.23,2.21,2.2,2.18,2.16,2.15,2.13,2.12,2.1,2.09
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.5,2.49,2.48,2.46,2.45,2.43,2.42,2.4,2.39,2.37,2.36,2.35,2.33,2.32,2.3,2.29,2.27,2.26,2.25,2.23,2.22,2.2,2.19,2.18,2.16,2.15,2.13
 NG 1-on-1 Combined Cycle (H-Frame)/Conservative,2.53,2.52,2.51,2.5,2.48,2.47,2.46,2.45,2.43,2.42,2.41,2.4,2.38,2.37,2.36,2.34,2.33,2.32,2.31,2.29,2.28,2.27,2.26,2.24,2.23,2.22,2.21,2.19,2.18
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,5.11,4.99,4.87,4.74,4.62,4.49,4.37,4.24,4.12,3.99,3.87,3.75,3.62,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,5.11,5.04,4.96,4.88,4.8,4.72,4.64,4.57,4.49,4.41,4.33,4.25,4.17,4.1,4.07,4.04,4.01,3.98,3.95,3.92,3.89,3.86,3.84,3.81,3.78,3.75,3.72,3.69,3.66
@@ -17,8 +17,8 @@ NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,5.11,5.08,5.05,5.02,4.99
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.71,4.61,4.51,4.41,4.31,4.21,4.11,4.01,3.97,3.94,3.91,3.87,3.84,3.81,3.77,3.74,3.71,3.67,3.64,3.61,3.57,3.54,3.51
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.9,4.83,4.76,4.69,4.62,4.56,4.49,4.42,4.39,4.35,4.32,4.28,4.25,4.21,4.18,4.14,4.11,4.07,4.04,4.0,3.97,3.93,3.9
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.7,4.6,4.5,4.4,4.3,4.2,4.1,4.0,3.96,3.93,3.9,3.86,3.83,3.8,3.76,3.73,3.7,3.67,3.63,3.6,3.57,3.53,3.5
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.89,4.82,4.76,4.69,4.62,4.55,4.48,4.41,4.38,4.34,4.31,4.28,4.24,4.21,4.17,4.14,4.1,4.07,4.03,4.0,3.96,3.93,3.89
 NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,5.3,5.27,5.23,5.19,5.16,5.12,5.09,5.05,5.01,4.98,4.94,4.9,4.87,4.83,4.8,4.76,4.72,4.69,4.65,4.61,4.58,4.54,4.51,4.47,4.43,4.4,4.36,4.32,4.29
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,5.21,5.08,4.95,4.82,4.7,4.57,4.44,4.31,4.18,4.05,3.93,3.8,3.67,3.54,3.52,3.49,3.46,3.44,3.41,3.39,3.36,3.34,3.31,3.28,3.26,3.23,3.21,3.18,3.16
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,5.21,5.13,5.05,4.97,4.89,4.81,4.72,4.64,4.56,4.48,4.4,4.32,4.24,4.16,4.13,4.1,4.07,4.04,4.02,3.99,3.96,3.93,3.9,3.87,3.84,3.81,3.78,3.75,3.72
@@ -26,6 +26,6 @@ NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,5.21,5.17,5.14,5.11,5.08
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.88,4.77,4.67,4.57,4.47,4.36,4.26,4.16,4.06,4.02,3.99,3.95,3.92,3.89,3.85,3.82,3.79,3.75,3.72,3.69,3.65,3.62,3.58,3.55
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.45,4.41,4.38,4.34,4.31,4.27,4.24,4.2,4.17,4.13,4.1,4.06,4.03,3.99,3.96
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.87,4.77,4.67,4.56,4.46,4.35,4.25,4.15,4.04,4.01,3.98,3.94,3.91,3.88,3.84,3.81,3.78,3.74,3.71,3.68,3.64,3.61,3.58,3.54
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.44,4.41,4.37,4.34,4.3,4.27,4.23,4.2,4.16,4.13,4.09,4.06,4.02,3.99,3.95
 NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,5.39,5.35,5.32,5.28,5.24,5.21,5.17,5.13,5.1,5.06,5.02,4.99,4.95,4.91,4.88,4.84,4.8,4.77,4.73,4.69,4.66,4.62,4.58,4.55,4.51,4.47,4.43,4.4,4.36
diff --git a/tests/data/Natural_Gas_FE/Market/TechLife/df_capex.csv b/tests/data/Natural_Gas_FE/Market/TechLife/df_capex.csv
index 8faea65..ca6b387 100644
--- a/tests/data/Natural_Gas_FE/Market/TechLife/df_capex.csv
+++ b/tests/data/Natural_Gas_FE/Market/TechLife/df_capex.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1499.2530441159731,1490.11533416
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1536.02675487547,1518.4199479057713,1500.8131409360728,1483.2063339663744,1465.5995269966759,1447.9927200269774,1430.3859130572787,1412.7791060875804,1395.172299117882,1377.5654921481835,1360.070120665635,1342.4633136959364,1324.856506726238,1307.2496997565393,1296.2175865286904,1285.0740378136913,1274.041924585842,1263.0098113579932,1251.977698130144,1240.834149415145,1229.8020361872957,1218.7699229594468,1207.7378097315977,1196.5942610165987,1185.5621477887498,1174.5300345609005,1163.4979213330514,1152.3543726180524,1141.3222593902035
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1536.02675487547,1522.4316254431712,1508.9479314980222,1495.3528020657234,1481.8691081205745,1468.2739786882755,1454.790284743127,1441.1951553108279,1427.7114613656793,1414.1163319333803,1400.6326379882314,1387.0375085559326,1373.5538146107835,1359.958685178485,1349.7066203606857,1339.4545555428865,1329.2024907250875,1318.9504259072883,1308.6983610894893,1298.44629627169,1288.082795966741,1277.8307311489418,1267.5786663311426,1257.3266015133436,1247.0745366955443,1236.8224718777453,1226.570407059946,1216.2069067549971,1205.954841937198
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1536.02675487547,1526.5547384677209,1517.0827220599717,1507.4992701650724,1498.027253757323,1488.5552373495739,1479.0832209418247,1469.6112045340756,1460.1391881263264,1450.667171718577,1441.1951553108279,1431.7231389030787,1422.2511224953296,1412.7791060875804,1403.307089679831,1393.835073272082,1384.3630568643327,1374.8910404565836,1365.4190240488344,1355.947007641085,1346.474991233336,1337.0029748255868,1327.5309584178376,1318.0589420100882,1308.4754901151894,1299.00347370744,1289.5314572996908,1280.0594408919417,1270.5874244841925
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1772.6042940948998,1760.012084046951,1747.419873999002,1734.827663951053,1722.2354539031041,1709.6432438551553,1697.0510338072063,1684.4588237592573,1671.8666137113084,1659.2744036633594,1646.6821936154106,1634.0899835674618,1621.4977735195125,1608.9055634715637,1595.087563064965,1581.269562658366,1567.3401267646173,1553.5221263580183,1539.5926904642695,1525.7746900576708,1511.9566896510719,1498.027253757323,1484.2092533507243,1470.3912529441254,1456.4618170503766,1442.6438166437777,1428.714380750029,1414.8963803434303,1401.0783799368314
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1772.6042940948998,1760.680696969851,1748.868535331952,1737.0563736940528,1725.2442120561539,1713.432050418255,1701.619888780356,1689.807727142457,1677.9955655045578,1666.1834038666589,1654.37124222876,1642.559080590861,1630.746918952962,1618.8233218279129,1606.453982754264,1593.973208193465,1581.4924336326662,1569.0116590718671,1556.530884511068,1544.1615454374194,1531.6807708766203,1519.1999963158214,1506.7192217550223,1494.2384471942237,1481.7576726334246,1469.3883335597754,1456.9075589989768,1444.4267844381777,1431.9460098773789
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1772.6042940948998,1761.4607453799008,1750.4286321520517,1739.3965189242028,1728.3644056963537,1717.2208569813547,1706.1887437535054,1695.1566305256565,1684.1245172978074,1672.9809685828084,1661.9488553549593,1650.9167421271102,1639.884628899261,1628.741080184262,1617.7089669564132,1606.6768537285639,1595.644740500715,1584.501191785716,1573.4690785578669,1562.4369653300175,1551.4048521021687,1540.2613033871696,1529.2291901593205,1518.1970769314717,1507.1649637036223,1496.1328504757732,1484.9893017607742,1473.9571885329253,1462.925075305076
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1762.9094067128508,1750.6515031263518,1738.3935995398529,1725.021341081854,1712.763437495355,1700.505533908856,1688.247630322357,1674.8753718643582,1662.6174682778592,1650.3595646913602,1638.1016611048613,1624.7294026468624,1612.4714990603634,1600.2135954738644,1585.7269821443658,1572.354723686367,1558.982465228368,1544.4958518988692,1531.1235934408703,1517.7513349828714,1503.2647216533728,1489.892463195374,1476.520204737375,1462.0335914078762,1448.6613329498773,1434.1747196203785,1420.8024611623796,1407.430202704381,1392.943589374882
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1762.9094067128508,1751.7658579978518,1739.5079544113528,1727.2500508248538,1716.1065021098548,1703.8485985233558,1692.7050498083568,1680.4471462218578,1669.3035975068588,1657.0456939203598,1645.9021452053607,1633.6442416188618,1621.3863380323628,1610.2427893173638,1597.9848857308648,1585.7269821443658,1572.354723686367,1560.096820099868,1547.838916513369,1535.58101292687,1523.323109340371,1511.065205753872,1498.807302167373,1486.5493985808741,1474.2914949943752,1460.9192365363763,1448.6613329498773,1436.4034293633783,1424.1455257768794
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1762.9094067128508,1751.7658579978518,1740.6223092828527,1730.5931154393534,1719.4495667243543,1708.3060180093553,1697.1624692943562,1686.0189205793572,1674.8753718643582,1663.7318231493591,1652.58827443436,1642.559080590861,1631.415531875862,1620.2719831608629,1609.1284344458638,1597.9848857308648,1586.8413370158655,1575.6977883008665,1565.6685944573674,1554.5250457423683,1543.3814970273693,1532.2379483123702,1521.0943995973712,1509.9508508823722,1498.807302167373,1487.663753452374,1477.634559608875,1466.491010893876,1455.3474621788769
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,3071.8306387766397,2987.139668542647,2902.560133795804,2817.869163561811,2733.2896288149686,2648.7100940681257,2564.019123834133,2479.43958908729,2394.748618853297,2310.169084106454,2225.4781138724616,2140.8985791256187,2056.207608891626,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,3071.8306387766397,3015.332846791595,2958.835054806549,2902.3372628215043,2845.8394708364594,2789.3416788514137,2732.7324513792187,2676.2346593941734,2619.736867409128,2563.239075424083,2506.741283439038,2450.2434914539926,2393.7456994689474,2337.247907483902,2311.840616413704,2286.4333253435066,2260.914598786159,2235.5073077159605,2210.100016645763,2184.692725575565,2159.1739990182173,2133.7667079480193,2108.3594168778213,2082.952125807624,2057.544834737426,2032.026108180078,2006.6188171098802,1981.2115260396824,1955.8042349694842
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,3071.8306387766397,3043.414589553392,3015.1099758172945,2986.693926594047,2958.277877370799,2929.973263634702,2901.5572144114544,2873.1411651882067,2844.8365514521092,2816.4205022288616,2788.004453005614,2759.6998392695164,2731.2837900462687,2702.867740823021,2674.5631270869235,2646.147077863676,2617.731028640428,2589.4264149043306,2561.010365681083,2532.5943164578352,2504.289702721738,2475.8736534984905,2447.457604275243,2419.1529905391453,2390.7369413158976,2362.32089209265,2334.0162783565524,2305.6002291333048,2277.184179910057
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3429.76142350241,3360.7828569565654,3291.8042904107215,3222.714288377727,3153.735721831883,3084.645719798889,3015.6671532530445,2946.5771512200504,2877.5985846742064,2808.5085826412123,2739.530016095368,2670.440014062374,2601.46144751653,2532.3714454835354,2503.1753478502383,2473.8678147297906,2444.560281609343,2415.2527484888956,2385.945215368448,2356.6376822480006,2327.330149127553,2298.022616007105,2268.715082886658,2239.40754976621,2210.100016645763,2180.9039190124654,2151.5963858920177,2122.2888527715704,2092.9813196511227
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3429.76142350241,3379.3925833106136,3328.912307631668,3278.543467439872,3228.0631917609267,3177.582916081981,3127.2140758901855,3076.7338002112397,3026.364960019444,2975.884684340498,2925.404408661552,2875.0355684697565,2824.5552927908107,2774.186452599015,2743.541693632768,2713.00837015367,2682.4750466745727,2651.830287708325,2621.2969642292283,2590.763640750131,2560.1188817838834,2529.585558304786,2499.052234825688,2468.407475859441,2437.8741523803433,2407.3408289012464,2376.807505422149,2346.1627464559015,2315.629422976804
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3429.76142350241,3398.0023096646623,3366.1317603397647,3334.2612110148675,3302.50209717712,3270.631547852223,3238.7609985273257,3206.8904492024285,3175.1313353646815,3143.260786039784,3111.390236714886,3079.519687389989,3047.760573552242,3015.890024227345,2984.0194749024477,2952.14892557755,2920.3898117398026,2888.5192624149054,2856.648713090008,2824.8895992522607,2793.0190499273635,2761.1485006024664,2729.2779512775687,2697.5188374398213,2665.648288114924,2633.777738790027,2601.9071894651297,2570.1480756273827,2538.277526302485
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3419.9551006332103,3350.8650986002162,3281.775096567222,3212.685094534228,3143.595092501234,3074.50509046824,3005.4150884352457,2936.325086402251,2868.349439240757,2799.259437207763,2730.1694351747688,2661.0794331417746,2591.9894311087805,2522.8994290757864,2493.926202416789,2464.952975757791,2435.979749098794,2405.8921675682964,2376.9189409092987,2347.945714250301,2318.9724875913034,2289.9992609323062,2259.9116794018087,2230.938452742811,2201.9652260838134,2172.991999424816,2144.0187727658185,2113.931191235321,2084.9579645763233
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3419.9551006332103,3369.8091314157145,3318.548807326719,3268.4028381092235,3218.2568688917277,3168.110899674232,3117.964930456736,3066.7046063677403,3016.5586371502445,2966.4126679327487,2916.266698715253,2866.120729497757,2814.860405408762,2764.714436191266,2734.6268546607685,2704.539273130271,2673.337336728274,2643.2497551977763,2613.1621736672787,2581.960237265281,2551.872655734784,2521.7850742042865,2490.583137802289,2460.4955562717914,2430.4079747412943,2399.206038339297,2369.1184568087992,2339.030875278302,2307.8289388763046
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3419.9551006332103,3387.6388093597134,3356.436872957716,3324.1205816842185,3292.918645282221,3260.602354008724,3229.4004176067265,3197.0841263332295,3165.882189931232,3133.5658986577346,3102.3639622557375,3070.04767098224,3038.8457345802426,3006.5294433067456,2975.327506904748,2943.0112156312507,2911.8092792292537,2880.607342827256,2848.2910515537587,2817.0891151517617,2784.7728238782643,2753.5708874762668,2721.25459620277,2690.0526598007723,2657.736368527275,2626.534432125278,2594.2181408517804,2563.016204449783,2530.699913176286
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,3117.073446559536,3030.2652020696937,2943.345522092701,2856.537277602858,2769.7290331130152,2682.920788623173,2596.11254413333,2509.1928641563372,2422.384619666495,2335.576375176652,2248.7681306868094,2161.9598861969666,2075.1516417071243,1988.2319617301316,1965.6105578386837,1942.8777184600856,1920.2563145686374,1897.5234751900393,1874.9020712985912,1852.169231919993,1829.4363925413952,1806.814988649947,1784.082149271349,1761.4607453799008,1738.7279060013027,1716.1065021098548,1693.3736627312564,1670.6408233526586,1648.0194194612106
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,3117.073446559536,3059.2384287286914,3001.403410897846,2943.5683930670007,2885.7333752361556,2827.8983574053104,2770.0633395744658,2712.3397572307704,2654.5047393999253,2596.66972156908,2538.834703738235,2480.99968590739,2423.164668076545,2365.3296502456997,2339.588052714052,2313.846455182404,2288.1048576507565,2262.3632601191084,2236.6216625874604,2210.880065055813,2185.138467524165,2159.396869992517,2133.6552724608696,2107.9136749292215,2082.1720773975735,2056.430479865926,2030.688882334278,2004.8358493154801,1979.0942517838325
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,3117.073446559536,3088.2116553876886,3059.461299702991,3030.5995085311433,3001.7377173592954,2972.9873616745986,2944.1255705027506,2915.375214818053,2886.513423646206,2857.763067961508,2828.90127678966,2800.150921104963,2771.2891299331154,2742.427338761268,2713.67698307657,2684.8151919047227,2656.064836220025,2627.2030450481775,2598.45268936348,2569.5908981916327,2540.729107019785,2511.978751335087,2483.11696016324,2454.3666044785423,2425.5048133066944,2396.754457621997,2367.8926664501496,2339.142310765452,2310.2805195936044
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3476.8986345668554,3406.0256647394617,3335.1526949120675,3264.279725084674,3193.406755257279,3122.5337854298855,3051.6608156024918,2980.7878457750976,2909.914875947704,2838.9304706331595,2768.057500805766,2697.1845309783716,2626.311561150978,2555.4385913235833,2525.908187228836,2496.2663476469384,2466.735943552191,2437.2055394574436,2407.5636998755463,2378.0332957807987,2348.3914561989013,2318.8610521041537,2289.2192125222564,2259.688808427509,2230.158404332761,2200.516564750864,2170.986160656116,2141.3443210742184,2111.8139169794713
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3476.8986345668554,3425.30400401641,3373.7093734659643,3322.1147429155185,3270.520112365073,3218.9254818146273,3167.330851264182,3115.847656200886,3064.2530256504406,3012.658395099995,2961.063764549549,2909.4691339991036,2857.874503448658,2806.2798728982125,2775.300807470515,2744.433177529968,2713.4541121022703,2682.586482161723,2651.6074167340253,2620.628351306328,2589.7607213657807,2558.781655938083,2527.914025997536,2496.9349605698385,2465.9558951421413,2435.0882652015935,2404.1091997738963,2373.241569833349,2342.2625044056517
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3476.8986345668554,3444.582343293358,3412.266052019861,3380.061196233514,3347.7449049600164,3315.428613686519,3283.112322413022,3250.9074666266747,3218.5911753531777,3186.2748840796803,3153.9585928061833,3121.642301532686,3089.4374457463387,3057.121154472841,3024.804863199344,2992.488571925847,2960.1722806523494,2927.967424866002,2895.6511335925047,2863.3348423190077,2831.0185510455103,2798.702259772013,2766.4974039856656,2734.181112712168,2701.8648214386712,2669.548530165174,2637.2322388916764,2605.027383105329,2572.711091831832
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3466.7580052362064,3395.4392934602124,3325.2349365557184,3253.9162247797244,3183.7118678752304,3112.3931560992364,3042.1887991947424,2970.8700874187484,2900.6657305142544,2829.3470187382604,2758.0283069622665,2687.8239500577724,2616.5052382817785,2546.3008813772844,2516.213299846787,2487.240073187789,2457.152491657292,2428.1792649982945,2399.206038339297,2369.1184568087992,2340.145230149802,2310.0576486193045,2281.084421960307,2250.9968404298093,2222.023613770812,2193.0503871118144,2162.962805581317,2133.989578922319,2103.901997391822
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3466.7580052362064,3415.4976811472106,3364.237357058215,3311.8626780977197,3260.602354008724,3209.3420299197282,3158.0817058307325,3105.707026870237,3054.4467027812416,3003.186378692246,2951.92605460325,2900.6657305142544,2848.2910515537587,2797.030727464763,2765.828791062766,2735.7412095322684,2704.539273130271,2673.337336728274,2643.2497551977763,2612.0478187957788,2580.8458823937813,2550.758300863284,2519.5563644612866,2488.354428059289,2458.266846528792,2427.0649101267945,2395.862973724797,2365.7753921942995,2334.5734557923024
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3466.7580052362064,3434.4417139627094,3402.125422689212,3369.8091314157145,3337.4928401422176,3306.29090374022,3273.9746124667226,3241.6583211932257,3209.3420299197282,3177.025738646231,3144.709447372734,3112.3931560992364,3080.076864825739,3047.760573552242,3016.5586371502445,2984.242345876747,2951.92605460325,2919.6097633297527,2887.2934720562557,2854.9771807827583,2822.660889509261,2790.344598235764,2758.0283069622665,2725.712015688769,2694.510079286772,2662.1937880132746,2629.877496739777,2597.56120546628,2565.2449141927827
diff --git a/tests/data/Natural_Gas_FE/Market/TechLife/df_fom.csv b/tests/data/Natural_Gas_FE/Market/TechLife/df_fom.csv
index ffabb04..d75d001 100644
--- a/tests/data/Natural_Gas_FE/Market/TechLife/df_fom.csv
+++ b/tests/data/Natural_Gas_FE/Market/TechLife/df_fom.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,34.5,34.3,34.1,33.9,33.7,33.5,33
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,34.1,33.7,33.2,32.8,32.3,31.9,31.4,31,30.5,30.1,29.6,29.2,28.7,28.3,28.0,27.8,27.6,27.3,27.1,26.8,26.6,26.4,26.1,25.9,25.6,25.4,25.1,24.9,24.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,34.1,33.8,33.5,33.2,32.8,32.5,32.2,31.8,31.5,31.2,30.9,30.5,30.2,29.9,29.6,29.4,29.2,29.0,28.7,28.5,28.3,28.1,27.8,27.6,27.4,27.2,26.9,26.7,26.5
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,34.1,33.9,33.7,33.5,33.3,33.1,32.9,32.7,32.5,32.3,32.1,31.9,31.7,31.4,31.2,31.0,30.8,30.6,30.4,30.2,30.0,29.8,29.6,29.4,29.2,29.0,28.7,28.5,28.3
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,39.7,39.4,39,38.7,38.4,38.1,37.7,37.4,37.1,36.8,36.5,36.1,35.8,35.5,35.2,34.9,34.6,34.3,34.0,33.7,33.4,33.1,32.8,32.5,32.2,31.9,31.5,31.2
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,39.7,39.5,39.2,38.9,38.6,38.3,38,37.8,37.5,37.2,36.9,36.6,36.3,36.1,35.8,35.5,35.2,35.0,34.7,34.4,34.2,33.9,33.6,33.3,33.1,32.8,32.5,32.2
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,39.8,39.5,39.3,39,38.8,38.6,38.3,38.1,37.8,37.6,37.4,37.1,36.9,36.6,36.4,36.1,35.9,35.7,35.4,35.2,34.9,34.7,34.4,34.2,34.0,33.7,33.5,33.2
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,40,39,39,39,38,38,38,37,37.0,37.0,36.0,36.0,36.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0,33.0,32.0,32.0,32.0,31.0,31.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,40,39,39,39,38,38,38,38,37.0,37.0,37.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,33.0,33.0,33.0,33.0,32.0,32.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,40,39,39,39,39,38,38,38,38.0,37.0,37.0,37.0,37.0,36.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,70.7,68.6,66.4,64.3,62.2,60,57.9,55.8,53.6,51.5,49.3,47.2,45.1,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,70.7,69.3,67.9,66.6,65.2,63.8,62.4,61.1,59.7,58.3,56.9,55.5,54.2,52.8,52.2,51.7,51.1,50.5,50.0,49.4,48.9,48.3,47.8,47.2,46.6,46.1,45.5,45.0,44.4
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,70.7,70.1,69.5,68.8,68.2,67.6,67,66.4,65.7,65.1,64.5,63.9,63.2,62.6,62.0,61.4,60.8,60.1,59.5,58.9,58.3,57.6,57.0,56.4,55.8,55.2,54.5,53.9,53.3
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78.2,76.5,74.8,73.2,71.5,69.8,68.1,66.4,64.8,63.1,61.4,59.7,58.0,56.4,55.7,55.1,54.4,53.8,53.2,52.5,51.9,51.2,50.6,49.9,49.3,48.7,48.0,47.4,46.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78.2,77,75.8,74.6,73.4,72.3,71.1,69.9,68.7,67.5,66.3,65.1,63.9,62.7,62.1,61.4,60.7,60.1,59.4,58.7,58.1,57.4,56.7,56.0,55.4,54.7,54.0,53.4,52.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78.2,77.5,76.8,76.1,75.4,74.7,74,73.3,72.6,71.9,71.2,70.5,69.8,69.1,68.4,67.7,67.0,66.3,65.6,64.9,64.2,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78,76,75,73,71,70,68,66,65,63.0,61.0,60.0,58.0,56.0,56.0,55.0,54.0,54.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,49.0,48.0,47.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78,77,76,74,73,72,71,70,69,67.0,66.0,65.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78,77,77,76,75,75,74,73,72,72.0,71.0,70.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,71.7,69.5,67.4,65.2,63,60.8,58.6,56.4,54.2,52.1,49.9,47.7,45.5,43.3,42.8,42.3,41.8,41.3,40.8,40.3,39.8,39.3,38.8,38.3,37.8,37.3,36.8,36.3,35.8
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,71.7,70.3,68.9,67.5,66.1,64.7,63.3,61.9,60.5,59.0,57.6,56.2,54.8,53.4,52.8,52.3,51.7,51.2,50.6,50.0,49.5,48.9,48.3,47.8,47.2,46.6,46.1,45.5,44.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,71.7,71.1,70.5,69.8,69.2,68.6,67.9,67.3,66.7,66.0,65.4,64.8,64.2,63.5,62.9,62.3,61.6,61.0,60.4,59.7,59.1,58.5,57.8,57.2,56.6,55.9,55.3,54.7,54.0
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79.3,77.5,75.8,74.1,72.4,70.7,68.9,67.2,65.5,63.8,62.0,60.3,58.6,56.9,56.2,55.6,54.9,54.3,53.6,53.0,52.3,51.7,51.0,50.4,49.8,49.1,48.5,47.8,47.2
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79.3,78,76.8,75.6,74.4,73.2,72,70.8,69.5,68.3,67.1,65.9,64.7,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7,58.0,57.4,56.7,56.0,55.3,54.7,54.0,53.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79.3,78.5,77.8,77.1,76.4,75.7,75,74.3,73.6,72.9,72.2,71.5,70.8,70.1,69.3,68.6,67.9,67.2,66.5,65.8,65.1,64.4,63.7,63.0,62.3,61.6,60.9,60.1,59.4
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79,77,76,74,72,70,69,67,65,64.0,62.0,60.0,58.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,48.0,48.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79,78,77,75,74,73,72,71,69,68.0,67.0,66.0,65.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79,78,78,77,76,76,75,74,73,73.0,72.0,71.0,71.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0
diff --git a/tests/data/Natural_Gas_FE/Market/TechLife/df_occ.csv b/tests/data/Natural_Gas_FE/Market/TechLife/df_occ.csv
index dbf4193..dc391b8 100644
--- a/tests/data/Natural_Gas_FE/Market/TechLife/df_occ.csv
+++ b/tests/data/Natural_Gas_FE/Market/TechLife/df_occ.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1245.4,1237.2,1228.9,1220.6,1212
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1278.4,1262.6,1246.8,1231,1215.2,1199.4,1183.6,1167.8,1152,1136.2,1120.5,1104.7,1088.9,1073.1,1063.2,1053.2,1043.3,1033.4,1023.5,1013.5,1003.6,993.7,983.8,973.8,963.9,954.0,944.1,934.1,924.2
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1278.4,1266.2,1254.1,1241.9,1229.8,1217.6,1205.5,1193.3,1181.2,1169.0,1156.9,1144.7,1132.6,1120.4,1111.2,1102.0,1092.8,1083.6,1074.4,1065.2,1055.9,1046.7,1037.5,1028.3,1019.1,1009.9,1000.7,991.4,982.2
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1278.4,1269.9,1261.4,1252.8,1244.3,1235.8,1227.3,1218.8,1210.3,1201.8,1193.3,1184.8,1176.3,1167.8,1159.3,1150.8,1142.3,1133.8,1125.3,1116.8,1108.3,1099.8,1091.3,1082.8,1074.2,1065.7,1057.2,1048.7,1040.2
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1490.7,1479.4,1468.1,1456.8,1445.5,1434.2,1422.9,1411.6,1400.3,1389.0,1377.7,1366.4,1355.1,1343.8,1331.4,1319.0,1306.5,1294.1,1281.6,1269.2,1256.8,1244.3,1231.9,1219.5,1207.0,1194.6,1182.1,1169.7,1157.3
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1490.7,1480,1469.4,1458.8,1448.2,1437.6,1427,1416.4,1405.8,1395.2,1384.6,1374.0,1363.4,1352.7,1341.6,1330.4,1319.2,1308.0,1296.8,1285.7,1274.5,1263.3,1252.1,1240.9,1229.7,1218.6,1207.4,1196.2,1185.0
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1490.7,1480.7,1470.8,1460.9,1451,1441,1431.1,1421.2,1411.3,1401.3,1391.4,1381.5,1371.6,1361.6,1351.7,1341.8,1331.9,1321.9,1312.0,1302.1,1292.2,1282.2,1272.3,1262.4,1252.5,1242.6,1232.6,1222.7,1212.8
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1482,1471,1460,1448,1437,1426,1415,1403,1392,1381.0,1370.0,1358.0,1347.0,1336.0,1323.0,1311.0,1299.0,1286.0,1274.0,1262.0,1249.0,1237.0,1225.0,1212.0,1200.0,1187.0,1175.0,1163.0,1150.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1482,1472,1461,1450,1440,1429,1419,1408,1398,1387.0,1377.0,1366.0,1355.0,1345.0,1334.0,1323.0,1311.0,1300.0,1289.0,1278.0,1267.0,1256.0,1245.0,1234.0,1223.0,1211.0,1200.0,1189.0,1178.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1482,1472,1462,1453,1443,1433,1423,1413,1403,1393.0,1383.0,1374.0,1364.0,1354.0,1344.0,1334.0,1324.0,1314.0,1305.0,1295.0,1285.0,1275.0,1265.0,1255.0,1245.0,1235.0,1226.0,1216.0,1206.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,2656.6,2580.6,2504.7,2428.7,2352.8,2276.9,2200.9,2125,2049,1973.1,1897.1,1821.2,1745.2,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,2656.6,2605.9,2555.2,2504.5,2453.8,2403.1,2352.3,2301.6,2250.9,2200.2,2149.5,2098.8,2048.1,1997.4,1974.6,1951.8,1928.9,1906.1,1883.3,1860.5,1837.6,1814.8,1792.0,1769.2,1746.4,1723.5,1700.7,1677.9,1655.1
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,2656.6,2631.1,2605.7,2580.2,2554.7,2529.3,2503.8,2478.3,2452.9,2427.4,2401.9,2376.5,2351.0,2325.5,2300.1,2274.6,2249.1,2223.7,2198.2,2172.7,2147.3,2121.8,2096.3,2070.9,2045.4,2019.9,1994.5,1969.0,1943.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2977.8,2915.9,2854,2792,2730.1,2668.1,2606.2,2544.2,2482.3,2420.3,2358.4,2296.4,2234.5,2172.5,2146.3,2120.0,2093.7,2067.4,2041.1,2014.8,1988.5,1962.2,1935.9,1909.6,1883.3,1857.1,1830.8,1804.5,1778.2
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2977.8,2932.6,2887.3,2842.1,2796.8,2751.5,2706.3,2661,2615.8,2570.5,2525.2,2480.0,2434.7,2389.5,2362.0,2334.6,2307.2,2279.7,2252.3,2224.9,2197.4,2170.0,2142.6,2115.1,2087.7,2060.3,2032.9,2005.4,1978.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2977.8,2949.3,2920.7,2892.1,2863.6,2835,2806.4,2777.8,2749.3,2720.7,2692.1,2663.5,2635.0,2606.4,2577.8,2549.2,2520.7,2492.1,2463.5,2435.0,2406.4,2377.8,2349.2,2320.7,2292.1,2263.5,2234.9,2206.4,2177.8
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2969,2907,2845,2783,2721,2659,2597,2535,2474,2412.0,2350.0,2288.0,2226.0,2164.0,2138.0,2112.0,2086.0,2059.0,2033.0,2007.0,1981.0,1955.0,1928.0,1902.0,1876.0,1850.0,1824.0,1797.0,1771.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2969,2924,2878,2833,2788,2743,2698,2652,2607,2562.0,2517.0,2472.0,2426.0,2381.0,2354.0,2327.0,2299.0,2272.0,2245.0,2217.0,2190.0,2163.0,2135.0,2108.0,2081.0,2053.0,2026.0,1999.0,1971.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2969,2940,2912,2883,2855,2826,2798,2769,2741,2712.0,2684.0,2655.0,2627.0,2598.0,2570.0,2541.0,2513.0,2485.0,2456.0,2428.0,2399.0,2371.0,2342.0,2314.0,2285.0,2257.0,2228.0,2200.0,2171.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,2697.2,2619.3,2541.3,2463.4,2385.5,2307.6,2229.7,2151.7,2073.8,1995.9,1918.0,1840.1,1762.2,1684.2,1663.9,1643.5,1623.2,1602.8,1582.5,1562.1,1541.7,1521.4,1501.0,1480.7,1460.3,1440.0,1419.6,1399.2,1378.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,2697.2,2645.3,2593.4,2541.5,2489.6,2437.7,2385.8,2334,2282.1,2230.2,2178.3,2126.4,2074.5,2022.6,1999.5,1976.4,1953.3,1930.2,1907.1,1884.0,1860.9,1837.8,1814.7,1791.6,1768.5,1745.4,1722.3,1699.1,1676.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,2697.2,2671.3,2645.5,2619.6,2593.7,2567.9,2542,2516.2,2490.3,2464.5,2438.6,2412.8,2386.9,2361.0,2335.2,2309.3,2283.5,2257.6,2231.8,2205.9,2180.0,2154.2,2128.3,2102.5,2076.6,2050.8,2024.9,1999.1,1973.2
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3020.1,2956.5,2892.9,2829.3,2765.7,2702.1,2638.5,2574.9,2511.3,2447.6,2384.0,2320.4,2256.8,2193.2,2166.7,2140.1,2113.6,2087.1,2060.5,2034.0,2007.4,1980.9,1954.3,1927.8,1901.3,1874.7,1848.2,1821.6,1795.1
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3020.1,2973.8,2927.5,2881.2,2834.9,2788.6,2742.3,2696.1,2649.8,2603.5,2557.2,2510.9,2464.6,2418.3,2390.5,2362.8,2335.0,2307.3,2279.5,2251.7,2224.0,2196.2,2168.5,2140.7,2112.9,2085.2,2057.4,2029.7,2001.9
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3020.1,2991.1,2962.1,2933.2,2904.2,2875.2,2846.2,2817.3,2788.3,2759.3,2730.3,2701.3,2672.4,2643.4,2614.4,2585.4,2556.4,2527.5,2498.5,2469.5,2440.5,2411.5,2382.6,2353.6,2324.6,2295.6,2266.6,2237.7,2208.7
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3011,2947,2884,2820,2757,2693,2630,2566,2503,2439.0,2375.0,2312.0,2248.0,2185.0,2158.0,2132.0,2105.0,2079.0,2053.0,2026.0,2000.0,1973.0,1947.0,1920.0,1894.0,1868.0,1841.0,1815.0,1788.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3011,2965,2919,2872,2826,2780,2734,2687,2641,2595.0,2549.0,2503.0,2456.0,2410.0,2382.0,2355.0,2327.0,2299.0,2272.0,2244.0,2216.0,2189.0,2161.0,2133.0,2106.0,2078.0,2050.0,2023.0,1995.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3011,2982,2953,2924,2895,2867,2838,2809,2780,2751.0,2722.0,2693.0,2664.0,2635.0,2607.0,2578.0,2549.0,2520.0,2491.0,2462.0,2433.0,2404.0,2375.0,2346.0,2318.0,2289.0,2260.0,2231.0,2202.0
diff --git a/tests/data/Natural_Gas_FE/Market/TechLife/df_vom.csv b/tests/data/Natural_Gas_FE/Market/TechLife/df_vom.csv
index eed519d..953bc21 100644
--- a/tests/data/Natural_Gas_FE/Market/TechLife/df_vom.csv
+++ b/tests/data/Natural_Gas_FE/Market/TechLife/df_vom.csv
@@ -8,8 +8,8 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,2.17,2.16,2.15,2.14,2.13,2.12,2.
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,2.16,2.14,2.12,2.1,2.08,2.06,2.04,2.02,2,1.97,1.95,1.93,1.91,1.89,1.88,1.87,1.85,1.84,1.83,1.82,1.8,1.79,1.78,1.76,1.75,1.74,1.73,1.71,1.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,2.16,2.15,2.13,2.12,2.1,2.08,2.07,2.05,2.04,2.02,2.01,1.99,1.97,1.96,1.95,1.93,1.92,1.91,1.9,1.89,1.88,1.86,1.85,1.84,1.83,1.82,1.81,1.79,1.78
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,2.16,2.15,2.14,2.13,2.12,2.11,2.1,2.09,2.08,2.07,2.06,2.05,2.04,2.02,2.01,2.0,1.99,1.98,1.97,1.96,1.95,1.94,1.93,1.92,1.91,1.89,1.88,1.87,1.86
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.49,2.47,2.46,2.44,2.42,2.41,2.39,2.38,2.36,2.35,2.33,2.31,2.3,2.28,2.27,2.25,2.24,2.22,2.2,2.19,2.17,2.16,2.14,2.13,2.11,2.09
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.51,2.49,2.48,2.46,2.45,2.43,2.42,2.41,2.39,2.38,2.36,2.35,2.34,2.32,2.31,2.29,2.28,2.27,2.25,2.24,2.22,2.21,2.19,2.18,2.17,2.15,2.14
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.48,2.47,2.45,2.44,2.42,2.4,2.39,2.37,2.35,2.34,2.32,2.3,2.29,2.27,2.26,2.24,2.23,2.21,2.2,2.18,2.16,2.15,2.13,2.12,2.1,2.09
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.5,2.49,2.48,2.46,2.45,2.43,2.42,2.4,2.39,2.37,2.36,2.35,2.33,2.32,2.3,2.29,2.27,2.26,2.25,2.23,2.22,2.2,2.19,2.18,2.16,2.15,2.13
 NG 1-on-1 Combined Cycle (H-Frame)/Conservative,2.53,2.52,2.51,2.5,2.48,2.47,2.46,2.45,2.43,2.42,2.41,2.4,2.38,2.37,2.36,2.34,2.33,2.32,2.31,2.29,2.28,2.27,2.26,2.24,2.23,2.22,2.21,2.19,2.18
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,5.11,4.99,4.87,4.74,4.62,4.49,4.37,4.24,4.12,3.99,3.87,3.75,3.62,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,5.11,5.04,4.96,4.88,4.8,4.72,4.64,4.57,4.49,4.41,4.33,4.25,4.17,4.1,4.07,4.04,4.01,3.98,3.95,3.92,3.89,3.86,3.84,3.81,3.78,3.75,3.72,3.69,3.66
@@ -17,8 +17,8 @@ NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,5.11,5.08,5.05,5.02,4.99
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.71,4.61,4.51,4.41,4.31,4.21,4.11,4.01,3.97,3.94,3.91,3.87,3.84,3.81,3.77,3.74,3.71,3.67,3.64,3.61,3.57,3.54,3.51
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.9,4.83,4.76,4.69,4.62,4.56,4.49,4.42,4.39,4.35,4.32,4.28,4.25,4.21,4.18,4.14,4.11,4.07,4.04,4.0,3.97,3.93,3.9
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.7,4.6,4.5,4.4,4.3,4.2,4.1,4.0,3.96,3.93,3.9,3.86,3.83,3.8,3.76,3.73,3.7,3.67,3.63,3.6,3.57,3.53,3.5
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.89,4.82,4.76,4.69,4.62,4.55,4.48,4.41,4.38,4.34,4.31,4.28,4.24,4.21,4.17,4.14,4.1,4.07,4.03,4.0,3.96,3.93,3.89
 NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,5.3,5.27,5.23,5.19,5.16,5.12,5.09,5.05,5.01,4.98,4.94,4.9,4.87,4.83,4.8,4.76,4.72,4.69,4.65,4.61,4.58,4.54,4.51,4.47,4.43,4.4,4.36,4.32,4.29
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,5.21,5.08,4.95,4.82,4.7,4.57,4.44,4.31,4.18,4.05,3.93,3.8,3.67,3.54,3.52,3.49,3.46,3.44,3.41,3.39,3.36,3.34,3.31,3.28,3.26,3.23,3.21,3.18,3.16
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,5.21,5.13,5.05,4.97,4.89,4.81,4.72,4.64,4.56,4.48,4.4,4.32,4.24,4.16,4.13,4.1,4.07,4.04,4.02,3.99,3.96,3.93,3.9,3.87,3.84,3.81,3.78,3.75,3.72
@@ -26,6 +26,6 @@ NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,5.21,5.17,5.14,5.11,5.08
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.88,4.77,4.67,4.57,4.47,4.36,4.26,4.16,4.06,4.02,3.99,3.95,3.92,3.89,3.85,3.82,3.79,3.75,3.72,3.69,3.65,3.62,3.58,3.55
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.45,4.41,4.38,4.34,4.31,4.27,4.24,4.2,4.17,4.13,4.1,4.06,4.03,3.99,3.96
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.87,4.77,4.67,4.56,4.46,4.35,4.25,4.15,4.04,4.01,3.98,3.94,3.91,3.88,3.84,3.81,3.78,3.74,3.71,3.68,3.64,3.61,3.58,3.54
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.44,4.41,4.37,4.34,4.3,4.27,4.23,4.2,4.16,4.13,4.09,4.06,4.02,3.99,3.95
 NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,5.39,5.35,5.32,5.28,5.24,5.21,5.17,5.13,5.1,5.06,5.02,4.99,4.95,4.91,4.88,4.84,4.8,4.77,4.73,4.69,4.66,4.62,4.58,4.55,4.51,4.47,4.43,4.4,4.36
diff --git a/tests/data/Natural_Gas_FE/R&D/20/df_capex.csv b/tests/data/Natural_Gas_FE/R&D/20/df_capex.csv
index 8faea65..ca6b387 100644
--- a/tests/data/Natural_Gas_FE/R&D/20/df_capex.csv
+++ b/tests/data/Natural_Gas_FE/R&D/20/df_capex.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1499.2530441159731,1490.11533416
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1536.02675487547,1518.4199479057713,1500.8131409360728,1483.2063339663744,1465.5995269966759,1447.9927200269774,1430.3859130572787,1412.7791060875804,1395.172299117882,1377.5654921481835,1360.070120665635,1342.4633136959364,1324.856506726238,1307.2496997565393,1296.2175865286904,1285.0740378136913,1274.041924585842,1263.0098113579932,1251.977698130144,1240.834149415145,1229.8020361872957,1218.7699229594468,1207.7378097315977,1196.5942610165987,1185.5621477887498,1174.5300345609005,1163.4979213330514,1152.3543726180524,1141.3222593902035
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1536.02675487547,1522.4316254431712,1508.9479314980222,1495.3528020657234,1481.8691081205745,1468.2739786882755,1454.790284743127,1441.1951553108279,1427.7114613656793,1414.1163319333803,1400.6326379882314,1387.0375085559326,1373.5538146107835,1359.958685178485,1349.7066203606857,1339.4545555428865,1329.2024907250875,1318.9504259072883,1308.6983610894893,1298.44629627169,1288.082795966741,1277.8307311489418,1267.5786663311426,1257.3266015133436,1247.0745366955443,1236.8224718777453,1226.570407059946,1216.2069067549971,1205.954841937198
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1536.02675487547,1526.5547384677209,1517.0827220599717,1507.4992701650724,1498.027253757323,1488.5552373495739,1479.0832209418247,1469.6112045340756,1460.1391881263264,1450.667171718577,1441.1951553108279,1431.7231389030787,1422.2511224953296,1412.7791060875804,1403.307089679831,1393.835073272082,1384.3630568643327,1374.8910404565836,1365.4190240488344,1355.947007641085,1346.474991233336,1337.0029748255868,1327.5309584178376,1318.0589420100882,1308.4754901151894,1299.00347370744,1289.5314572996908,1280.0594408919417,1270.5874244841925
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1772.6042940948998,1760.012084046951,1747.419873999002,1734.827663951053,1722.2354539031041,1709.6432438551553,1697.0510338072063,1684.4588237592573,1671.8666137113084,1659.2744036633594,1646.6821936154106,1634.0899835674618,1621.4977735195125,1608.9055634715637,1595.087563064965,1581.269562658366,1567.3401267646173,1553.5221263580183,1539.5926904642695,1525.7746900576708,1511.9566896510719,1498.027253757323,1484.2092533507243,1470.3912529441254,1456.4618170503766,1442.6438166437777,1428.714380750029,1414.8963803434303,1401.0783799368314
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1772.6042940948998,1760.680696969851,1748.868535331952,1737.0563736940528,1725.2442120561539,1713.432050418255,1701.619888780356,1689.807727142457,1677.9955655045578,1666.1834038666589,1654.37124222876,1642.559080590861,1630.746918952962,1618.8233218279129,1606.453982754264,1593.973208193465,1581.4924336326662,1569.0116590718671,1556.530884511068,1544.1615454374194,1531.6807708766203,1519.1999963158214,1506.7192217550223,1494.2384471942237,1481.7576726334246,1469.3883335597754,1456.9075589989768,1444.4267844381777,1431.9460098773789
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1772.6042940948998,1761.4607453799008,1750.4286321520517,1739.3965189242028,1728.3644056963537,1717.2208569813547,1706.1887437535054,1695.1566305256565,1684.1245172978074,1672.9809685828084,1661.9488553549593,1650.9167421271102,1639.884628899261,1628.741080184262,1617.7089669564132,1606.6768537285639,1595.644740500715,1584.501191785716,1573.4690785578669,1562.4369653300175,1551.4048521021687,1540.2613033871696,1529.2291901593205,1518.1970769314717,1507.1649637036223,1496.1328504757732,1484.9893017607742,1473.9571885329253,1462.925075305076
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1762.9094067128508,1750.6515031263518,1738.3935995398529,1725.021341081854,1712.763437495355,1700.505533908856,1688.247630322357,1674.8753718643582,1662.6174682778592,1650.3595646913602,1638.1016611048613,1624.7294026468624,1612.4714990603634,1600.2135954738644,1585.7269821443658,1572.354723686367,1558.982465228368,1544.4958518988692,1531.1235934408703,1517.7513349828714,1503.2647216533728,1489.892463195374,1476.520204737375,1462.0335914078762,1448.6613329498773,1434.1747196203785,1420.8024611623796,1407.430202704381,1392.943589374882
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1762.9094067128508,1751.7658579978518,1739.5079544113528,1727.2500508248538,1716.1065021098548,1703.8485985233558,1692.7050498083568,1680.4471462218578,1669.3035975068588,1657.0456939203598,1645.9021452053607,1633.6442416188618,1621.3863380323628,1610.2427893173638,1597.9848857308648,1585.7269821443658,1572.354723686367,1560.096820099868,1547.838916513369,1535.58101292687,1523.323109340371,1511.065205753872,1498.807302167373,1486.5493985808741,1474.2914949943752,1460.9192365363763,1448.6613329498773,1436.4034293633783,1424.1455257768794
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1762.9094067128508,1751.7658579978518,1740.6223092828527,1730.5931154393534,1719.4495667243543,1708.3060180093553,1697.1624692943562,1686.0189205793572,1674.8753718643582,1663.7318231493591,1652.58827443436,1642.559080590861,1631.415531875862,1620.2719831608629,1609.1284344458638,1597.9848857308648,1586.8413370158655,1575.6977883008665,1565.6685944573674,1554.5250457423683,1543.3814970273693,1532.2379483123702,1521.0943995973712,1509.9508508823722,1498.807302167373,1487.663753452374,1477.634559608875,1466.491010893876,1455.3474621788769
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,3071.8306387766397,2987.139668542647,2902.560133795804,2817.869163561811,2733.2896288149686,2648.7100940681257,2564.019123834133,2479.43958908729,2394.748618853297,2310.169084106454,2225.4781138724616,2140.8985791256187,2056.207608891626,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,3071.8306387766397,3015.332846791595,2958.835054806549,2902.3372628215043,2845.8394708364594,2789.3416788514137,2732.7324513792187,2676.2346593941734,2619.736867409128,2563.239075424083,2506.741283439038,2450.2434914539926,2393.7456994689474,2337.247907483902,2311.840616413704,2286.4333253435066,2260.914598786159,2235.5073077159605,2210.100016645763,2184.692725575565,2159.1739990182173,2133.7667079480193,2108.3594168778213,2082.952125807624,2057.544834737426,2032.026108180078,2006.6188171098802,1981.2115260396824,1955.8042349694842
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,3071.8306387766397,3043.414589553392,3015.1099758172945,2986.693926594047,2958.277877370799,2929.973263634702,2901.5572144114544,2873.1411651882067,2844.8365514521092,2816.4205022288616,2788.004453005614,2759.6998392695164,2731.2837900462687,2702.867740823021,2674.5631270869235,2646.147077863676,2617.731028640428,2589.4264149043306,2561.010365681083,2532.5943164578352,2504.289702721738,2475.8736534984905,2447.457604275243,2419.1529905391453,2390.7369413158976,2362.32089209265,2334.0162783565524,2305.6002291333048,2277.184179910057
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3429.76142350241,3360.7828569565654,3291.8042904107215,3222.714288377727,3153.735721831883,3084.645719798889,3015.6671532530445,2946.5771512200504,2877.5985846742064,2808.5085826412123,2739.530016095368,2670.440014062374,2601.46144751653,2532.3714454835354,2503.1753478502383,2473.8678147297906,2444.560281609343,2415.2527484888956,2385.945215368448,2356.6376822480006,2327.330149127553,2298.022616007105,2268.715082886658,2239.40754976621,2210.100016645763,2180.9039190124654,2151.5963858920177,2122.2888527715704,2092.9813196511227
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3429.76142350241,3379.3925833106136,3328.912307631668,3278.543467439872,3228.0631917609267,3177.582916081981,3127.2140758901855,3076.7338002112397,3026.364960019444,2975.884684340498,2925.404408661552,2875.0355684697565,2824.5552927908107,2774.186452599015,2743.541693632768,2713.00837015367,2682.4750466745727,2651.830287708325,2621.2969642292283,2590.763640750131,2560.1188817838834,2529.585558304786,2499.052234825688,2468.407475859441,2437.8741523803433,2407.3408289012464,2376.807505422149,2346.1627464559015,2315.629422976804
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3429.76142350241,3398.0023096646623,3366.1317603397647,3334.2612110148675,3302.50209717712,3270.631547852223,3238.7609985273257,3206.8904492024285,3175.1313353646815,3143.260786039784,3111.390236714886,3079.519687389989,3047.760573552242,3015.890024227345,2984.0194749024477,2952.14892557755,2920.3898117398026,2888.5192624149054,2856.648713090008,2824.8895992522607,2793.0190499273635,2761.1485006024664,2729.2779512775687,2697.5188374398213,2665.648288114924,2633.777738790027,2601.9071894651297,2570.1480756273827,2538.277526302485
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3419.9551006332103,3350.8650986002162,3281.775096567222,3212.685094534228,3143.595092501234,3074.50509046824,3005.4150884352457,2936.325086402251,2868.349439240757,2799.259437207763,2730.1694351747688,2661.0794331417746,2591.9894311087805,2522.8994290757864,2493.926202416789,2464.952975757791,2435.979749098794,2405.8921675682964,2376.9189409092987,2347.945714250301,2318.9724875913034,2289.9992609323062,2259.9116794018087,2230.938452742811,2201.9652260838134,2172.991999424816,2144.0187727658185,2113.931191235321,2084.9579645763233
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3419.9551006332103,3369.8091314157145,3318.548807326719,3268.4028381092235,3218.2568688917277,3168.110899674232,3117.964930456736,3066.7046063677403,3016.5586371502445,2966.4126679327487,2916.266698715253,2866.120729497757,2814.860405408762,2764.714436191266,2734.6268546607685,2704.539273130271,2673.337336728274,2643.2497551977763,2613.1621736672787,2581.960237265281,2551.872655734784,2521.7850742042865,2490.583137802289,2460.4955562717914,2430.4079747412943,2399.206038339297,2369.1184568087992,2339.030875278302,2307.8289388763046
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3419.9551006332103,3387.6388093597134,3356.436872957716,3324.1205816842185,3292.918645282221,3260.602354008724,3229.4004176067265,3197.0841263332295,3165.882189931232,3133.5658986577346,3102.3639622557375,3070.04767098224,3038.8457345802426,3006.5294433067456,2975.327506904748,2943.0112156312507,2911.8092792292537,2880.607342827256,2848.2910515537587,2817.0891151517617,2784.7728238782643,2753.5708874762668,2721.25459620277,2690.0526598007723,2657.736368527275,2626.534432125278,2594.2181408517804,2563.016204449783,2530.699913176286
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,3117.073446559536,3030.2652020696937,2943.345522092701,2856.537277602858,2769.7290331130152,2682.920788623173,2596.11254413333,2509.1928641563372,2422.384619666495,2335.576375176652,2248.7681306868094,2161.9598861969666,2075.1516417071243,1988.2319617301316,1965.6105578386837,1942.8777184600856,1920.2563145686374,1897.5234751900393,1874.9020712985912,1852.169231919993,1829.4363925413952,1806.814988649947,1784.082149271349,1761.4607453799008,1738.7279060013027,1716.1065021098548,1693.3736627312564,1670.6408233526586,1648.0194194612106
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,3117.073446559536,3059.2384287286914,3001.403410897846,2943.5683930670007,2885.7333752361556,2827.8983574053104,2770.0633395744658,2712.3397572307704,2654.5047393999253,2596.66972156908,2538.834703738235,2480.99968590739,2423.164668076545,2365.3296502456997,2339.588052714052,2313.846455182404,2288.1048576507565,2262.3632601191084,2236.6216625874604,2210.880065055813,2185.138467524165,2159.396869992517,2133.6552724608696,2107.9136749292215,2082.1720773975735,2056.430479865926,2030.688882334278,2004.8358493154801,1979.0942517838325
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,3117.073446559536,3088.2116553876886,3059.461299702991,3030.5995085311433,3001.7377173592954,2972.9873616745986,2944.1255705027506,2915.375214818053,2886.513423646206,2857.763067961508,2828.90127678966,2800.150921104963,2771.2891299331154,2742.427338761268,2713.67698307657,2684.8151919047227,2656.064836220025,2627.2030450481775,2598.45268936348,2569.5908981916327,2540.729107019785,2511.978751335087,2483.11696016324,2454.3666044785423,2425.5048133066944,2396.754457621997,2367.8926664501496,2339.142310765452,2310.2805195936044
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3476.8986345668554,3406.0256647394617,3335.1526949120675,3264.279725084674,3193.406755257279,3122.5337854298855,3051.6608156024918,2980.7878457750976,2909.914875947704,2838.9304706331595,2768.057500805766,2697.1845309783716,2626.311561150978,2555.4385913235833,2525.908187228836,2496.2663476469384,2466.735943552191,2437.2055394574436,2407.5636998755463,2378.0332957807987,2348.3914561989013,2318.8610521041537,2289.2192125222564,2259.688808427509,2230.158404332761,2200.516564750864,2170.986160656116,2141.3443210742184,2111.8139169794713
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3476.8986345668554,3425.30400401641,3373.7093734659643,3322.1147429155185,3270.520112365073,3218.9254818146273,3167.330851264182,3115.847656200886,3064.2530256504406,3012.658395099995,2961.063764549549,2909.4691339991036,2857.874503448658,2806.2798728982125,2775.300807470515,2744.433177529968,2713.4541121022703,2682.586482161723,2651.6074167340253,2620.628351306328,2589.7607213657807,2558.781655938083,2527.914025997536,2496.9349605698385,2465.9558951421413,2435.0882652015935,2404.1091997738963,2373.241569833349,2342.2625044056517
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3476.8986345668554,3444.582343293358,3412.266052019861,3380.061196233514,3347.7449049600164,3315.428613686519,3283.112322413022,3250.9074666266747,3218.5911753531777,3186.2748840796803,3153.9585928061833,3121.642301532686,3089.4374457463387,3057.121154472841,3024.804863199344,2992.488571925847,2960.1722806523494,2927.967424866002,2895.6511335925047,2863.3348423190077,2831.0185510455103,2798.702259772013,2766.4974039856656,2734.181112712168,2701.8648214386712,2669.548530165174,2637.2322388916764,2605.027383105329,2572.711091831832
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3466.7580052362064,3395.4392934602124,3325.2349365557184,3253.9162247797244,3183.7118678752304,3112.3931560992364,3042.1887991947424,2970.8700874187484,2900.6657305142544,2829.3470187382604,2758.0283069622665,2687.8239500577724,2616.5052382817785,2546.3008813772844,2516.213299846787,2487.240073187789,2457.152491657292,2428.1792649982945,2399.206038339297,2369.1184568087992,2340.145230149802,2310.0576486193045,2281.084421960307,2250.9968404298093,2222.023613770812,2193.0503871118144,2162.962805581317,2133.989578922319,2103.901997391822
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3466.7580052362064,3415.4976811472106,3364.237357058215,3311.8626780977197,3260.602354008724,3209.3420299197282,3158.0817058307325,3105.707026870237,3054.4467027812416,3003.186378692246,2951.92605460325,2900.6657305142544,2848.2910515537587,2797.030727464763,2765.828791062766,2735.7412095322684,2704.539273130271,2673.337336728274,2643.2497551977763,2612.0478187957788,2580.8458823937813,2550.758300863284,2519.5563644612866,2488.354428059289,2458.266846528792,2427.0649101267945,2395.862973724797,2365.7753921942995,2334.5734557923024
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3466.7580052362064,3434.4417139627094,3402.125422689212,3369.8091314157145,3337.4928401422176,3306.29090374022,3273.9746124667226,3241.6583211932257,3209.3420299197282,3177.025738646231,3144.709447372734,3112.3931560992364,3080.076864825739,3047.760573552242,3016.5586371502445,2984.242345876747,2951.92605460325,2919.6097633297527,2887.2934720562557,2854.9771807827583,2822.660889509261,2790.344598235764,2758.0283069622665,2725.712015688769,2694.510079286772,2662.1937880132746,2629.877496739777,2597.56120546628,2565.2449141927827
diff --git a/tests/data/Natural_Gas_FE/R&D/20/df_fom.csv b/tests/data/Natural_Gas_FE/R&D/20/df_fom.csv
index ffabb04..d75d001 100644
--- a/tests/data/Natural_Gas_FE/R&D/20/df_fom.csv
+++ b/tests/data/Natural_Gas_FE/R&D/20/df_fom.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,34.5,34.3,34.1,33.9,33.7,33.5,33
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,34.1,33.7,33.2,32.8,32.3,31.9,31.4,31,30.5,30.1,29.6,29.2,28.7,28.3,28.0,27.8,27.6,27.3,27.1,26.8,26.6,26.4,26.1,25.9,25.6,25.4,25.1,24.9,24.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,34.1,33.8,33.5,33.2,32.8,32.5,32.2,31.8,31.5,31.2,30.9,30.5,30.2,29.9,29.6,29.4,29.2,29.0,28.7,28.5,28.3,28.1,27.8,27.6,27.4,27.2,26.9,26.7,26.5
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,34.1,33.9,33.7,33.5,33.3,33.1,32.9,32.7,32.5,32.3,32.1,31.9,31.7,31.4,31.2,31.0,30.8,30.6,30.4,30.2,30.0,29.8,29.6,29.4,29.2,29.0,28.7,28.5,28.3
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,39.7,39.4,39,38.7,38.4,38.1,37.7,37.4,37.1,36.8,36.5,36.1,35.8,35.5,35.2,34.9,34.6,34.3,34.0,33.7,33.4,33.1,32.8,32.5,32.2,31.9,31.5,31.2
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,39.7,39.5,39.2,38.9,38.6,38.3,38,37.8,37.5,37.2,36.9,36.6,36.3,36.1,35.8,35.5,35.2,35.0,34.7,34.4,34.2,33.9,33.6,33.3,33.1,32.8,32.5,32.2
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,39.8,39.5,39.3,39,38.8,38.6,38.3,38.1,37.8,37.6,37.4,37.1,36.9,36.6,36.4,36.1,35.9,35.7,35.4,35.2,34.9,34.7,34.4,34.2,34.0,33.7,33.5,33.2
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,40,39,39,39,38,38,38,37,37.0,37.0,36.0,36.0,36.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0,33.0,32.0,32.0,32.0,31.0,31.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,40,39,39,39,38,38,38,38,37.0,37.0,37.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,33.0,33.0,33.0,33.0,32.0,32.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,40,39,39,39,39,38,38,38,38.0,37.0,37.0,37.0,37.0,36.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,70.7,68.6,66.4,64.3,62.2,60,57.9,55.8,53.6,51.5,49.3,47.2,45.1,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,70.7,69.3,67.9,66.6,65.2,63.8,62.4,61.1,59.7,58.3,56.9,55.5,54.2,52.8,52.2,51.7,51.1,50.5,50.0,49.4,48.9,48.3,47.8,47.2,46.6,46.1,45.5,45.0,44.4
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,70.7,70.1,69.5,68.8,68.2,67.6,67,66.4,65.7,65.1,64.5,63.9,63.2,62.6,62.0,61.4,60.8,60.1,59.5,58.9,58.3,57.6,57.0,56.4,55.8,55.2,54.5,53.9,53.3
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78.2,76.5,74.8,73.2,71.5,69.8,68.1,66.4,64.8,63.1,61.4,59.7,58.0,56.4,55.7,55.1,54.4,53.8,53.2,52.5,51.9,51.2,50.6,49.9,49.3,48.7,48.0,47.4,46.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78.2,77,75.8,74.6,73.4,72.3,71.1,69.9,68.7,67.5,66.3,65.1,63.9,62.7,62.1,61.4,60.7,60.1,59.4,58.7,58.1,57.4,56.7,56.0,55.4,54.7,54.0,53.4,52.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78.2,77.5,76.8,76.1,75.4,74.7,74,73.3,72.6,71.9,71.2,70.5,69.8,69.1,68.4,67.7,67.0,66.3,65.6,64.9,64.2,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78,76,75,73,71,70,68,66,65,63.0,61.0,60.0,58.0,56.0,56.0,55.0,54.0,54.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,49.0,48.0,47.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78,77,76,74,73,72,71,70,69,67.0,66.0,65.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78,77,77,76,75,75,74,73,72,72.0,71.0,70.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,71.7,69.5,67.4,65.2,63,60.8,58.6,56.4,54.2,52.1,49.9,47.7,45.5,43.3,42.8,42.3,41.8,41.3,40.8,40.3,39.8,39.3,38.8,38.3,37.8,37.3,36.8,36.3,35.8
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,71.7,70.3,68.9,67.5,66.1,64.7,63.3,61.9,60.5,59.0,57.6,56.2,54.8,53.4,52.8,52.3,51.7,51.2,50.6,50.0,49.5,48.9,48.3,47.8,47.2,46.6,46.1,45.5,44.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,71.7,71.1,70.5,69.8,69.2,68.6,67.9,67.3,66.7,66.0,65.4,64.8,64.2,63.5,62.9,62.3,61.6,61.0,60.4,59.7,59.1,58.5,57.8,57.2,56.6,55.9,55.3,54.7,54.0
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79.3,77.5,75.8,74.1,72.4,70.7,68.9,67.2,65.5,63.8,62.0,60.3,58.6,56.9,56.2,55.6,54.9,54.3,53.6,53.0,52.3,51.7,51.0,50.4,49.8,49.1,48.5,47.8,47.2
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79.3,78,76.8,75.6,74.4,73.2,72,70.8,69.5,68.3,67.1,65.9,64.7,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7,58.0,57.4,56.7,56.0,55.3,54.7,54.0,53.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79.3,78.5,77.8,77.1,76.4,75.7,75,74.3,73.6,72.9,72.2,71.5,70.8,70.1,69.3,68.6,67.9,67.2,66.5,65.8,65.1,64.4,63.7,63.0,62.3,61.6,60.9,60.1,59.4
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79,77,76,74,72,70,69,67,65,64.0,62.0,60.0,58.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,48.0,48.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79,78,77,75,74,73,72,71,69,68.0,67.0,66.0,65.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79,78,78,77,76,76,75,74,73,73.0,72.0,71.0,71.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0
diff --git a/tests/data/Natural_Gas_FE/R&D/20/df_occ.csv b/tests/data/Natural_Gas_FE/R&D/20/df_occ.csv
index dbf4193..dc391b8 100644
--- a/tests/data/Natural_Gas_FE/R&D/20/df_occ.csv
+++ b/tests/data/Natural_Gas_FE/R&D/20/df_occ.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1245.4,1237.2,1228.9,1220.6,1212
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1278.4,1262.6,1246.8,1231,1215.2,1199.4,1183.6,1167.8,1152,1136.2,1120.5,1104.7,1088.9,1073.1,1063.2,1053.2,1043.3,1033.4,1023.5,1013.5,1003.6,993.7,983.8,973.8,963.9,954.0,944.1,934.1,924.2
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1278.4,1266.2,1254.1,1241.9,1229.8,1217.6,1205.5,1193.3,1181.2,1169.0,1156.9,1144.7,1132.6,1120.4,1111.2,1102.0,1092.8,1083.6,1074.4,1065.2,1055.9,1046.7,1037.5,1028.3,1019.1,1009.9,1000.7,991.4,982.2
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1278.4,1269.9,1261.4,1252.8,1244.3,1235.8,1227.3,1218.8,1210.3,1201.8,1193.3,1184.8,1176.3,1167.8,1159.3,1150.8,1142.3,1133.8,1125.3,1116.8,1108.3,1099.8,1091.3,1082.8,1074.2,1065.7,1057.2,1048.7,1040.2
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1490.7,1479.4,1468.1,1456.8,1445.5,1434.2,1422.9,1411.6,1400.3,1389.0,1377.7,1366.4,1355.1,1343.8,1331.4,1319.0,1306.5,1294.1,1281.6,1269.2,1256.8,1244.3,1231.9,1219.5,1207.0,1194.6,1182.1,1169.7,1157.3
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1490.7,1480,1469.4,1458.8,1448.2,1437.6,1427,1416.4,1405.8,1395.2,1384.6,1374.0,1363.4,1352.7,1341.6,1330.4,1319.2,1308.0,1296.8,1285.7,1274.5,1263.3,1252.1,1240.9,1229.7,1218.6,1207.4,1196.2,1185.0
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1490.7,1480.7,1470.8,1460.9,1451,1441,1431.1,1421.2,1411.3,1401.3,1391.4,1381.5,1371.6,1361.6,1351.7,1341.8,1331.9,1321.9,1312.0,1302.1,1292.2,1282.2,1272.3,1262.4,1252.5,1242.6,1232.6,1222.7,1212.8
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1482,1471,1460,1448,1437,1426,1415,1403,1392,1381.0,1370.0,1358.0,1347.0,1336.0,1323.0,1311.0,1299.0,1286.0,1274.0,1262.0,1249.0,1237.0,1225.0,1212.0,1200.0,1187.0,1175.0,1163.0,1150.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1482,1472,1461,1450,1440,1429,1419,1408,1398,1387.0,1377.0,1366.0,1355.0,1345.0,1334.0,1323.0,1311.0,1300.0,1289.0,1278.0,1267.0,1256.0,1245.0,1234.0,1223.0,1211.0,1200.0,1189.0,1178.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1482,1472,1462,1453,1443,1433,1423,1413,1403,1393.0,1383.0,1374.0,1364.0,1354.0,1344.0,1334.0,1324.0,1314.0,1305.0,1295.0,1285.0,1275.0,1265.0,1255.0,1245.0,1235.0,1226.0,1216.0,1206.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,2656.6,2580.6,2504.7,2428.7,2352.8,2276.9,2200.9,2125,2049,1973.1,1897.1,1821.2,1745.2,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,2656.6,2605.9,2555.2,2504.5,2453.8,2403.1,2352.3,2301.6,2250.9,2200.2,2149.5,2098.8,2048.1,1997.4,1974.6,1951.8,1928.9,1906.1,1883.3,1860.5,1837.6,1814.8,1792.0,1769.2,1746.4,1723.5,1700.7,1677.9,1655.1
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,2656.6,2631.1,2605.7,2580.2,2554.7,2529.3,2503.8,2478.3,2452.9,2427.4,2401.9,2376.5,2351.0,2325.5,2300.1,2274.6,2249.1,2223.7,2198.2,2172.7,2147.3,2121.8,2096.3,2070.9,2045.4,2019.9,1994.5,1969.0,1943.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2977.8,2915.9,2854,2792,2730.1,2668.1,2606.2,2544.2,2482.3,2420.3,2358.4,2296.4,2234.5,2172.5,2146.3,2120.0,2093.7,2067.4,2041.1,2014.8,1988.5,1962.2,1935.9,1909.6,1883.3,1857.1,1830.8,1804.5,1778.2
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2977.8,2932.6,2887.3,2842.1,2796.8,2751.5,2706.3,2661,2615.8,2570.5,2525.2,2480.0,2434.7,2389.5,2362.0,2334.6,2307.2,2279.7,2252.3,2224.9,2197.4,2170.0,2142.6,2115.1,2087.7,2060.3,2032.9,2005.4,1978.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2977.8,2949.3,2920.7,2892.1,2863.6,2835,2806.4,2777.8,2749.3,2720.7,2692.1,2663.5,2635.0,2606.4,2577.8,2549.2,2520.7,2492.1,2463.5,2435.0,2406.4,2377.8,2349.2,2320.7,2292.1,2263.5,2234.9,2206.4,2177.8
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2969,2907,2845,2783,2721,2659,2597,2535,2474,2412.0,2350.0,2288.0,2226.0,2164.0,2138.0,2112.0,2086.0,2059.0,2033.0,2007.0,1981.0,1955.0,1928.0,1902.0,1876.0,1850.0,1824.0,1797.0,1771.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2969,2924,2878,2833,2788,2743,2698,2652,2607,2562.0,2517.0,2472.0,2426.0,2381.0,2354.0,2327.0,2299.0,2272.0,2245.0,2217.0,2190.0,2163.0,2135.0,2108.0,2081.0,2053.0,2026.0,1999.0,1971.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2969,2940,2912,2883,2855,2826,2798,2769,2741,2712.0,2684.0,2655.0,2627.0,2598.0,2570.0,2541.0,2513.0,2485.0,2456.0,2428.0,2399.0,2371.0,2342.0,2314.0,2285.0,2257.0,2228.0,2200.0,2171.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,2697.2,2619.3,2541.3,2463.4,2385.5,2307.6,2229.7,2151.7,2073.8,1995.9,1918.0,1840.1,1762.2,1684.2,1663.9,1643.5,1623.2,1602.8,1582.5,1562.1,1541.7,1521.4,1501.0,1480.7,1460.3,1440.0,1419.6,1399.2,1378.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,2697.2,2645.3,2593.4,2541.5,2489.6,2437.7,2385.8,2334,2282.1,2230.2,2178.3,2126.4,2074.5,2022.6,1999.5,1976.4,1953.3,1930.2,1907.1,1884.0,1860.9,1837.8,1814.7,1791.6,1768.5,1745.4,1722.3,1699.1,1676.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,2697.2,2671.3,2645.5,2619.6,2593.7,2567.9,2542,2516.2,2490.3,2464.5,2438.6,2412.8,2386.9,2361.0,2335.2,2309.3,2283.5,2257.6,2231.8,2205.9,2180.0,2154.2,2128.3,2102.5,2076.6,2050.8,2024.9,1999.1,1973.2
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3020.1,2956.5,2892.9,2829.3,2765.7,2702.1,2638.5,2574.9,2511.3,2447.6,2384.0,2320.4,2256.8,2193.2,2166.7,2140.1,2113.6,2087.1,2060.5,2034.0,2007.4,1980.9,1954.3,1927.8,1901.3,1874.7,1848.2,1821.6,1795.1
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3020.1,2973.8,2927.5,2881.2,2834.9,2788.6,2742.3,2696.1,2649.8,2603.5,2557.2,2510.9,2464.6,2418.3,2390.5,2362.8,2335.0,2307.3,2279.5,2251.7,2224.0,2196.2,2168.5,2140.7,2112.9,2085.2,2057.4,2029.7,2001.9
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3020.1,2991.1,2962.1,2933.2,2904.2,2875.2,2846.2,2817.3,2788.3,2759.3,2730.3,2701.3,2672.4,2643.4,2614.4,2585.4,2556.4,2527.5,2498.5,2469.5,2440.5,2411.5,2382.6,2353.6,2324.6,2295.6,2266.6,2237.7,2208.7
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3011,2947,2884,2820,2757,2693,2630,2566,2503,2439.0,2375.0,2312.0,2248.0,2185.0,2158.0,2132.0,2105.0,2079.0,2053.0,2026.0,2000.0,1973.0,1947.0,1920.0,1894.0,1868.0,1841.0,1815.0,1788.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3011,2965,2919,2872,2826,2780,2734,2687,2641,2595.0,2549.0,2503.0,2456.0,2410.0,2382.0,2355.0,2327.0,2299.0,2272.0,2244.0,2216.0,2189.0,2161.0,2133.0,2106.0,2078.0,2050.0,2023.0,1995.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3011,2982,2953,2924,2895,2867,2838,2809,2780,2751.0,2722.0,2693.0,2664.0,2635.0,2607.0,2578.0,2549.0,2520.0,2491.0,2462.0,2433.0,2404.0,2375.0,2346.0,2318.0,2289.0,2260.0,2231.0,2202.0
diff --git a/tests/data/Natural_Gas_FE/R&D/20/df_vom.csv b/tests/data/Natural_Gas_FE/R&D/20/df_vom.csv
index eed519d..953bc21 100644
--- a/tests/data/Natural_Gas_FE/R&D/20/df_vom.csv
+++ b/tests/data/Natural_Gas_FE/R&D/20/df_vom.csv
@@ -8,8 +8,8 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,2.17,2.16,2.15,2.14,2.13,2.12,2.
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,2.16,2.14,2.12,2.1,2.08,2.06,2.04,2.02,2,1.97,1.95,1.93,1.91,1.89,1.88,1.87,1.85,1.84,1.83,1.82,1.8,1.79,1.78,1.76,1.75,1.74,1.73,1.71,1.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,2.16,2.15,2.13,2.12,2.1,2.08,2.07,2.05,2.04,2.02,2.01,1.99,1.97,1.96,1.95,1.93,1.92,1.91,1.9,1.89,1.88,1.86,1.85,1.84,1.83,1.82,1.81,1.79,1.78
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,2.16,2.15,2.14,2.13,2.12,2.11,2.1,2.09,2.08,2.07,2.06,2.05,2.04,2.02,2.01,2.0,1.99,1.98,1.97,1.96,1.95,1.94,1.93,1.92,1.91,1.89,1.88,1.87,1.86
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.49,2.47,2.46,2.44,2.42,2.41,2.39,2.38,2.36,2.35,2.33,2.31,2.3,2.28,2.27,2.25,2.24,2.22,2.2,2.19,2.17,2.16,2.14,2.13,2.11,2.09
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.51,2.49,2.48,2.46,2.45,2.43,2.42,2.41,2.39,2.38,2.36,2.35,2.34,2.32,2.31,2.29,2.28,2.27,2.25,2.24,2.22,2.21,2.19,2.18,2.17,2.15,2.14
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.48,2.47,2.45,2.44,2.42,2.4,2.39,2.37,2.35,2.34,2.32,2.3,2.29,2.27,2.26,2.24,2.23,2.21,2.2,2.18,2.16,2.15,2.13,2.12,2.1,2.09
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.5,2.49,2.48,2.46,2.45,2.43,2.42,2.4,2.39,2.37,2.36,2.35,2.33,2.32,2.3,2.29,2.27,2.26,2.25,2.23,2.22,2.2,2.19,2.18,2.16,2.15,2.13
 NG 1-on-1 Combined Cycle (H-Frame)/Conservative,2.53,2.52,2.51,2.5,2.48,2.47,2.46,2.45,2.43,2.42,2.41,2.4,2.38,2.37,2.36,2.34,2.33,2.32,2.31,2.29,2.28,2.27,2.26,2.24,2.23,2.22,2.21,2.19,2.18
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,5.11,4.99,4.87,4.74,4.62,4.49,4.37,4.24,4.12,3.99,3.87,3.75,3.62,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,5.11,5.04,4.96,4.88,4.8,4.72,4.64,4.57,4.49,4.41,4.33,4.25,4.17,4.1,4.07,4.04,4.01,3.98,3.95,3.92,3.89,3.86,3.84,3.81,3.78,3.75,3.72,3.69,3.66
@@ -17,8 +17,8 @@ NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,5.11,5.08,5.05,5.02,4.99
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.71,4.61,4.51,4.41,4.31,4.21,4.11,4.01,3.97,3.94,3.91,3.87,3.84,3.81,3.77,3.74,3.71,3.67,3.64,3.61,3.57,3.54,3.51
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.9,4.83,4.76,4.69,4.62,4.56,4.49,4.42,4.39,4.35,4.32,4.28,4.25,4.21,4.18,4.14,4.11,4.07,4.04,4.0,3.97,3.93,3.9
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.7,4.6,4.5,4.4,4.3,4.2,4.1,4.0,3.96,3.93,3.9,3.86,3.83,3.8,3.76,3.73,3.7,3.67,3.63,3.6,3.57,3.53,3.5
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.89,4.82,4.76,4.69,4.62,4.55,4.48,4.41,4.38,4.34,4.31,4.28,4.24,4.21,4.17,4.14,4.1,4.07,4.03,4.0,3.96,3.93,3.89
 NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,5.3,5.27,5.23,5.19,5.16,5.12,5.09,5.05,5.01,4.98,4.94,4.9,4.87,4.83,4.8,4.76,4.72,4.69,4.65,4.61,4.58,4.54,4.51,4.47,4.43,4.4,4.36,4.32,4.29
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,5.21,5.08,4.95,4.82,4.7,4.57,4.44,4.31,4.18,4.05,3.93,3.8,3.67,3.54,3.52,3.49,3.46,3.44,3.41,3.39,3.36,3.34,3.31,3.28,3.26,3.23,3.21,3.18,3.16
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,5.21,5.13,5.05,4.97,4.89,4.81,4.72,4.64,4.56,4.48,4.4,4.32,4.24,4.16,4.13,4.1,4.07,4.04,4.02,3.99,3.96,3.93,3.9,3.87,3.84,3.81,3.78,3.75,3.72
@@ -26,6 +26,6 @@ NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,5.21,5.17,5.14,5.11,5.08
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.88,4.77,4.67,4.57,4.47,4.36,4.26,4.16,4.06,4.02,3.99,3.95,3.92,3.89,3.85,3.82,3.79,3.75,3.72,3.69,3.65,3.62,3.58,3.55
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.45,4.41,4.38,4.34,4.31,4.27,4.24,4.2,4.17,4.13,4.1,4.06,4.03,3.99,3.96
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.87,4.77,4.67,4.56,4.46,4.35,4.25,4.15,4.04,4.01,3.98,3.94,3.91,3.88,3.84,3.81,3.78,3.74,3.71,3.68,3.64,3.61,3.58,3.54
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.44,4.41,4.37,4.34,4.3,4.27,4.23,4.2,4.16,4.13,4.09,4.06,4.02,3.99,3.95
 NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,5.39,5.35,5.32,5.28,5.24,5.21,5.17,5.13,5.1,5.06,5.02,4.99,4.95,4.91,4.88,4.84,4.8,4.77,4.73,4.69,4.66,4.62,4.58,4.55,4.51,4.47,4.43,4.4,4.36
diff --git a/tests/data/Natural_Gas_FE/R&D/30/df_capex.csv b/tests/data/Natural_Gas_FE/R&D/30/df_capex.csv
index 8faea65..ca6b387 100644
--- a/tests/data/Natural_Gas_FE/R&D/30/df_capex.csv
+++ b/tests/data/Natural_Gas_FE/R&D/30/df_capex.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1499.2530441159731,1490.11533416
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1536.02675487547,1518.4199479057713,1500.8131409360728,1483.2063339663744,1465.5995269966759,1447.9927200269774,1430.3859130572787,1412.7791060875804,1395.172299117882,1377.5654921481835,1360.070120665635,1342.4633136959364,1324.856506726238,1307.2496997565393,1296.2175865286904,1285.0740378136913,1274.041924585842,1263.0098113579932,1251.977698130144,1240.834149415145,1229.8020361872957,1218.7699229594468,1207.7378097315977,1196.5942610165987,1185.5621477887498,1174.5300345609005,1163.4979213330514,1152.3543726180524,1141.3222593902035
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1536.02675487547,1522.4316254431712,1508.9479314980222,1495.3528020657234,1481.8691081205745,1468.2739786882755,1454.790284743127,1441.1951553108279,1427.7114613656793,1414.1163319333803,1400.6326379882314,1387.0375085559326,1373.5538146107835,1359.958685178485,1349.7066203606857,1339.4545555428865,1329.2024907250875,1318.9504259072883,1308.6983610894893,1298.44629627169,1288.082795966741,1277.8307311489418,1267.5786663311426,1257.3266015133436,1247.0745366955443,1236.8224718777453,1226.570407059946,1216.2069067549971,1205.954841937198
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1536.02675487547,1526.5547384677209,1517.0827220599717,1507.4992701650724,1498.027253757323,1488.5552373495739,1479.0832209418247,1469.6112045340756,1460.1391881263264,1450.667171718577,1441.1951553108279,1431.7231389030787,1422.2511224953296,1412.7791060875804,1403.307089679831,1393.835073272082,1384.3630568643327,1374.8910404565836,1365.4190240488344,1355.947007641085,1346.474991233336,1337.0029748255868,1327.5309584178376,1318.0589420100882,1308.4754901151894,1299.00347370744,1289.5314572996908,1280.0594408919417,1270.5874244841925
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1772.6042940948998,1760.012084046951,1747.419873999002,1734.827663951053,1722.2354539031041,1709.6432438551553,1697.0510338072063,1684.4588237592573,1671.8666137113084,1659.2744036633594,1646.6821936154106,1634.0899835674618,1621.4977735195125,1608.9055634715637,1595.087563064965,1581.269562658366,1567.3401267646173,1553.5221263580183,1539.5926904642695,1525.7746900576708,1511.9566896510719,1498.027253757323,1484.2092533507243,1470.3912529441254,1456.4618170503766,1442.6438166437777,1428.714380750029,1414.8963803434303,1401.0783799368314
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1772.6042940948998,1760.680696969851,1748.868535331952,1737.0563736940528,1725.2442120561539,1713.432050418255,1701.619888780356,1689.807727142457,1677.9955655045578,1666.1834038666589,1654.37124222876,1642.559080590861,1630.746918952962,1618.8233218279129,1606.453982754264,1593.973208193465,1581.4924336326662,1569.0116590718671,1556.530884511068,1544.1615454374194,1531.6807708766203,1519.1999963158214,1506.7192217550223,1494.2384471942237,1481.7576726334246,1469.3883335597754,1456.9075589989768,1444.4267844381777,1431.9460098773789
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1772.6042940948998,1761.4607453799008,1750.4286321520517,1739.3965189242028,1728.3644056963537,1717.2208569813547,1706.1887437535054,1695.1566305256565,1684.1245172978074,1672.9809685828084,1661.9488553549593,1650.9167421271102,1639.884628899261,1628.741080184262,1617.7089669564132,1606.6768537285639,1595.644740500715,1584.501191785716,1573.4690785578669,1562.4369653300175,1551.4048521021687,1540.2613033871696,1529.2291901593205,1518.1970769314717,1507.1649637036223,1496.1328504757732,1484.9893017607742,1473.9571885329253,1462.925075305076
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1762.9094067128508,1750.6515031263518,1738.3935995398529,1725.021341081854,1712.763437495355,1700.505533908856,1688.247630322357,1674.8753718643582,1662.6174682778592,1650.3595646913602,1638.1016611048613,1624.7294026468624,1612.4714990603634,1600.2135954738644,1585.7269821443658,1572.354723686367,1558.982465228368,1544.4958518988692,1531.1235934408703,1517.7513349828714,1503.2647216533728,1489.892463195374,1476.520204737375,1462.0335914078762,1448.6613329498773,1434.1747196203785,1420.8024611623796,1407.430202704381,1392.943589374882
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1762.9094067128508,1751.7658579978518,1739.5079544113528,1727.2500508248538,1716.1065021098548,1703.8485985233558,1692.7050498083568,1680.4471462218578,1669.3035975068588,1657.0456939203598,1645.9021452053607,1633.6442416188618,1621.3863380323628,1610.2427893173638,1597.9848857308648,1585.7269821443658,1572.354723686367,1560.096820099868,1547.838916513369,1535.58101292687,1523.323109340371,1511.065205753872,1498.807302167373,1486.5493985808741,1474.2914949943752,1460.9192365363763,1448.6613329498773,1436.4034293633783,1424.1455257768794
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1762.9094067128508,1751.7658579978518,1740.6223092828527,1730.5931154393534,1719.4495667243543,1708.3060180093553,1697.1624692943562,1686.0189205793572,1674.8753718643582,1663.7318231493591,1652.58827443436,1642.559080590861,1631.415531875862,1620.2719831608629,1609.1284344458638,1597.9848857308648,1586.8413370158655,1575.6977883008665,1565.6685944573674,1554.5250457423683,1543.3814970273693,1532.2379483123702,1521.0943995973712,1509.9508508823722,1498.807302167373,1487.663753452374,1477.634559608875,1466.491010893876,1455.3474621788769
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,3071.8306387766397,2987.139668542647,2902.560133795804,2817.869163561811,2733.2896288149686,2648.7100940681257,2564.019123834133,2479.43958908729,2394.748618853297,2310.169084106454,2225.4781138724616,2140.8985791256187,2056.207608891626,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,3071.8306387766397,3015.332846791595,2958.835054806549,2902.3372628215043,2845.8394708364594,2789.3416788514137,2732.7324513792187,2676.2346593941734,2619.736867409128,2563.239075424083,2506.741283439038,2450.2434914539926,2393.7456994689474,2337.247907483902,2311.840616413704,2286.4333253435066,2260.914598786159,2235.5073077159605,2210.100016645763,2184.692725575565,2159.1739990182173,2133.7667079480193,2108.3594168778213,2082.952125807624,2057.544834737426,2032.026108180078,2006.6188171098802,1981.2115260396824,1955.8042349694842
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,3071.8306387766397,3043.414589553392,3015.1099758172945,2986.693926594047,2958.277877370799,2929.973263634702,2901.5572144114544,2873.1411651882067,2844.8365514521092,2816.4205022288616,2788.004453005614,2759.6998392695164,2731.2837900462687,2702.867740823021,2674.5631270869235,2646.147077863676,2617.731028640428,2589.4264149043306,2561.010365681083,2532.5943164578352,2504.289702721738,2475.8736534984905,2447.457604275243,2419.1529905391453,2390.7369413158976,2362.32089209265,2334.0162783565524,2305.6002291333048,2277.184179910057
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3429.76142350241,3360.7828569565654,3291.8042904107215,3222.714288377727,3153.735721831883,3084.645719798889,3015.6671532530445,2946.5771512200504,2877.5985846742064,2808.5085826412123,2739.530016095368,2670.440014062374,2601.46144751653,2532.3714454835354,2503.1753478502383,2473.8678147297906,2444.560281609343,2415.2527484888956,2385.945215368448,2356.6376822480006,2327.330149127553,2298.022616007105,2268.715082886658,2239.40754976621,2210.100016645763,2180.9039190124654,2151.5963858920177,2122.2888527715704,2092.9813196511227
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3429.76142350241,3379.3925833106136,3328.912307631668,3278.543467439872,3228.0631917609267,3177.582916081981,3127.2140758901855,3076.7338002112397,3026.364960019444,2975.884684340498,2925.404408661552,2875.0355684697565,2824.5552927908107,2774.186452599015,2743.541693632768,2713.00837015367,2682.4750466745727,2651.830287708325,2621.2969642292283,2590.763640750131,2560.1188817838834,2529.585558304786,2499.052234825688,2468.407475859441,2437.8741523803433,2407.3408289012464,2376.807505422149,2346.1627464559015,2315.629422976804
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3429.76142350241,3398.0023096646623,3366.1317603397647,3334.2612110148675,3302.50209717712,3270.631547852223,3238.7609985273257,3206.8904492024285,3175.1313353646815,3143.260786039784,3111.390236714886,3079.519687389989,3047.760573552242,3015.890024227345,2984.0194749024477,2952.14892557755,2920.3898117398026,2888.5192624149054,2856.648713090008,2824.8895992522607,2793.0190499273635,2761.1485006024664,2729.2779512775687,2697.5188374398213,2665.648288114924,2633.777738790027,2601.9071894651297,2570.1480756273827,2538.277526302485
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3419.9551006332103,3350.8650986002162,3281.775096567222,3212.685094534228,3143.595092501234,3074.50509046824,3005.4150884352457,2936.325086402251,2868.349439240757,2799.259437207763,2730.1694351747688,2661.0794331417746,2591.9894311087805,2522.8994290757864,2493.926202416789,2464.952975757791,2435.979749098794,2405.8921675682964,2376.9189409092987,2347.945714250301,2318.9724875913034,2289.9992609323062,2259.9116794018087,2230.938452742811,2201.9652260838134,2172.991999424816,2144.0187727658185,2113.931191235321,2084.9579645763233
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3419.9551006332103,3369.8091314157145,3318.548807326719,3268.4028381092235,3218.2568688917277,3168.110899674232,3117.964930456736,3066.7046063677403,3016.5586371502445,2966.4126679327487,2916.266698715253,2866.120729497757,2814.860405408762,2764.714436191266,2734.6268546607685,2704.539273130271,2673.337336728274,2643.2497551977763,2613.1621736672787,2581.960237265281,2551.872655734784,2521.7850742042865,2490.583137802289,2460.4955562717914,2430.4079747412943,2399.206038339297,2369.1184568087992,2339.030875278302,2307.8289388763046
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3419.9551006332103,3387.6388093597134,3356.436872957716,3324.1205816842185,3292.918645282221,3260.602354008724,3229.4004176067265,3197.0841263332295,3165.882189931232,3133.5658986577346,3102.3639622557375,3070.04767098224,3038.8457345802426,3006.5294433067456,2975.327506904748,2943.0112156312507,2911.8092792292537,2880.607342827256,2848.2910515537587,2817.0891151517617,2784.7728238782643,2753.5708874762668,2721.25459620277,2690.0526598007723,2657.736368527275,2626.534432125278,2594.2181408517804,2563.016204449783,2530.699913176286
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,3117.073446559536,3030.2652020696937,2943.345522092701,2856.537277602858,2769.7290331130152,2682.920788623173,2596.11254413333,2509.1928641563372,2422.384619666495,2335.576375176652,2248.7681306868094,2161.9598861969666,2075.1516417071243,1988.2319617301316,1965.6105578386837,1942.8777184600856,1920.2563145686374,1897.5234751900393,1874.9020712985912,1852.169231919993,1829.4363925413952,1806.814988649947,1784.082149271349,1761.4607453799008,1738.7279060013027,1716.1065021098548,1693.3736627312564,1670.6408233526586,1648.0194194612106
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,3117.073446559536,3059.2384287286914,3001.403410897846,2943.5683930670007,2885.7333752361556,2827.8983574053104,2770.0633395744658,2712.3397572307704,2654.5047393999253,2596.66972156908,2538.834703738235,2480.99968590739,2423.164668076545,2365.3296502456997,2339.588052714052,2313.846455182404,2288.1048576507565,2262.3632601191084,2236.6216625874604,2210.880065055813,2185.138467524165,2159.396869992517,2133.6552724608696,2107.9136749292215,2082.1720773975735,2056.430479865926,2030.688882334278,2004.8358493154801,1979.0942517838325
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,3117.073446559536,3088.2116553876886,3059.461299702991,3030.5995085311433,3001.7377173592954,2972.9873616745986,2944.1255705027506,2915.375214818053,2886.513423646206,2857.763067961508,2828.90127678966,2800.150921104963,2771.2891299331154,2742.427338761268,2713.67698307657,2684.8151919047227,2656.064836220025,2627.2030450481775,2598.45268936348,2569.5908981916327,2540.729107019785,2511.978751335087,2483.11696016324,2454.3666044785423,2425.5048133066944,2396.754457621997,2367.8926664501496,2339.142310765452,2310.2805195936044
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3476.8986345668554,3406.0256647394617,3335.1526949120675,3264.279725084674,3193.406755257279,3122.5337854298855,3051.6608156024918,2980.7878457750976,2909.914875947704,2838.9304706331595,2768.057500805766,2697.1845309783716,2626.311561150978,2555.4385913235833,2525.908187228836,2496.2663476469384,2466.735943552191,2437.2055394574436,2407.5636998755463,2378.0332957807987,2348.3914561989013,2318.8610521041537,2289.2192125222564,2259.688808427509,2230.158404332761,2200.516564750864,2170.986160656116,2141.3443210742184,2111.8139169794713
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3476.8986345668554,3425.30400401641,3373.7093734659643,3322.1147429155185,3270.520112365073,3218.9254818146273,3167.330851264182,3115.847656200886,3064.2530256504406,3012.658395099995,2961.063764549549,2909.4691339991036,2857.874503448658,2806.2798728982125,2775.300807470515,2744.433177529968,2713.4541121022703,2682.586482161723,2651.6074167340253,2620.628351306328,2589.7607213657807,2558.781655938083,2527.914025997536,2496.9349605698385,2465.9558951421413,2435.0882652015935,2404.1091997738963,2373.241569833349,2342.2625044056517
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3476.8986345668554,3444.582343293358,3412.266052019861,3380.061196233514,3347.7449049600164,3315.428613686519,3283.112322413022,3250.9074666266747,3218.5911753531777,3186.2748840796803,3153.9585928061833,3121.642301532686,3089.4374457463387,3057.121154472841,3024.804863199344,2992.488571925847,2960.1722806523494,2927.967424866002,2895.6511335925047,2863.3348423190077,2831.0185510455103,2798.702259772013,2766.4974039856656,2734.181112712168,2701.8648214386712,2669.548530165174,2637.2322388916764,2605.027383105329,2572.711091831832
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3466.7580052362064,3395.4392934602124,3325.2349365557184,3253.9162247797244,3183.7118678752304,3112.3931560992364,3042.1887991947424,2970.8700874187484,2900.6657305142544,2829.3470187382604,2758.0283069622665,2687.8239500577724,2616.5052382817785,2546.3008813772844,2516.213299846787,2487.240073187789,2457.152491657292,2428.1792649982945,2399.206038339297,2369.1184568087992,2340.145230149802,2310.0576486193045,2281.084421960307,2250.9968404298093,2222.023613770812,2193.0503871118144,2162.962805581317,2133.989578922319,2103.901997391822
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3466.7580052362064,3415.4976811472106,3364.237357058215,3311.8626780977197,3260.602354008724,3209.3420299197282,3158.0817058307325,3105.707026870237,3054.4467027812416,3003.186378692246,2951.92605460325,2900.6657305142544,2848.2910515537587,2797.030727464763,2765.828791062766,2735.7412095322684,2704.539273130271,2673.337336728274,2643.2497551977763,2612.0478187957788,2580.8458823937813,2550.758300863284,2519.5563644612866,2488.354428059289,2458.266846528792,2427.0649101267945,2395.862973724797,2365.7753921942995,2334.5734557923024
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3466.7580052362064,3434.4417139627094,3402.125422689212,3369.8091314157145,3337.4928401422176,3306.29090374022,3273.9746124667226,3241.6583211932257,3209.3420299197282,3177.025738646231,3144.709447372734,3112.3931560992364,3080.076864825739,3047.760573552242,3016.5586371502445,2984.242345876747,2951.92605460325,2919.6097633297527,2887.2934720562557,2854.9771807827583,2822.660889509261,2790.344598235764,2758.0283069622665,2725.712015688769,2694.510079286772,2662.1937880132746,2629.877496739777,2597.56120546628,2565.2449141927827
diff --git a/tests/data/Natural_Gas_FE/R&D/30/df_fom.csv b/tests/data/Natural_Gas_FE/R&D/30/df_fom.csv
index ffabb04..d75d001 100644
--- a/tests/data/Natural_Gas_FE/R&D/30/df_fom.csv
+++ b/tests/data/Natural_Gas_FE/R&D/30/df_fom.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,34.5,34.3,34.1,33.9,33.7,33.5,33
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,34.1,33.7,33.2,32.8,32.3,31.9,31.4,31,30.5,30.1,29.6,29.2,28.7,28.3,28.0,27.8,27.6,27.3,27.1,26.8,26.6,26.4,26.1,25.9,25.6,25.4,25.1,24.9,24.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,34.1,33.8,33.5,33.2,32.8,32.5,32.2,31.8,31.5,31.2,30.9,30.5,30.2,29.9,29.6,29.4,29.2,29.0,28.7,28.5,28.3,28.1,27.8,27.6,27.4,27.2,26.9,26.7,26.5
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,34.1,33.9,33.7,33.5,33.3,33.1,32.9,32.7,32.5,32.3,32.1,31.9,31.7,31.4,31.2,31.0,30.8,30.6,30.4,30.2,30.0,29.8,29.6,29.4,29.2,29.0,28.7,28.5,28.3
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,39.7,39.4,39,38.7,38.4,38.1,37.7,37.4,37.1,36.8,36.5,36.1,35.8,35.5,35.2,34.9,34.6,34.3,34.0,33.7,33.4,33.1,32.8,32.5,32.2,31.9,31.5,31.2
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,39.7,39.5,39.2,38.9,38.6,38.3,38,37.8,37.5,37.2,36.9,36.6,36.3,36.1,35.8,35.5,35.2,35.0,34.7,34.4,34.2,33.9,33.6,33.3,33.1,32.8,32.5,32.2
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,39.8,39.5,39.3,39,38.8,38.6,38.3,38.1,37.8,37.6,37.4,37.1,36.9,36.6,36.4,36.1,35.9,35.7,35.4,35.2,34.9,34.7,34.4,34.2,34.0,33.7,33.5,33.2
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,40,39,39,39,38,38,38,37,37.0,37.0,36.0,36.0,36.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0,33.0,32.0,32.0,32.0,31.0,31.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,40,39,39,39,38,38,38,38,37.0,37.0,37.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,33.0,33.0,33.0,33.0,32.0,32.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,40,39,39,39,39,38,38,38,38.0,37.0,37.0,37.0,37.0,36.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,70.7,68.6,66.4,64.3,62.2,60,57.9,55.8,53.6,51.5,49.3,47.2,45.1,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,70.7,69.3,67.9,66.6,65.2,63.8,62.4,61.1,59.7,58.3,56.9,55.5,54.2,52.8,52.2,51.7,51.1,50.5,50.0,49.4,48.9,48.3,47.8,47.2,46.6,46.1,45.5,45.0,44.4
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,70.7,70.1,69.5,68.8,68.2,67.6,67,66.4,65.7,65.1,64.5,63.9,63.2,62.6,62.0,61.4,60.8,60.1,59.5,58.9,58.3,57.6,57.0,56.4,55.8,55.2,54.5,53.9,53.3
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78.2,76.5,74.8,73.2,71.5,69.8,68.1,66.4,64.8,63.1,61.4,59.7,58.0,56.4,55.7,55.1,54.4,53.8,53.2,52.5,51.9,51.2,50.6,49.9,49.3,48.7,48.0,47.4,46.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78.2,77,75.8,74.6,73.4,72.3,71.1,69.9,68.7,67.5,66.3,65.1,63.9,62.7,62.1,61.4,60.7,60.1,59.4,58.7,58.1,57.4,56.7,56.0,55.4,54.7,54.0,53.4,52.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78.2,77.5,76.8,76.1,75.4,74.7,74,73.3,72.6,71.9,71.2,70.5,69.8,69.1,68.4,67.7,67.0,66.3,65.6,64.9,64.2,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78,76,75,73,71,70,68,66,65,63.0,61.0,60.0,58.0,56.0,56.0,55.0,54.0,54.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,49.0,48.0,47.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78,77,76,74,73,72,71,70,69,67.0,66.0,65.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78,77,77,76,75,75,74,73,72,72.0,71.0,70.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,71.7,69.5,67.4,65.2,63,60.8,58.6,56.4,54.2,52.1,49.9,47.7,45.5,43.3,42.8,42.3,41.8,41.3,40.8,40.3,39.8,39.3,38.8,38.3,37.8,37.3,36.8,36.3,35.8
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,71.7,70.3,68.9,67.5,66.1,64.7,63.3,61.9,60.5,59.0,57.6,56.2,54.8,53.4,52.8,52.3,51.7,51.2,50.6,50.0,49.5,48.9,48.3,47.8,47.2,46.6,46.1,45.5,44.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,71.7,71.1,70.5,69.8,69.2,68.6,67.9,67.3,66.7,66.0,65.4,64.8,64.2,63.5,62.9,62.3,61.6,61.0,60.4,59.7,59.1,58.5,57.8,57.2,56.6,55.9,55.3,54.7,54.0
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79.3,77.5,75.8,74.1,72.4,70.7,68.9,67.2,65.5,63.8,62.0,60.3,58.6,56.9,56.2,55.6,54.9,54.3,53.6,53.0,52.3,51.7,51.0,50.4,49.8,49.1,48.5,47.8,47.2
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79.3,78,76.8,75.6,74.4,73.2,72,70.8,69.5,68.3,67.1,65.9,64.7,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7,58.0,57.4,56.7,56.0,55.3,54.7,54.0,53.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79.3,78.5,77.8,77.1,76.4,75.7,75,74.3,73.6,72.9,72.2,71.5,70.8,70.1,69.3,68.6,67.9,67.2,66.5,65.8,65.1,64.4,63.7,63.0,62.3,61.6,60.9,60.1,59.4
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79,77,76,74,72,70,69,67,65,64.0,62.0,60.0,58.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,48.0,48.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79,78,77,75,74,73,72,71,69,68.0,67.0,66.0,65.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79,78,78,77,76,76,75,74,73,73.0,72.0,71.0,71.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0
diff --git a/tests/data/Natural_Gas_FE/R&D/30/df_occ.csv b/tests/data/Natural_Gas_FE/R&D/30/df_occ.csv
index dbf4193..dc391b8 100644
--- a/tests/data/Natural_Gas_FE/R&D/30/df_occ.csv
+++ b/tests/data/Natural_Gas_FE/R&D/30/df_occ.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1245.4,1237.2,1228.9,1220.6,1212
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1278.4,1262.6,1246.8,1231,1215.2,1199.4,1183.6,1167.8,1152,1136.2,1120.5,1104.7,1088.9,1073.1,1063.2,1053.2,1043.3,1033.4,1023.5,1013.5,1003.6,993.7,983.8,973.8,963.9,954.0,944.1,934.1,924.2
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1278.4,1266.2,1254.1,1241.9,1229.8,1217.6,1205.5,1193.3,1181.2,1169.0,1156.9,1144.7,1132.6,1120.4,1111.2,1102.0,1092.8,1083.6,1074.4,1065.2,1055.9,1046.7,1037.5,1028.3,1019.1,1009.9,1000.7,991.4,982.2
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1278.4,1269.9,1261.4,1252.8,1244.3,1235.8,1227.3,1218.8,1210.3,1201.8,1193.3,1184.8,1176.3,1167.8,1159.3,1150.8,1142.3,1133.8,1125.3,1116.8,1108.3,1099.8,1091.3,1082.8,1074.2,1065.7,1057.2,1048.7,1040.2
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1490.7,1479.4,1468.1,1456.8,1445.5,1434.2,1422.9,1411.6,1400.3,1389.0,1377.7,1366.4,1355.1,1343.8,1331.4,1319.0,1306.5,1294.1,1281.6,1269.2,1256.8,1244.3,1231.9,1219.5,1207.0,1194.6,1182.1,1169.7,1157.3
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1490.7,1480,1469.4,1458.8,1448.2,1437.6,1427,1416.4,1405.8,1395.2,1384.6,1374.0,1363.4,1352.7,1341.6,1330.4,1319.2,1308.0,1296.8,1285.7,1274.5,1263.3,1252.1,1240.9,1229.7,1218.6,1207.4,1196.2,1185.0
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1490.7,1480.7,1470.8,1460.9,1451,1441,1431.1,1421.2,1411.3,1401.3,1391.4,1381.5,1371.6,1361.6,1351.7,1341.8,1331.9,1321.9,1312.0,1302.1,1292.2,1282.2,1272.3,1262.4,1252.5,1242.6,1232.6,1222.7,1212.8
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1482,1471,1460,1448,1437,1426,1415,1403,1392,1381.0,1370.0,1358.0,1347.0,1336.0,1323.0,1311.0,1299.0,1286.0,1274.0,1262.0,1249.0,1237.0,1225.0,1212.0,1200.0,1187.0,1175.0,1163.0,1150.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1482,1472,1461,1450,1440,1429,1419,1408,1398,1387.0,1377.0,1366.0,1355.0,1345.0,1334.0,1323.0,1311.0,1300.0,1289.0,1278.0,1267.0,1256.0,1245.0,1234.0,1223.0,1211.0,1200.0,1189.0,1178.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1482,1472,1462,1453,1443,1433,1423,1413,1403,1393.0,1383.0,1374.0,1364.0,1354.0,1344.0,1334.0,1324.0,1314.0,1305.0,1295.0,1285.0,1275.0,1265.0,1255.0,1245.0,1235.0,1226.0,1216.0,1206.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,2656.6,2580.6,2504.7,2428.7,2352.8,2276.9,2200.9,2125,2049,1973.1,1897.1,1821.2,1745.2,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,2656.6,2605.9,2555.2,2504.5,2453.8,2403.1,2352.3,2301.6,2250.9,2200.2,2149.5,2098.8,2048.1,1997.4,1974.6,1951.8,1928.9,1906.1,1883.3,1860.5,1837.6,1814.8,1792.0,1769.2,1746.4,1723.5,1700.7,1677.9,1655.1
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,2656.6,2631.1,2605.7,2580.2,2554.7,2529.3,2503.8,2478.3,2452.9,2427.4,2401.9,2376.5,2351.0,2325.5,2300.1,2274.6,2249.1,2223.7,2198.2,2172.7,2147.3,2121.8,2096.3,2070.9,2045.4,2019.9,1994.5,1969.0,1943.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2977.8,2915.9,2854,2792,2730.1,2668.1,2606.2,2544.2,2482.3,2420.3,2358.4,2296.4,2234.5,2172.5,2146.3,2120.0,2093.7,2067.4,2041.1,2014.8,1988.5,1962.2,1935.9,1909.6,1883.3,1857.1,1830.8,1804.5,1778.2
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2977.8,2932.6,2887.3,2842.1,2796.8,2751.5,2706.3,2661,2615.8,2570.5,2525.2,2480.0,2434.7,2389.5,2362.0,2334.6,2307.2,2279.7,2252.3,2224.9,2197.4,2170.0,2142.6,2115.1,2087.7,2060.3,2032.9,2005.4,1978.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2977.8,2949.3,2920.7,2892.1,2863.6,2835,2806.4,2777.8,2749.3,2720.7,2692.1,2663.5,2635.0,2606.4,2577.8,2549.2,2520.7,2492.1,2463.5,2435.0,2406.4,2377.8,2349.2,2320.7,2292.1,2263.5,2234.9,2206.4,2177.8
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2969,2907,2845,2783,2721,2659,2597,2535,2474,2412.0,2350.0,2288.0,2226.0,2164.0,2138.0,2112.0,2086.0,2059.0,2033.0,2007.0,1981.0,1955.0,1928.0,1902.0,1876.0,1850.0,1824.0,1797.0,1771.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2969,2924,2878,2833,2788,2743,2698,2652,2607,2562.0,2517.0,2472.0,2426.0,2381.0,2354.0,2327.0,2299.0,2272.0,2245.0,2217.0,2190.0,2163.0,2135.0,2108.0,2081.0,2053.0,2026.0,1999.0,1971.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2969,2940,2912,2883,2855,2826,2798,2769,2741,2712.0,2684.0,2655.0,2627.0,2598.0,2570.0,2541.0,2513.0,2485.0,2456.0,2428.0,2399.0,2371.0,2342.0,2314.0,2285.0,2257.0,2228.0,2200.0,2171.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,2697.2,2619.3,2541.3,2463.4,2385.5,2307.6,2229.7,2151.7,2073.8,1995.9,1918.0,1840.1,1762.2,1684.2,1663.9,1643.5,1623.2,1602.8,1582.5,1562.1,1541.7,1521.4,1501.0,1480.7,1460.3,1440.0,1419.6,1399.2,1378.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,2697.2,2645.3,2593.4,2541.5,2489.6,2437.7,2385.8,2334,2282.1,2230.2,2178.3,2126.4,2074.5,2022.6,1999.5,1976.4,1953.3,1930.2,1907.1,1884.0,1860.9,1837.8,1814.7,1791.6,1768.5,1745.4,1722.3,1699.1,1676.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,2697.2,2671.3,2645.5,2619.6,2593.7,2567.9,2542,2516.2,2490.3,2464.5,2438.6,2412.8,2386.9,2361.0,2335.2,2309.3,2283.5,2257.6,2231.8,2205.9,2180.0,2154.2,2128.3,2102.5,2076.6,2050.8,2024.9,1999.1,1973.2
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3020.1,2956.5,2892.9,2829.3,2765.7,2702.1,2638.5,2574.9,2511.3,2447.6,2384.0,2320.4,2256.8,2193.2,2166.7,2140.1,2113.6,2087.1,2060.5,2034.0,2007.4,1980.9,1954.3,1927.8,1901.3,1874.7,1848.2,1821.6,1795.1
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3020.1,2973.8,2927.5,2881.2,2834.9,2788.6,2742.3,2696.1,2649.8,2603.5,2557.2,2510.9,2464.6,2418.3,2390.5,2362.8,2335.0,2307.3,2279.5,2251.7,2224.0,2196.2,2168.5,2140.7,2112.9,2085.2,2057.4,2029.7,2001.9
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3020.1,2991.1,2962.1,2933.2,2904.2,2875.2,2846.2,2817.3,2788.3,2759.3,2730.3,2701.3,2672.4,2643.4,2614.4,2585.4,2556.4,2527.5,2498.5,2469.5,2440.5,2411.5,2382.6,2353.6,2324.6,2295.6,2266.6,2237.7,2208.7
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3011,2947,2884,2820,2757,2693,2630,2566,2503,2439.0,2375.0,2312.0,2248.0,2185.0,2158.0,2132.0,2105.0,2079.0,2053.0,2026.0,2000.0,1973.0,1947.0,1920.0,1894.0,1868.0,1841.0,1815.0,1788.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3011,2965,2919,2872,2826,2780,2734,2687,2641,2595.0,2549.0,2503.0,2456.0,2410.0,2382.0,2355.0,2327.0,2299.0,2272.0,2244.0,2216.0,2189.0,2161.0,2133.0,2106.0,2078.0,2050.0,2023.0,1995.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3011,2982,2953,2924,2895,2867,2838,2809,2780,2751.0,2722.0,2693.0,2664.0,2635.0,2607.0,2578.0,2549.0,2520.0,2491.0,2462.0,2433.0,2404.0,2375.0,2346.0,2318.0,2289.0,2260.0,2231.0,2202.0
diff --git a/tests/data/Natural_Gas_FE/R&D/30/df_vom.csv b/tests/data/Natural_Gas_FE/R&D/30/df_vom.csv
index eed519d..953bc21 100644
--- a/tests/data/Natural_Gas_FE/R&D/30/df_vom.csv
+++ b/tests/data/Natural_Gas_FE/R&D/30/df_vom.csv
@@ -8,8 +8,8 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,2.17,2.16,2.15,2.14,2.13,2.12,2.
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,2.16,2.14,2.12,2.1,2.08,2.06,2.04,2.02,2,1.97,1.95,1.93,1.91,1.89,1.88,1.87,1.85,1.84,1.83,1.82,1.8,1.79,1.78,1.76,1.75,1.74,1.73,1.71,1.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,2.16,2.15,2.13,2.12,2.1,2.08,2.07,2.05,2.04,2.02,2.01,1.99,1.97,1.96,1.95,1.93,1.92,1.91,1.9,1.89,1.88,1.86,1.85,1.84,1.83,1.82,1.81,1.79,1.78
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,2.16,2.15,2.14,2.13,2.12,2.11,2.1,2.09,2.08,2.07,2.06,2.05,2.04,2.02,2.01,2.0,1.99,1.98,1.97,1.96,1.95,1.94,1.93,1.92,1.91,1.89,1.88,1.87,1.86
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.49,2.47,2.46,2.44,2.42,2.41,2.39,2.38,2.36,2.35,2.33,2.31,2.3,2.28,2.27,2.25,2.24,2.22,2.2,2.19,2.17,2.16,2.14,2.13,2.11,2.09
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.51,2.49,2.48,2.46,2.45,2.43,2.42,2.41,2.39,2.38,2.36,2.35,2.34,2.32,2.31,2.29,2.28,2.27,2.25,2.24,2.22,2.21,2.19,2.18,2.17,2.15,2.14
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.48,2.47,2.45,2.44,2.42,2.4,2.39,2.37,2.35,2.34,2.32,2.3,2.29,2.27,2.26,2.24,2.23,2.21,2.2,2.18,2.16,2.15,2.13,2.12,2.1,2.09
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.5,2.49,2.48,2.46,2.45,2.43,2.42,2.4,2.39,2.37,2.36,2.35,2.33,2.32,2.3,2.29,2.27,2.26,2.25,2.23,2.22,2.2,2.19,2.18,2.16,2.15,2.13
 NG 1-on-1 Combined Cycle (H-Frame)/Conservative,2.53,2.52,2.51,2.5,2.48,2.47,2.46,2.45,2.43,2.42,2.41,2.4,2.38,2.37,2.36,2.34,2.33,2.32,2.31,2.29,2.28,2.27,2.26,2.24,2.23,2.22,2.21,2.19,2.18
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,5.11,4.99,4.87,4.74,4.62,4.49,4.37,4.24,4.12,3.99,3.87,3.75,3.62,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,5.11,5.04,4.96,4.88,4.8,4.72,4.64,4.57,4.49,4.41,4.33,4.25,4.17,4.1,4.07,4.04,4.01,3.98,3.95,3.92,3.89,3.86,3.84,3.81,3.78,3.75,3.72,3.69,3.66
@@ -17,8 +17,8 @@ NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,5.11,5.08,5.05,5.02,4.99
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.71,4.61,4.51,4.41,4.31,4.21,4.11,4.01,3.97,3.94,3.91,3.87,3.84,3.81,3.77,3.74,3.71,3.67,3.64,3.61,3.57,3.54,3.51
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.9,4.83,4.76,4.69,4.62,4.56,4.49,4.42,4.39,4.35,4.32,4.28,4.25,4.21,4.18,4.14,4.11,4.07,4.04,4.0,3.97,3.93,3.9
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.7,4.6,4.5,4.4,4.3,4.2,4.1,4.0,3.96,3.93,3.9,3.86,3.83,3.8,3.76,3.73,3.7,3.67,3.63,3.6,3.57,3.53,3.5
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.89,4.82,4.76,4.69,4.62,4.55,4.48,4.41,4.38,4.34,4.31,4.28,4.24,4.21,4.17,4.14,4.1,4.07,4.03,4.0,3.96,3.93,3.89
 NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,5.3,5.27,5.23,5.19,5.16,5.12,5.09,5.05,5.01,4.98,4.94,4.9,4.87,4.83,4.8,4.76,4.72,4.69,4.65,4.61,4.58,4.54,4.51,4.47,4.43,4.4,4.36,4.32,4.29
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,5.21,5.08,4.95,4.82,4.7,4.57,4.44,4.31,4.18,4.05,3.93,3.8,3.67,3.54,3.52,3.49,3.46,3.44,3.41,3.39,3.36,3.34,3.31,3.28,3.26,3.23,3.21,3.18,3.16
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,5.21,5.13,5.05,4.97,4.89,4.81,4.72,4.64,4.56,4.48,4.4,4.32,4.24,4.16,4.13,4.1,4.07,4.04,4.02,3.99,3.96,3.93,3.9,3.87,3.84,3.81,3.78,3.75,3.72
@@ -26,6 +26,6 @@ NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,5.21,5.17,5.14,5.11,5.08
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.88,4.77,4.67,4.57,4.47,4.36,4.26,4.16,4.06,4.02,3.99,3.95,3.92,3.89,3.85,3.82,3.79,3.75,3.72,3.69,3.65,3.62,3.58,3.55
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.45,4.41,4.38,4.34,4.31,4.27,4.24,4.2,4.17,4.13,4.1,4.06,4.03,3.99,3.96
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.87,4.77,4.67,4.56,4.46,4.35,4.25,4.15,4.04,4.01,3.98,3.94,3.91,3.88,3.84,3.81,3.78,3.74,3.71,3.68,3.64,3.61,3.58,3.54
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.44,4.41,4.37,4.34,4.3,4.27,4.23,4.2,4.16,4.13,4.09,4.06,4.02,3.99,3.95
 NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,5.39,5.35,5.32,5.28,5.24,5.21,5.17,5.13,5.1,5.06,5.02,4.99,4.95,4.91,4.88,4.84,4.8,4.77,4.73,4.69,4.66,4.62,4.58,4.55,4.51,4.47,4.43,4.4,4.36
diff --git a/tests/data/Natural_Gas_FE/R&D/TechLife/df_capex.csv b/tests/data/Natural_Gas_FE/R&D/TechLife/df_capex.csv
index 8faea65..ca6b387 100644
--- a/tests/data/Natural_Gas_FE/R&D/TechLife/df_capex.csv
+++ b/tests/data/Natural_Gas_FE/R&D/TechLife/df_capex.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1499.2530441159731,1490.11533416
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1536.02675487547,1518.4199479057713,1500.8131409360728,1483.2063339663744,1465.5995269966759,1447.9927200269774,1430.3859130572787,1412.7791060875804,1395.172299117882,1377.5654921481835,1360.070120665635,1342.4633136959364,1324.856506726238,1307.2496997565393,1296.2175865286904,1285.0740378136913,1274.041924585842,1263.0098113579932,1251.977698130144,1240.834149415145,1229.8020361872957,1218.7699229594468,1207.7378097315977,1196.5942610165987,1185.5621477887498,1174.5300345609005,1163.4979213330514,1152.3543726180524,1141.3222593902035
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1536.02675487547,1522.4316254431712,1508.9479314980222,1495.3528020657234,1481.8691081205745,1468.2739786882755,1454.790284743127,1441.1951553108279,1427.7114613656793,1414.1163319333803,1400.6326379882314,1387.0375085559326,1373.5538146107835,1359.958685178485,1349.7066203606857,1339.4545555428865,1329.2024907250875,1318.9504259072883,1308.6983610894893,1298.44629627169,1288.082795966741,1277.8307311489418,1267.5786663311426,1257.3266015133436,1247.0745366955443,1236.8224718777453,1226.570407059946,1216.2069067549971,1205.954841937198
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1536.02675487547,1526.5547384677209,1517.0827220599717,1507.4992701650724,1498.027253757323,1488.5552373495739,1479.0832209418247,1469.6112045340756,1460.1391881263264,1450.667171718577,1441.1951553108279,1431.7231389030787,1422.2511224953296,1412.7791060875804,1403.307089679831,1393.835073272082,1384.3630568643327,1374.8910404565836,1365.4190240488344,1355.947007641085,1346.474991233336,1337.0029748255868,1327.5309584178376,1318.0589420100882,1308.4754901151894,1299.00347370744,1289.5314572996908,1280.0594408919417,1270.5874244841925
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1772.6042940948998,1760.012084046951,1747.419873999002,1734.827663951053,1722.2354539031041,1709.6432438551553,1697.0510338072063,1684.4588237592573,1671.8666137113084,1659.2744036633594,1646.6821936154106,1634.0899835674618,1621.4977735195125,1608.9055634715637,1595.087563064965,1581.269562658366,1567.3401267646173,1553.5221263580183,1539.5926904642695,1525.7746900576708,1511.9566896510719,1498.027253757323,1484.2092533507243,1470.3912529441254,1456.4618170503766,1442.6438166437777,1428.714380750029,1414.8963803434303,1401.0783799368314
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1772.6042940948998,1760.680696969851,1748.868535331952,1737.0563736940528,1725.2442120561539,1713.432050418255,1701.619888780356,1689.807727142457,1677.9955655045578,1666.1834038666589,1654.37124222876,1642.559080590861,1630.746918952962,1618.8233218279129,1606.453982754264,1593.973208193465,1581.4924336326662,1569.0116590718671,1556.530884511068,1544.1615454374194,1531.6807708766203,1519.1999963158214,1506.7192217550223,1494.2384471942237,1481.7576726334246,1469.3883335597754,1456.9075589989768,1444.4267844381777,1431.9460098773789
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1772.6042940948998,1761.4607453799008,1750.4286321520517,1739.3965189242028,1728.3644056963537,1717.2208569813547,1706.1887437535054,1695.1566305256565,1684.1245172978074,1672.9809685828084,1661.9488553549593,1650.9167421271102,1639.884628899261,1628.741080184262,1617.7089669564132,1606.6768537285639,1595.644740500715,1584.501191785716,1573.4690785578669,1562.4369653300175,1551.4048521021687,1540.2613033871696,1529.2291901593205,1518.1970769314717,1507.1649637036223,1496.1328504757732,1484.9893017607742,1473.9571885329253,1462.925075305076
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1762.9094067128508,1750.6515031263518,1738.3935995398529,1725.021341081854,1712.763437495355,1700.505533908856,1688.247630322357,1674.8753718643582,1662.6174682778592,1650.3595646913602,1638.1016611048613,1624.7294026468624,1612.4714990603634,1600.2135954738644,1585.7269821443658,1572.354723686367,1558.982465228368,1544.4958518988692,1531.1235934408703,1517.7513349828714,1503.2647216533728,1489.892463195374,1476.520204737375,1462.0335914078762,1448.6613329498773,1434.1747196203785,1420.8024611623796,1407.430202704381,1392.943589374882
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1762.9094067128508,1751.7658579978518,1739.5079544113528,1727.2500508248538,1716.1065021098548,1703.8485985233558,1692.7050498083568,1680.4471462218578,1669.3035975068588,1657.0456939203598,1645.9021452053607,1633.6442416188618,1621.3863380323628,1610.2427893173638,1597.9848857308648,1585.7269821443658,1572.354723686367,1560.096820099868,1547.838916513369,1535.58101292687,1523.323109340371,1511.065205753872,1498.807302167373,1486.5493985808741,1474.2914949943752,1460.9192365363763,1448.6613329498773,1436.4034293633783,1424.1455257768794
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1762.9094067128508,1751.7658579978518,1740.6223092828527,1730.5931154393534,1719.4495667243543,1708.3060180093553,1697.1624692943562,1686.0189205793572,1674.8753718643582,1663.7318231493591,1652.58827443436,1642.559080590861,1631.415531875862,1620.2719831608629,1609.1284344458638,1597.9848857308648,1586.8413370158655,1575.6977883008665,1565.6685944573674,1554.5250457423683,1543.3814970273693,1532.2379483123702,1521.0943995973712,1509.9508508823722,1498.807302167373,1487.663753452374,1477.634559608875,1466.491010893876,1455.3474621788769
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,3071.8306387766397,2987.139668542647,2902.560133795804,2817.869163561811,2733.2896288149686,2648.7100940681257,2564.019123834133,2479.43958908729,2394.748618853297,2310.169084106454,2225.4781138724616,2140.8985791256187,2056.207608891626,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,3071.8306387766397,3015.332846791595,2958.835054806549,2902.3372628215043,2845.8394708364594,2789.3416788514137,2732.7324513792187,2676.2346593941734,2619.736867409128,2563.239075424083,2506.741283439038,2450.2434914539926,2393.7456994689474,2337.247907483902,2311.840616413704,2286.4333253435066,2260.914598786159,2235.5073077159605,2210.100016645763,2184.692725575565,2159.1739990182173,2133.7667079480193,2108.3594168778213,2082.952125807624,2057.544834737426,2032.026108180078,2006.6188171098802,1981.2115260396824,1955.8042349694842
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,3071.8306387766397,3043.414589553392,3015.1099758172945,2986.693926594047,2958.277877370799,2929.973263634702,2901.5572144114544,2873.1411651882067,2844.8365514521092,2816.4205022288616,2788.004453005614,2759.6998392695164,2731.2837900462687,2702.867740823021,2674.5631270869235,2646.147077863676,2617.731028640428,2589.4264149043306,2561.010365681083,2532.5943164578352,2504.289702721738,2475.8736534984905,2447.457604275243,2419.1529905391453,2390.7369413158976,2362.32089209265,2334.0162783565524,2305.6002291333048,2277.184179910057
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3429.76142350241,3360.7828569565654,3291.8042904107215,3222.714288377727,3153.735721831883,3084.645719798889,3015.6671532530445,2946.5771512200504,2877.5985846742064,2808.5085826412123,2739.530016095368,2670.440014062374,2601.46144751653,2532.3714454835354,2503.1753478502383,2473.8678147297906,2444.560281609343,2415.2527484888956,2385.945215368448,2356.6376822480006,2327.330149127553,2298.022616007105,2268.715082886658,2239.40754976621,2210.100016645763,2180.9039190124654,2151.5963858920177,2122.2888527715704,2092.9813196511227
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3429.76142350241,3379.3925833106136,3328.912307631668,3278.543467439872,3228.0631917609267,3177.582916081981,3127.2140758901855,3076.7338002112397,3026.364960019444,2975.884684340498,2925.404408661552,2875.0355684697565,2824.5552927908107,2774.186452599015,2743.541693632768,2713.00837015367,2682.4750466745727,2651.830287708325,2621.2969642292283,2590.763640750131,2560.1188817838834,2529.585558304786,2499.052234825688,2468.407475859441,2437.8741523803433,2407.3408289012464,2376.807505422149,2346.1627464559015,2315.629422976804
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3429.76142350241,3398.0023096646623,3366.1317603397647,3334.2612110148675,3302.50209717712,3270.631547852223,3238.7609985273257,3206.8904492024285,3175.1313353646815,3143.260786039784,3111.390236714886,3079.519687389989,3047.760573552242,3015.890024227345,2984.0194749024477,2952.14892557755,2920.3898117398026,2888.5192624149054,2856.648713090008,2824.8895992522607,2793.0190499273635,2761.1485006024664,2729.2779512775687,2697.5188374398213,2665.648288114924,2633.777738790027,2601.9071894651297,2570.1480756273827,2538.277526302485
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,3419.9551006332103,3350.8650986002162,3281.775096567222,3212.685094534228,3143.595092501234,3074.50509046824,3005.4150884352457,2936.325086402251,2868.349439240757,2799.259437207763,2730.1694351747688,2661.0794331417746,2591.9894311087805,2522.8994290757864,2493.926202416789,2464.952975757791,2435.979749098794,2405.8921675682964,2376.9189409092987,2347.945714250301,2318.9724875913034,2289.9992609323062,2259.9116794018087,2230.938452742811,2201.9652260838134,2172.991999424816,2144.0187727658185,2113.931191235321,2084.9579645763233
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,3419.9551006332103,3369.8091314157145,3318.548807326719,3268.4028381092235,3218.2568688917277,3168.110899674232,3117.964930456736,3066.7046063677403,3016.5586371502445,2966.4126679327487,2916.266698715253,2866.120729497757,2814.860405408762,2764.714436191266,2734.6268546607685,2704.539273130271,2673.337336728274,2643.2497551977763,2613.1621736672787,2581.960237265281,2551.872655734784,2521.7850742042865,2490.583137802289,2460.4955562717914,2430.4079747412943,2399.206038339297,2369.1184568087992,2339.030875278302,2307.8289388763046
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,3419.9551006332103,3387.6388093597134,3356.436872957716,3324.1205816842185,3292.918645282221,3260.602354008724,3229.4004176067265,3197.0841263332295,3165.882189931232,3133.5658986577346,3102.3639622557375,3070.04767098224,3038.8457345802426,3006.5294433067456,2975.327506904748,2943.0112156312507,2911.8092792292537,2880.607342827256,2848.2910515537587,2817.0891151517617,2784.7728238782643,2753.5708874762668,2721.25459620277,2690.0526598007723,2657.736368527275,2626.534432125278,2594.2181408517804,2563.016204449783,2530.699913176286
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,3117.073446559536,3030.2652020696937,2943.345522092701,2856.537277602858,2769.7290331130152,2682.920788623173,2596.11254413333,2509.1928641563372,2422.384619666495,2335.576375176652,2248.7681306868094,2161.9598861969666,2075.1516417071243,1988.2319617301316,1965.6105578386837,1942.8777184600856,1920.2563145686374,1897.5234751900393,1874.9020712985912,1852.169231919993,1829.4363925413952,1806.814988649947,1784.082149271349,1761.4607453799008,1738.7279060013027,1716.1065021098548,1693.3736627312564,1670.6408233526586,1648.0194194612106
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,3117.073446559536,3059.2384287286914,3001.403410897846,2943.5683930670007,2885.7333752361556,2827.8983574053104,2770.0633395744658,2712.3397572307704,2654.5047393999253,2596.66972156908,2538.834703738235,2480.99968590739,2423.164668076545,2365.3296502456997,2339.588052714052,2313.846455182404,2288.1048576507565,2262.3632601191084,2236.6216625874604,2210.880065055813,2185.138467524165,2159.396869992517,2133.6552724608696,2107.9136749292215,2082.1720773975735,2056.430479865926,2030.688882334278,2004.8358493154801,1979.0942517838325
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,3117.073446559536,3088.2116553876886,3059.461299702991,3030.5995085311433,3001.7377173592954,2972.9873616745986,2944.1255705027506,2915.375214818053,2886.513423646206,2857.763067961508,2828.90127678966,2800.150921104963,2771.2891299331154,2742.427338761268,2713.67698307657,2684.8151919047227,2656.064836220025,2627.2030450481775,2598.45268936348,2569.5908981916327,2540.729107019785,2511.978751335087,2483.11696016324,2454.3666044785423,2425.5048133066944,2396.754457621997,2367.8926664501496,2339.142310765452,2310.2805195936044
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2924.178618302902,2850.965503245359,2777.640952700665,2704.427837643121,2631.1032870984272,2557.778736553734,2484.5656214961896,2411.241070951496,2338.027955893952,2264.703405349258,2191.3788548045645,2118.165739747021,2044.8411892023269,1971.628074144783,1949.118105740485,1926.608137336187,1904.0981689318887,1881.6996360147405,1859.1896676104427,1836.6796992061445,1814.1697308018463,1791.7711978846985,1769.2612294804003,1746.751261076102,1724.2412926718039,1701.731324267506,1679.3327913503579,1656.8228229460597,1634.3128545417615
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2924.178618302902,2874.1440845725565,2823.9981153550607,2773.852146137565,2723.706176920069,2673.5602077025733,2623.525673972228,2573.3797047547323,2523.2337355372365,2473.0877663197407,2422.941797102245,2372.795827884749,2322.7612941544035,2272.6153249369077,2247.87664678961,2223.1379686423115,2198.3992904950137,2173.660612347716,2148.921934200418,2124.18325605312,2099.556013392972,2074.8173352456743,2050.0786570983764,2025.3399789510786,2000.6013008037805,1975.8626226564827,1951.1239445091849,1926.385266361887,1901.646588214589
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2924.178618302902,2897.211230412605,2870.2438425223067,2843.276454632009,2816.309066741712,2789.3416788514137,2762.374290961116,2735.4069030708183,2708.4395151805206,2681.472127290223,2654.5047393999253,2627.5373515096276,2600.5699636193294,2573.602575729032,2546.6351878387345,2519.6677999484364,2492.700412058139,2465.733024167841,2438.7656362775433,2411.798248387246,2384.830860496948,2357.8634726066502,2330.8960847163526,2303.928696826055,2276.961308935757,2249.9939210454595,2223.026533155162,2196.059145264864,2169.0917573745664
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3476.8986345668554,3406.0256647394617,3335.1526949120675,3264.279725084674,3193.406755257279,3122.5337854298855,3051.6608156024918,2980.7878457750976,2909.914875947704,2838.9304706331595,2768.057500805766,2697.1845309783716,2626.311561150978,2555.4385913235833,2525.908187228836,2496.2663476469384,2466.735943552191,2437.2055394574436,2407.5636998755463,2378.0332957807987,2348.3914561989013,2318.8610521041537,2289.2192125222564,2259.688808427509,2230.158404332761,2200.516564750864,2170.986160656116,2141.3443210742184,2111.8139169794713
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3476.8986345668554,3425.30400401641,3373.7093734659643,3322.1147429155185,3270.520112365073,3218.9254818146273,3167.330851264182,3115.847656200886,3064.2530256504406,3012.658395099995,2961.063764549549,2909.4691339991036,2857.874503448658,2806.2798728982125,2775.300807470515,2744.433177529968,2713.4541121022703,2682.586482161723,2651.6074167340253,2620.628351306328,2589.7607213657807,2558.781655938083,2527.914025997536,2496.9349605698385,2465.9558951421413,2435.0882652015935,2404.1091997738963,2373.241569833349,2342.2625044056517
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3476.8986345668554,3444.582343293358,3412.266052019861,3380.061196233514,3347.7449049600164,3315.428613686519,3283.112322413022,3250.9074666266747,3218.5911753531777,3186.2748840796803,3153.9585928061833,3121.642301532686,3089.4374457463387,3057.121154472841,3024.804863199344,2992.488571925847,2960.1722806523494,2927.967424866002,2895.6511335925047,2863.3348423190077,2831.0185510455103,2798.702259772013,2766.4974039856656,2734.181112712168,2701.8648214386712,2669.548530165174,2637.2322388916764,2605.027383105329,2572.711091831832
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3466.7580052362064,3395.4392934602124,3325.2349365557184,3253.9162247797244,3183.7118678752304,3112.3931560992364,3042.1887991947424,2970.8700874187484,2900.6657305142544,2829.3470187382604,2758.0283069622665,2687.8239500577724,2616.5052382817785,2546.3008813772844,2516.213299846787,2487.240073187789,2457.152491657292,2428.1792649982945,2399.206038339297,2369.1184568087992,2340.145230149802,2310.0576486193045,2281.084421960307,2250.9968404298093,2222.023613770812,2193.0503871118144,2162.962805581317,2133.989578922319,2103.901997391822
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3466.7580052362064,3415.4976811472106,3364.237357058215,3311.8626780977197,3260.602354008724,3209.3420299197282,3158.0817058307325,3105.707026870237,3054.4467027812416,3003.186378692246,2951.92605460325,2900.6657305142544,2848.2910515537587,2797.030727464763,2765.828791062766,2735.7412095322684,2704.539273130271,2673.337336728274,2643.2497551977763,2612.0478187957788,2580.8458823937813,2550.758300863284,2519.5563644612866,2488.354428059289,2458.266846528792,2427.0649101267945,2395.862973724797,2365.7753921942995,2334.5734557923024
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3466.7580052362064,3434.4417139627094,3402.125422689212,3369.8091314157145,3337.4928401422176,3306.29090374022,3273.9746124667226,3241.6583211932257,3209.3420299197282,3177.025738646231,3144.709447372734,3112.3931560992364,3080.076864825739,3047.760573552242,3016.5586371502445,2984.242345876747,2951.92605460325,2919.6097633297527,2887.2934720562557,2854.9771807827583,2822.660889509261,2790.344598235764,2758.0283069622665,2725.712015688769,2694.510079286772,2662.1937880132746,2629.877496739777,2597.56120546628,2565.2449141927827
diff --git a/tests/data/Natural_Gas_FE/R&D/TechLife/df_fom.csv b/tests/data/Natural_Gas_FE/R&D/TechLife/df_fom.csv
index ffabb04..d75d001 100644
--- a/tests/data/Natural_Gas_FE/R&D/TechLife/df_fom.csv
+++ b/tests/data/Natural_Gas_FE/R&D/TechLife/df_fom.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,34.5,34.3,34.1,33.9,33.7,33.5,33
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,34.1,33.7,33.2,32.8,32.3,31.9,31.4,31,30.5,30.1,29.6,29.2,28.7,28.3,28.0,27.8,27.6,27.3,27.1,26.8,26.6,26.4,26.1,25.9,25.6,25.4,25.1,24.9,24.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,34.1,33.8,33.5,33.2,32.8,32.5,32.2,31.8,31.5,31.2,30.9,30.5,30.2,29.9,29.6,29.4,29.2,29.0,28.7,28.5,28.3,28.1,27.8,27.6,27.4,27.2,26.9,26.7,26.5
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,34.1,33.9,33.7,33.5,33.3,33.1,32.9,32.7,32.5,32.3,32.1,31.9,31.7,31.4,31.2,31.0,30.8,30.6,30.4,30.2,30.0,29.8,29.6,29.4,29.2,29.0,28.7,28.5,28.3
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,39.7,39.4,39,38.7,38.4,38.1,37.7,37.4,37.1,36.8,36.5,36.1,35.8,35.5,35.2,34.9,34.6,34.3,34.0,33.7,33.4,33.1,32.8,32.5,32.2,31.9,31.5,31.2
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,39.7,39.5,39.2,38.9,38.6,38.3,38,37.8,37.5,37.2,36.9,36.6,36.3,36.1,35.8,35.5,35.2,35.0,34.7,34.4,34.2,33.9,33.6,33.3,33.1,32.8,32.5,32.2
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,39.8,39.5,39.3,39,38.8,38.6,38.3,38.1,37.8,37.6,37.4,37.1,36.9,36.6,36.4,36.1,35.9,35.7,35.4,35.2,34.9,34.7,34.4,34.2,34.0,33.7,33.5,33.2
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,40,40,39,39,39,38,38,38,37,37.0,37.0,36.0,36.0,36.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0,33.0,32.0,32.0,32.0,31.0,31.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,40,40,39,39,39,38,38,38,38,37.0,37.0,37.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,33.0,33.0,33.0,33.0,32.0,32.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,40,40,39,39,39,39,38,38,38,38.0,37.0,37.0,37.0,37.0,36.0,36.0,36.0,36.0,36.0,35.0,35.0,35.0,35.0,34.0,34.0,34.0,34.0,33.0,33.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,70.7,68.6,66.4,64.3,62.2,60,57.9,55.8,53.6,51.5,49.3,47.2,45.1,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,70.7,69.3,67.9,66.6,65.2,63.8,62.4,61.1,59.7,58.3,56.9,55.5,54.2,52.8,52.2,51.7,51.1,50.5,50.0,49.4,48.9,48.3,47.8,47.2,46.6,46.1,45.5,45.0,44.4
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,70.7,70.1,69.5,68.8,68.2,67.6,67,66.4,65.7,65.1,64.5,63.9,63.2,62.6,62.0,61.4,60.8,60.1,59.5,58.9,58.3,57.6,57.0,56.4,55.8,55.2,54.5,53.9,53.3
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78.2,76.5,74.8,73.2,71.5,69.8,68.1,66.4,64.8,63.1,61.4,59.7,58.0,56.4,55.7,55.1,54.4,53.8,53.2,52.5,51.9,51.2,50.6,49.9,49.3,48.7,48.0,47.4,46.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78.2,77,75.8,74.6,73.4,72.3,71.1,69.9,68.7,67.5,66.3,65.1,63.9,62.7,62.1,61.4,60.7,60.1,59.4,58.7,58.1,57.4,56.7,56.0,55.4,54.7,54.0,53.4,52.7
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78.2,77.5,76.8,76.1,75.4,74.7,74,73.3,72.6,71.9,71.2,70.5,69.8,69.1,68.4,67.7,67.0,66.3,65.6,64.9,64.2,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,78,76,75,73,71,70,68,66,65,63.0,61.0,60.0,58.0,56.0,56.0,55.0,54.0,54.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,49.0,48.0,47.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,78,77,76,74,73,72,71,70,69,67.0,66.0,65.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,78,77,77,76,75,75,74,73,72,72.0,71.0,70.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,71.7,69.5,67.4,65.2,63,60.8,58.6,56.4,54.2,52.1,49.9,47.7,45.5,43.3,42.8,42.3,41.8,41.3,40.8,40.3,39.8,39.3,38.8,38.3,37.8,37.3,36.8,36.3,35.8
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,71.7,70.3,68.9,67.5,66.1,64.7,63.3,61.9,60.5,59.0,57.6,56.2,54.8,53.4,52.8,52.3,51.7,51.2,50.6,50.0,49.5,48.9,48.3,47.8,47.2,46.6,46.1,45.5,44.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,71.7,71.1,70.5,69.8,69.2,68.6,67.9,67.3,66.7,66.0,65.4,64.8,64.2,63.5,62.9,62.3,61.6,61.0,60.4,59.7,59.1,58.5,57.8,57.2,56.6,55.9,55.3,54.7,54.0
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,65.8,64.1,62.3,60.6,58.8,57,55.3,53.5,51.7,50.0,48.2,46.5,44.7,42.9,42.4,41.9,41.5,41.0,40.5,40.0,39.5,39.0,38.5,38.0,37.5,37.0,36.5,36.0,35.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,65.8,64.7,63.5,62.3,61.1,60,58.8,57.6,56.4,55.3,54.1,52.9,51.7,50.5,50.0,49.5,48.9,48.4,47.8,47.3,46.8,46.2,45.7,45.1,44.6,44.0,43.5,43.0,42.4
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,65.8,65.2,64.7,64.1,63.5,62.9,62.3,61.7,61.1,60.5,59.9,59.3,58.7,58.2,57.6,57.0,56.4,55.8,55.2,54.6,54.0,53.4,52.8,52.2,51.7,51.1,50.5,49.9,49.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79.3,77.5,75.8,74.1,72.4,70.7,68.9,67.2,65.5,63.8,62.0,60.3,58.6,56.9,56.2,55.6,54.9,54.3,53.6,53.0,52.3,51.7,51.0,50.4,49.8,49.1,48.5,47.8,47.2
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79.3,78,76.8,75.6,74.4,73.2,72,70.8,69.5,68.3,67.1,65.9,64.7,63.5,62.8,62.1,61.4,60.8,60.1,59.4,58.7,58.0,57.4,56.7,56.0,55.3,54.7,54.0,53.3
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79.3,78.5,77.8,77.1,76.4,75.7,75,74.3,73.6,72.9,72.2,71.5,70.8,70.1,69.3,68.6,67.9,67.2,66.5,65.8,65.1,64.4,63.7,63.0,62.3,61.6,60.9,60.1,59.4
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,79,77,76,74,72,70,69,67,65,64.0,62.0,60.0,58.0,57.0,56.0,55.0,55.0,54.0,53.0,53.0,52.0,52.0,51.0,50.0,50.0,49.0,48.0,48.0,47.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,79,78,77,75,74,73,72,71,69,68.0,67.0,66.0,65.0,63.0,63.0,62.0,61.0,61.0,60.0,59.0,59.0,58.0,57.0,57.0,56.0,55.0,55.0,54.0,53.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,79,78,78,77,76,76,75,74,73,73.0,72.0,71.0,71.0,70.0,69.0,68.0,68.0,67.0,66.0,66.0,65.0,64.0,64.0,63.0,62.0,61.0,61.0,60.0,59.0
diff --git a/tests/data/Natural_Gas_FE/R&D/TechLife/df_occ.csv b/tests/data/Natural_Gas_FE/R&D/TechLife/df_occ.csv
index dbf4193..dc391b8 100644
--- a/tests/data/Natural_Gas_FE/R&D/TechLife/df_occ.csv
+++ b/tests/data/Natural_Gas_FE/R&D/TechLife/df_occ.csv
@@ -8,24 +8,24 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,1245.4,1237.2,1228.9,1220.6,1212
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,1278.4,1262.6,1246.8,1231,1215.2,1199.4,1183.6,1167.8,1152,1136.2,1120.5,1104.7,1088.9,1073.1,1063.2,1053.2,1043.3,1033.4,1023.5,1013.5,1003.6,993.7,983.8,973.8,963.9,954.0,944.1,934.1,924.2
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,1278.4,1266.2,1254.1,1241.9,1229.8,1217.6,1205.5,1193.3,1181.2,1169.0,1156.9,1144.7,1132.6,1120.4,1111.2,1102.0,1092.8,1083.6,1074.4,1065.2,1055.9,1046.7,1037.5,1028.3,1019.1,1009.9,1000.7,991.4,982.2
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,1278.4,1269.9,1261.4,1252.8,1244.3,1235.8,1227.3,1218.8,1210.3,1201.8,1193.3,1184.8,1176.3,1167.8,1159.3,1150.8,1142.3,1133.8,1125.3,1116.8,1108.3,1099.8,1091.3,1082.8,1074.2,1065.7,1057.2,1048.7,1040.2
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1490.7,1479.4,1468.1,1456.8,1445.5,1434.2,1422.9,1411.6,1400.3,1389.0,1377.7,1366.4,1355.1,1343.8,1331.4,1319.0,1306.5,1294.1,1281.6,1269.2,1256.8,1244.3,1231.9,1219.5,1207.0,1194.6,1182.1,1169.7,1157.3
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1490.7,1480,1469.4,1458.8,1448.2,1437.6,1427,1416.4,1405.8,1395.2,1384.6,1374.0,1363.4,1352.7,1341.6,1330.4,1319.2,1308.0,1296.8,1285.7,1274.5,1263.3,1252.1,1240.9,1229.7,1218.6,1207.4,1196.2,1185.0
-NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1490.7,1480.7,1470.8,1460.9,1451,1441,1431.1,1421.2,1411.3,1401.3,1391.4,1381.5,1371.6,1361.6,1351.7,1341.8,1331.9,1321.9,1312.0,1302.1,1292.2,1282.2,1272.3,1262.4,1252.5,1242.6,1232.6,1222.7,1212.8
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,1482,1471,1460,1448,1437,1426,1415,1403,1392,1381.0,1370.0,1358.0,1347.0,1336.0,1323.0,1311.0,1299.0,1286.0,1274.0,1262.0,1249.0,1237.0,1225.0,1212.0,1200.0,1187.0,1175.0,1163.0,1150.0
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,1482,1472,1461,1450,1440,1429,1419,1408,1398,1387.0,1377.0,1366.0,1355.0,1345.0,1334.0,1323.0,1311.0,1300.0,1289.0,1278.0,1267.0,1256.0,1245.0,1234.0,1223.0,1211.0,1200.0,1189.0,1178.0
+NG 1-on-1 Combined Cycle (H-Frame)/Conservative,1482,1472,1462,1453,1443,1433,1423,1413,1403,1393.0,1383.0,1374.0,1364.0,1354.0,1344.0,1334.0,1324.0,1314.0,1305.0,1295.0,1285.0,1275.0,1265.0,1255.0,1245.0,1235.0,1226.0,1216.0,1206.0
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,2656.6,2580.6,2504.7,2428.7,2352.8,2276.9,2200.9,2125,2049,1973.1,1897.1,1821.2,1745.2,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,2656.6,2605.9,2555.2,2504.5,2453.8,2403.1,2352.3,2301.6,2250.9,2200.2,2149.5,2098.8,2048.1,1997.4,1974.6,1951.8,1928.9,1906.1,1883.3,1860.5,1837.6,1814.8,1792.0,1769.2,1746.4,1723.5,1700.7,1677.9,1655.1
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,2656.6,2631.1,2605.7,2580.2,2554.7,2529.3,2503.8,2478.3,2452.9,2427.4,2401.9,2376.5,2351.0,2325.5,2300.1,2274.6,2249.1,2223.7,2198.2,2172.7,2147.3,2121.8,2096.3,2070.9,2045.4,2019.9,1994.5,1969.0,1943.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2977.8,2915.9,2854,2792,2730.1,2668.1,2606.2,2544.2,2482.3,2420.3,2358.4,2296.4,2234.5,2172.5,2146.3,2120.0,2093.7,2067.4,2041.1,2014.8,1988.5,1962.2,1935.9,1909.6,1883.3,1857.1,1830.8,1804.5,1778.2
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2977.8,2932.6,2887.3,2842.1,2796.8,2751.5,2706.3,2661,2615.8,2570.5,2525.2,2480.0,2434.7,2389.5,2362.0,2334.6,2307.2,2279.7,2252.3,2224.9,2197.4,2170.0,2142.6,2115.1,2087.7,2060.3,2032.9,2005.4,1978.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2977.8,2949.3,2920.7,2892.1,2863.6,2835,2806.4,2777.8,2749.3,2720.7,2692.1,2663.5,2635.0,2606.4,2577.8,2549.2,2520.7,2492.1,2463.5,2435.0,2406.4,2377.8,2349.2,2320.7,2292.1,2263.5,2234.9,2206.4,2177.8
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,2969,2907,2845,2783,2721,2659,2597,2535,2474,2412.0,2350.0,2288.0,2226.0,2164.0,2138.0,2112.0,2086.0,2059.0,2033.0,2007.0,1981.0,1955.0,1928.0,1902.0,1876.0,1850.0,1824.0,1797.0,1771.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,2969,2924,2878,2833,2788,2743,2698,2652,2607,2562.0,2517.0,2472.0,2426.0,2381.0,2354.0,2327.0,2299.0,2272.0,2245.0,2217.0,2190.0,2163.0,2135.0,2108.0,2081.0,2053.0,2026.0,1999.0,1971.0
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,2969,2940,2912,2883,2855,2826,2798,2769,2741,2712.0,2684.0,2655.0,2627.0,2598.0,2570.0,2541.0,2513.0,2485.0,2456.0,2428.0,2399.0,2371.0,2342.0,2314.0,2285.0,2257.0,2228.0,2200.0,2171.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,2697.2,2619.3,2541.3,2463.4,2385.5,2307.6,2229.7,2151.7,2073.8,1995.9,1918.0,1840.1,1762.2,1684.2,1663.9,1643.5,1623.2,1602.8,1582.5,1562.1,1541.7,1521.4,1501.0,1480.7,1460.3,1440.0,1419.6,1399.2,1378.9
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,2697.2,2645.3,2593.4,2541.5,2489.6,2437.7,2385.8,2334,2282.1,2230.2,2178.3,2126.4,2074.5,2022.6,1999.5,1976.4,1953.3,1930.2,1907.1,1884.0,1860.9,1837.8,1814.7,1791.6,1768.5,1745.4,1722.3,1699.1,1676.0
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,2697.2,2671.3,2645.5,2619.6,2593.7,2567.9,2542,2516.2,2490.3,2464.5,2438.6,2412.8,2386.9,2361.0,2335.2,2309.3,2283.5,2257.6,2231.8,2205.9,2180.0,2154.2,2128.3,2102.5,2076.6,2050.8,2024.9,1999.1,1973.2
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,2524.1,2458.4,2392.6,2326.9,2261.1,2195.3,2129.6,2063.8,1998.1,1932.3,1866.5,1800.8,1735.0,1669.3,1649.1,1628.9,1608.7,1588.6,1568.4,1548.2,1528.0,1507.9,1487.7,1467.5,1447.3,1427.1,1407.0,1386.8,1366.6
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,2524.1,2479.2,2434.2,2389.2,2344.2,2299.2,2254.3,2209.3,2164.3,2119.3,2074.3,2029.3,1984.4,1939.4,1917.2,1895.0,1872.8,1850.6,1828.4,1806.2,1784.1,1761.9,1739.7,1717.5,1695.3,1673.1,1650.9,1628.7,1606.5
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,2524.1,2499.9,2475.7,2451.5,2427.3,2403.1,2378.9,2354.7,2330.5,2306.3,2282.1,2257.9,2233.7,2209.5,2185.3,2161.1,2136.9,2112.7,2088.5,2064.3,2040.1,2015.9,1991.7,1967.5,1943.3,1919.1,1894.9,1870.7,1846.5
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3020.1,2956.5,2892.9,2829.3,2765.7,2702.1,2638.5,2574.9,2511.3,2447.6,2384.0,2320.4,2256.8,2193.2,2166.7,2140.1,2113.6,2087.1,2060.5,2034.0,2007.4,1980.9,1954.3,1927.8,1901.3,1874.7,1848.2,1821.6,1795.1
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3020.1,2973.8,2927.5,2881.2,2834.9,2788.6,2742.3,2696.1,2649.8,2603.5,2557.2,2510.9,2464.6,2418.3,2390.5,2362.8,2335.0,2307.3,2279.5,2251.7,2224.0,2196.2,2168.5,2140.7,2112.9,2085.2,2057.4,2029.7,2001.9
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3020.1,2991.1,2962.1,2933.2,2904.2,2875.2,2846.2,2817.3,2788.3,2759.3,2730.3,2701.3,2672.4,2643.4,2614.4,2585.4,2556.4,2527.5,2498.5,2469.5,2440.5,2411.5,2382.6,2353.6,2324.6,2295.6,2266.6,2237.7,2208.7
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,3011,2947,2884,2820,2757,2693,2630,2566,2503,2439.0,2375.0,2312.0,2248.0,2185.0,2158.0,2132.0,2105.0,2079.0,2053.0,2026.0,2000.0,1973.0,1947.0,1920.0,1894.0,1868.0,1841.0,1815.0,1788.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,3011,2965,2919,2872,2826,2780,2734,2687,2641,2595.0,2549.0,2503.0,2456.0,2410.0,2382.0,2355.0,2327.0,2299.0,2272.0,2244.0,2216.0,2189.0,2161.0,2133.0,2106.0,2078.0,2050.0,2023.0,1995.0
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,3011,2982,2953,2924,2895,2867,2838,2809,2780,2751.0,2722.0,2693.0,2664.0,2635.0,2607.0,2578.0,2549.0,2520.0,2491.0,2462.0,2433.0,2404.0,2375.0,2346.0,2318.0,2289.0,2260.0,2231.0,2202.0
diff --git a/tests/data/Natural_Gas_FE/R&D/TechLife/df_vom.csv b/tests/data/Natural_Gas_FE/R&D/TechLife/df_vom.csv
index eed519d..953bc21 100644
--- a/tests/data/Natural_Gas_FE/R&D/TechLife/df_vom.csv
+++ b/tests/data/Natural_Gas_FE/R&D/TechLife/df_vom.csv
@@ -8,8 +8,8 @@ NG 2-on-1 Combined Cycle (F-Frame)/Conservative,2.17,2.16,2.15,2.14,2.13,2.12,2.
 NG 2-on-1 Combined Cycle (H-Frame)/Advanced,2.16,2.14,2.12,2.1,2.08,2.06,2.04,2.02,2,1.97,1.95,1.93,1.91,1.89,1.88,1.87,1.85,1.84,1.83,1.82,1.8,1.79,1.78,1.76,1.75,1.74,1.73,1.71,1.7
 NG 2-on-1 Combined Cycle (H-Frame)/Moderate,2.16,2.15,2.13,2.12,2.1,2.08,2.07,2.05,2.04,2.02,2.01,1.99,1.97,1.96,1.95,1.93,1.92,1.91,1.9,1.89,1.88,1.86,1.85,1.84,1.83,1.82,1.81,1.79,1.78
 NG 2-on-1 Combined Cycle (H-Frame)/Conservative,2.16,2.15,2.14,2.13,2.12,2.11,2.1,2.09,2.08,2.07,2.06,2.05,2.04,2.02,2.01,2.0,1.99,1.98,1.97,1.96,1.95,1.94,1.93,1.92,1.91,1.89,1.88,1.87,1.86
-NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.49,2.47,2.46,2.44,2.42,2.41,2.39,2.38,2.36,2.35,2.33,2.31,2.3,2.28,2.27,2.25,2.24,2.22,2.2,2.19,2.17,2.16,2.14,2.13,2.11,2.09
-NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.51,2.49,2.48,2.46,2.45,2.43,2.42,2.41,2.39,2.38,2.36,2.35,2.34,2.32,2.31,2.29,2.28,2.27,2.25,2.24,2.22,2.21,2.19,2.18,2.17,2.15,2.14
+NG 1-on-1 Combined Cycle (H-Frame)/Advanced,2.53,2.52,2.5,2.48,2.47,2.45,2.44,2.42,2.4,2.39,2.37,2.35,2.34,2.32,2.3,2.29,2.27,2.26,2.24,2.23,2.21,2.2,2.18,2.16,2.15,2.13,2.12,2.1,2.09
+NG 1-on-1 Combined Cycle (H-Frame)/Moderate,2.53,2.52,2.5,2.49,2.48,2.46,2.45,2.43,2.42,2.4,2.39,2.37,2.36,2.35,2.33,2.32,2.3,2.29,2.27,2.26,2.25,2.23,2.22,2.2,2.19,2.18,2.16,2.15,2.13
 NG 1-on-1 Combined Cycle (H-Frame)/Conservative,2.53,2.52,2.51,2.5,2.48,2.47,2.46,2.45,2.43,2.42,2.41,2.4,2.38,2.37,2.36,2.34,2.33,2.32,2.31,2.29,2.28,2.27,2.26,2.24,2.23,2.22,2.21,2.19,2.18
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Advanced,5.11,4.99,4.87,4.74,4.62,4.49,4.37,4.24,4.12,3.99,3.87,3.75,3.62,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Moderate,5.11,5.04,4.96,4.88,4.8,4.72,4.64,4.57,4.49,4.41,4.33,4.25,4.17,4.1,4.07,4.04,4.01,3.98,3.95,3.92,3.89,3.86,3.84,3.81,3.78,3.75,3.72,3.69,3.66
@@ -17,8 +17,8 @@ NG 2-on-1 Combined Cycle (F-Frame) 95% CCS/Conservative,5.11,5.08,5.05,5.02,4.99
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.71,4.61,4.51,4.41,4.31,4.21,4.11,4.01,3.97,3.94,3.91,3.87,3.84,3.81,3.77,3.74,3.71,3.67,3.64,3.61,3.57,3.54,3.51
-NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.9,4.83,4.76,4.69,4.62,4.56,4.49,4.42,4.39,4.35,4.32,4.28,4.25,4.21,4.18,4.14,4.11,4.07,4.04,4.0,3.97,3.93,3.9
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Advanced,5.3,5.2,5.1,5,4.9,4.8,4.7,4.6,4.5,4.4,4.3,4.2,4.1,4.0,3.96,3.93,3.9,3.86,3.83,3.8,3.76,3.73,3.7,3.67,3.63,3.6,3.57,3.53,3.5
+NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Moderate,5.3,5.23,5.17,5.1,5.03,4.96,4.89,4.82,4.76,4.69,4.62,4.55,4.48,4.41,4.38,4.34,4.31,4.28,4.24,4.21,4.17,4.14,4.1,4.07,4.03,4.0,3.96,3.93,3.89
 NG 1-on-1 Combined Cycle (H-Frame) 95% CCS/Conservative,5.3,5.27,5.23,5.19,5.16,5.12,5.09,5.05,5.01,4.98,4.94,4.9,4.87,4.83,4.8,4.76,4.72,4.69,4.65,4.61,4.58,4.54,4.51,4.47,4.43,4.4,4.36,4.32,4.29
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Advanced,5.21,5.08,4.95,4.82,4.7,4.57,4.44,4.31,4.18,4.05,3.93,3.8,3.67,3.54,3.52,3.49,3.46,3.44,3.41,3.39,3.36,3.34,3.31,3.28,3.26,3.23,3.21,3.18,3.16
 NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Moderate,5.21,5.13,5.05,4.97,4.89,4.81,4.72,4.64,4.56,4.48,4.4,4.32,4.24,4.16,4.13,4.1,4.07,4.04,4.02,3.99,3.96,3.93,3.9,3.87,3.84,3.81,3.78,3.75,3.72
@@ -26,6 +26,6 @@ NG 2-on-1 Combined Cycle (F-Frame) 97% CCS/Conservative,5.21,5.17,5.14,5.11,5.08
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,4.86,4.76,4.65,4.55,4.44,4.34,4.23,4.13,4.02,3.92,3.81,3.71,3.6,3.5,3.47,3.45,3.42,3.39,3.37,3.34,3.32,3.29,3.27,3.24,3.22,3.19,3.16,3.14,3.11
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,4.86,4.79,4.73,4.66,4.59,4.52,4.45,4.39,4.32,4.25,4.18,4.12,4.05,3.98,3.95,3.92,3.9,3.87,3.84,3.81,3.78,3.75,3.73,3.7,3.67,3.64,3.61,3.59,3.56
 NG 2-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,4.86,4.83,4.8,4.77,4.74,4.71,4.68,4.65,4.62,4.59,4.55,4.52,4.49,4.46,4.43,4.4,4.37,4.34,4.31,4.28,4.25,4.22,4.19,4.16,4.13,4.09,4.06,4.03,4.0
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.88,4.77,4.67,4.57,4.47,4.36,4.26,4.16,4.06,4.02,3.99,3.95,3.92,3.89,3.85,3.82,3.79,3.75,3.72,3.69,3.65,3.62,3.58,3.55
-NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.45,4.41,4.38,4.34,4.31,4.27,4.24,4.2,4.17,4.13,4.1,4.06,4.03,3.99,3.96
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Advanced,5.39,5.29,5.18,5.08,4.98,4.87,4.77,4.67,4.56,4.46,4.35,4.25,4.15,4.04,4.01,3.98,3.94,3.91,3.88,3.84,3.81,3.78,3.74,3.71,3.68,3.64,3.61,3.58,3.54
+NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Moderate,5.39,5.32,5.25,5.18,5.11,5.04,4.97,4.9,4.83,4.76,4.69,4.62,4.55,4.48,4.44,4.41,4.37,4.34,4.3,4.27,4.23,4.2,4.16,4.13,4.09,4.06,4.02,3.99,3.95
 NG 1-on-1 Combined Cycle (H-Frame) 97% CCS/Conservative,5.39,5.35,5.32,5.28,5.24,5.21,5.17,5.13,5.1,5.06,5.02,4.99,4.95,4.91,4.88,4.84,4.8,4.77,4.73,4.69,4.66,4.62,4.58,4.55,4.51,4.47,4.43,4.4,4.36
diff --git a/tests/data/Nuclear/Market/20/df_lcoe.csv b/tests/data/Nuclear/Market/20/df_lcoe.csv
index 144f6ef..4ce1e6b 100644
--- a/tests/data/Nuclear/Market/20/df_lcoe.csv
+++ b/tests/data/Nuclear/Market/20/df_lcoe.csv
@@ -1,7 +1,7 @@
 tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Nuclear - Large/Advanced,73.95239049529036,71.7348549086626,69.51732489681409,67.2998006027322,65.0822821743367,62.86476976469376,61.09063644597413,59.31651183836507,57.54239668174315,55.768291802214726,53.99419812505495,53.107126192907614,52.2200573380399,51.33299175695019,50.44592966323003,49.55887128946486,48.51846716275504,48.086580580853244,47.654693168497424,47.222804864895714,46.790915603174454
-Nuclear - Large/Moderate,90.3130756224322,89.83564053337493,89.35820548040166,88.8807704644378,88.40333548644078,87.92590054740121,86.49359597446667,85.06129179133816,83.62898803112375,82.1966847307903,80.76438193174215,79.80951370027768,78.85464572737916,77.89977802955757,76.94491062475944,75.99004353252771,73.96454704747497,73.03487502552017,72.10520338103923,71.1755321416643,70.24586133779225
-Nuclear - Large/Conservative,126.57058291908872,126.57045234465929,126.57031955642137,126.57018449759279,126.570047109433,126.56990733115737,126.01665641449813,125.46338741989533,124.91009881190202,124.35678887612123,123.8034556923533,122.14468288088607,120.48590986182037,118.82713662190086,117.16836314671764,115.50958942058035,111.89614631669787,110.28113893526103,108.66613125080205,107.05112324113865,105.43611488186961
-Nuclear - Small/Advanced,73.743864269647,69.962718397291,66.18158289438301,62.40045802688895,58.619344069948944,54.83824130827615,53.577756314727175,52.31727687349899,51.05680345617695,49.796336589307884,48.535876862647186,48.11567786908754,47.69547872055736,47.27527940716123,46.855079918142614,46.43488024178866,45.50474738803161,45.09563427215366,44.68652093005678,44.277407345181,43.8682934993097
-Nuclear - Small/Moderate,101.07236395267836,98.45142096332154,95.8304841884816,93.20955378755453,90.58862992543466,87.96771277275343,85.78341844846126,83.59913129828966,81.41485193157128,79.23058102865413,77.04631935155764,75.73574684066948,74.42517775839315,73.11461232366132,71.80405077445116,70.49349336990231,68.58239651047818,67.73167621851137,66.8809556892279,66.03023490525544,65.17951384748375
-Nuclear - Small/Conservative,134.4207793191466,133.49995069261064,132.57912251141136,131.65829478697094,130.73746753110595,129.81664075604363,127.05416344450283,124.29169094383305,121.52922366264463,118.76676205717015,116.00430663840982,114.16267341031389,112.32104337336372,110.47941673132901,108.63779370570435,106.7961745376814,103.7264560587046,102.38160084955327,101.03674477394006,99.69188776843728,98.3470297632717
+Nuclear - Large/Advanced,73.95239049529036,71.7348549086626,69.51732489681409,67.2998006027322,65.0822821743367,62.86476976469376,61.09063644597413,59.31651183836507,57.54239668174315,55.768291802214726,53.99419812505495,53.107126192907614,52.2200573380399,51.33299175695019,50.44592966323003,49.55887128946486,49.11528152086176,48.671690966383224,48.22809956987097,47.784507269685534,47.340913998020454
+Nuclear - Large/Moderate,90.3130756224322,89.83564053337493,89.35820548040166,88.8807704644378,88.40333548644078,87.92590054740121,86.49359597446667,85.06129179133816,83.62898803112375,82.1966847307903,80.76438193174215,79.80951370027768,78.85464572737916,77.89977802955757,76.94491062475944,75.99004353252771,75.03517677418262,74.08031037302834,73.12544435458952,72.1705787468824,71.21571358072566
+Nuclear - Large/Conservative,126.57058291908872,126.57045234465929,126.57031955642137,126.57018449759279,126.570047109433,126.56990733115737,126.01665641449813,125.46338741989533,124.91009881190202,124.35678887612123,123.8034556923533,122.14468288088607,120.48590986182037,118.82713662190086,117.16836314671764,115.50958942058035,113.85081542637161,112.19204114538057,110.53326655711389,108.87449163907844,107.2157163665298
+Nuclear - Small/Advanced,73.743864269647,69.962718397291,66.18158289438301,62.40045802688895,58.619344069948944,54.83824130827615,53.577756314727175,52.31727687349899,51.05680345617695,49.796336589307884,48.535876862647186,48.11567786908754,47.69547872055736,47.27527940716123,46.855079918142614,46.43488024178866,46.014680365321276,45.59448027477309,45.174279954845964,44.75407938874874,44.33387855801015
+Nuclear - Small/Moderate,101.07236395267836,98.45142096332154,95.8304841884816,93.20955378755453,90.58862992543466,87.96771277275343,85.78341844846126,83.59913129828966,81.41485193157128,79.23058102865413,77.04631935155764,75.73574684066948,74.42517775839315,73.11461232366132,71.80405077445116,70.49349336990231,69.61971869899253,68.74594380349208,67.87216866735183,66.99839327295638,66.12461760092756
+Nuclear - Small/Conservative,134.4207793191466,133.49995069261064,132.57912251141136,131.65829478697094,130.73746753110595,129.81664075604363,127.05416344450283,124.29169094383305,121.52922366264463,118.76676205717015,116.00430663840982,114.16267341031389,112.32104337336372,110.47941673132901,108.63779370570435,106.7961745376814,105.41487457593752,104.03357379422714,102.65227213395586,101.27096953081055,99.88966591404308
diff --git a/tests/data/Nuclear/Market/20/df_tc.csv b/tests/data/Nuclear/Market/20/df_tc.csv
index b03b729..0e6f2f1 100644
--- a/tests/data/Nuclear/Market/20/df_tc.csv
+++ b/tests/data/Nuclear/Market/20/df_tc.csv
@@ -1,31 +1,31 @@
 Tax Credit,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-10 year CRF/Advanced,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13174051733638875,0.13174012078732802,0.13173970534617493,0.13173926962992083,0.13173881211718894
-10 year CRF/Moderate,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13174051733638875,0.13174012078732802,0.13173970534617493,0.13173926962992083,0.13173881211718894
-10 year CRF/Conservative,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13174051733638875,0.13174012078732802,0.13173970534617493,0.13173926962992083,0.13173881211718894
+10 year CRF/Advanced,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13360217892255735,0.133601779666457,0.13360136138928855,0.1336009226986017,0.13360046206263168
+10 year CRF/Moderate,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13360217892255735,0.133601779666457,0.13360136138928855,0.1336009226986017,0.13360046206263168
+10 year CRF/Conservative,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13360217892255735,0.133601779666457,0.13360136138928855,0.1336009226986017,0.13360046206263168
 ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
 PTC/Advanced,0,0,0,0,0,0,0,0,0,0.0,0,0,0,0,0,0,0,0,0,0,0
 PTC/Moderate,0,0,0,0,0,0,0,0,0,0.0,0,0,0,0,0,0,0,0,0,0,0
 PTC/Conservative,0,0,0,0,0,0,0,0,0,0.0,0,0,0,0,0,0,0,0,0,0,0
-PVD/Advanced,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8115657741814299,0.8115670445585186,0.8115683754635129,0.8115697713278152,0.8115712370262282
-PVD/Moderate,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8115657741814299,0.8115670445585186,0.8115683754635129,0.8115697713278152,0.8115712370262282
-PVD/Conservative,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8115657741814299,0.8115670445585186,0.8115683754635129,0.8115697713278152,0.8115712370262282
-PFF/Advanced,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7035247961096678,0.7035244218222974,0.7035240297017727,0.7035236184424829,0.7035231866081797
-PFF/Moderate,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7035247961096678,0.7035244218222974,0.7035240297017727,0.7035236184424829,0.7035231866081797
-PFF/Conservative,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7035247961096678,0.7035244218222974,0.7035240297017727,0.7035236184424829,0.7035231866081797
+PVD/Advanced,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8056582324022871,0.8056594873815994,0.8056608021551659,0.8056621811006747,0.8056636290338419
+PVD/Moderate,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8056582324022871,0.8056594873815994,0.8056608021551659,0.8056621811006747,0.8056636290338419
+PVD/Conservative,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8056582324022871,0.8056594873815994,0.8056608021551659,0.8056621811006747,0.8056636290338419
+PFF/Advanced,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7052653173280831,0.7052649475773131,0.7052645602095423,0.7052641539349856,0.7052637273348032
+PFF/Moderate,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7052653173280831,0.7052649475773131,0.7052645602095423,0.7052641539349856,0.7052637273348032
+PFF/Conservative,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7052653173280831,0.7052649475773131,0.7052645602095423,0.7052641539349856,0.7052637273348032
 Year/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039.0,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-1/nan,0.9234591932680972,0.9234593380607743,0.9234594853084832,0.923459635074197,0.9234597874230616,0.9234599424224892,0.9234604240344024,0.9234609321678058,0.9234614690754618,0.9234620372727042,0.9234626395768389,0.9234630616086975,0.9234635012333081,0.9234639595741392,0.9234644378524004,0.923464937397906,0.9260297642576188,0.9260303138646013,0.92603088965711,0.9260314935521909,0.9260321276587011
-2/nan,0.8527768816313649,0.8527771490516435,0.8527774210062087,0.8527776976113692,0.852777978987446,0.8527782652589471,0.8527791547577983,0.8527800932402327,0.85278108486701,0.8527821342838532,0.8527832466942229,0.8527840261557091,0.85278483811008,0.8527856846323473,0.8527865679780499,0.8527874906033184,0.8575311242910211,0.857532142196172,0.8575332085991386,0.8575343270505015,0.8575355014561009
-3/nan,0.7875046511489838,0.787505021576585,0.7875053982850893,0.7875057814356089,0.787506171194815,0.7875065677351776,0.7875077998603356,0.7875090998377736,0.7875104734310551,0.7875119270755319,0.7875134679791537,0.7875145476847428,0.7875156723998142,0.7875168449987304,0.7875180686059277,0.7875193466237108,0.7940993448707852,0.7941007587869051,0.7941022400695764,0.7941037936508489,0.7941054249562642
-4/nan,0.727228409844915,0.7272288659446489,0.7272293297780006,0.7272298015433478,0.7272302814459131,0.727230769698059,0.7272322867894248,0.7272338874268199,0.7272355787069544,0.7272373685537237,0.7272392658423398,0.7272405952663412,0.7272419801104353,0.7272434239138613,0.7272449305237811,0.7272465041295049,0.7353596291278226,0.7353613748995558,0.7353632038503338,0.7353651220699564,0.7353671362575666
-5/nan,0.6715657606770263,0.6715662871639331,0.6715668225780256,0.6715673671483007,0.6715679211116561,0.6715684847132322,0.6715702359300704,0.6715720835871882,0.6715740358766678,0.6715761019454621,0.6715782920386895,0.6715798266307871,0.6715814251966264,0.6715830918217486,0.6715848309471515,0.6715866474087993,0.6809649040058074,0.6809669248021404,0.6809690418826274,0.680971262296631,0.6809735937988803
-6/nan,0.6201635755812828,0.6201641590083375,0.620164752328157,0.620165355794509,0.6201659696699173,0.6201665942260397,0.6201685348408664,0.6201705823273004,0.6201727457636045,0.6201750352862176,0.6201774622485535,0.620179162815105,0.6201809342753315,0.6201827811567545,0.6201847083808106,0.6201867213066363,0.63059376952421,0.6305960151059384,0.6305983676835192,0.63060083509067,0.6306034259449693
-7/nan,0.57269575520055,0.5726963837668562,0.5726970229914229,0.5726976731476568,0.5726983345183987,0.5726990073963297,0.5727010981569405,0.5727033040590198,0.572705634883421,0.5727081015510816,0.5727107162941146,0.5727125484391558,0.5727144569640418,0.5727164467467183,0.5727185230895402,0.5727206917664456,0.5839485997348275,0.583951025790319,0.5839535674422907,0.583956233154272,0.583959032236686
-8/nan,0.5288611600855636,0.5288618234631401,0.5288624980893599,0.528863184252777,0.5288638822519018,0.5288645923956313,0.5288667989489763,0.5288691270219247,0.528871586937239,0.5288741902209446,0.5288769497829053,0.5288788834033422,0.5288808976349468,0.5288829976259561,0.5288851889725392,0.528887477768586,0.5407537841510087,0.5407563516941649,0.5407590415770277,0.5407618627569619,0.5407648250876544
-9/nan,0.4883817002434445,0.4883823894208855,0.488383090284559,0.4883838031342473,0.4883845282800764,0.4883852660429629,0.4883875584151386,0.48838997703444015,0.4883925326253335,0.48839523716238514,0.4883981040578691,0.4884001128878398,0.4884022054653828,0.48840438713910556,0.4884066637229866,0.48840904154810366,0.5007540992587739,0.5007567740836243,0.5007595763617011,0.5007625154248944,0.5007656015389059
-10/nan,0.451000570913713,0.4510012780551502,0.45100199718754536,0.4510027286185005,0.4510034726662315,0.45100422966002657,0.45100658178717035,0.4510090634536374,0.45101168566367583,0.45101446070426165,0.45101740233760346,0.45101946353743805,0.4510216106691319,0.45102384922085914,0.4510261851583141,0.4510286249777908,0.46371320048763864,0.46371595267448384,0.46371883600254354,0.463721860073867,0.46372503545136246
-11/nan,0.41648062337942865,0.4164813416973722,0.41648207219590866,0.4164828151875076,0.4164835709954207,0.4164843399541473,0.4164867292594867,0.41648925015302507,0.41649191381317846,0.4164947327214074,0.4164977208577725,0.41649981464339486,0.4165019957204025,0.41650426966386406,0.4165066425339352,0.41650912092977926,0.429412225730714,0.4294150291991749,0.42941796625419487,0.4294210466770032,0.4294242812276317
-12/nan,0.3846028604777614,0.3846035841185185,0.3846043200302443,0.38460506852773,0.38460582993662884,0.38460660459392526,0.384609011606667,0.38461155118418294,0.3846142345879684,0.3846170743922613,0.384620084681056,0.38462219399004444,0.38462439123862324,0.38462668204332695,0.3846290725093912,0.3846315692850754,0.3976485021627524,0.39765133426748883,0.3976543013251189,0.39765741321705034,0.39766068081353234
-13/nan,0.35516504726539605,0.35516577120588844,0.35516650742254857,0.3551672562303041,0.3551680179549494,0.35516879293361525,0.35517120094574506,0.35517374157905124,0.3551764260999395,0.3551792670881448,0.35518227863383534,0.3551843888247009,0.35518658699294875,0.35518887875759414,0.3551912702265751,0.3551937680511005,0.36823434871516886,0.3682371898804002,0.36824016643207647,0.3682432882834859,0.3682465663399629
-14/nan,0.32798042802472827,0.3279811479796342,0.3279818801432383,0.32798262482874047,0.3279833823601477,0.32798415307274137,0.3279865478301657,0.32798907448011805,0.3279917442272223,0.3279945695822441,0.32799756455811785,0.32799966313967227,0.3280018492156173,0.3280041283741867,0.3280065066898642,0.3280089907774359,0.34099596713226565,0.3409988005215658,0.341001768928578,0.3410048822397265,0.3410081513308069
-15/nan,0.30287654147144083,0.3028772538096858,0.30287797822758344,0.30287871503502595,0.30287946455259873,0.3028802271120426,0.3028825965368246,0.3028850964602657,0.30288773796869384,0.3028905334408028,0.3028934967416142,0.30289557312958326,0.3028977360876536,0.30289999114509064,0.3029023443122851,0.30290480213423515,0.31577241505629067,0.31577522627443816,0.3157781714555793,0.315781260409043,0.31578450392582746
-16/nan,0.2796941266470481,0.27969482831675757,0.2796955418853182,0.2796962676579868,0.2796970059505535,0.2796977570897973,0.27970009103053683,0.2797025535169327,0.2797051554695135,0.2797079090818599,0.27971082801166974,0.2797128733099661,0.27971500388314713,0.27971722517781716,0.2797195431145186,0.27972196414041656,0.2924146550736358,0.2924174318975834,0.2924203410473056,0.29242339221237934,0.2924265960520815
+1/nan,0.9234591932680972,0.9234593380607743,0.9234594853084832,0.923459635074197,0.9234597874230616,0.9234599424224892,0.9234604240344024,0.9234609321678058,0.9234614690754618,0.9234620372727042,0.9234626395768389,0.9234630616086975,0.9234635012333081,0.9234639595741392,0.9234644378524004,0.923464937397906,0.923465459661423,0.9234660062287436,0.9234665788367664,0.9234671793919347,0.9234678099914423
+2/nan,0.8527768816313649,0.8527771490516435,0.8527774210062087,0.8527776976113692,0.852777978987446,0.8527782652589471,0.8527791547577983,0.8527800932402327,0.85278108486701,0.8527821342838532,0.8527832466942229,0.8527840261557091,0.85278483811008,0.8527856846323473,0.8527865679780499,0.8527874906033184,0.8527884551876833,0.8527894646600661,0.8527905222284817,0.8527916314140956,0.8527927960903905
+3/nan,0.7875046511489838,0.787505021576585,0.7875053982850893,0.7875057814356089,0.787506171194815,0.7875065677351776,0.7875077998603356,0.7875090998377736,0.7875104734310551,0.7875119270755319,0.7875134679791537,0.7875145476847428,0.7875156723998142,0.7875168449987304,0.7875180686059277,0.7875193466237108,0.7875206827638488,0.7875220810835796,0.7875235460267554,0.7875250824710212,0.7875266957820715
+4/nan,0.727228409844915,0.7272288659446489,0.7272293297780006,0.7272298015433478,0.7272302814459131,0.727230769698059,0.7272322867894248,0.7272338874268199,0.7272355787069544,0.7272373685537237,0.7272392658423398,0.7272405952663412,0.7272419801104353,0.7272434239138613,0.7272449305237811,0.7272465041295049,0.7272481493013954,0.7272498710352021,0.7272516748027267,0.7272535666099148,0.7272555530636663
+5/nan,0.6715657606770263,0.6715662871639331,0.6715668225780256,0.6715673671483007,0.6715679211116561,0.6715684847132322,0.6715702359300704,0.6715720835871882,0.6715740358766678,0.6715761019454621,0.6715782920386895,0.6715798266307871,0.6715814251966264,0.6715830918217486,0.6715848309471515,0.6715866474087993,0.6715885464825323,0.6715905339352469,0.6715926160833825,0.6715947998599824,0.671597092891819
+6/nan,0.6201635755812828,0.6201641590083375,0.620164752328157,0.620165355794509,0.6201659696699173,0.6201665942260397,0.6201685348408664,0.6201705823273004,0.6201727457636045,0.6201750352862176,0.6201774622485535,0.620179162815105,0.6201809342753315,0.6201827811567545,0.6201847083808106,0.6201867213066363,0.6201888257808387,0.6201910281942121,0.6201933355465552,0.6201957555209889,0.6201982965694274
+7/nan,0.57269575520055,0.5726963837668562,0.5726970229914229,0.5726976731476568,0.5726983345183987,0.5726990073963297,0.5727010981569405,0.5727033040590198,0.572705634883421,0.5727081015510816,0.5727107162941146,0.5727125484391558,0.5727144569640418,0.5727164467467183,0.5727185230895402,0.5727206917664456,0.5727229590765804,0.5727253319054072,0.5727278177945402,0.5727304250218175,0.5727331626933921
+8/nan,0.5288611600855636,0.5288618234631401,0.5288624980893599,0.528863184252777,0.5288638822519018,0.5288645923956313,0.5288667989489763,0.5288691270219247,0.528871586937239,0.5288741902209446,0.5288769497829053,0.5288788834033422,0.5288808976349468,0.5288829976259561,0.5288851889725392,0.528887477768586,0.5288898706623046,0.5288923749207182,0.5288949985033709,0.5288977501468417,0.5289006394619392
+9/nan,0.4883817002434445,0.4883823894208855,0.488383090284559,0.4883838031342473,0.4883845282800764,0.4883852660429629,0.4883875584151386,0.48838997703444015,0.4883925326253335,0.48839523716238514,0.4883981040578691,0.4884001128878398,0.4884022054653828,0.48840438713910556,0.4884066637229866,0.48840904154810366,0.48841152752143574,0.48841412919287086,0.48841685483178454,0.4884197135148441,0.4884227152269904
+10/nan,0.451000570913713,0.4510012780551502,0.45100199718754536,0.4510027286185005,0.4510034726662315,0.45100422966002657,0.45100658178717035,0.4510090634536374,0.45101168566367583,0.45101446070426165,0.45101740233760346,0.45101946353743805,0.4510216106691319,0.45102384922085914,0.4510261851583141,0.4510286249777908,0.4510311757665204,0.4510338452714302,0.45103664197772175,0.4510395751989699,0.4510426551807426
+11/nan,0.41648062337942865,0.4164813416973722,0.41648207219590866,0.4164828151875076,0.4164835709954207,0.4164843399541473,0.4164867292594867,0.41648925015302507,0.41649191381317846,0.4164947327214074,0.4164977208577725,0.41649981464339486,0.4165019957204025,0.41650426966386406,0.4165066425339352,0.41650912092977926,0.41651171205086185,0.41651442376680076,0.4165172646971902,0.4165202443031291,0.41652337299248565
+12/nan,0.3846028604777614,0.3846035841185185,0.3846043200302443,0.38460506852773,0.38460582993662884,0.38460660459392526,0.384609011606667,0.38461155118418294,0.3846142345879684,0.3846170743922613,0.384620084681056,0.38462219399004444,0.38462439123862324,0.38462668204332695,0.3846290725093912,0.3846315692850754,0.38463417962341545,0.38463691145259404,0.3846397734563621,0.38464277516625023,0.3846459270676194
+13/nan,0.35516504726539605,0.35516577120588844,0.35516650742254857,0.3551672562303041,0.3551680179549494,0.35516879293361525,0.35517120094574506,0.35517374157905124,0.3551764260999395,0.3551792670881448,0.35518227863383534,0.3551843888247009,0.35518658699294875,0.35518887875759414,0.3551912702265751,0.3551937680511005,0.3551963794874317,0.3551991124672859,0.35520197567829553,0.3552049786562632,0.35520813189126244
+14/nan,0.32798042802472827,0.3279811479796342,0.3279818801432383,0.32798262482874047,0.3279833823601477,0.32798415307274137,0.3279865478301657,0.32798907448011805,0.3279917442272223,0.3279945695822441,0.32799756455811785,0.32799966313967227,0.3280018492156173,0.3280041283741867,0.3280065066898642,0.3280089907774359,0.32801158785343437,0.3280143058061589,0.3280171532756959,0.32802013974567173,0.32802327564877554
+15/nan,0.30287654147144083,0.3028772538096858,0.30287797822758344,0.30287871503502595,0.30287946455259873,0.3028802271120426,0.3028825965368246,0.3028850964602657,0.30288773796869384,0.3028905334408028,0.3028934967416142,0.30289557312958326,0.3028977360876536,0.30289999114509064,0.3029023443122851,0.30290480213423515,0.302907371751345,0.3029100609687074,0.3029128783352822,0.30291583323468374,0.30291893598959396
+16/nan,0.2796941266470481,0.27969482831675757,0.2796955418853182,0.2796962676579868,0.2796970059505535,0.2796977570897973,0.27970009103053683,0.2797025535169327,0.2797051554695135,0.2797079090818599,0.27971082801166974,0.2797128733099661,0.27971500388314713,0.27971722517781716,0.2797195431145186,0.27972196414041656,0.27972449528918936,0.27972714424927747,0.2797299194418807,0.279732830110391,0.27973588642324815
diff --git a/tests/data/Nuclear/Market/30/df_lcoe.csv b/tests/data/Nuclear/Market/30/df_lcoe.csv
index 17bcd2a..4407ffa 100644
--- a/tests/data/Nuclear/Market/30/df_lcoe.csv
+++ b/tests/data/Nuclear/Market/30/df_lcoe.csv
@@ -1,7 +1,7 @@
 tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Nuclear - Large/Advanced,65.67431962023488,63.8436049567752,62.01289626282983,60.18219369150938,58.351497401205926,56.52080755582234,55.05612355189225,53.59144887595021,52.126784320259496,50.66213076941759,49.19748921421124,48.465141566425885,47.73279721385078,47.000456366897865,46.26811925428236,45.535786125057996,44.53133214101715,44.17761624342335,43.82389945906531,43.47018172302998,43.11646296391032
-Nuclear - Large/Moderate,80.57030428642341,80.17613484883445,79.78196544989758,79.38779609060406,78.99362677197944,78.59945749508488,77.41694992596354,76.23444277438995,75.05193607582814,73.86942986987532,72.68692420088202,71.89858741089135,71.11025089786719,70.32191467949526,69.5335787749991,68.74524320531205,66.8119958048884,66.05060403741172,65.28921267319355,64.52782174175314,63.76643127556321
-Nuclear - Large/Conservative,111.42993781358625,111.42979799377491,111.42965580342617,111.42951118173842,111.42936406581308,111.4292143905628,110.97237045291615,110.51550715756665,110.05862286038737,109.60171572563694,109.14478369720699,107.77530120778327,106.40581849623312,105.03633554837363,103.66685234878673,102.29736888068425,98.83759710918066,97.51491776332375,96.19223809414305,94.86955807797041,93.54687768877025
-Nuclear - Small/Advanced,65.53563335319214,62.414072855742674,59.29252346196419,56.17098545665212,53.04945913442559,49.9279448001544,48.887314302852374,47.84668975107206,46.806071649790354,45.76546056283662,44.7248571217237,44.37794031743789,44.03102334725368,43.68410620057802,43.33718886589602,42.99027133066901,42.098040419820336,41.7629789607246,41.427917260119855,41.09285530032709,40.75779306189874
-Nuclear - Small/Moderate,88.72817818625988,86.56442000373194,84.40066847575825,82.23692377301981,80.07318607208519,77.90945555566614,76.1061361679222,74.30282446240791,72.49952109160571,70.69622678404157,68.89294235569545,67.81095509640556,66.72897150857182,65.64699182663107,64.56501630541307,63.4830452224084,61.652362789822064,60.95562862757758,60.258894212047224,59.562159524689854,58.86542454510963
-Nuclear - Small/Conservative,118.1992068262178,117.43897802096613,116.67874969260525,115.91852185336658,115.15829451590368,114.39806769331021,112.11739045270275,109.8367183638295,107.55605186424786,105.27539144251031,102.99473764581639,101.47430576249747,99.95387729641223,98.43345246576457,96.91303150773896,95.39261468061177,92.44664599722103,91.34521611459388,90.24378530690362,89.14235350643354,88.0409206386927
+Nuclear - Large/Advanced,65.67431962023488,63.8436049567752,62.01289626282983,60.18219369150938,58.351497401205926,56.52080755582234,55.05612355189225,53.59144887595021,52.126784320259496,50.66213076941759,49.19748921421124,48.465141566425885,47.73279721385078,47.000456366897865,46.26811925428236,45.535786125057996,45.16955468962843,44.80332241275628,44.43708923431328,44.07085508830244,43.70461990212397
+Nuclear - Large/Moderate,80.57030428642341,80.17613484883445,79.78196544989758,79.38779609060406,78.99362677197944,78.59945749508488,77.41694992596354,76.23444277438995,75.05193607582814,73.86942986987532,72.68692420088202,71.89858741089135,71.11025089786719,70.32191467949526,69.5335787749991,68.74524320531205,67.95690799327137,67.16857316383914,66.38023874435613,65.59190476483177,64.8035712582773
+Nuclear - Large/Conservative,111.42993781358625,111.42979799377491,111.42965580342617,111.42951118173842,111.42936406581308,111.4292143905628,110.97237045291615,110.51550715756665,110.05862286038737,109.60171572563694,109.14478369720699,107.77530120778327,106.40581849623312,105.03633554837363,103.66685234878673,102.29736888068425,100.92788512575117,99.55840106396747,98.18891667340611,96.8194319300002,95.44994680727427
+Nuclear - Small/Advanced,65.53563335319214,62.414072855742674,59.29252346196419,56.17098545665212,53.04945913442559,49.9279448001544,48.887314302852374,47.84668975107206,46.806071649790354,45.76546056283662,44.7248571217237,44.37794031743789,44.03102334725368,43.68410620057802,43.33718886589602,42.99027133066901,42.643353581218086,42.29643560259112,41.94951737841153,41.602598890704414,41.255680119696336
+Nuclear - Small/Moderate,88.72817818625988,86.56442000373194,84.40066847575825,82.23692377301981,80.07318607208519,77.90945555566614,76.1061361679222,74.30282446240791,72.49952109160571,70.69622678404157,68.89294235569545,67.81095509640556,66.72897150857182,65.64699182663107,64.56501630541307,63.4830452224084,62.761656495464216,62.04026752815359,61.318878303300345,60.59748880205197,59.87609900366944
+Nuclear - Small/Conservative,118.1992068262178,117.43897802096613,116.67874969260525,115.91852185336658,115.15829451590368,114.39806769331021,112.11739045270275,109.8367183638295,107.55605186424786,105.27539144251031,102.99473764581639,101.47430576249747,99.95387729641223,98.43345246576457,96.91303150773896,95.39261468061177,94.25221041529115,93.11180527215478,91.9713991884753,90.83099209540313,89.69058391719996
diff --git a/tests/data/Nuclear/Market/30/df_tc.csv b/tests/data/Nuclear/Market/30/df_tc.csv
index b03b729..0e6f2f1 100644
--- a/tests/data/Nuclear/Market/30/df_tc.csv
+++ b/tests/data/Nuclear/Market/30/df_tc.csv
@@ -1,31 +1,31 @@
 Tax Credit,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-10 year CRF/Advanced,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13174051733638875,0.13174012078732802,0.13173970534617493,0.13173926962992083,0.13173881211718894
-10 year CRF/Moderate,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13174051733638875,0.13174012078732802,0.13173970534617493,0.13173926962992083,0.13173881211718894
-10 year CRF/Conservative,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13174051733638875,0.13174012078732802,0.13173970534617493,0.13173926962992083,0.13173881211718894
+10 year CRF/Advanced,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13360217892255735,0.133601779666457,0.13360136138928855,0.1336009226986017,0.13360046206263168
+10 year CRF/Moderate,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13360217892255735,0.133601779666457,0.13360136138928855,0.1336009226986017,0.13360046206263168
+10 year CRF/Conservative,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13360217892255735,0.133601779666457,0.13360136138928855,0.1336009226986017,0.13360046206263168
 ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
 PTC/Advanced,0,0,0,0,0,0,0,0,0,0.0,0,0,0,0,0,0,0,0,0,0,0
 PTC/Moderate,0,0,0,0,0,0,0,0,0,0.0,0,0,0,0,0,0,0,0,0,0,0
 PTC/Conservative,0,0,0,0,0,0,0,0,0,0.0,0,0,0,0,0,0,0,0,0,0,0
-PVD/Advanced,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8115657741814299,0.8115670445585186,0.8115683754635129,0.8115697713278152,0.8115712370262282
-PVD/Moderate,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8115657741814299,0.8115670445585186,0.8115683754635129,0.8115697713278152,0.8115712370262282
-PVD/Conservative,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8115657741814299,0.8115670445585186,0.8115683754635129,0.8115697713278152,0.8115712370262282
-PFF/Advanced,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7035247961096678,0.7035244218222974,0.7035240297017727,0.7035236184424829,0.7035231866081797
-PFF/Moderate,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7035247961096678,0.7035244218222974,0.7035240297017727,0.7035236184424829,0.7035231866081797
-PFF/Conservative,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7035247961096678,0.7035244218222974,0.7035240297017727,0.7035236184424829,0.7035231866081797
+PVD/Advanced,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8056582324022871,0.8056594873815994,0.8056608021551659,0.8056621811006747,0.8056636290338419
+PVD/Moderate,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8056582324022871,0.8056594873815994,0.8056608021551659,0.8056621811006747,0.8056636290338419
+PVD/Conservative,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8056582324022871,0.8056594873815994,0.8056608021551659,0.8056621811006747,0.8056636290338419
+PFF/Advanced,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7052653173280831,0.7052649475773131,0.7052645602095423,0.7052641539349856,0.7052637273348032
+PFF/Moderate,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7052653173280831,0.7052649475773131,0.7052645602095423,0.7052641539349856,0.7052637273348032
+PFF/Conservative,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7052653173280831,0.7052649475773131,0.7052645602095423,0.7052641539349856,0.7052637273348032
 Year/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039.0,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-1/nan,0.9234591932680972,0.9234593380607743,0.9234594853084832,0.923459635074197,0.9234597874230616,0.9234599424224892,0.9234604240344024,0.9234609321678058,0.9234614690754618,0.9234620372727042,0.9234626395768389,0.9234630616086975,0.9234635012333081,0.9234639595741392,0.9234644378524004,0.923464937397906,0.9260297642576188,0.9260303138646013,0.92603088965711,0.9260314935521909,0.9260321276587011
-2/nan,0.8527768816313649,0.8527771490516435,0.8527774210062087,0.8527776976113692,0.852777978987446,0.8527782652589471,0.8527791547577983,0.8527800932402327,0.85278108486701,0.8527821342838532,0.8527832466942229,0.8527840261557091,0.85278483811008,0.8527856846323473,0.8527865679780499,0.8527874906033184,0.8575311242910211,0.857532142196172,0.8575332085991386,0.8575343270505015,0.8575355014561009
-3/nan,0.7875046511489838,0.787505021576585,0.7875053982850893,0.7875057814356089,0.787506171194815,0.7875065677351776,0.7875077998603356,0.7875090998377736,0.7875104734310551,0.7875119270755319,0.7875134679791537,0.7875145476847428,0.7875156723998142,0.7875168449987304,0.7875180686059277,0.7875193466237108,0.7940993448707852,0.7941007587869051,0.7941022400695764,0.7941037936508489,0.7941054249562642
-4/nan,0.727228409844915,0.7272288659446489,0.7272293297780006,0.7272298015433478,0.7272302814459131,0.727230769698059,0.7272322867894248,0.7272338874268199,0.7272355787069544,0.7272373685537237,0.7272392658423398,0.7272405952663412,0.7272419801104353,0.7272434239138613,0.7272449305237811,0.7272465041295049,0.7353596291278226,0.7353613748995558,0.7353632038503338,0.7353651220699564,0.7353671362575666
-5/nan,0.6715657606770263,0.6715662871639331,0.6715668225780256,0.6715673671483007,0.6715679211116561,0.6715684847132322,0.6715702359300704,0.6715720835871882,0.6715740358766678,0.6715761019454621,0.6715782920386895,0.6715798266307871,0.6715814251966264,0.6715830918217486,0.6715848309471515,0.6715866474087993,0.6809649040058074,0.6809669248021404,0.6809690418826274,0.680971262296631,0.6809735937988803
-6/nan,0.6201635755812828,0.6201641590083375,0.620164752328157,0.620165355794509,0.6201659696699173,0.6201665942260397,0.6201685348408664,0.6201705823273004,0.6201727457636045,0.6201750352862176,0.6201774622485535,0.620179162815105,0.6201809342753315,0.6201827811567545,0.6201847083808106,0.6201867213066363,0.63059376952421,0.6305960151059384,0.6305983676835192,0.63060083509067,0.6306034259449693
-7/nan,0.57269575520055,0.5726963837668562,0.5726970229914229,0.5726976731476568,0.5726983345183987,0.5726990073963297,0.5727010981569405,0.5727033040590198,0.572705634883421,0.5727081015510816,0.5727107162941146,0.5727125484391558,0.5727144569640418,0.5727164467467183,0.5727185230895402,0.5727206917664456,0.5839485997348275,0.583951025790319,0.5839535674422907,0.583956233154272,0.583959032236686
-8/nan,0.5288611600855636,0.5288618234631401,0.5288624980893599,0.528863184252777,0.5288638822519018,0.5288645923956313,0.5288667989489763,0.5288691270219247,0.528871586937239,0.5288741902209446,0.5288769497829053,0.5288788834033422,0.5288808976349468,0.5288829976259561,0.5288851889725392,0.528887477768586,0.5407537841510087,0.5407563516941649,0.5407590415770277,0.5407618627569619,0.5407648250876544
-9/nan,0.4883817002434445,0.4883823894208855,0.488383090284559,0.4883838031342473,0.4883845282800764,0.4883852660429629,0.4883875584151386,0.48838997703444015,0.4883925326253335,0.48839523716238514,0.4883981040578691,0.4884001128878398,0.4884022054653828,0.48840438713910556,0.4884066637229866,0.48840904154810366,0.5007540992587739,0.5007567740836243,0.5007595763617011,0.5007625154248944,0.5007656015389059
-10/nan,0.451000570913713,0.4510012780551502,0.45100199718754536,0.4510027286185005,0.4510034726662315,0.45100422966002657,0.45100658178717035,0.4510090634536374,0.45101168566367583,0.45101446070426165,0.45101740233760346,0.45101946353743805,0.4510216106691319,0.45102384922085914,0.4510261851583141,0.4510286249777908,0.46371320048763864,0.46371595267448384,0.46371883600254354,0.463721860073867,0.46372503545136246
-11/nan,0.41648062337942865,0.4164813416973722,0.41648207219590866,0.4164828151875076,0.4164835709954207,0.4164843399541473,0.4164867292594867,0.41648925015302507,0.41649191381317846,0.4164947327214074,0.4164977208577725,0.41649981464339486,0.4165019957204025,0.41650426966386406,0.4165066425339352,0.41650912092977926,0.429412225730714,0.4294150291991749,0.42941796625419487,0.4294210466770032,0.4294242812276317
-12/nan,0.3846028604777614,0.3846035841185185,0.3846043200302443,0.38460506852773,0.38460582993662884,0.38460660459392526,0.384609011606667,0.38461155118418294,0.3846142345879684,0.3846170743922613,0.384620084681056,0.38462219399004444,0.38462439123862324,0.38462668204332695,0.3846290725093912,0.3846315692850754,0.3976485021627524,0.39765133426748883,0.3976543013251189,0.39765741321705034,0.39766068081353234
-13/nan,0.35516504726539605,0.35516577120588844,0.35516650742254857,0.3551672562303041,0.3551680179549494,0.35516879293361525,0.35517120094574506,0.35517374157905124,0.3551764260999395,0.3551792670881448,0.35518227863383534,0.3551843888247009,0.35518658699294875,0.35518887875759414,0.3551912702265751,0.3551937680511005,0.36823434871516886,0.3682371898804002,0.36824016643207647,0.3682432882834859,0.3682465663399629
-14/nan,0.32798042802472827,0.3279811479796342,0.3279818801432383,0.32798262482874047,0.3279833823601477,0.32798415307274137,0.3279865478301657,0.32798907448011805,0.3279917442272223,0.3279945695822441,0.32799756455811785,0.32799966313967227,0.3280018492156173,0.3280041283741867,0.3280065066898642,0.3280089907774359,0.34099596713226565,0.3409988005215658,0.341001768928578,0.3410048822397265,0.3410081513308069
-15/nan,0.30287654147144083,0.3028772538096858,0.30287797822758344,0.30287871503502595,0.30287946455259873,0.3028802271120426,0.3028825965368246,0.3028850964602657,0.30288773796869384,0.3028905334408028,0.3028934967416142,0.30289557312958326,0.3028977360876536,0.30289999114509064,0.3029023443122851,0.30290480213423515,0.31577241505629067,0.31577522627443816,0.3157781714555793,0.315781260409043,0.31578450392582746
-16/nan,0.2796941266470481,0.27969482831675757,0.2796955418853182,0.2796962676579868,0.2796970059505535,0.2796977570897973,0.27970009103053683,0.2797025535169327,0.2797051554695135,0.2797079090818599,0.27971082801166974,0.2797128733099661,0.27971500388314713,0.27971722517781716,0.2797195431145186,0.27972196414041656,0.2924146550736358,0.2924174318975834,0.2924203410473056,0.29242339221237934,0.2924265960520815
+1/nan,0.9234591932680972,0.9234593380607743,0.9234594853084832,0.923459635074197,0.9234597874230616,0.9234599424224892,0.9234604240344024,0.9234609321678058,0.9234614690754618,0.9234620372727042,0.9234626395768389,0.9234630616086975,0.9234635012333081,0.9234639595741392,0.9234644378524004,0.923464937397906,0.923465459661423,0.9234660062287436,0.9234665788367664,0.9234671793919347,0.9234678099914423
+2/nan,0.8527768816313649,0.8527771490516435,0.8527774210062087,0.8527776976113692,0.852777978987446,0.8527782652589471,0.8527791547577983,0.8527800932402327,0.85278108486701,0.8527821342838532,0.8527832466942229,0.8527840261557091,0.85278483811008,0.8527856846323473,0.8527865679780499,0.8527874906033184,0.8527884551876833,0.8527894646600661,0.8527905222284817,0.8527916314140956,0.8527927960903905
+3/nan,0.7875046511489838,0.787505021576585,0.7875053982850893,0.7875057814356089,0.787506171194815,0.7875065677351776,0.7875077998603356,0.7875090998377736,0.7875104734310551,0.7875119270755319,0.7875134679791537,0.7875145476847428,0.7875156723998142,0.7875168449987304,0.7875180686059277,0.7875193466237108,0.7875206827638488,0.7875220810835796,0.7875235460267554,0.7875250824710212,0.7875266957820715
+4/nan,0.727228409844915,0.7272288659446489,0.7272293297780006,0.7272298015433478,0.7272302814459131,0.727230769698059,0.7272322867894248,0.7272338874268199,0.7272355787069544,0.7272373685537237,0.7272392658423398,0.7272405952663412,0.7272419801104353,0.7272434239138613,0.7272449305237811,0.7272465041295049,0.7272481493013954,0.7272498710352021,0.7272516748027267,0.7272535666099148,0.7272555530636663
+5/nan,0.6715657606770263,0.6715662871639331,0.6715668225780256,0.6715673671483007,0.6715679211116561,0.6715684847132322,0.6715702359300704,0.6715720835871882,0.6715740358766678,0.6715761019454621,0.6715782920386895,0.6715798266307871,0.6715814251966264,0.6715830918217486,0.6715848309471515,0.6715866474087993,0.6715885464825323,0.6715905339352469,0.6715926160833825,0.6715947998599824,0.671597092891819
+6/nan,0.6201635755812828,0.6201641590083375,0.620164752328157,0.620165355794509,0.6201659696699173,0.6201665942260397,0.6201685348408664,0.6201705823273004,0.6201727457636045,0.6201750352862176,0.6201774622485535,0.620179162815105,0.6201809342753315,0.6201827811567545,0.6201847083808106,0.6201867213066363,0.6201888257808387,0.6201910281942121,0.6201933355465552,0.6201957555209889,0.6201982965694274
+7/nan,0.57269575520055,0.5726963837668562,0.5726970229914229,0.5726976731476568,0.5726983345183987,0.5726990073963297,0.5727010981569405,0.5727033040590198,0.572705634883421,0.5727081015510816,0.5727107162941146,0.5727125484391558,0.5727144569640418,0.5727164467467183,0.5727185230895402,0.5727206917664456,0.5727229590765804,0.5727253319054072,0.5727278177945402,0.5727304250218175,0.5727331626933921
+8/nan,0.5288611600855636,0.5288618234631401,0.5288624980893599,0.528863184252777,0.5288638822519018,0.5288645923956313,0.5288667989489763,0.5288691270219247,0.528871586937239,0.5288741902209446,0.5288769497829053,0.5288788834033422,0.5288808976349468,0.5288829976259561,0.5288851889725392,0.528887477768586,0.5288898706623046,0.5288923749207182,0.5288949985033709,0.5288977501468417,0.5289006394619392
+9/nan,0.4883817002434445,0.4883823894208855,0.488383090284559,0.4883838031342473,0.4883845282800764,0.4883852660429629,0.4883875584151386,0.48838997703444015,0.4883925326253335,0.48839523716238514,0.4883981040578691,0.4884001128878398,0.4884022054653828,0.48840438713910556,0.4884066637229866,0.48840904154810366,0.48841152752143574,0.48841412919287086,0.48841685483178454,0.4884197135148441,0.4884227152269904
+10/nan,0.451000570913713,0.4510012780551502,0.45100199718754536,0.4510027286185005,0.4510034726662315,0.45100422966002657,0.45100658178717035,0.4510090634536374,0.45101168566367583,0.45101446070426165,0.45101740233760346,0.45101946353743805,0.4510216106691319,0.45102384922085914,0.4510261851583141,0.4510286249777908,0.4510311757665204,0.4510338452714302,0.45103664197772175,0.4510395751989699,0.4510426551807426
+11/nan,0.41648062337942865,0.4164813416973722,0.41648207219590866,0.4164828151875076,0.4164835709954207,0.4164843399541473,0.4164867292594867,0.41648925015302507,0.41649191381317846,0.4164947327214074,0.4164977208577725,0.41649981464339486,0.4165019957204025,0.41650426966386406,0.4165066425339352,0.41650912092977926,0.41651171205086185,0.41651442376680076,0.4165172646971902,0.4165202443031291,0.41652337299248565
+12/nan,0.3846028604777614,0.3846035841185185,0.3846043200302443,0.38460506852773,0.38460582993662884,0.38460660459392526,0.384609011606667,0.38461155118418294,0.3846142345879684,0.3846170743922613,0.384620084681056,0.38462219399004444,0.38462439123862324,0.38462668204332695,0.3846290725093912,0.3846315692850754,0.38463417962341545,0.38463691145259404,0.3846397734563621,0.38464277516625023,0.3846459270676194
+13/nan,0.35516504726539605,0.35516577120588844,0.35516650742254857,0.3551672562303041,0.3551680179549494,0.35516879293361525,0.35517120094574506,0.35517374157905124,0.3551764260999395,0.3551792670881448,0.35518227863383534,0.3551843888247009,0.35518658699294875,0.35518887875759414,0.3551912702265751,0.3551937680511005,0.3551963794874317,0.3551991124672859,0.35520197567829553,0.3552049786562632,0.35520813189126244
+14/nan,0.32798042802472827,0.3279811479796342,0.3279818801432383,0.32798262482874047,0.3279833823601477,0.32798415307274137,0.3279865478301657,0.32798907448011805,0.3279917442272223,0.3279945695822441,0.32799756455811785,0.32799966313967227,0.3280018492156173,0.3280041283741867,0.3280065066898642,0.3280089907774359,0.32801158785343437,0.3280143058061589,0.3280171532756959,0.32802013974567173,0.32802327564877554
+15/nan,0.30287654147144083,0.3028772538096858,0.30287797822758344,0.30287871503502595,0.30287946455259873,0.3028802271120426,0.3028825965368246,0.3028850964602657,0.30288773796869384,0.3028905334408028,0.3028934967416142,0.30289557312958326,0.3028977360876536,0.30289999114509064,0.3029023443122851,0.30290480213423515,0.302907371751345,0.3029100609687074,0.3029128783352822,0.30291583323468374,0.30291893598959396
+16/nan,0.2796941266470481,0.27969482831675757,0.2796955418853182,0.2796962676579868,0.2796970059505535,0.2796977570897973,0.27970009103053683,0.2797025535169327,0.2797051554695135,0.2797079090818599,0.27971082801166974,0.2797128733099661,0.27971500388314713,0.27971722517781716,0.2797195431145186,0.27972196414041656,0.27972449528918936,0.27972714424927747,0.2797299194418807,0.279732830110391,0.27973588642324815
diff --git a/tests/data/Nuclear/Market/TechLife/df_lcoe.csv b/tests/data/Nuclear/Market/TechLife/df_lcoe.csv
index 05f773e..faa57dc 100644
--- a/tests/data/Nuclear/Market/TechLife/df_lcoe.csv
+++ b/tests/data/Nuclear/Market/TechLife/df_lcoe.csv
@@ -1,7 +1,7 @@
 tech_detail-scenario,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-Nuclear - Large/Advanced,59.352594464962415,57.817275506115955,56.281963500826976,54.746658627446706,53.21136107047839,51.676071020844795,50.44768507267244,49.219309990103866,47.990946696004464,46.7625962207955,45.534259718593546,44.92006016774585,44.30586445527695,43.691672826284005,43.077485547184956,42.46330290808906,41.41211991073646,41.11954294736742,40.82696494949753,40.534385841398716,40.241805539766865
-Nuclear - Large/Moderate,73.1300294244977,72.79943737499079,72.468845370497,72.13825341217074,71.80766150120635,71.47706963883964,70.48529435634785,69.49351956012094,68.50174529145974,67.50997159647831,66.51819852682661,65.8570168561676,65.19583550805727,64.53465450309213,63.87347386365967,63.21229361413856,61.216417728914195,60.58664715332418,59.95687704808775,59.32710744763581,58.69733838984426
-Nuclear - Large/Conservative,99.8674616672502,99.86729879868055,99.86713316878273,99.86696470673148,99.86679333925854,99.86661899054639,99.4833459807447,99.10005042198942,98.71673039909503,98.33338377366934,97.95000815062089,96.80141142166835,95.6528144338348,94.50421717059032,93.35561961396563,92.2070217443944,88.62164350446531,87.5276073947892,86.43357090780829,85.33953401590277,84.24549668869012
-Nuclear - Small/Advanced,59.2672429699689,56.64938092265545,54.031531809402786,51.41369596195571,48.79587372350203,46.178065449170354,45.30531624742165,44.43257397123755,43.559839208837914,42.68711261699703,41.814394931330625,41.52343196945485,41.232468814296766,40.941505453514665,40.65054187369286,40.3595780602229,39.43290819272174,39.155765557611026,38.87862264073251,38.60147942146005,38.32433587710409
-Nuclear - Small/Moderate,79.3012777817135,77.48664596292156,75.67202189564891,73.8574057787136,72.04279781779165,70.22819822571537,68.7157865541787,67.20338383114301,65.6909908166454,64.17860835930192,62.6662374095995,61.75879550054403,60.851357868105765,59.943924785365446,59.03649654915858,58.12907348271705,56.23086444078792,55.65456972759717,55.07827471886542,54.501979392958276,53.925683726077175
-Nuclear - Small/Conservative,105.81125745559385,105.17365716464036,104.53605742917364,103.89845826344114,103.2608596821818,102.62326170064748,100.71047151508803,98.797687330323,96.88490965602736,94.9721390612764,93.05937618345925,91.78420556886975,90.5090389347211,89.2338765351821,87.9587186465308,86.68356556961376,83.62223415583647,82.7111968374651,81.80015843984299,80.88911888396616,79.97807808292718
+Nuclear - Large/Advanced,59.352594464962415,57.817275506115955,56.281963500826976,54.746658627446706,53.21136107047839,51.676071020844795,50.44768507267244,49.219309990103866,47.990946696004464,46.7625962207955,45.534259718593546,44.92006016774585,44.30586445527695,43.691672826284005,43.077485547184956,42.46330290808906,42.15613602368078,41.84896815905916,41.541799244178975,41.23462920215833,40.927457948423424
+Nuclear - Large/Moderate,73.1300294244977,72.79943737499079,72.468845370497,72.13825341217074,71.80766150120635,71.47706963883964,70.48529435634785,69.49351956012094,68.50174529145974,67.50997159647831,66.51819852682661,65.8570168561676,65.19583550805727,64.53465450309213,63.87347386365967,63.21229361413856,62.55111378112481,61.889934393689,61.228755483671904,60.56757708602217,59.906399239184466
+Nuclear - Large/Conservative,99.8674616672502,99.86729879868055,99.86713316878273,99.86696470673148,99.86679333925854,99.86661899054639,99.4833459807447,99.10005042198942,98.71673039909503,98.33338377366934,97.95000815062089,96.80141142166835,95.6528144338348,94.50421717059032,93.35561961396563,92.2070217443944,91.05842354053097,89.90982497904236,88.76122603437314,87.61262667847379,86.46402688048767
+Nuclear - Small/Advanced,59.2672429699689,56.64938092265545,54.031531809402786,51.41369596195571,48.79587372350203,46.178065449170354,45.30531624742165,44.43257397123755,43.559839208837914,42.68711261699703,41.814394931330625,41.52343196945485,41.232468814296766,40.941505453514665,40.65054187369286,40.3595780602229,40.06861399716779,39.77764966710716,39.48668505096108,39.195720127787325,38.90475487454835
+Nuclear - Small/Moderate,79.3012777817135,77.48664596292156,75.67202189564891,73.8574057787136,72.04279781779165,70.22819822571537,68.7157865541787,67.20338383114301,65.6909908166454,64.17860835930192,62.6662374095995,61.75879550054403,60.851357868105765,59.943924785365446,59.03649654915858,58.12907348271705,57.524037790399795,56.919001817990676,56.31396554547465,55.70892895088324,55.10389201004961
+Nuclear - Small/Conservative,105.81125745559385,105.17365716464036,104.53605742917364,103.89845826344114,103.2608596821818,102.62326170064748,100.71047151508803,98.797687330323,96.88490965602736,94.9721390612764,93.05937618345925,91.78420556886975,90.5090389347211,89.2338765351821,87.9587186465308,86.68356556961376,85.72709400907445,84.77062142584654,83.81414774684959,82.85767289187045,81.90119677267032
diff --git a/tests/data/Nuclear/Market/TechLife/df_tc.csv b/tests/data/Nuclear/Market/TechLife/df_tc.csv
index b03b729..0e6f2f1 100644
--- a/tests/data/Nuclear/Market/TechLife/df_tc.csv
+++ b/tests/data/Nuclear/Market/TechLife/df_tc.csv
@@ -1,31 +1,31 @@
 Tax Credit,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-10 year CRF/Advanced,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13174051733638875,0.13174012078732802,0.13173970534617493,0.13173926962992083,0.13173881211718894
-10 year CRF/Moderate,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13174051733638875,0.13174012078732802,0.13173970534617493,0.13173926962992083,0.13173881211718894
-10 year CRF/Conservative,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13174051733638875,0.13174012078732802,0.13173970534617493,0.13173926962992083,0.13173881211718894
+10 year CRF/Advanced,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13360217892255735,0.133601779666457,0.13360136138928855,0.1336009226986017,0.13360046206263168
+10 year CRF/Moderate,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13360217892255735,0.133601779666457,0.13360136138928855,0.1336009226986017,0.13360046206263168
+10 year CRF/Conservative,0.13360675646798328,0.13360665069664457,0.13360654313197598,0.13360643372797903,0.1336063224370691,0.13360620921000507,0.1336058573930966,0.13360548620315568,0.1336050939946936,0.13360467893044212,0.1336042389525735,0.13360393066277498,0.1336036095223229,0.13360327471062125,0.13360292533568635,0.1336025604262132,0.13360217892255735,0.133601779666457,0.13360136138928855,0.1336009226986017,0.13360046206263168
 ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896
 PTC/Advanced,0,0,0,0,0,0,0,0,0,0.0,0,0,0,0,0,0,0,0,0,0,0
 PTC/Moderate,0,0,0,0,0,0,0,0,0,0.0,0,0,0,0,0,0,0,0,0,0,0
 PTC/Conservative,0,0,0,0,0,0,0,0,0,0.0,0,0,0,0,0,0,0,0,0,0,0
-PVD/Advanced,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8115657741814299,0.8115670445585186,0.8115683754635129,0.8115697713278152,0.8115712370262282
-PVD/Moderate,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8115657741814299,0.8115670445585186,0.8115683754635129,0.8115697713278152,0.8115712370262282
-PVD/Conservative,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8115657741814299,0.8115670445585186,0.8115683754635129,0.8115697713278152,0.8115712370262282
-PFF/Advanced,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7035247961096678,0.7035244218222974,0.7035240297017727,0.7035236184424829,0.7035231866081797
-PFF/Moderate,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7035247961096678,0.7035244218222974,0.7035240297017727,0.7035236184424829,0.7035231866081797
-PFF/Conservative,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7035247961096678,0.7035244218222974,0.7035240297017727,0.7035236184424829,0.7035231866081797
+PVD/Advanced,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8056582324022871,0.8056594873815994,0.8056608021551659,0.8056621811006747,0.8056636290338419
+PVD/Moderate,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8056582324022871,0.8056594873815994,0.8056608021551659,0.8056621811006747,0.8056636290338419
+PVD/Conservative,0.8056438441938707,0.8056441766483741,0.8056445147399366,0.8056448586131563,0.8056452084176187,0.8056455643081156,0.8056466701266801,0.8056478368421545,0.8056490696273151,0.8056503742578683,0.8056517572029278,0.8056527262277362,0.8056537356482842,0.8056547880443067,0.8056558862199802,0.8056570332288704,0.8056582324022871,0.8056594873815994,0.8056608021551659,0.8056621811006747,0.8056636290338419
+PFF/Advanced,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7052653173280831,0.7052649475773131,0.7052645602095423,0.7052641539349856,0.7052637273348032
+PFF/Moderate,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7052653173280831,0.7052649475773131,0.7052645602095423,0.7052641539349856,0.7052637273348032
+PFF/Conservative,0.7052695564825368,0.705269458532469,0.7052693589215716,0.705269257607242,0.7052691545454082,0.7052690496904643,0.7052687238864757,0.7052683801406141,0.7052680169288399,0.7052676325494747,0.7052672250965424,0.7052669395956854,0.7052666421931536,0.7052663321288873,0.7052660085767004,0.7052656706369304,0.7052653173280831,0.7052649475773131,0.7052645602095423,0.7052641539349856,0.7052637273348032
 Year/nan,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039.0,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-1/nan,0.9234591932680972,0.9234593380607743,0.9234594853084832,0.923459635074197,0.9234597874230616,0.9234599424224892,0.9234604240344024,0.9234609321678058,0.9234614690754618,0.9234620372727042,0.9234626395768389,0.9234630616086975,0.9234635012333081,0.9234639595741392,0.9234644378524004,0.923464937397906,0.9260297642576188,0.9260303138646013,0.92603088965711,0.9260314935521909,0.9260321276587011
-2/nan,0.8527768816313649,0.8527771490516435,0.8527774210062087,0.8527776976113692,0.852777978987446,0.8527782652589471,0.8527791547577983,0.8527800932402327,0.85278108486701,0.8527821342838532,0.8527832466942229,0.8527840261557091,0.85278483811008,0.8527856846323473,0.8527865679780499,0.8527874906033184,0.8575311242910211,0.857532142196172,0.8575332085991386,0.8575343270505015,0.8575355014561009
-3/nan,0.7875046511489838,0.787505021576585,0.7875053982850893,0.7875057814356089,0.787506171194815,0.7875065677351776,0.7875077998603356,0.7875090998377736,0.7875104734310551,0.7875119270755319,0.7875134679791537,0.7875145476847428,0.7875156723998142,0.7875168449987304,0.7875180686059277,0.7875193466237108,0.7940993448707852,0.7941007587869051,0.7941022400695764,0.7941037936508489,0.7941054249562642
-4/nan,0.727228409844915,0.7272288659446489,0.7272293297780006,0.7272298015433478,0.7272302814459131,0.727230769698059,0.7272322867894248,0.7272338874268199,0.7272355787069544,0.7272373685537237,0.7272392658423398,0.7272405952663412,0.7272419801104353,0.7272434239138613,0.7272449305237811,0.7272465041295049,0.7353596291278226,0.7353613748995558,0.7353632038503338,0.7353651220699564,0.7353671362575666
-5/nan,0.6715657606770263,0.6715662871639331,0.6715668225780256,0.6715673671483007,0.6715679211116561,0.6715684847132322,0.6715702359300704,0.6715720835871882,0.6715740358766678,0.6715761019454621,0.6715782920386895,0.6715798266307871,0.6715814251966264,0.6715830918217486,0.6715848309471515,0.6715866474087993,0.6809649040058074,0.6809669248021404,0.6809690418826274,0.680971262296631,0.6809735937988803
-6/nan,0.6201635755812828,0.6201641590083375,0.620164752328157,0.620165355794509,0.6201659696699173,0.6201665942260397,0.6201685348408664,0.6201705823273004,0.6201727457636045,0.6201750352862176,0.6201774622485535,0.620179162815105,0.6201809342753315,0.6201827811567545,0.6201847083808106,0.6201867213066363,0.63059376952421,0.6305960151059384,0.6305983676835192,0.63060083509067,0.6306034259449693
-7/nan,0.57269575520055,0.5726963837668562,0.5726970229914229,0.5726976731476568,0.5726983345183987,0.5726990073963297,0.5727010981569405,0.5727033040590198,0.572705634883421,0.5727081015510816,0.5727107162941146,0.5727125484391558,0.5727144569640418,0.5727164467467183,0.5727185230895402,0.5727206917664456,0.5839485997348275,0.583951025790319,0.5839535674422907,0.583956233154272,0.583959032236686
-8/nan,0.5288611600855636,0.5288618234631401,0.5288624980893599,0.528863184252777,0.5288638822519018,0.5288645923956313,0.5288667989489763,0.5288691270219247,0.528871586937239,0.5288741902209446,0.5288769497829053,0.5288788834033422,0.5288808976349468,0.5288829976259561,0.5288851889725392,0.528887477768586,0.5407537841510087,0.5407563516941649,0.5407590415770277,0.5407618627569619,0.5407648250876544
-9/nan,0.4883817002434445,0.4883823894208855,0.488383090284559,0.4883838031342473,0.4883845282800764,0.4883852660429629,0.4883875584151386,0.48838997703444015,0.4883925326253335,0.48839523716238514,0.4883981040578691,0.4884001128878398,0.4884022054653828,0.48840438713910556,0.4884066637229866,0.48840904154810366,0.5007540992587739,0.5007567740836243,0.5007595763617011,0.5007625154248944,0.5007656015389059
-10/nan,0.451000570913713,0.4510012780551502,0.45100199718754536,0.4510027286185005,0.4510034726662315,0.45100422966002657,0.45100658178717035,0.4510090634536374,0.45101168566367583,0.45101446070426165,0.45101740233760346,0.45101946353743805,0.4510216106691319,0.45102384922085914,0.4510261851583141,0.4510286249777908,0.46371320048763864,0.46371595267448384,0.46371883600254354,0.463721860073867,0.46372503545136246
-11/nan,0.41648062337942865,0.4164813416973722,0.41648207219590866,0.4164828151875076,0.4164835709954207,0.4164843399541473,0.4164867292594867,0.41648925015302507,0.41649191381317846,0.4164947327214074,0.4164977208577725,0.41649981464339486,0.4165019957204025,0.41650426966386406,0.4165066425339352,0.41650912092977926,0.429412225730714,0.4294150291991749,0.42941796625419487,0.4294210466770032,0.4294242812276317
-12/nan,0.3846028604777614,0.3846035841185185,0.3846043200302443,0.38460506852773,0.38460582993662884,0.38460660459392526,0.384609011606667,0.38461155118418294,0.3846142345879684,0.3846170743922613,0.384620084681056,0.38462219399004444,0.38462439123862324,0.38462668204332695,0.3846290725093912,0.3846315692850754,0.3976485021627524,0.39765133426748883,0.3976543013251189,0.39765741321705034,0.39766068081353234
-13/nan,0.35516504726539605,0.35516577120588844,0.35516650742254857,0.3551672562303041,0.3551680179549494,0.35516879293361525,0.35517120094574506,0.35517374157905124,0.3551764260999395,0.3551792670881448,0.35518227863383534,0.3551843888247009,0.35518658699294875,0.35518887875759414,0.3551912702265751,0.3551937680511005,0.36823434871516886,0.3682371898804002,0.36824016643207647,0.3682432882834859,0.3682465663399629
-14/nan,0.32798042802472827,0.3279811479796342,0.3279818801432383,0.32798262482874047,0.3279833823601477,0.32798415307274137,0.3279865478301657,0.32798907448011805,0.3279917442272223,0.3279945695822441,0.32799756455811785,0.32799966313967227,0.3280018492156173,0.3280041283741867,0.3280065066898642,0.3280089907774359,0.34099596713226565,0.3409988005215658,0.341001768928578,0.3410048822397265,0.3410081513308069
-15/nan,0.30287654147144083,0.3028772538096858,0.30287797822758344,0.30287871503502595,0.30287946455259873,0.3028802271120426,0.3028825965368246,0.3028850964602657,0.30288773796869384,0.3028905334408028,0.3028934967416142,0.30289557312958326,0.3028977360876536,0.30289999114509064,0.3029023443122851,0.30290480213423515,0.31577241505629067,0.31577522627443816,0.3157781714555793,0.315781260409043,0.31578450392582746
-16/nan,0.2796941266470481,0.27969482831675757,0.2796955418853182,0.2796962676579868,0.2796970059505535,0.2796977570897973,0.27970009103053683,0.2797025535169327,0.2797051554695135,0.2797079090818599,0.27971082801166974,0.2797128733099661,0.27971500388314713,0.27971722517781716,0.2797195431145186,0.27972196414041656,0.2924146550736358,0.2924174318975834,0.2924203410473056,0.29242339221237934,0.2924265960520815
+1/nan,0.9234591932680972,0.9234593380607743,0.9234594853084832,0.923459635074197,0.9234597874230616,0.9234599424224892,0.9234604240344024,0.9234609321678058,0.9234614690754618,0.9234620372727042,0.9234626395768389,0.9234630616086975,0.9234635012333081,0.9234639595741392,0.9234644378524004,0.923464937397906,0.923465459661423,0.9234660062287436,0.9234665788367664,0.9234671793919347,0.9234678099914423
+2/nan,0.8527768816313649,0.8527771490516435,0.8527774210062087,0.8527776976113692,0.852777978987446,0.8527782652589471,0.8527791547577983,0.8527800932402327,0.85278108486701,0.8527821342838532,0.8527832466942229,0.8527840261557091,0.85278483811008,0.8527856846323473,0.8527865679780499,0.8527874906033184,0.8527884551876833,0.8527894646600661,0.8527905222284817,0.8527916314140956,0.8527927960903905
+3/nan,0.7875046511489838,0.787505021576585,0.7875053982850893,0.7875057814356089,0.787506171194815,0.7875065677351776,0.7875077998603356,0.7875090998377736,0.7875104734310551,0.7875119270755319,0.7875134679791537,0.7875145476847428,0.7875156723998142,0.7875168449987304,0.7875180686059277,0.7875193466237108,0.7875206827638488,0.7875220810835796,0.7875235460267554,0.7875250824710212,0.7875266957820715
+4/nan,0.727228409844915,0.7272288659446489,0.7272293297780006,0.7272298015433478,0.7272302814459131,0.727230769698059,0.7272322867894248,0.7272338874268199,0.7272355787069544,0.7272373685537237,0.7272392658423398,0.7272405952663412,0.7272419801104353,0.7272434239138613,0.7272449305237811,0.7272465041295049,0.7272481493013954,0.7272498710352021,0.7272516748027267,0.7272535666099148,0.7272555530636663
+5/nan,0.6715657606770263,0.6715662871639331,0.6715668225780256,0.6715673671483007,0.6715679211116561,0.6715684847132322,0.6715702359300704,0.6715720835871882,0.6715740358766678,0.6715761019454621,0.6715782920386895,0.6715798266307871,0.6715814251966264,0.6715830918217486,0.6715848309471515,0.6715866474087993,0.6715885464825323,0.6715905339352469,0.6715926160833825,0.6715947998599824,0.671597092891819
+6/nan,0.6201635755812828,0.6201641590083375,0.620164752328157,0.620165355794509,0.6201659696699173,0.6201665942260397,0.6201685348408664,0.6201705823273004,0.6201727457636045,0.6201750352862176,0.6201774622485535,0.620179162815105,0.6201809342753315,0.6201827811567545,0.6201847083808106,0.6201867213066363,0.6201888257808387,0.6201910281942121,0.6201933355465552,0.6201957555209889,0.6201982965694274
+7/nan,0.57269575520055,0.5726963837668562,0.5726970229914229,0.5726976731476568,0.5726983345183987,0.5726990073963297,0.5727010981569405,0.5727033040590198,0.572705634883421,0.5727081015510816,0.5727107162941146,0.5727125484391558,0.5727144569640418,0.5727164467467183,0.5727185230895402,0.5727206917664456,0.5727229590765804,0.5727253319054072,0.5727278177945402,0.5727304250218175,0.5727331626933921
+8/nan,0.5288611600855636,0.5288618234631401,0.5288624980893599,0.528863184252777,0.5288638822519018,0.5288645923956313,0.5288667989489763,0.5288691270219247,0.528871586937239,0.5288741902209446,0.5288769497829053,0.5288788834033422,0.5288808976349468,0.5288829976259561,0.5288851889725392,0.528887477768586,0.5288898706623046,0.5288923749207182,0.5288949985033709,0.5288977501468417,0.5289006394619392
+9/nan,0.4883817002434445,0.4883823894208855,0.488383090284559,0.4883838031342473,0.4883845282800764,0.4883852660429629,0.4883875584151386,0.48838997703444015,0.4883925326253335,0.48839523716238514,0.4883981040578691,0.4884001128878398,0.4884022054653828,0.48840438713910556,0.4884066637229866,0.48840904154810366,0.48841152752143574,0.48841412919287086,0.48841685483178454,0.4884197135148441,0.4884227152269904
+10/nan,0.451000570913713,0.4510012780551502,0.45100199718754536,0.4510027286185005,0.4510034726662315,0.45100422966002657,0.45100658178717035,0.4510090634536374,0.45101168566367583,0.45101446070426165,0.45101740233760346,0.45101946353743805,0.4510216106691319,0.45102384922085914,0.4510261851583141,0.4510286249777908,0.4510311757665204,0.4510338452714302,0.45103664197772175,0.4510395751989699,0.4510426551807426
+11/nan,0.41648062337942865,0.4164813416973722,0.41648207219590866,0.4164828151875076,0.4164835709954207,0.4164843399541473,0.4164867292594867,0.41648925015302507,0.41649191381317846,0.4164947327214074,0.4164977208577725,0.41649981464339486,0.4165019957204025,0.41650426966386406,0.4165066425339352,0.41650912092977926,0.41651171205086185,0.41651442376680076,0.4165172646971902,0.4165202443031291,0.41652337299248565
+12/nan,0.3846028604777614,0.3846035841185185,0.3846043200302443,0.38460506852773,0.38460582993662884,0.38460660459392526,0.384609011606667,0.38461155118418294,0.3846142345879684,0.3846170743922613,0.384620084681056,0.38462219399004444,0.38462439123862324,0.38462668204332695,0.3846290725093912,0.3846315692850754,0.38463417962341545,0.38463691145259404,0.3846397734563621,0.38464277516625023,0.3846459270676194
+13/nan,0.35516504726539605,0.35516577120588844,0.35516650742254857,0.3551672562303041,0.3551680179549494,0.35516879293361525,0.35517120094574506,0.35517374157905124,0.3551764260999395,0.3551792670881448,0.35518227863383534,0.3551843888247009,0.35518658699294875,0.35518887875759414,0.3551912702265751,0.3551937680511005,0.3551963794874317,0.3551991124672859,0.35520197567829553,0.3552049786562632,0.35520813189126244
+14/nan,0.32798042802472827,0.3279811479796342,0.3279818801432383,0.32798262482874047,0.3279833823601477,0.32798415307274137,0.3279865478301657,0.32798907448011805,0.3279917442272223,0.3279945695822441,0.32799756455811785,0.32799966313967227,0.3280018492156173,0.3280041283741867,0.3280065066898642,0.3280089907774359,0.32801158785343437,0.3280143058061589,0.3280171532756959,0.32802013974567173,0.32802327564877554
+15/nan,0.30287654147144083,0.3028772538096858,0.30287797822758344,0.30287871503502595,0.30287946455259873,0.3028802271120426,0.3028825965368246,0.3028850964602657,0.30288773796869384,0.3028905334408028,0.3028934967416142,0.30289557312958326,0.3028977360876536,0.30289999114509064,0.3029023443122851,0.30290480213423515,0.302907371751345,0.3029100609687074,0.3029128783352822,0.30291583323468374,0.30291893598959396
+16/nan,0.2796941266470481,0.27969482831675757,0.2796955418853182,0.2796962676579868,0.2796970059505535,0.2796977570897973,0.27970009103053683,0.2797025535169327,0.2797051554695135,0.2797079090818599,0.27971082801166974,0.2797128733099661,0.27971500388314713,0.27971722517781716,0.2797195431145186,0.27972196414041656,0.27972449528918936,0.27972714424927747,0.2797299194418807,0.279732830110391,0.27973588642324815
diff --git a/tests/data/Nuclear/Market/df_just_wacc.csv b/tests/data/Nuclear/Market/df_just_wacc.csv
index 0935044..d5b9283 100644
--- a/tests/data/Nuclear/Market/df_just_wacc.csv
+++ b/tests/data/Nuclear/Market/df_just_wacc.csv
@@ -1,7 +1,7 @@
 WACC Type,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-WACC Nominal - Advanced,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.07987889655110783,0.07987825563366381,0.07987758418110573,0.07987687995801437,0.07987614050531139
-WACC Nominal - Moderate,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.07987889655110783,0.07987825563366381,0.07987758418110573,0.07987687995801437,0.07987614050531139
-WACC Nominal - Conservative,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.07987889655110783,0.07987825563366381,0.07987758418110573,0.07987687995801437,0.07987614050531139
-WACC Real - Advanced,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.053540386879129764,0.05353976159381846,0.05353910651815208,0.05353841947123361,0.05353769805396258
-WACC Real - Moderate,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.053540386879129764,0.05353976159381846,0.05353910651815208,0.05353841947123361,0.05353769805396258
-WACC Real - Conservative,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.053540386879129764,0.05353976159381846,0.05353910651815208,0.05353841947123361,0.05353769805396258
+WACC Nominal - Advanced,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.08287753433315975,0.08287689341571575,0.08287622196315766,0.08287551774006631,0.08287477828736334
+WACC Nominal - Moderate,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.08287753433315975,0.08287689341571575,0.08287622196315766,0.08287551774006631,0.08287477828736334
+WACC Nominal - Conservative,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.08287753433315975,0.08287689341571575,0.08287622196315766,0.08287551774006631,0.08287477828736334
+WACC Real - Advanced,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.05646588715430245,0.056465261868991146,0.056464606793324545,0.0564639197464063,0.056463198329135045
+WACC Real - Moderate,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.05646588715430245,0.056465261868991146,0.056464606793324545,0.0564639197464063,0.056463198329135045
+WACC Real - Conservative,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.05646588715430245,0.056465261868991146,0.056464606793324545,0.0564639197464063,0.056463198329135045
diff --git a/tests/data/Nuclear/Market/df_wacc.csv b/tests/data/Nuclear/Market/df_wacc.csv
index 0a7b94f..b629e31 100644
--- a/tests/data/Nuclear/Market/df_wacc.csv
+++ b/tests/data/Nuclear/Market/df_wacc.csv
@@ -13,13 +13,13 @@ Rate of Return on Equity Nominal - Conservative,0.105,0.105,0.105,0.105,0.105,0.
 Calculated Rate of Return on Equity Real - Advanced,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
 Calculated Rate of Return on Equity Real - Moderate,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
 Calculated Rate of Return on Equity Real - Conservative,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495,0.07804878048780495
-Debt Fraction - Advanced,0.485065746080653,0.485069470190373,0.485073257443025,0.485077109458237,0.48508102791151,0.485085014536642,0.485097401710348,0.485110471009118,0.485124280372139,0.485138894491544,0.485154385825776,0.485165240523509,0.48517654769786,0.4851883362432,0.485200637567597,0.485213485872249,0.550998057748995,0.551012115422359,0.551026842842917,0.551042289041622,0.551058507955093
-Debt Fraction - Moderate,0.485065746080653,0.485069470190373,0.485073257443025,0.485077109458237,0.48508102791151,0.485085014536642,0.485097401710348,0.485110471009118,0.485124280372139,0.485138894491544,0.485154385825776,0.485165240523509,0.48517654769786,0.4851883362432,0.485200637567597,0.485213485872249,0.550998057748995,0.551012115422359,0.551026842842917,0.551042289041622,0.551058507955093
-Debt Fraction - Conservative,0.485065746080653,0.485069470190373,0.485073257443025,0.485077109458237,0.48508102791151,0.485085014536642,0.485097401710348,0.485110471009118,0.485124280372139,0.485138894491544,0.485154385825776,0.485165240523509,0.48517654769786,0.4851883362432,0.485200637567597,0.485213485872249,0.550998057748995,0.551012115422359,0.551026842842917,0.551042289041622,0.551058507955093
+Debt Fraction - Advanced,0.485065746080653,0.485069470190373,0.485073257443025,0.485077109458237,0.48508102791151,0.485085014536642,0.485097401710348,0.485110471009118,0.485124280372139,0.485138894491544,0.485154385825776,0.485165240523509,0.48517654769786,0.4851883362432,0.485200637567597,0.485213485872249,0.485226918469035,0.485240976142399,0.485255703562957,0.485271149761662,0.485287368675133
+Debt Fraction - Moderate,0.485065746080653,0.485069470190373,0.485073257443025,0.485077109458237,0.48508102791151,0.485085014536642,0.485097401710348,0.485110471009118,0.485124280372139,0.485138894491544,0.485154385825776,0.485165240523509,0.48517654769786,0.4851883362432,0.485200637567597,0.485213485872249,0.485226918469035,0.485240976142399,0.485255703562957,0.485271149761662,0.485287368675133
+Debt Fraction - Conservative,0.485065746080653,0.485069470190373,0.485073257443025,0.485077109458237,0.48508102791151,0.485085014536642,0.485097401710348,0.485110471009118,0.485124280372139,0.485138894491544,0.485154385825776,0.485165240523509,0.48517654769786,0.4851883362432,0.485200637567597,0.485213485872249,0.485226918469035,0.485240976142399,0.485255703562957,0.485271149761662,0.485287368675133
 Tax Rate (Federal and State),0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996
-WACC Nominal - Advanced,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.07987889655110783,0.07987825563366381,0.07987758418110573,0.07987687995801437,0.07987614050531139
-WACC Nominal - Moderate,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.07987889655110783,0.07987825563366381,0.07987758418110573,0.07987687995801437,0.07987614050531139
-WACC Nominal - Conservative,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.07987889655110783,0.07987825563366381,0.07987758418110573,0.07987687995801437,0.07987614050531139
-WACC Real - Advanced,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.053540386879129764,0.05353976159381846,0.05353910651815208,0.05353841947123361,0.05353769805396258
-WACC Real - Moderate,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.053540386879129764,0.05353976159381846,0.05353910651815208,0.05353841947123361,0.05353769805396258
-WACC Real - Conservative,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.053540386879129764,0.05353976159381846,0.05353910651815208,0.05353841947123361,0.05353769805396258
+WACC Nominal - Advanced,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.08287753433315975,0.08287689341571575,0.08287622196315766,0.08287551774006631,0.08287477828736334
+WACC Nominal - Moderate,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.08287753433315975,0.08287689341571575,0.08287622196315766,0.08287551774006631,0.08287477828736334
+WACC Nominal - Conservative,0.08288488250469087,0.08288471271508051,0.0828845400466576,0.08288436442558006,0.08288418577545843,0.08288400401724541,0.08288343926122181,0.08288284340575229,0.08288221380927344,0.08288154752234153,0.08288084124143122,0.08288034635405218,0.08287983083735917,0.08287929337400003,0.08287873253201812,0.08287814675211241,0.08287753433315975,0.08287689341571575,0.08287622196315766,0.08287551774006631,0.08287477828736334
+WACC Real - Advanced,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.05646588715430245,0.056465261868991146,0.056464606793324545,0.0564639197464063,0.056463198329135045
+WACC Real - Moderate,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.05646588715430245,0.056465261868991146,0.056464606793324545,0.0564639197464063,0.056463198329135045
+WACC Real - Conservative,0.0564730561021376,0.056472890453737046,0.05647272199673914,0.056472550659102616,0.05647237636630109,0.05647219904121514,0.05647164805972871,0.056471066737319386,0.05647045249685223,0.056469802460821006,0.056469113406274474,0.05646863058931939,0.056468127646204014,0.056467603291707524,0.05646705612879832,0.05646648463620729,0.05646588715430245,0.056465261868991146,0.056464606793324545,0.0564639197464063,0.056463198329135045
diff --git a/tests/data/PSH_One_New_Res/Market/df_just_wacc.csv b/tests/data/PSH_One_New_Res/Market/df_just_wacc.csv
index a517a71..b044bc0 100644
--- a/tests/data/PSH_One_New_Res/Market/df_just_wacc.csv
+++ b/tests/data/PSH_One_New_Res/Market/df_just_wacc.csv
@@ -1,7 +1,7 @@
 WACC Type,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
+WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
diff --git a/tests/data/PSH_One_New_Res/Market/df_wacc.csv b/tests/data/PSH_One_New_Res/Market/df_wacc.csv
index 42f0cb2..59520c3 100644
--- a/tests/data/PSH_One_New_Res/Market/df_wacc.csv
+++ b/tests/data/PSH_One_New_Res/Market/df_wacc.csv
@@ -13,13 +13,13 @@ Rate of Return on Equity Nominal - Conservative,0.0975,0.0975,0.0975,0.0975,0.09
 Calculated Rate of Return on Equity Real - Advanced,0.06824116572981875,0.07015175428284248,0.0707142973284951,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323
 Calculated Rate of Return on Equity Real - Moderate,0.06824116572981875,0.07015175428284248,0.0707142973284951,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323
 Calculated Rate of Return on Equity Real - Conservative,0.06824116572981875,0.07015175428284248,0.0707142973284951,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323
-Debt Fraction - Advanced,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468
-Debt Fraction - Moderate,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468
-Debt Fraction - Conservative,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468
+Debt Fraction - Advanced,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286
+Debt Fraction - Moderate,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286
+Debt Fraction - Conservative,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286
 Tax Rate (Federal and State),0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996
-WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
+WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
diff --git a/tests/data/Pumped_Storage_Hydropower/Market/df_just_wacc.csv b/tests/data/Pumped_Storage_Hydropower/Market/df_just_wacc.csv
index a517a71..b044bc0 100644
--- a/tests/data/Pumped_Storage_Hydropower/Market/df_just_wacc.csv
+++ b/tests/data/Pumped_Storage_Hydropower/Market/df_just_wacc.csv
@@ -1,7 +1,7 @@
 WACC Type,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
-WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
+WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
diff --git a/tests/data/Pumped_Storage_Hydropower/Market/df_wacc.csv b/tests/data/Pumped_Storage_Hydropower/Market/df_wacc.csv
index 42f0cb2..59520c3 100644
--- a/tests/data/Pumped_Storage_Hydropower/Market/df_wacc.csv
+++ b/tests/data/Pumped_Storage_Hydropower/Market/df_wacc.csv
@@ -13,13 +13,13 @@ Rate of Return on Equity Nominal - Conservative,0.0975,0.0975,0.0975,0.0975,0.09
 Calculated Rate of Return on Equity Real - Advanced,0.06824116572981875,0.07015175428284248,0.0707142973284951,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323
 Calculated Rate of Return on Equity Real - Moderate,0.06824116572981875,0.07015175428284248,0.0707142973284951,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323
 Calculated Rate of Return on Equity Real - Conservative,0.06824116572981875,0.07015175428284248,0.0707142973284951,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323,0.07073170731707323
-Debt Fraction - Advanced,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468
-Debt Fraction - Moderate,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468
-Debt Fraction - Conservative,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468,0.605058658578468
+Debt Fraction - Advanced,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286
+Debt Fraction - Moderate,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286
+Debt Fraction - Conservative,0.816900025852514,0.605133902167668,0.605106637263485,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507521579423742,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286,0.507474441225286
 Tax Rate (Federal and State),0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996,0.25739999999999996
-WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253,0.0699589399788253
-WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
-WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652,0.04386238046714652
+WACC Nominal - Advanced,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Moderate,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Nominal - Conservative,0.06031634462324527,0.0699555150411321,0.06995675608504069,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07439863274779011,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743,0.07440077838430743
+WACC Real - Advanced,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Moderate,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
+WACC Real - Conservative,0.032048809132315004,0.04329364139031444,0.043843276777649764,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819378804662455,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387,0.04819588135054387
diff --git a/tests/data/Solar_-_PV_Dist._Res/Market/20/df_lcoe.csv b/tests/data/Solar_-_PV_Dist._Res/Market/20/df_lcoe.csv
index dbac44d..98b563d 100644
--- a/tests/data/Solar_-_PV_Dist._Res/Market/20/df_lcoe.csv
+++ b/tests/data/Solar_-_PV_Dist._Res/Market/20/df_lcoe.csv
@@ -1,31 +1,31 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
 Residential PV - Class 1/Advanced,124.35632547879598,107.18168676501354,102.48745948403402,97.41012592857943,92.34736910667897,87.31142323022236,82.30207590040105,77.31911695780859,72.36233845330607,67.43153461940594,62.52650184217602,60.269760183451695,57.51847272070771,62.83438011231044,61.93948866404549,61.04459720962299,60.14970574872145,59.25481428099663,58.35992280607925,57.46503132357326,56.57013983305254,55.6752483340588,54.780356826098,53.885465308636824,52.990573781099044,52.0956822428607,51.20079069324529,50.30589913151803,49.41100755687953
 Residential PV - Class 1/Moderate,124.96675895169616,107.88244715571054,104.95839737498602,101.62884093418103,98.29358954243578,94.96537358651491,91.644170831019,88.32995913443129,85.0227164486703,81.72242081865599,78.42905038188866,78.58544375811289,78.35254437515297,90.09263771962972,88.23169424805042,86.37713640790889,84.52893138883368,82.68704660490302,80.85144969273314,79.02210850958814,77.19899113150768,75.38206585145629,73.57130117749097,71.76666583094833,69.96812874465199,68.17565906113776,66.38922613089912,64.60879951065101,62.83434896161313
-Residential PV - Class 1/Conservative,105.80052499039066,108.3414568297086,107.85285173747404,106.95050949488972,106.03505751969101,105.11960540516324,104.2041531380097,103.28870070318627,102.37324808360418,101.4577952597717,100.54234220935422,104.21891617253962,107.68752708533886,128.70014583934724,126.08547154203899,123.47671700979178,120.87386216244822,118.27688701064457,115.6857716553047,113.10049628714012,110.52104118615098,107.94738672113499,105.3795133491982,102.81740161527071,100.26103215162834,97.71038567741732,95.1654429981852,92.62618500541637,90.09259267607358
+Residential PV - Class 1/Conservative,125.3655329376363,108.3414568297086,107.85285173747404,106.95050949488972,106.03505751969101,105.11960540516324,104.2041531380097,103.28870070318627,102.37324808360418,101.4577952597717,100.54234220935422,104.21891617253962,107.68752708533886,128.70014583934724,126.08547154203899,123.47671700979178,120.87386216244822,118.27688701064457,115.6857716553047,113.10049628714012,110.52104118615098,107.94738672113499,105.3795133491982,102.81740161527071,100.26103215162834,97.71038567741732,95.1654429981852,92.62618500541637,90.09259267607358
 Residential PV - Class 2/Advanced,126.31041170197577,108.86589749316342,104.09790697719829,98.94079020594829,93.79847922129096,88.68340047869364,83.59533824179675,78.53407904883181,73.49941168302924,68.49112714355238,63.509018616960084,61.21681541040045,58.42229530222203,63.82173476473174,62.912781345404504,62.003827919822946,61.09487448766055,60.18592104856764,59.276967602169165,58.368014148062834,57.459060685815835,56.550107214962665,55.64115373500154,54.73220024539075,53.82324674554501,52.914293234830566,52.005339712560286,51.096386177987824,50.18743263030126
 Residential PV - Class 2/Moderate,126.93043728557052,109.57766935609504,106.60767221104945,103.2257964342941,99.83813621838686,96.45762199036609,93.08423116543412,89.71794125415111,86.35872986198073,83.0065746888495,79.661453528719,79.82030440873885,79.58374533678543,91.50831787502216,89.61813227212441,87.73443264195686,85.85718565857881,83.98635822402618,82.12191746636978,80.26383073779542,78.41206561270225,76.56658988582295,74.72737157036255,72.89437889615714,71.06758030785292,69.24694446310374,67.43244023078877,65.62403668924925,63.82170312454466
-Residential PV - Class 2/Conservative,107.77046950130979,110.0438917269689,109.54760888713577,108.63108759464755,107.70125056838023,106.77141340059448,105.84157607778467,104.91173858467023,103.98190090389396,103.05206301565775,102.12222489727608,105.85657109281317,109.37968638865988,130.72248914144794,128.0667288840745,125.41698141261418,122.7732263313778,120.13544333689674,117.50361221740863,114.87771285234957,112.2577252118475,109.64362935622312,107.03540543549315,104.43303368887841,101.83649444431796,99.24576811798627,96.6608352138169,94.0816763230305,91.50827212366936
+Residential PV - Class 2/Conservative,127.33547744855544,110.0438917269689,109.54760888713577,108.63108759464755,107.70125056838023,106.77141340059448,105.84157607778467,104.91173858467023,103.98190090389396,103.05206301565775,102.12222489727608,105.85657109281317,109.37968638865988,130.72248914144794,128.0667288840745,125.41698141261418,122.7732263313778,120.13544333689674,117.50361221740863,114.87771285234957,112.2577252118475,109.64362935622312,107.03540543549315,104.43303368887841,101.83649444431796,99.24576811798627,96.6608352138169,94.0816763230305,91.50827212366936
 Residential PV - Class 3/Advanced,135.393715639453,116.69472191097802,111.58385303333276,106.05587483868045,100.54376715250592,95.06085004839045,89.60689227582242,84.18166502245307,78.78494188237607,73.4164988249714,68.07611416431574,65.61907277750565,62.623591599214755,68.41131852804747,67.43699994949458,66.4626813642376,65.48836277192653,64.51404417218657,63.539725564615665,62.56540694878262,61.591088324223485,60.6167696904393,59.64245104689217,58.66813239300145,57.693813728139766,56.71949505162777,55.74517636272893,54.77085766064323,53.796538944500355
 Residential PV - Class 3/Moderate,136.05832884451866,117.45767910438269,114.27410188784195,110.64902679643677,107.01775129210351,103.39413566187588,99.77815569682575,96.1697872902403,92.56900643713496,88.97578923378106,85.39011187724734,85.5603861292958,85.30681549098955,98.08891446136917,96.06280078969215,94.04363951359079,92.03139491057102,90.02603150250967,88.0275140535733,86.03580756816007,84.0508772888615,82.07268869444732,80.10120749787053,78.13639964429366,76.17823130913698,74.22666889614622,72.28167903548224,70.3432285818309,68.41128461253383
-Residential PV - Class 3/Conservative,116.92748853168092,117.95742871533149,117.42545691041292,116.44302623363355,115.4463222546891,114.44961812404925,113.45291382723715,112.45620934787343,111.45950466735259,110.46279976445287,109.46609461485734,113.46898717205033,117.24545867668255,140.12307682330064,137.27633407067802,134.4360364987428,131.6021622450998,128.77468954620616,125.95359673682012,123.13886224945668,120.33046461384458,117.52838245639136,114.73259449965074,111.94307956179554,109.15981655609673,106.3827844904059,103.61196246664471,100.84732968029908,98.08886541991986
+Residential PV - Class 3/Conservative,136.49249647892657,117.95742871533149,117.42545691041292,116.44302623363355,115.4463222546891,114.44961812404925,113.45291382723715,112.45620934787343,111.45950466735259,110.46279976445287,109.46609461485734,113.46898717205033,117.24545867668255,140.12307682330064,137.27633407067802,134.4360364987428,131.6021622450998,128.77468954620616,125.95359673682012,123.13886224945668,120.33046461384458,117.52838245639136,114.73259449965074,111.94307956179554,109.15981655609673,106.3827844904059,103.61196246664471,100.84732968029908,98.08886541991986
 Residential PV - Class 4/Advanced,143.27763918539782,123.48981030497252,118.08133751495656,112.23146729419025,106.3983917154546,100.59620647504902,94.82466685683431,89.0835307248074,83.37255848953383,77.69151307517748,72.04015988712972,69.44004593338884,66.27013904795619,72.39488307094449,71.36383029947558,70.3327775209122,69.30172473488399,68.2706719409943,67.23961913881767,66.20856632789781,65.17751350774374,64.14646067782743,63.1154078375797,62.084354986386074,61.05330212358265,60.02224924845052,58.99119636021026,57.96014345801529,56.92909054094458
 Residential PV - Class 4/Moderate,143.9809525596081,124.29719419981774,120.92823851678557,117.09207670888125,113.24935344040908,109.41473607754061,105.58819900167124,101.76971670236364,97.95926377683227,94.15681492944361,90.36234497123098,90.54253422693124,90.27419826870994,103.80059390428724,101.65650041938585,99.51976416535784,97.39034733960216,95.2682123981183,93.15332205330388,91.04563927177678,88.94512727221804,86.85174952323962,84.76546974127301,82.68625188848081,80.61406017069109,78.54885903535273,76.49061316951385,74.43928749782148,72.39484718054364
-Residential PV - Class 4/Conservative,124.87539365971946,124.82604403677205,124.26309571999126,123.22345848596262,122.16871682092007,121.11397499534895,120.05923299392947,119.00449079932842,117.94974839185699,116.8950057490576,115.84026284519742,120.07624228337667,124.07261625892745,148.28238923658336,145.26988175765382,142.2641947597832,139.26530510753753,136.27318977009128,133.28782582064403,130.30919043584456,127.33726089521599,124.37201458058986,121.4134289755425,118.4614816648371,115.51615033387257,112.5774127681359,109.64524685266173,106.71963057149715,103.80054200717336
+Residential PV - Class 4/Conservative,144.4404016069651,124.82604403677205,124.26309571999126,123.22345848596262,122.16871682092007,121.11397499534895,120.05923299392947,119.00449079932842,117.94974839185699,116.8950057490576,115.84026284519742,120.07624228337667,124.07261625892745,148.28238923658336,145.26988175765382,142.2641947597832,139.26530510753753,136.27318977009128,133.28782582064403,130.30919043584456,127.33726089521599,124.37201458058986,121.4134289755425,118.4614816648371,115.51615033387257,112.5774127681359,109.64524685266173,106.71963057149715,103.80054200717336
 Residential PV - Class 5/Advanced,151.2705947186922,130.378872465645,124.66868000213769,118.49246609776542,112.33398374943016,106.20811500274846,100.11460148972841,94.05318756645104,88.02362027763004,82.0256493218023,76.05902701715112,73.31386185142833,69.96711701051288,76.43353895970702,75.34496738068597,74.25639579417468,73.1678241997821,72.07925259708948,70.99068098564763,69.90210936497479,68.8135377345526,67.72496609382358,66.63639444218677,65.54782277899344,64.45925110354263,63.370679415075344,62.28210771276868,61.19353599572881,60.104964262983344
 Residential PV - Class 5/Moderate,152.01314347225397,131.23129746813598,127.6743995973262,123.62423181526269,119.56713653182514,115.51859935395368,111.47859323387182,107.44709123800472,103.42406654643473,99.40949245237394,95.4033423616518,95.59358374213981,95.31027826463944,109.59126393572828,107.32755901682032,105.07162176281825,102.82341226224686,100.5828908766579,98.35001823830486,96.12475524784342,93.90706307205427,91.69690314159168,89.49423714875448,87.29902704528111,85.11123504016865,82.93082359751426,80.75775543438061,78.5919935186842,76.43350106710695
-Residential PV - Class 5/Conservative,132.93321561867666,131.78964997734676,131.1952967540561,130.0976618155036,128.98407982285846,127.87049766072941,126.75691531294201,125.64333276119616,124.5297499847046,123.41616695975699,122.30258365918492,126.77487349081996,130.99419111384148,156.55454217180173,153.37397749665024,150.20061379320592,147.0344266353904,143.8753917075693,140.72348480393674,137.57868182790696,134.44095879150765,131.31029181478223,128.18665712519496,125.07003105704182,121.9603900508686,118.85771065289276,115.7619695144328,112.67314339134326,109.59120914345696
+Residential PV - Class 5/Conservative,152.4982235659223,131.78964997734676,131.1952967540561,130.0976618155036,128.98407982285846,127.87049766072941,126.75691531294201,125.64333276119616,124.5297499847046,123.41616695975699,122.30258365918492,126.77487349081996,130.99419111384148,156.55454217180173,153.37397749665024,150.20061379320592,147.0344266353904,143.8753917075693,140.72348480393674,137.57868182790696,134.44095879150765,131.31029181478223,128.18665712519496,125.07003105704182,121.9603900508686,118.85771065289276,115.7619695144328,112.67314339134326,109.59120914345696
 Residential PV - Class 6/Advanced,153.1713197275124,132.0170916051815,126.2351501964099,119.98133175660432,113.74546767100792,107.54262697912282,101.37254806654629,95.23497207717662,89.12964287732765,83.05630702048182,77.01471371268408,74.23505536543097,70.84625845465293,77.39393142252189,76.291681869748,75.18943230938977,74.08718274105124,72.98493316430836,71.88268357870632,70.78043398375729,69.67818437893642,68.5759347636792,67.47368513737716,66.37143549937336,65.26918584895809,64.16693618536279,63.0646865077542,61.96243681522729,60.86018710679745
 Residential PV - Class 6/Moderate,153.9231986551824,132.880227384102,129.2786368567357,125.17757844911736,121.06950549561287,116.9700981808359,112.87932911715286,108.79717103256671,104.7235967701658,100.65857928758966,96.60209165651024,96.79472343250295,96.50785820297526,110.96828540178541,108.6761368811321,106.39185362660702,104.11539522524461,101.84672154053695,99.58579271007913,97.33256914324105,95.08701151886139,92.84908078296806,90.61873814652112,88.39594508318007,86.18066332709553,83.97285487072358,81.77248196266432,79.57950710552366,77.39389305379879
-Residential PV - Class 6/Conservative,134.84936586500473,133.4455956294508,132.84377431867307,131.73234752465694,130.60477330076068,129.477198905251,128.34962432175013,127.22204953172806,126.09447451413634,124.9668992449667,123.83932369670936,128.3678081453186,132.6401417728131,158.52166032919192,155.3011316489311,152.08789442106234,148.8819239125919,145.683195502358,142.4916846804071,139.30736704737825,136.13021831388872,132.9602142999287,129.79733093425895,126.64154425381435,123.49283040311458,120.35116563367873,117.21652630344762,114.08888887621156,110.96822992104558
+Residential PV - Class 6/Conservative,154.41437381225037,133.4455956294508,132.84377431867307,131.73234752465694,130.60477330076068,129.477198905251,128.34962432175013,127.22204953172806,126.09447451413634,124.9668992449667,123.83932369670936,128.3678081453186,132.6401417728131,158.52166032919192,155.3011316489311,152.08789442106234,148.8819239125919,145.683195502358,142.4916846804071,139.30736704737825,136.13021831388872,132.9602142999287,129.79733093425895,126.64154425381435,123.49283040311458,120.35116563367873,117.21652630344762,114.08888887621156,110.96822992104558
 Residential PV - Class 7/Advanced,160.2355735005949,138.105713412073,132.05710914836672,125.51486490803816,118.99140307585664,112.50248767468896,106.04784502448896,99.62720433072414,93.24029764683527,86.88685983736383,80.56662854174981,77.65877248749517,74.11368442896335,80.9633357538148,79.81025050558623,78.6571652494235,77.50407998491242,76.35099471160942,75.19790942903865,74.04482413668981,72.89173883401384,71.7386535204202,70.58556819527234,69.43248285788306,68.27939750750987,67.1263121433488,65.97322676452815,64.82014137010114,63.66705595903776
 Residential PV - Class 7/Moderate,161.02212904762894,139.00865697089483,135.240961264587,130.95076224382262,126.65322516665898,122.36475338705704,118.08531825426692,113.81489123850841,109.55344393039444,105.30094804037216,101.05737539818038,101.25889134225882,100.95879590237804,116.08613729623015,113.68827499793038,111.29864071144792,108.91719215997324,106.54388735590459,104.17868459838493,101.82154247086625,99.47241983869718,97.1312758467383,94.79806991700113,92.47276174631213,90.15531130400292,87.84567882962345,85.54382483068113,83.2497100804039,80.96329561552807
-Residential PV - Class 7/Conservative,141.97094923166824,139.60009997206276,138.97052269187154,137.80783694848355,136.62825905653926,135.44868098506672,134.26910271693288,133.08952423275306,131.9099455105081,130.73036652508247,129.55078724769763,134.28812517755483,138.75749862295768,165.8326715490988,162.4636122436444,159.10218067200972,155.74835096051655,152.40209735247632,149.06339420753758,145.73221600104216,142.40853732338215,139.09233287936678,135.78357748759254,132.48224607981888,129.1883137003519,125.90175550543191,122.62254676262913,119.35066285024496,116.08607925672132
+Residential PV - Class 7/Conservative,161.5359571789139,139.60009997206276,138.97052269187154,137.80783694848355,136.62825905653926,135.44868098506672,134.26910271693288,133.08952423275306,131.9099455105081,130.73036652508247,129.55078724769763,134.28812517755483,138.75749862295768,165.8326715490988,162.4636122436444,159.10218067200972,155.74835096051655,152.40209735247632,149.06339420753758,145.73221600104216,142.40853732338215,139.09233287936678,135.78357748759254,132.48224607981888,129.1883137003519,125.90175550543191,122.62254676262913,119.35066285024496,116.08607925672132
 Residential PV - Class 8/Advanced,168.2083950978297,144.97742230004474,138.62785838266566,131.76009250544863,124.91204359033594,118.10026002872904,111.32445452311755,104.58434280507893,97.87964359587019,91.2100785677206,84.57537230582821,81.52283041780693,77.80134985154612,84.99181842954094,83.78135926134136,82.57090008481288,81.36044089952064,80.149981704999,78.93952250074848,77.72906328623337,76.51860406087727,75.30814482406028,74.09768557511416,72.88722631331751,71.67676703789094,70.46630774799043,69.25584844270094,68.04538912102855,66.83492978189203
 Residential PV - Class 8/Moderate,169.03408719186032,145.92529350975957,141.970129034546,137.46646311213226,132.95509401455521,128.45324127542864,123.96087481843074,119.47796469422858,115.00448107987278,110.5403942782107,106.08567471731688,106.29721746528185,105.98219021374376,121.86222086091695,119.3450484250402,116.83651340114632,114.33657140886379,111.84517837141898,109.36229051305047,106.88786435645214,104.42185672024092,101.96422471645326,99.51492574806673,97.07391750654779,94.64115796942703,92.21660539789859,89.80021833444682,87.39195560049805,84.99177629409844
-Residential PV - Class 8/Conservative,150.00847385862798,146.54616486712976,145.88526178813504,144.66472443412673,143.42645443101728,142.18818423944677,140.94991384142972,139.71164321661695,138.47337234189362,137.2351011908946,135.99682973340936,140.9698828002703,145.66163830699168,174.0839872611426,170.5472940888378,167.01860818256026,163.4979023812384,159.98514964661115,156.48032306254345,152.98339583434975,149.49434128811941,146.01313287005212,142.53974414579625,139.07414879979396,135.61632063463398,132.16623357040876,128.72386164408002,125.28917900885043,121.86215993354345
+Residential PV - Class 8/Conservative,169.57348180587363,146.54616486712976,145.88526178813504,144.66472443412673,143.42645443101728,142.18818423944677,140.94991384142972,139.71164321661695,138.47337234189362,137.2351011908946,135.99682973340936,140.9698828002703,145.66163830699168,174.0839872611426,170.5472940888378,167.01860818256026,163.4979023812384,159.98514964661115,156.48032306254345,152.98339583434975,149.49434128811941,146.01313287005212,142.53974414579625,139.07414879979396,135.61632063463398,132.16623357040876,128.72386164408002,125.28917900885043,121.86215993354345
 Residential PV - Class 9/Advanced,175.18157901715773,150.98755175440604,144.37476270502523,137.22228931039288,130.09035025682508,122.99617995960898,115.93947921113671,108.91995195846103,101.93730526225323,94.99124925649126,88.08149710888085,84.90241019322139,81.02665332924282,88.51520726636228,87.25456775846098,85.99392824188548,84.73328871618291,83.47264918086834,82.21200963542158,80.95137007928469,79.6907305118574,78.4300909324941,77.16945134049884,75.90881173512035,74.64817211554687,73.38753248089944,72.12689283022506,70.86625316248863,69.60561347656407
 Residential PV - Class 9/Moderate,176.0415006918764,151.97471755624468,147.8555892711344,143.16522106926578,138.4668303523036,133.7783505003661,129.0997501902989,124.43099823120082,119.77206356379345,115.1229152598102,110.48352252140305,110.70383490591023,110.37574800319777,126.91409522418357,124.29257183518216,121.68004392746393,119.07646528084145,116.48178999131086,113.8959724683593,111.31896743230183,108.75072991164421,106.19121524047561,103.64037905588744,101.09817729541952,98.56456619453479,96.03950228411918,93.52294238800985,91.01484362054966,88.51516338416874
-Residential PV - Class 9/Conservative,157.0382482987531,152.62132752293144,151.93302629463508,150.66189080344722,149.37228754513106,148.08268409054105,146.79308042094615,145.50347651515355,144.21387234909022,142.92426789529802,141.634663122314,146.8138772054288,151.70013236262162,181.3007475178224,177.61743852445608,173.94246874332376,170.2758098873747,166.6174337974599,162.96731244161916,159.32541791437646,155.69172243603757,152.06619835199785,148.44881813205313,144.83955436971772,141.23837978155032,137.64526720648453,134.06018960516818,130.4831200593088,126.91403177102782
+Residential PV - Class 9/Conservative,176.60325624599875,152.62132752293144,151.93302629463508,150.66189080344722,149.37228754513106,148.08268409054105,146.79308042094615,145.50347651515355,144.21387234909022,142.92426789529802,141.634663122314,146.8138772054288,151.70013236262162,181.3007475178224,177.61743852445608,173.94246874332376,170.2758098873747,166.6174337974599,162.96731244161916,159.32541791437646,155.69172243603757,152.06619835199785,148.44881813205313,144.83955436971772,141.23837978155032,137.64526720648453,134.06018960516818,130.4831200593088,126.91403177102782
 Residential PV - Class 10/Advanced,191.88347704403023,165.3827793055987,158.1395236912079,150.30512996027485,142.49322832459737,134.72269633710462,126.99320626358812,119.30443382526678,111.65605815383198,104.04776174729237,96.47923042662148,92.99704779860572,88.75177436626248,96.95429072413535,95.57346122463937,94.1926317156422,92.81180219664778,91.43097266712493,90.05014312650388,88.66931357417351,87.2884840094763,85.90765443170511,84.52682484009762,83.14599523383093,81.7651656120159,80.38433597368974,79.00350631780864,77.62267664323879,76.24184694874673
 Residential PV - Class 10/Moderate,192.82538407475963,166.46406198120013,161.9522139765651,156.81466376015135,151.66832615810358,146.53284432783343,141.40818395982157,136.29431088941087,131.19119109611609,126.09879070295439,121.01707597579575,121.25839305155381,120.89902618194188,139.0141475727212,136.14268685261564,133.28107924740942,130.42927413025959,127.5872212206521,124.75487058145202,121.932172615987,119.11907806515833,116.31553800458532,113.52150384177779,110.73692731333892,107.96176048219911,105.19595573487754,102.43946577877476,99.69224363949394,96.95424265819187
-Residential PV - Class 10/Conservative,173.8756897328516,167.17232006058998,166.41839585417418,165.02606967917544,163.6135150110343,162.20096012790654,160.78840500927518,159.3758496319269,157.96329396949358,156.55073799189915,155.138181664681,160.81118456943358,166.1632976999737,198.586050083464,194.55157259650485,190.52622938638146,186.50998946914174,182.50282200092963,178.50469627720383,174.5155817319667,170.53544793699422,166.56426460107807,162.6020015692709,158.64862882213916,154.70411647502482,150.76843477731208,146.84155411170352,142.92344499350344,139.01407806991034
+Residential PV - Class 10/Conservative,193.44069768009726,167.17232006058998,166.41839585417418,165.02606967917544,163.6135150110343,162.20096012790654,160.78840500927518,159.3758496319269,157.96329396949358,156.55073799189915,155.138181664681,160.81118456943358,166.1632976999737,198.586050083464,194.55157259650485,190.52622938638146,186.50998946914174,182.50282200092963,178.50469627720383,174.5155817319667,170.53544793699422,166.56426460107807,162.6020015692709,158.64862882213916,154.70411647502482,150.76843477731208,146.84155411170352,142.92344499350344,139.01407806991034
diff --git a/tests/data/Solar_-_PV_Dist._Res/Market/20/df_tc.csv b/tests/data/Solar_-_PV_Dist._Res/Market/20/df_tc.csv
index 64b38d5..4770be6 100644
--- a/tests/data/Solar_-_PV_Dist._Res/Market/20/df_tc.csv
+++ b/tests/data/Solar_-_PV_Dist._Res/Market/20/df_tc.csv
@@ -5,7 +5,7 @@ Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035
 ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.26,0.22,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 PTC/Advanced,0,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 PTC/Moderate,0,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-PTC/Conservative,19.565007947245643,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 PVD/Advanced,0.8268096090463388,0.8268075420810661,0.8268057591299116,0.8268057115454759,0.8268057195913142,0.8268057281332646,0.8268057372186723,0.8268057469011048,0.8268057572414103,0.8268057683089945,0.8268057801833839,0.8295268359539126,0.8322628357491292,0.8475828724702382,0.8475828791158139,0.847582885988777,0.8475828931010003,0.8475829004651997,0.8475829080950071,0.8475829160050556,0.8475829242110745,0.847582932729991,0.8475829415800502,0.8475829507809429,0.847582960353952,0.8475829703221178,0.8475829807104237,0.8475829915460028,0.8475830028583782
 PVD/Moderate,0.8268096090463388,0.8268075420810661,0.8268057591299116,0.8268057115454759,0.8268057195913142,0.8268057281332646,0.8268057372186723,0.8268057469011048,0.8268057572414103,0.8268057683089945,0.8268057801833839,0.8295268359539126,0.8322628357491292,0.8475828724702382,0.8475828791158139,0.847582885988777,0.8475828931010003,0.8475829004651997,0.8475829080950071,0.8475829160050556,0.8475829242110745,0.847582932729991,0.8475829415800502,0.8475829507809429,0.847582960353952,0.8475829703221178,0.8475829807104237,0.8475829915460028,0.8475830028583782
 PVD/Conservative,0.8268096090463388,0.8268075420810661,0.8268057591299116,0.8268057115454759,0.8268057195913142,0.8268057281332646,0.8268057372186723,0.8268057469011048,0.8268057572414103,0.8268057683089945,0.8268057801833839,0.8295268359539126,0.8322628357491292,0.8475828724702382,0.8475828791158139,0.847582885988777,0.8475828931010003,0.8475829004651997,0.8475829080950071,0.8475829160050556,0.8475829242110745,0.847582932729991,0.8475829415800502,0.8475829507809429,0.847582960353952,0.8475829703221178,0.8475829807104237,0.8475829915460028,0.8475830028583782
diff --git a/tests/data/Solar_-_PV_Dist._Res/Market/30/df_lcoe.csv b/tests/data/Solar_-_PV_Dist._Res/Market/30/df_lcoe.csv
index efffeee..ac8cc54 100644
--- a/tests/data/Solar_-_PV_Dist._Res/Market/30/df_lcoe.csv
+++ b/tests/data/Solar_-_PV_Dist._Res/Market/30/df_lcoe.csv
@@ -1,31 +1,31 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
 Residential PV - Class 1/Advanced,103.12945074338688,89.46193834199573,85.65864989062545,81.43271973481144,77.21578561321485,73.02118322639178,68.84873566311374,64.69826787776947,60.56960666615669,56.46258064171822,52.37702021222646,50.25628303135686,47.750923807661444,50.83161886025556,50.11277345165781,49.393928036592044,48.6750826147206,47.956237185681864,47.23739174908798,46.51854630452287,45.79970085153892,45.080855389654815,44.36200991835157,43.64316443706895,42.92431894520168,42.205473442094416,41.48662792703645,40.76778239925602,40.048936857913404
 Residential PV - Class 1/Moderate,103.63568690413857,90.04684593915357,87.71885115206321,84.94899163760768,82.17116597078602,79.39919990145202,76.63307491089793,73.87277255866792,71.11827448219532,68.36956239645399,65.62661809362223,65.44069956796345,64.93881102289762,72.73678065190622,71.24129684158284,69.75094462968214,68.26569764942244,66.78552971440443,65.31041481707607,63.840327127214664,62.37524099042346,60.91513092664598,59.45997162869475,58.00973796079634,56.564404957152696,55.123947820517124,53.68834192078647,52.25756279360908,50.83158613900804
-Residential PV - Class 1/Conservative,88.40458846300577,90.42997011262943,90.13085166985341,89.38272347278853,88.62036335526217,87.85800309015262,87.09564266337549,86.33328205899537,85.57092125891117,84.80856024247646,84.04619898603343,86.6866851536285,89.13416505817847,103.7555284863259,101.65479840916171,99.55882450430505,97.4675906388257,95.38108075275785,93.29927885869492,91.22216904138975,89.14973545735533,87.08196233447298,85.01883397160091,82.96033473818828,80.90644907389382,78.85716148820731,76.81245656007616,74.77231893753714,72.73673333735223
+Residential PV - Class 1/Conservative,103.96639257578349,90.42997011262943,90.13085166985341,89.38272347278853,88.62036335526217,87.85800309015262,87.09564266337549,86.33328205899537,85.57092125891117,84.80856024247646,84.04619898603343,86.6866851536285,89.13416505817847,103.7555284863259,101.65479840916171,99.55882450430505,97.4675906388257,95.38108075275785,93.29927885869492,91.22216904138975,89.14973545735533,87.08196233447298,85.01883397160091,82.96033473818828,80.90644907389382,78.85716148820731,76.81245656007616,74.77231893753714,72.73673333735223
 Residential PV - Class 2/Advanced,104.74998623384823,90.86770793626428,87.00465611108099,82.71232135649967,78.42912399626732,74.16860928287582,69.93059752518347,65.71491092698133,61.52137356240467,57.34981135179556,53.20005203802108,51.04599043000901,48.5012629801756,51.63036685907519,50.90022579740849,50.170084729172146,49.43994365402318,48.70980257159431,47.97966148149156,47.24952038329233,46.519379276541976,45.78923816075161,45.05909703539408,44.32895589990038,43.59881475365571,42.868673595994416,42.13853242619464,41.40839124347248,40.678250046975016
 Residential PV - Class 2/Moderate,105.26417718985131,91.46180654057868,89.09723056211287,86.28384656833148,83.46237124520943,80.64684759497753,77.83725680793239,75.03358015385216,72.235798981628,69.4438947189101,66.65784887176626,66.46900889576528,65.95923387216523,73.87973771857007,72.36075446582194,70.84698344740899,69.33839788223236,67.83497117240996,66.33667690171737,64.84348883404596,63.3553809118759,61.872327254767164,60.394302157865134,58.92128009042275,57.45323569433924,55.990143782713794,54.5319793384155,53.078717512669584,51.63033362365889
-Residential PV - Class 2/Conservative,90.0382753271346,91.85095097612222,91.5471323041791,90.78724831586334,90.01290877230436,89.23856907884314,88.46422922117395,87.68988918311099,86.91554894626876,86.14120848967634,85.36686778930422,88.04884551450787,90.53478415241601,105.38590191536741,103.25216179479287,101.12325258314057,98.99915789397373,96.87986141496664,94.7653469074929,92.6555982062194,90.55059921870088,88.4503339249818,86.3547863771988,84.26394069918877,82.17778108610135,80.09629180401454,78.01945718955545,75.94726164952614,73.87968966053384
+Residential PV - Class 2/Conservative,105.60007943991232,91.85095097612222,91.5471323041791,90.78724831586334,90.01290877230436,89.23856907884314,88.46422922117395,87.68988918311099,86.91554894626876,86.14120848967634,85.36686778930422,88.04884551450787,90.53478415241601,105.38590191536741,103.25216179479287,101.12325258314057,98.99915789397373,96.87986141496664,94.7653469074929,92.6555982062194,90.55059921870088,88.4503339249818,86.3547863771988,84.26394069918877,82.17778108610135,80.09629180401454,78.01945718955545,75.94726164952614,73.87968966053384
 Residential PV - Class 3/Advanced,112.2828249728555,97.40223662764761,93.26138289063809,88.66037539362878,84.06916238430658,79.50226318882554,74.9594851939955,70.44063781782862,65.94553248318239,61.47398259188659,57.02580349935842,54.71683782586211,51.98911253322683,55.34323825475202,54.56059088666937,53.77794351154461,52.995296129010136,52.212648738672236,51.43000134010861,50.64735393286627,49.864706516457865,49.08205909035936,48.299411654005695,47.51676420678694,46.73411674804408,45.9514692770636,45.16882179307173,44.3861742952282,43.603526782618744
 Residential PV - Class 3/Moderate,112.8339927122634,98.03905837821023,95.50443970883515,92.48873809480371,89.4643632832968,86.44636814466098,83.4347325165391,80.4294363217712,77.43045956799969,74.43778234728973,71.45138483576319,71.24896489533609,70.70253064929585,79.19261813338684,77.56440091983744,75.94177076569122,74.32469896395223,72.71315700401682,71.10711657000246,69.50654953909502,67.91142797991196,66.32172415088478,64.7374104986572,63.15845965650096,61.58484444274964,60.016537859248096,58.45351308981974,56.89574349875095,55.34320262929216
-Residential PV - Class 3/Conservative,97.63224643727277,98.45618718286468,98.13052013514671,97.3159909506821,96.48596667511903,95.65594223887385,94.82591762661208,93.99589282098397,93.16586780228185,92.33584254802676,91.50581703246114,94.38066261790935,97.04537144517698,112.96447097332474,110.67728815726997,108.39528365312223,106.11843989605428,103.84673940067944,101.58016476061024,99.31869864802326,97.06232381322444,94.81102308422236,92.56477936630209,90.32357564160517,88.08739496871414,85.85622048224049,83.63003539241825,81.40882298470284,79.19256661937465
+Residential PV - Class 3/Conservative,113.19405055005049,98.45618718286468,98.13052013514671,97.3159909506821,96.48596667511903,95.65594223887385,94.82591762661208,93.99589282098397,93.16586780228185,92.33584254802676,91.50581703246114,94.38066261790935,97.04537144517698,112.96447097332474,110.67728815726997,108.39528365312223,106.11843989605428,103.84673940067944,101.58016476061024,99.31869864802326,97.06232381322444,94.81102308422236,92.56477936630209,90.32357564160517,88.08739496871414,85.85622048224049,83.63003539241825,81.40882298470284,79.19256661937465
 Residential PV - Class 4/Advanced,118.82101031940451,103.0739310866527,98.6919570426678,93.82303466372012,88.96447710167854,84.13164913742739,79.32434694198517,74.54236883584876,69.78551526110184,65.05358875403509,60.34639391828328,57.9029780692077,55.01641839079676,58.56585355210732,57.73763293134999,56.90941230314051,56.081191667089854,55.25297102278137,54.424750369768184,53.59652970757092,52.768309035673866,51.940088353522455,51.11186766051873,50.28364695601724,49.45542623932061,48.62720550967377,47.79898476625788,46.97076400818376,46.1425432344839
 Residential PV - Class 4/Moderate,119.40427234249438,103.74783472074387,101.06562618936447,97.87432144006107,94.67383845635736,91.48010663140148,88.29310462879008,85.11281120227795,81.93920519536029,78.7722655408709,75.61197126059497,75.3977644855503,74.81951158531093,83.80397357051392,82.08094590016309,80.36383062151745,78.65259735598377,76.947215932797,75.24765638725178,73.55388895895338,71.86588409008571,70.18361242369953,68.50704480201725,66.83615226475668,65.17090604747351,63.511277579920446,61.85723848442539,60.20876057428744,58.565815852190745
-Residential PV - Class 4/Conservative,104.22349209574091,104.1892527738998,103.84462226031108,102.98266335737003,102.10430709018598,101.22595065296338,100.3475940294748,99.46923720136024,98.59088014776447,97.71252284489955,96.8341652655081,99.87641199431829,102.69628578302567,119.54234830208814,117.12198371779392,114.70709897650052,112.29767549058765,109.89369475650133,107.49513835428692,105.10198794712855,102.71422528088918,100.33183218365895,97.95479056530438,95.58308241702365,93.21668981090713,90.85559489950134,88.4997799153787,86.14922717071319,83.80391905686076
+Residential PV - Class 4/Conservative,119.78529620851863,104.1892527738998,103.84462226031108,102.98266335737003,102.10430709018598,101.22595065296338,100.3475940294748,99.46923720136024,98.59088014776447,97.71252284489955,96.8341652655081,99.87641199431829,102.69628578302567,119.54234830208814,117.12198371779392,114.70709897650052,112.29767549058765,109.89369475650133,107.49513835428692,105.10198794712855,102.71422528088918,100.33183218365895,97.95479056530438,95.58308241702365,93.21668981090713,90.85559489950134,88.4997799153787,86.14922717071319,83.80391905686076
 Residential PV - Class 5/Advanced,125.44961655066146,108.82406315542168,104.19763419243648,99.05709175964613,93.92749236044043,88.82505792278602,83.74957324679944,78.70082540198752,73.67860369779964,68.68269965472074,63.712906975909625,61.133181550950134,58.085590861106326,61.83303652547899,60.9586123894271,60.08418824550734,59.209764093308955,58.33533993239208,57.4609157622849,56.58649158248129,55.712067392436765,54.83764319156583,53.96321897923718,53.08879475476934,52.21437051742603,51.339946266410074,50.465522000856936,49.591097719827836,48.71667342230129
 Residential PV - Class 5/Moderate,126.0654167104858,109.53556150290727,106.70372199181445,103.33438557546657,99.95535890330419,96.58346001329005,93.21866637873786,89.8609555681492,86.51030524477217,83.16669316617754,79.83009718384967,79.60394056626433,78.99342897063543,88.47910248854228,86.65995316494501,84.84704606459023,83.04034911416984,81.23983045979797,79.4454584651437,77.6572017095846,75.87502898637796,74.09890930085358,72.32881186862403,70.56470611381489,68.8065616673146,67.05434836504233,65.3080362462354,63.567595551756064,61.832996722416674
-Residential PV - Class 5/Conservative,110.90589244502551,110.00160471662927,109.6377484788718,108.72770392054233,107.80034724669393,106.87299039332112,105.94563334329123,105.01827607721998,104.0909185730887,103.16356080578245,102.2362027465232,105.448165719703,108.42535034861397,126.21119544220456,123.65580723100933,121.10620456398144,118.56236781656266,116.02427745295078,113.49191402560672,110.9652581747681,108.44429062796382,105.92899219953708,103.41934379016946,100.91532638641146,98.41692106021841,95.9241089684902,93.43687135261693,90.95518953803101,88.47904493376417
+Residential PV - Class 5/Conservative,126.46769655780324,110.00160471662927,109.6377484788718,108.72770392054233,107.80034724669393,106.87299039332112,105.94563334329123,105.01827607721998,104.0909185730887,103.16356080578245,102.2362027465232,105.448165719703,108.42535034861397,126.21119544220456,123.65580723100933,121.10620456398144,118.56236781656266,116.02427745295078,113.49191402560672,110.9652581747681,108.44429062796382,105.92899219953708,103.41934379016946,100.91532638641146,98.41692106021841,95.9241089684902,93.43687135261693,90.95518953803101,88.47904493376417
 Residential PV - Class 6/Advanced,127.02589926421969,110.19144469302714,105.50688434470673,100.3017506568937,95.10769750260472,89.94115063940222,84.80189216340202,79.68970646862522,74.60438021718053,69.54570230999404,64.5134638580911,61.90132401286554,58.8154401448161,62.60997271135063,61.72456137830385,60.839150037290324,59.95373868789416,59.06832732966995,58.18291596213996,57.2975045847917,56.412093197073865,55.526681798393575,54.64127038811161,53.75585896553791,52.87044752992697,51.98503608047158,51.09962461629635,50.2142131364507,49.32880163990032
 Residential PV - Class 6/Moderate,127.64943699370458,110.91188306421878,108.04446130272424,104.63278895187707,101.21130458651137,97.79703756434715,94.38996507564883,90.99006440706468,87.5973129411801,84.21168815608826,80.83316762497591,80.60416933456082,79.98598662042971,89.59084825228898,87.74884119734892,85.9131547995985,84.08375658272635,82.26061429260044,80.44369589537725,78.63296957563216,76.82840373450769,75.02996698788353,73.23762816456444,71.45135630448809,69.67112065695301,67.89689067886472,66.12863603300158,64.36632658630032,62.609932408160205
-Residential PV - Class 6/Conservative,112.49496740108243,111.38378214168718,111.01535402628218,110.0938746980004,109.15486572632533,108.21585657287011,107.2768472202868,106.33783764894756,105.39882783655706,104.45981775768476,103.52080738319107,106.7731288831677,109.78772203348079,127.79704744481097,125.20955061204727,122.62791201919529,120.05211179511292,117.48213015852937,114.9179474175459,112.35954396914344,109.80690029869105,107.25999697946284,104.71881467215623,102.18333412441646,99.65353617036673,97.1294017301421,94.61091180942955,92.09804749901429,89.59078997433127
+Residential PV - Class 6/Conservative,128.05677151386016,111.38378214168718,111.01535402628218,110.0938746980004,109.15486572632533,108.21585657287011,107.2768472202868,106.33783764894756,105.39882783655706,104.45981775768476,103.52080738319107,106.7731288831677,109.78772203348079,127.79704744481097,125.20955061204727,122.62791201919529,120.05211179511292,117.48213015852937,114.9179474175459,112.35954396914344,109.80690029869105,107.25999697946284,104.71881467215623,102.18333412441646,99.65353617036673,97.1294017301421,94.61091180942955,92.09804749901429,89.59078997433127
 Residential PV - Class 7/Advanced,132.88432752450242,115.27346873198509,110.3728566895569,104.9276624906838,99.49405985899887,94.08923210719978,88.71295128168589,83.36499183274108,78.04513058334096,72.75314669853265,67.48882165539223,64.75621004828409,61.528005367193785,65.49754159007789,64.57129512966304,63.64504866091404,62.718802183395795,61.79255569664235,60.86630920015395,59.94006269339446,59.01381617578714,58.087569646711785,57.161323105499676,56.23507655142895,55.308829983719704,54.382583401527505,53.45633680393659,52.53009018995253,51.60384355849332
 Residential PV - Class 7/Moderate,133.53662278356921,116.02713368561399,113.02746657274629,109.45844805996835,105.87916500304227,102.30743215283307,98.74322564762129,95.18652172651649,91.63729672899008,88.0955270944259,84.56118936168727,84.32162968132025,83.67493641065334,93.72277379112866,91.79581346092107,89.8754652963035,87.96169532315872,86.05446979979567,84.15375521497157,82.25951828593597,80.37172595649359,78.49034539509009,76.61534399291617,74.74668936203295,72.88434933351814,71.02829195563123,69.17848549199941,67.33489841982397,65.4974994281063
-Residential PV - Class 7/Conservative,118.40093943909089,116.52079672545115,116.13537672338624,115.17139881356053,114.18908279404573,113.20676658436709,112.22445016637658,111.24213351954113,110.25981662053714,109.27749944276123,108.29518195572987,111.69750036419016,114.85112640312948,133.6910410214599,130.98420896134292,128.28350532287578,125.58890931846034,122.90040025451452,120.21795753095016,117.54156064065796,114.87118916899314,112.20682279327013,109.54844128225871,106.89602449568643,104.2495523837472,101.60900498661364,98.97436243395595,96.34560494446724,93.7227128253944
+Residential PV - Class 7/Conservative,133.9627435518686,116.52079672545115,116.13537672338624,115.17139881356053,114.18908279404573,113.20676658436709,112.22445016637658,111.24213351954113,110.25981662053714,109.27749944276123,108.29518195572987,111.69750036419016,114.85112640312948,133.6910410214599,130.98420896134292,128.28350532287578,125.58890931846034,122.90040025451452,120.21795753095016,117.54156064065796,114.87118916899314,112.20682279327013,109.54844128225871,106.89602449568643,104.2495523837472,101.60900498661364,98.97436243395595,96.34560494446724,93.7227128253944
 Residential PV - Class 8/Advanced,139.49623656115241,121.00911644751015,115.86466525826857,110.14853520563044,104.44457348035426,98.77081838310076,93.12703061801021,87.51297341271713,81.92841248560562,76.37311601366532,70.84685460095425,67.97827677634494,64.58944671451422,68.7564946599043,67.78416106900634,66.81182746935956,65.83949386050719,64.86716024196011,63.894826613193686,62.92249297364512,61.95015932270898,60.97782565973418,60.00549198401874,59.033158294804885,58.0608245912739,57.088490872539325,56.116157137639846,55.14382338553155,54.17148961507859
 Residential PV - Class 8/Moderate,140.18098799468567,121.80028141495066,118.65136023683696,114.90475851168017,111.14738151072254,107.39793039118288,103.65638010405706,99.92270570618702,96.19688235977013,92.47888533188761,88.76868999404984,88.51721057231869,87.8383398646288,98.38612624595599,96.3632863891111,94.34738769856102,92.33839450974264,90.33627140208374,88.34098319692677,86.35249495547556,84.37077197676187,82.3957797956357,80.42748418077535,78.46585113271921,76.51084688191993,74.5624378868182,72.62059083193842,70.68527262600591,68.7564504000847
-Residential PV - Class 8/Conservative,125.0665070885318,122.31850758555701,121.91391028815539,120.9019678487885,119.87077485267855,118.83958165694283,117.80838824253026,116.77719458788616,115.74600066852639,114.71480645652389,113.68361191987836,117.25521906426057,120.5657596836739,140.34308960172572,137.50157403383622,134.66649181871412,131.83782113443525,129.0155402577695,126.1996275636327,123.39006152454587,120.58682071009522,117.78988378640193,114.99922951559284,112.21483675527854,109.43668445803716,106.66475167090275,103.89901753485985,101.13946128434564,98.38606224675723
+Residential PV - Class 8/Conservative,140.62831120130951,122.31850758555701,121.91391028815539,120.9019678487885,119.87077485267855,118.83958165694283,117.80838824253026,116.77719458788616,115.74600066852639,114.71480645652389,113.68361191987836,117.25521906426057,120.5657596836739,140.34308960172572,137.50157403383622,134.66649181871412,131.83782113443525,129.0155402577695,126.1996275636327,123.39006152454587,120.58682071009522,117.78988378640193,114.99922951559284,112.21483675527854,109.43668445803716,106.66475167090275,103.89901753485985,101.13946128434564,98.38606224675723
 Residential PV - Class 9/Advanced,145.2791400424517,126.02562483529371,120.66790721374518,114.71481142499941,108.77438840921495,102.86542425605576,96.98766974950296,91.14087830164505,85.32480591857563,79.53921116691686,73.78385514097495,70.79635863370254,67.26704250826751,71.60683802494837,70.59419573865904,69.58155344325817,68.56891113827011,67.55626882318543,66.54362649745777,65.53098416050098,64.51834181168452,63.505699450330354,62.49305707570737,61.48041468702638,60.46777228343473,59.45512986400923,58.442487427748695,57.42984497356594,56.41720250027804
 Residential PV - Class 9/Moderate,145.99227827369663,126.84958803985717,123.57012637052908,119.66820693434605,115.75506552658403,111.850178572597,107.95351998495879,104.06506378647711,100.18478410968277,96.31265519633837,92.44865139696499,92.18674673897473,91.4797330227304,102.4647844664584,100.3580865218354,98.25861749388476,96.16634023954659,94.08121786986676,92.00321374783458,89.93229148624427,87.86841494557731,85.81154823190944,83.76165569483813,81.7187019254329,79.68265175420876,77.65347024912016,75.63112271357765,73.61557468448713,71.60679193031035
-Residential PV - Class 9/Conservative,130.89634143003957,127.38929759954972,126.96792746886351,125.9140343245905,124.84009257973936,123.76615062698681,122.69220844649206,121.61826601580681,120.54432330943195,119.47038029828266,118.39643694903208,122.11610729496185,125.5638884403201,146.16109990394872,143.20178753612544,140.24917521972054,137.30324022816845,134.36395993768895,131.4313118267166,128.5052734753373,125.5858225647261,122.67293687659492,119.76659429264134,116.866772794005,113.97345046073006,111.08660547123223,108.20621610177265,105.33226072593907,102.46471781413294
+Residential PV - Class 9/Conservative,146.45814554281728,127.38929759954972,126.96792746886351,125.9140343245905,124.84009257973936,123.76615062698681,122.69220844649206,121.61826601580681,120.54432330943195,119.47038029828266,118.39643694903208,122.11610729496185,125.5638884403201,146.16109990394872,143.20178753612544,140.24917521972054,137.30324022816845,134.36395993768895,131.4313118267166,128.5052734753373,125.5858225647261,122.67293687659492,119.76659429264134,116.866772794005,113.97345046073006,111.08660547123223,108.20621610177265,105.33226072593907,102.46471781413294
 Residential PV - Class 10/Advanced,159.13012480942373,138.04096997935025,132.17244492089014,125.65177804752652,119.14499217554015,112.67266446963637,106.23452195341835,99.83029452916169,93.45971494046066,87.12251873556035,80.81844423138043,77.54611833565265,73.68031547250051,78.43386923125074,77.32468113062298,76.21549302001499,75.10630489890575,73.99711676673728,72.8879286229111,71.77874046678524,70.66955229766899,69.56036411481966,68.45117591743647,67.34198770465498,66.23279947554126,65.12361122908405,64.01442296418675,62.90523467965853,61.79604637420366
 Residential PV - Class 10/Moderate,159.91125399088236,138.943490241669,135.3513630815316,131.0774327244639,126.79121048751966,122.51402968803895,118.24586175140749,113.98667822375475,109.73645077139426,105.49515118028559,101.2627513555158,100.97587657843509,100.20145582625372,112.23382748516893,109.92627592087929,107.62664248173807,105.33488648344772,103.0509675200431,100.77484546152284,98.50648045150709,96.24583290491775,93.9928635056862,91.74753320448298,89.50980321647273,87.27963501909444,85.05699034986408,82.84183120420235,80.63411983328673,78.43381874192723
-Residential PV - Class 10/Conservative,144.85973316212002,139.53465597660946,139.0731122101233,137.91874037439416,136.74240849463305,135.56607638714914,134.38974403020995,133.213411399227,132.03707846627003,130.8607451994813,129.68441156235653,133.75871711114183,137.53521140905767,160.09617115851353,156.85471649197171,153.6206006630505,150.3937987784224,147.17428605734486,143.96203783103525,140.75702954205386,137.55923674368793,134.36863509934687,131.18520038195848,128.00890847337328,124.83973536377617,121.67765715110218,118.52265004046053,115.37469034356614,112.23375447817794
+Residential PV - Class 10/Conservative,160.42153727489773,139.53465597660946,139.0731122101233,137.91874037439416,136.74240849463305,135.56607638714914,134.38974403020995,133.213411399227,132.03707846627003,130.8607451994813,129.68441156235653,133.75871711114183,137.53521140905767,160.09617115851353,156.85471649197171,153.6206006630505,150.3937987784224,147.17428605734486,143.96203783103525,140.75702954205386,137.55923674368793,134.36863509934687,131.18520038195848,128.00890847337328,124.83973536377617,121.67765715110218,118.52265004046053,115.37469034356614,112.23375447817794
diff --git a/tests/data/Solar_-_PV_Dist._Res/Market/30/df_tc.csv b/tests/data/Solar_-_PV_Dist._Res/Market/30/df_tc.csv
index 6512049..4770be6 100644
--- a/tests/data/Solar_-_PV_Dist._Res/Market/30/df_tc.csv
+++ b/tests/data/Solar_-_PV_Dist._Res/Market/30/df_tc.csv
@@ -5,7 +5,7 @@ Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035
 ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.26,0.22,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 PTC/Advanced,0,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 PTC/Moderate,0,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-PTC/Conservative,15.56180411277772,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 PVD/Advanced,0.8268096090463388,0.8268075420810661,0.8268057591299116,0.8268057115454759,0.8268057195913142,0.8268057281332646,0.8268057372186723,0.8268057469011048,0.8268057572414103,0.8268057683089945,0.8268057801833839,0.8295268359539126,0.8322628357491292,0.8475828724702382,0.8475828791158139,0.847582885988777,0.8475828931010003,0.8475829004651997,0.8475829080950071,0.8475829160050556,0.8475829242110745,0.847582932729991,0.8475829415800502,0.8475829507809429,0.847582960353952,0.8475829703221178,0.8475829807104237,0.8475829915460028,0.8475830028583782
 PVD/Moderate,0.8268096090463388,0.8268075420810661,0.8268057591299116,0.8268057115454759,0.8268057195913142,0.8268057281332646,0.8268057372186723,0.8268057469011048,0.8268057572414103,0.8268057683089945,0.8268057801833839,0.8295268359539126,0.8322628357491292,0.8475828724702382,0.8475828791158139,0.847582885988777,0.8475828931010003,0.8475829004651997,0.8475829080950071,0.8475829160050556,0.8475829242110745,0.847582932729991,0.8475829415800502,0.8475829507809429,0.847582960353952,0.8475829703221178,0.8475829807104237,0.8475829915460028,0.8475830028583782
 PVD/Conservative,0.8268096090463388,0.8268075420810661,0.8268057591299116,0.8268057115454759,0.8268057195913142,0.8268057281332646,0.8268057372186723,0.8268057469011048,0.8268057572414103,0.8268057683089945,0.8268057801833839,0.8295268359539126,0.8322628357491292,0.8475828724702382,0.8475828791158139,0.847582885988777,0.8475828931010003,0.8475829004651997,0.8475829080950071,0.8475829160050556,0.8475829242110745,0.847582932729991,0.8475829415800502,0.8475829507809429,0.847582960353952,0.8475829703221178,0.8475829807104237,0.8475829915460028,0.8475830028583782
diff --git a/tests/data/Solar_-_PV_Dist._Res/Market/TechLife/df_lcoe.csv b/tests/data/Solar_-_PV_Dist._Res/Market/TechLife/df_lcoe.csv
index efffeee..ac8cc54 100644
--- a/tests/data/Solar_-_PV_Dist._Res/Market/TechLife/df_lcoe.csv
+++ b/tests/data/Solar_-_PV_Dist._Res/Market/TechLife/df_lcoe.csv
@@ -1,31 +1,31 @@
 tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
 Residential PV - Class 1/Advanced,103.12945074338688,89.46193834199573,85.65864989062545,81.43271973481144,77.21578561321485,73.02118322639178,68.84873566311374,64.69826787776947,60.56960666615669,56.46258064171822,52.37702021222646,50.25628303135686,47.750923807661444,50.83161886025556,50.11277345165781,49.393928036592044,48.6750826147206,47.956237185681864,47.23739174908798,46.51854630452287,45.79970085153892,45.080855389654815,44.36200991835157,43.64316443706895,42.92431894520168,42.205473442094416,41.48662792703645,40.76778239925602,40.048936857913404
 Residential PV - Class 1/Moderate,103.63568690413857,90.04684593915357,87.71885115206321,84.94899163760768,82.17116597078602,79.39919990145202,76.63307491089793,73.87277255866792,71.11827448219532,68.36956239645399,65.62661809362223,65.44069956796345,64.93881102289762,72.73678065190622,71.24129684158284,69.75094462968214,68.26569764942244,66.78552971440443,65.31041481707607,63.840327127214664,62.37524099042346,60.91513092664598,59.45997162869475,58.00973796079634,56.564404957152696,55.123947820517124,53.68834192078647,52.25756279360908,50.83158613900804
-Residential PV - Class 1/Conservative,88.40458846300577,90.42997011262943,90.13085166985341,89.38272347278853,88.62036335526217,87.85800309015262,87.09564266337549,86.33328205899537,85.57092125891117,84.80856024247646,84.04619898603343,86.6866851536285,89.13416505817847,103.7555284863259,101.65479840916171,99.55882450430505,97.4675906388257,95.38108075275785,93.29927885869492,91.22216904138975,89.14973545735533,87.08196233447298,85.01883397160091,82.96033473818828,80.90644907389382,78.85716148820731,76.81245656007616,74.77231893753714,72.73673333735223
+Residential PV - Class 1/Conservative,103.96639257578349,90.42997011262943,90.13085166985341,89.38272347278853,88.62036335526217,87.85800309015262,87.09564266337549,86.33328205899537,85.57092125891117,84.80856024247646,84.04619898603343,86.6866851536285,89.13416505817847,103.7555284863259,101.65479840916171,99.55882450430505,97.4675906388257,95.38108075275785,93.29927885869492,91.22216904138975,89.14973545735533,87.08196233447298,85.01883397160091,82.96033473818828,80.90644907389382,78.85716148820731,76.81245656007616,74.77231893753714,72.73673333735223
 Residential PV - Class 2/Advanced,104.74998623384823,90.86770793626428,87.00465611108099,82.71232135649967,78.42912399626732,74.16860928287582,69.93059752518347,65.71491092698133,61.52137356240467,57.34981135179556,53.20005203802108,51.04599043000901,48.5012629801756,51.63036685907519,50.90022579740849,50.170084729172146,49.43994365402318,48.70980257159431,47.97966148149156,47.24952038329233,46.519379276541976,45.78923816075161,45.05909703539408,44.32895589990038,43.59881475365571,42.868673595994416,42.13853242619464,41.40839124347248,40.678250046975016
 Residential PV - Class 2/Moderate,105.26417718985131,91.46180654057868,89.09723056211287,86.28384656833148,83.46237124520943,80.64684759497753,77.83725680793239,75.03358015385216,72.235798981628,69.4438947189101,66.65784887176626,66.46900889576528,65.95923387216523,73.87973771857007,72.36075446582194,70.84698344740899,69.33839788223236,67.83497117240996,66.33667690171737,64.84348883404596,63.3553809118759,61.872327254767164,60.394302157865134,58.92128009042275,57.45323569433924,55.990143782713794,54.5319793384155,53.078717512669584,51.63033362365889
-Residential PV - Class 2/Conservative,90.0382753271346,91.85095097612222,91.5471323041791,90.78724831586334,90.01290877230436,89.23856907884314,88.46422922117395,87.68988918311099,86.91554894626876,86.14120848967634,85.36686778930422,88.04884551450787,90.53478415241601,105.38590191536741,103.25216179479287,101.12325258314057,98.99915789397373,96.87986141496664,94.7653469074929,92.6555982062194,90.55059921870088,88.4503339249818,86.3547863771988,84.26394069918877,82.17778108610135,80.09629180401454,78.01945718955545,75.94726164952614,73.87968966053384
+Residential PV - Class 2/Conservative,105.60007943991232,91.85095097612222,91.5471323041791,90.78724831586334,90.01290877230436,89.23856907884314,88.46422922117395,87.68988918311099,86.91554894626876,86.14120848967634,85.36686778930422,88.04884551450787,90.53478415241601,105.38590191536741,103.25216179479287,101.12325258314057,98.99915789397373,96.87986141496664,94.7653469074929,92.6555982062194,90.55059921870088,88.4503339249818,86.3547863771988,84.26394069918877,82.17778108610135,80.09629180401454,78.01945718955545,75.94726164952614,73.87968966053384
 Residential PV - Class 3/Advanced,112.2828249728555,97.40223662764761,93.26138289063809,88.66037539362878,84.06916238430658,79.50226318882554,74.9594851939955,70.44063781782862,65.94553248318239,61.47398259188659,57.02580349935842,54.71683782586211,51.98911253322683,55.34323825475202,54.56059088666937,53.77794351154461,52.995296129010136,52.212648738672236,51.43000134010861,50.64735393286627,49.864706516457865,49.08205909035936,48.299411654005695,47.51676420678694,46.73411674804408,45.9514692770636,45.16882179307173,44.3861742952282,43.603526782618744
 Residential PV - Class 3/Moderate,112.8339927122634,98.03905837821023,95.50443970883515,92.48873809480371,89.4643632832968,86.44636814466098,83.4347325165391,80.4294363217712,77.43045956799969,74.43778234728973,71.45138483576319,71.24896489533609,70.70253064929585,79.19261813338684,77.56440091983744,75.94177076569122,74.32469896395223,72.71315700401682,71.10711657000246,69.50654953909502,67.91142797991196,66.32172415088478,64.7374104986572,63.15845965650096,61.58484444274964,60.016537859248096,58.45351308981974,56.89574349875095,55.34320262929216
-Residential PV - Class 3/Conservative,97.63224643727277,98.45618718286468,98.13052013514671,97.3159909506821,96.48596667511903,95.65594223887385,94.82591762661208,93.99589282098397,93.16586780228185,92.33584254802676,91.50581703246114,94.38066261790935,97.04537144517698,112.96447097332474,110.67728815726997,108.39528365312223,106.11843989605428,103.84673940067944,101.58016476061024,99.31869864802326,97.06232381322444,94.81102308422236,92.56477936630209,90.32357564160517,88.08739496871414,85.85622048224049,83.63003539241825,81.40882298470284,79.19256661937465
+Residential PV - Class 3/Conservative,113.19405055005049,98.45618718286468,98.13052013514671,97.3159909506821,96.48596667511903,95.65594223887385,94.82591762661208,93.99589282098397,93.16586780228185,92.33584254802676,91.50581703246114,94.38066261790935,97.04537144517698,112.96447097332474,110.67728815726997,108.39528365312223,106.11843989605428,103.84673940067944,101.58016476061024,99.31869864802326,97.06232381322444,94.81102308422236,92.56477936630209,90.32357564160517,88.08739496871414,85.85622048224049,83.63003539241825,81.40882298470284,79.19256661937465
 Residential PV - Class 4/Advanced,118.82101031940451,103.0739310866527,98.6919570426678,93.82303466372012,88.96447710167854,84.13164913742739,79.32434694198517,74.54236883584876,69.78551526110184,65.05358875403509,60.34639391828328,57.9029780692077,55.01641839079676,58.56585355210732,57.73763293134999,56.90941230314051,56.081191667089854,55.25297102278137,54.424750369768184,53.59652970757092,52.768309035673866,51.940088353522455,51.11186766051873,50.28364695601724,49.45542623932061,48.62720550967377,47.79898476625788,46.97076400818376,46.1425432344839
 Residential PV - Class 4/Moderate,119.40427234249438,103.74783472074387,101.06562618936447,97.87432144006107,94.67383845635736,91.48010663140148,88.29310462879008,85.11281120227795,81.93920519536029,78.7722655408709,75.61197126059497,75.3977644855503,74.81951158531093,83.80397357051392,82.08094590016309,80.36383062151745,78.65259735598377,76.947215932797,75.24765638725178,73.55388895895338,71.86588409008571,70.18361242369953,68.50704480201725,66.83615226475668,65.17090604747351,63.511277579920446,61.85723848442539,60.20876057428744,58.565815852190745
-Residential PV - Class 4/Conservative,104.22349209574091,104.1892527738998,103.84462226031108,102.98266335737003,102.10430709018598,101.22595065296338,100.3475940294748,99.46923720136024,98.59088014776447,97.71252284489955,96.8341652655081,99.87641199431829,102.69628578302567,119.54234830208814,117.12198371779392,114.70709897650052,112.29767549058765,109.89369475650133,107.49513835428692,105.10198794712855,102.71422528088918,100.33183218365895,97.95479056530438,95.58308241702365,93.21668981090713,90.85559489950134,88.4997799153787,86.14922717071319,83.80391905686076
+Residential PV - Class 4/Conservative,119.78529620851863,104.1892527738998,103.84462226031108,102.98266335737003,102.10430709018598,101.22595065296338,100.3475940294748,99.46923720136024,98.59088014776447,97.71252284489955,96.8341652655081,99.87641199431829,102.69628578302567,119.54234830208814,117.12198371779392,114.70709897650052,112.29767549058765,109.89369475650133,107.49513835428692,105.10198794712855,102.71422528088918,100.33183218365895,97.95479056530438,95.58308241702365,93.21668981090713,90.85559489950134,88.4997799153787,86.14922717071319,83.80391905686076
 Residential PV - Class 5/Advanced,125.44961655066146,108.82406315542168,104.19763419243648,99.05709175964613,93.92749236044043,88.82505792278602,83.74957324679944,78.70082540198752,73.67860369779964,68.68269965472074,63.712906975909625,61.133181550950134,58.085590861106326,61.83303652547899,60.9586123894271,60.08418824550734,59.209764093308955,58.33533993239208,57.4609157622849,56.58649158248129,55.712067392436765,54.83764319156583,53.96321897923718,53.08879475476934,52.21437051742603,51.339946266410074,50.465522000856936,49.591097719827836,48.71667342230129
 Residential PV - Class 5/Moderate,126.0654167104858,109.53556150290727,106.70372199181445,103.33438557546657,99.95535890330419,96.58346001329005,93.21866637873786,89.8609555681492,86.51030524477217,83.16669316617754,79.83009718384967,79.60394056626433,78.99342897063543,88.47910248854228,86.65995316494501,84.84704606459023,83.04034911416984,81.23983045979797,79.4454584651437,77.6572017095846,75.87502898637796,74.09890930085358,72.32881186862403,70.56470611381489,68.8065616673146,67.05434836504233,65.3080362462354,63.567595551756064,61.832996722416674
-Residential PV - Class 5/Conservative,110.90589244502551,110.00160471662927,109.6377484788718,108.72770392054233,107.80034724669393,106.87299039332112,105.94563334329123,105.01827607721998,104.0909185730887,103.16356080578245,102.2362027465232,105.448165719703,108.42535034861397,126.21119544220456,123.65580723100933,121.10620456398144,118.56236781656266,116.02427745295078,113.49191402560672,110.9652581747681,108.44429062796382,105.92899219953708,103.41934379016946,100.91532638641146,98.41692106021841,95.9241089684902,93.43687135261693,90.95518953803101,88.47904493376417
+Residential PV - Class 5/Conservative,126.46769655780324,110.00160471662927,109.6377484788718,108.72770392054233,107.80034724669393,106.87299039332112,105.94563334329123,105.01827607721998,104.0909185730887,103.16356080578245,102.2362027465232,105.448165719703,108.42535034861397,126.21119544220456,123.65580723100933,121.10620456398144,118.56236781656266,116.02427745295078,113.49191402560672,110.9652581747681,108.44429062796382,105.92899219953708,103.41934379016946,100.91532638641146,98.41692106021841,95.9241089684902,93.43687135261693,90.95518953803101,88.47904493376417
 Residential PV - Class 6/Advanced,127.02589926421969,110.19144469302714,105.50688434470673,100.3017506568937,95.10769750260472,89.94115063940222,84.80189216340202,79.68970646862522,74.60438021718053,69.54570230999404,64.5134638580911,61.90132401286554,58.8154401448161,62.60997271135063,61.72456137830385,60.839150037290324,59.95373868789416,59.06832732966995,58.18291596213996,57.2975045847917,56.412093197073865,55.526681798393575,54.64127038811161,53.75585896553791,52.87044752992697,51.98503608047158,51.09962461629635,50.2142131364507,49.32880163990032
 Residential PV - Class 6/Moderate,127.64943699370458,110.91188306421878,108.04446130272424,104.63278895187707,101.21130458651137,97.79703756434715,94.38996507564883,90.99006440706468,87.5973129411801,84.21168815608826,80.83316762497591,80.60416933456082,79.98598662042971,89.59084825228898,87.74884119734892,85.9131547995985,84.08375658272635,82.26061429260044,80.44369589537725,78.63296957563216,76.82840373450769,75.02996698788353,73.23762816456444,71.45135630448809,69.67112065695301,67.89689067886472,66.12863603300158,64.36632658630032,62.609932408160205
-Residential PV - Class 6/Conservative,112.49496740108243,111.38378214168718,111.01535402628218,110.0938746980004,109.15486572632533,108.21585657287011,107.2768472202868,106.33783764894756,105.39882783655706,104.45981775768476,103.52080738319107,106.7731288831677,109.78772203348079,127.79704744481097,125.20955061204727,122.62791201919529,120.05211179511292,117.48213015852937,114.9179474175459,112.35954396914344,109.80690029869105,107.25999697946284,104.71881467215623,102.18333412441646,99.65353617036673,97.1294017301421,94.61091180942955,92.09804749901429,89.59078997433127
+Residential PV - Class 6/Conservative,128.05677151386016,111.38378214168718,111.01535402628218,110.0938746980004,109.15486572632533,108.21585657287011,107.2768472202868,106.33783764894756,105.39882783655706,104.45981775768476,103.52080738319107,106.7731288831677,109.78772203348079,127.79704744481097,125.20955061204727,122.62791201919529,120.05211179511292,117.48213015852937,114.9179474175459,112.35954396914344,109.80690029869105,107.25999697946284,104.71881467215623,102.18333412441646,99.65353617036673,97.1294017301421,94.61091180942955,92.09804749901429,89.59078997433127
 Residential PV - Class 7/Advanced,132.88432752450242,115.27346873198509,110.3728566895569,104.9276624906838,99.49405985899887,94.08923210719978,88.71295128168589,83.36499183274108,78.04513058334096,72.75314669853265,67.48882165539223,64.75621004828409,61.528005367193785,65.49754159007789,64.57129512966304,63.64504866091404,62.718802183395795,61.79255569664235,60.86630920015395,59.94006269339446,59.01381617578714,58.087569646711785,57.161323105499676,56.23507655142895,55.308829983719704,54.382583401527505,53.45633680393659,52.53009018995253,51.60384355849332
 Residential PV - Class 7/Moderate,133.53662278356921,116.02713368561399,113.02746657274629,109.45844805996835,105.87916500304227,102.30743215283307,98.74322564762129,95.18652172651649,91.63729672899008,88.0955270944259,84.56118936168727,84.32162968132025,83.67493641065334,93.72277379112866,91.79581346092107,89.8754652963035,87.96169532315872,86.05446979979567,84.15375521497157,82.25951828593597,80.37172595649359,78.49034539509009,76.61534399291617,74.74668936203295,72.88434933351814,71.02829195563123,69.17848549199941,67.33489841982397,65.4974994281063
-Residential PV - Class 7/Conservative,118.40093943909089,116.52079672545115,116.13537672338624,115.17139881356053,114.18908279404573,113.20676658436709,112.22445016637658,111.24213351954113,110.25981662053714,109.27749944276123,108.29518195572987,111.69750036419016,114.85112640312948,133.6910410214599,130.98420896134292,128.28350532287578,125.58890931846034,122.90040025451452,120.21795753095016,117.54156064065796,114.87118916899314,112.20682279327013,109.54844128225871,106.89602449568643,104.2495523837472,101.60900498661364,98.97436243395595,96.34560494446724,93.7227128253944
+Residential PV - Class 7/Conservative,133.9627435518686,116.52079672545115,116.13537672338624,115.17139881356053,114.18908279404573,113.20676658436709,112.22445016637658,111.24213351954113,110.25981662053714,109.27749944276123,108.29518195572987,111.69750036419016,114.85112640312948,133.6910410214599,130.98420896134292,128.28350532287578,125.58890931846034,122.90040025451452,120.21795753095016,117.54156064065796,114.87118916899314,112.20682279327013,109.54844128225871,106.89602449568643,104.2495523837472,101.60900498661364,98.97436243395595,96.34560494446724,93.7227128253944
 Residential PV - Class 8/Advanced,139.49623656115241,121.00911644751015,115.86466525826857,110.14853520563044,104.44457348035426,98.77081838310076,93.12703061801021,87.51297341271713,81.92841248560562,76.37311601366532,70.84685460095425,67.97827677634494,64.58944671451422,68.7564946599043,67.78416106900634,66.81182746935956,65.83949386050719,64.86716024196011,63.894826613193686,62.92249297364512,61.95015932270898,60.97782565973418,60.00549198401874,59.033158294804885,58.0608245912739,57.088490872539325,56.116157137639846,55.14382338553155,54.17148961507859
 Residential PV - Class 8/Moderate,140.18098799468567,121.80028141495066,118.65136023683696,114.90475851168017,111.14738151072254,107.39793039118288,103.65638010405706,99.92270570618702,96.19688235977013,92.47888533188761,88.76868999404984,88.51721057231869,87.8383398646288,98.38612624595599,96.3632863891111,94.34738769856102,92.33839450974264,90.33627140208374,88.34098319692677,86.35249495547556,84.37077197676187,82.3957797956357,80.42748418077535,78.46585113271921,76.51084688191993,74.5624378868182,72.62059083193842,70.68527262600591,68.7564504000847
-Residential PV - Class 8/Conservative,125.0665070885318,122.31850758555701,121.91391028815539,120.9019678487885,119.87077485267855,118.83958165694283,117.80838824253026,116.77719458788616,115.74600066852639,114.71480645652389,113.68361191987836,117.25521906426057,120.5657596836739,140.34308960172572,137.50157403383622,134.66649181871412,131.83782113443525,129.0155402577695,126.1996275636327,123.39006152454587,120.58682071009522,117.78988378640193,114.99922951559284,112.21483675527854,109.43668445803716,106.66475167090275,103.89901753485985,101.13946128434564,98.38606224675723
+Residential PV - Class 8/Conservative,140.62831120130951,122.31850758555701,121.91391028815539,120.9019678487885,119.87077485267855,118.83958165694283,117.80838824253026,116.77719458788616,115.74600066852639,114.71480645652389,113.68361191987836,117.25521906426057,120.5657596836739,140.34308960172572,137.50157403383622,134.66649181871412,131.83782113443525,129.0155402577695,126.1996275636327,123.39006152454587,120.58682071009522,117.78988378640193,114.99922951559284,112.21483675527854,109.43668445803716,106.66475167090275,103.89901753485985,101.13946128434564,98.38606224675723
 Residential PV - Class 9/Advanced,145.2791400424517,126.02562483529371,120.66790721374518,114.71481142499941,108.77438840921495,102.86542425605576,96.98766974950296,91.14087830164505,85.32480591857563,79.53921116691686,73.78385514097495,70.79635863370254,67.26704250826751,71.60683802494837,70.59419573865904,69.58155344325817,68.56891113827011,67.55626882318543,66.54362649745777,65.53098416050098,64.51834181168452,63.505699450330354,62.49305707570737,61.48041468702638,60.46777228343473,59.45512986400923,58.442487427748695,57.42984497356594,56.41720250027804
 Residential PV - Class 9/Moderate,145.99227827369663,126.84958803985717,123.57012637052908,119.66820693434605,115.75506552658403,111.850178572597,107.95351998495879,104.06506378647711,100.18478410968277,96.31265519633837,92.44865139696499,92.18674673897473,91.4797330227304,102.4647844664584,100.3580865218354,98.25861749388476,96.16634023954659,94.08121786986676,92.00321374783458,89.93229148624427,87.86841494557731,85.81154823190944,83.76165569483813,81.7187019254329,79.68265175420876,77.65347024912016,75.63112271357765,73.61557468448713,71.60679193031035
-Residential PV - Class 9/Conservative,130.89634143003957,127.38929759954972,126.96792746886351,125.9140343245905,124.84009257973936,123.76615062698681,122.69220844649206,121.61826601580681,120.54432330943195,119.47038029828266,118.39643694903208,122.11610729496185,125.5638884403201,146.16109990394872,143.20178753612544,140.24917521972054,137.30324022816845,134.36395993768895,131.4313118267166,128.5052734753373,125.5858225647261,122.67293687659492,119.76659429264134,116.866772794005,113.97345046073006,111.08660547123223,108.20621610177265,105.33226072593907,102.46471781413294
+Residential PV - Class 9/Conservative,146.45814554281728,127.38929759954972,126.96792746886351,125.9140343245905,124.84009257973936,123.76615062698681,122.69220844649206,121.61826601580681,120.54432330943195,119.47038029828266,118.39643694903208,122.11610729496185,125.5638884403201,146.16109990394872,143.20178753612544,140.24917521972054,137.30324022816845,134.36395993768895,131.4313118267166,128.5052734753373,125.5858225647261,122.67293687659492,119.76659429264134,116.866772794005,113.97345046073006,111.08660547123223,108.20621610177265,105.33226072593907,102.46471781413294
 Residential PV - Class 10/Advanced,159.13012480942373,138.04096997935025,132.17244492089014,125.65177804752652,119.14499217554015,112.67266446963637,106.23452195341835,99.83029452916169,93.45971494046066,87.12251873556035,80.81844423138043,77.54611833565265,73.68031547250051,78.43386923125074,77.32468113062298,76.21549302001499,75.10630489890575,73.99711676673728,72.8879286229111,71.77874046678524,70.66955229766899,69.56036411481966,68.45117591743647,67.34198770465498,66.23279947554126,65.12361122908405,64.01442296418675,62.90523467965853,61.79604637420366
 Residential PV - Class 10/Moderate,159.91125399088236,138.943490241669,135.3513630815316,131.0774327244639,126.79121048751966,122.51402968803895,118.24586175140749,113.98667822375475,109.73645077139426,105.49515118028559,101.2627513555158,100.97587657843509,100.20145582625372,112.23382748516893,109.92627592087929,107.62664248173807,105.33488648344772,103.0509675200431,100.77484546152284,98.50648045150709,96.24583290491775,93.9928635056862,91.74753320448298,89.50980321647273,87.27963501909444,85.05699034986408,82.84183120420235,80.63411983328673,78.43381874192723
-Residential PV - Class 10/Conservative,144.85973316212002,139.53465597660946,139.0731122101233,137.91874037439416,136.74240849463305,135.56607638714914,134.38974403020995,133.213411399227,132.03707846627003,130.8607451994813,129.68441156235653,133.75871711114183,137.53521140905767,160.09617115851353,156.85471649197171,153.6206006630505,150.3937987784224,147.17428605734486,143.96203783103525,140.75702954205386,137.55923674368793,134.36863509934687,131.18520038195848,128.00890847337328,124.83973536377617,121.67765715110218,118.52265004046053,115.37469034356614,112.23375447817794
+Residential PV - Class 10/Conservative,160.42153727489773,139.53465597660946,139.0731122101233,137.91874037439416,136.74240849463305,135.56607638714914,134.38974403020995,133.213411399227,132.03707846627003,130.8607451994813,129.68441156235653,133.75871711114183,137.53521140905767,160.09617115851353,156.85471649197171,153.6206006630505,150.3937987784224,147.17428605734486,143.96203783103525,140.75702954205386,137.55923674368793,134.36863509934687,131.18520038195848,128.00890847337328,124.83973536377617,121.67765715110218,118.52265004046053,115.37469034356614,112.23375447817794
diff --git a/tests/data/Solar_-_PV_Dist._Res/Market/TechLife/df_tc.csv b/tests/data/Solar_-_PV_Dist._Res/Market/TechLife/df_tc.csv
index 6512049..4770be6 100644
--- a/tests/data/Solar_-_PV_Dist._Res/Market/TechLife/df_tc.csv
+++ b/tests/data/Solar_-_PV_Dist._Res/Market/TechLife/df_tc.csv
@@ -5,7 +5,7 @@ Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035
 ITC Schedule/*,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.30000001192092896,0.26,0.22,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 PTC/Advanced,0,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 PTC/Moderate,0,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-PTC/Conservative,15.56180411277772,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+PTC/Conservative,0,0,0,0,0,0.0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 PVD/Advanced,0.8268096090463388,0.8268075420810661,0.8268057591299116,0.8268057115454759,0.8268057195913142,0.8268057281332646,0.8268057372186723,0.8268057469011048,0.8268057572414103,0.8268057683089945,0.8268057801833839,0.8295268359539126,0.8322628357491292,0.8475828724702382,0.8475828791158139,0.847582885988777,0.8475828931010003,0.8475829004651997,0.8475829080950071,0.8475829160050556,0.8475829242110745,0.847582932729991,0.8475829415800502,0.8475829507809429,0.847582960353952,0.8475829703221178,0.8475829807104237,0.8475829915460028,0.8475830028583782
 PVD/Moderate,0.8268096090463388,0.8268075420810661,0.8268057591299116,0.8268057115454759,0.8268057195913142,0.8268057281332646,0.8268057372186723,0.8268057469011048,0.8268057572414103,0.8268057683089945,0.8268057801833839,0.8295268359539126,0.8322628357491292,0.8475828724702382,0.8475828791158139,0.847582885988777,0.8475828931010003,0.8475829004651997,0.8475829080950071,0.8475829160050556,0.8475829242110745,0.847582932729991,0.8475829415800502,0.8475829507809429,0.847582960353952,0.8475829703221178,0.8475829807104237,0.8475829915460028,0.8475830028583782
 PVD/Conservative,0.8268096090463388,0.8268075420810661,0.8268057591299116,0.8268057115454759,0.8268057195913142,0.8268057281332646,0.8268057372186723,0.8268057469011048,0.8268057572414103,0.8268057683089945,0.8268057801833839,0.8295268359539126,0.8322628357491292,0.8475828724702382,0.8475828791158139,0.847582885988777,0.8475828931010003,0.8475829004651997,0.8475829080950071,0.8475829160050556,0.8475829242110745,0.847582932729991,0.8475829415800502,0.8475829507809429,0.847582960353952,0.8475829703221178,0.8475829807104237,0.8475829915460028,0.8475830028583782