Rename tests to follow new folder structure

lbonaldo · Feb 26, 2024 · 7a7ac9d · 7a7ac9d
1 parent 349160a
commit 7a7ac9d
Show file tree

Hide file tree

Showing 211 changed files with 14 additions and 15 deletions.
diff --git a/example_systems/1_three_zones/settings/genx_settings.yml b/example_systems/1_three_zones/settings/genx_settings.yml
@@ -2,7 +2,6 @@ OverwriteResults: 0 # Overwrite existing results in output folder or create a ne
 PrintModel: 0 # Write the model formulation as an output; 0 = active; 1 = not active
 NetworkExpansion: 1 # Transmission network expansionl; 0 = not active; 1 = active systemwide
 Trans_Loss_Segments: 1 # Number of segments used in piecewise linear approximation of transmission losses; 1 = linear, >2 = piecewise quadratic
-Reserves: 0 # Regulation (primary) and operating (secondary) reserves; 0 = not active, 1 = active systemwide
 EnergyShareRequirement: 0 # Minimum qualifying renewables penetration; 0 = not active; 1 = active systemwide
 CapacityReserveMargin: 0 # Number of capacity reserve margin constraints; 0 = not active; 1 = active systemwide
 CO2Cap: 2 # CO2 emissions cap; 0 = not active (no CO2 emission limit); 1 = mass-based emission limit constraint; 2 = demand + rate-based emission limit constraint; 3 = generation + rate-based emission limit constraint

diff --git a/test/VREStor/highs_settings.yml → test/VRE_storage/highs_settings.yml b/test/VREStor/highs_settings.yml → test/VRE_storage/highs_settings.yml
diff --git a/...ta/test_gen_vre_stor/Policies/CO2_cap.csv → test/VRE_storage/policies/CO2_cap.csv b/...ta/test_gen_vre_stor/Policies/CO2_cap.csv → test/VRE_storage/policies/CO2_cap.csv
diff --git a/...stor/Policies/Capacity_reserve_margin.csv → ...rage/policies/Capacity_reserve_margin.csv b/...stor/Policies/Capacity_reserve_margin.csv → ...rage/policies/Capacity_reserve_margin.csv
diff --git a/...Policies/Maximum_capacity_requirement.csv → ...policies/Maximum_capacity_requirement.csv b/...Policies/Maximum_capacity_requirement.csv → ...policies/Maximum_capacity_requirement.csv
diff --git a/...Policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/...Policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/...st_gen_vre_stor/Resources/Flex_demand.csv → test/VRE_storage/resources/Flex_demand.csv b/...st_gen_vre_stor/Resources/Flex_demand.csv → test/VRE_storage/resources/Flex_demand.csv
diff --git a/...ata/test_gen_vre_stor/Resources/Hydro.csv → test/VRE_storage/resources/Hydro.csv b/...ata/test_gen_vre_stor/Resources/Hydro.csv → test/VRE_storage/resources/Hydro.csv
diff --git a/.../test_gen_vre_stor/Resources/Must_run.csv → test/VRE_storage/resources/Must_run.csv b/.../test_gen_vre_stor/Resources/Must_run.csv → test/VRE_storage/resources/Must_run.csv
diff --git a/...a/test_gen_vre_stor/Resources/Storage.csv → test/VRE_storage/resources/Storage.csv b/...a/test_gen_vre_stor/Resources/Storage.csv → test/VRE_storage/resources/Storage.csv
diff --git a/...a/test_gen_vre_stor/Resources/Thermal.csv → test/VRE_storage/resources/Thermal.csv b/...a/test_gen_vre_stor/Resources/Thermal.csv → test/VRE_storage/resources/Thermal.csv
diff --git a/...eData/test_gen_vre_stor/Resources/Vre.csv → test/VRE_storage/resources/Vre.csv b/...eData/test_gen_vre_stor/Resources/Vre.csv → test/VRE_storage/resources/Vre.csv
diff --git a/test/VREStor/Resources/Vre_stor.csv → test/VRE_storage/resources/Vre_stor.csv b/test/VREStor/Resources/Vre_stor.csv → test/VRE_storage/resources/Vre_stor.csv
diff --git a/...ents/Resource_capacity_reserve_margin.csv → ...ents/Resource_capacity_reserve_margin.csv b/...ents/Resource_capacity_reserve_margin.csv → ...ents/Resource_capacity_reserve_margin.csv
diff --git a/...Resource_maximum_capacity_requirement.csv → ...Resource_maximum_capacity_requirement.csv b/...Resource_maximum_capacity_requirement.csv → ...Resource_maximum_capacity_requirement.csv
diff --git a/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv b/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv
diff --git a/.../test_gen_vre_stor/System/Demand_data.csv → test/VRE_storage/system/Demand_data.csv b/.../test_gen_vre_stor/System/Demand_data.csv → test/VRE_storage/system/Demand_data.csv
diff --git a/...a/test_gen_vre_stor/System/Fuels_data.csv → test/VRE_storage/system/Fuels_data.csv b/...a/test_gen_vre_stor/System/Fuels_data.csv → test/VRE_storage/system/Fuels_data.csv
diff --git a/...re_stor/System/Generators_variability.csv → ...storage/system/Generators_variability.csv b/...re_stor/System/Generators_variability.csv → ...storage/system/Generators_variability.csv
diff --git a/...Data/test_gen_vre_stor/System/Network.csv → test/VRE_storage/system/Network.csv b/...Data/test_gen_vre_stor/System/Network.csv → test/VRE_storage/system/Network.csv
diff --git a/...System/Vre_and_stor_solar_variability.csv → ...system/Vre_and_stor_solar_variability.csv b/...System/Vre_and_stor_solar_variability.csv → ...system/Vre_and_stor_solar_variability.csv
diff --git a/.../System/Vre_and_stor_wind_variability.csv → .../system/Vre_and_stor_wind_variability.csv b/.../System/Vre_and_stor_wind_variability.csv → .../system/Vre_and_stor_wind_variability.csv
diff --git a/test/ComputeConflicts/highs_settings.yml → test/compute_conflicts/highs_settings.yml b/test/ComputeConflicts/highs_settings.yml → test/compute_conflicts/highs_settings.yml
diff --git a/test/ComputeConflicts/Policies/CO2_cap.csv → test/compute_conflicts/policies/CO2_cap.csv b/test/ComputeConflicts/Policies/CO2_cap.csv → test/compute_conflicts/policies/CO2_cap.csv
diff --git a/...icts/Policies/Capacity_reserve_margin.csv → ...icts/policies/Capacity_reserve_margin.csv b/...icts/Policies/Capacity_reserve_margin.csv → ...icts/policies/Capacity_reserve_margin.csv
diff --git a/...Policies/Maximum_capacity_requirement.csv → ...policies/Maximum_capacity_requirement.csv b/...Policies/Maximum_capacity_requirement.csv → ...policies/Maximum_capacity_requirement.csv
diff --git a/test/ComputeConflicts/Resources/Storage.csv → test/compute_conflicts/resources/Storage.csv b/test/ComputeConflicts/Resources/Storage.csv → test/compute_conflicts/resources/Storage.csv
diff --git a/test/ComputeConflicts/Resources/Thermal.csv → test/compute_conflicts/resources/Thermal.csv b/test/ComputeConflicts/Resources/Thermal.csv → test/compute_conflicts/resources/Thermal.csv
diff --git a/test/ComputeConflicts/Resources/Vre.csv → test/compute_conflicts/resources/Vre.csv b/test/ComputeConflicts/Resources/Vre.csv → test/compute_conflicts/resources/Vre.csv
diff --git a/test/ComputeConflicts/System/Demand_data.csv → .../compute_conflicts/system/Demand_data.csv b/test/ComputeConflicts/System/Demand_data.csv → .../compute_conflicts/system/Demand_data.csv
diff --git a/test/ComputeConflicts/System/Fuels_data.csv → test/compute_conflicts/system/Fuels_data.csv b/test/ComputeConflicts/System/Fuels_data.csv → test/compute_conflicts/system/Fuels_data.csv
diff --git a/...nflicts/System/Generators_variability.csv → ...nflicts/system/Generators_variability.csv b/...nflicts/System/Generators_variability.csv → ...nflicts/system/Generators_variability.csv
diff --git a/...est_gen_non_colocated/generators_data.csv → ...est_gen_non_colocated/generators_data.csv b/...est_gen_non_colocated/generators_data.csv → ...est_gen_non_colocated/generators_data.csv
diff --git a/...n_non_colocated/inputs_after_loadgen.jld2 → ...n_non_colocated/inputs_after_loadgen.jld2 b/...n_non_colocated/inputs_after_loadgen.jld2 → ...n_non_colocated/inputs_after_loadgen.jld2
diff --git a/..._non_colocated/inputs_before_loadgen.jld2 → ..._non_colocated/inputs_before_loadgen.jld2 b/..._non_colocated/inputs_before_loadgen.jld2 → ..._non_colocated/inputs_before_loadgen.jld2
diff --git a/...st_gen_non_colocated/Policies/CO2_cap.csv → ...st_gen_non_colocated/policies/CO2_cap.csv b/...st_gen_non_colocated/Policies/CO2_cap.csv → ...st_gen_non_colocated/policies/CO2_cap.csv
diff --git a/...ated/Policies/Capacity_reserve_margin.csv → ...ated/policies/Capacity_reserve_margin.csv b/...ated/Policies/Capacity_reserve_margin.csv → ...ated/policies/Capacity_reserve_margin.csv
diff --git a/...ted/Policies/Energy_share_requirement.csv → ...ted/policies/Energy_share_requirement.csv b/...ted/Policies/Energy_share_requirement.csv → ...ted/policies/Energy_share_requirement.csv
diff --git a/...Policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/...Policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/..._non_colocated/Resources/Electrolyzer.csv → ..._non_colocated/resources/Electrolyzer.csv b/..._non_colocated/Resources/Electrolyzer.csv → ..._non_colocated/resources/Electrolyzer.csv
diff --git a/...n_non_colocated/Resources/Flex_demand.csv → ...n_non_colocated/resources/Flex_demand.csv b/...n_non_colocated/Resources/Flex_demand.csv → ...n_non_colocated/resources/Flex_demand.csv
diff --git a/...est_gen_non_colocated/Resources/Hydro.csv → ...est_gen_non_colocated/resources/Hydro.csv b/...est_gen_non_colocated/Resources/Hydro.csv → ...est_gen_non_colocated/resources/Hydro.csv
diff --git a/..._gen_non_colocated/Resources/Must_run.csv → ..._gen_non_colocated/resources/Must_run.csv b/..._gen_non_colocated/Resources/Must_run.csv → ..._gen_non_colocated/resources/Must_run.csv
diff --git a/...ed/Resources/Resource_multistage_data.csv → ...ed/resources/Resource_multistage_data.csv b/...ed/Resources/Resource_multistage_data.csv → ...ed/resources/Resource_multistage_data.csv
diff --git a/...t_gen_non_colocated/Resources/Storage.csv → ...t_gen_non_colocated/resources/Storage.csv b/...t_gen_non_colocated/Resources/Storage.csv → ...t_gen_non_colocated/resources/Storage.csv
diff --git a/...t_gen_non_colocated/Resources/Thermal.csv → ...t_gen_non_colocated/resources/Thermal.csv b/...t_gen_non_colocated/Resources/Thermal.csv → ...t_gen_non_colocated/resources/Thermal.csv
diff --git a/.../test_gen_non_colocated/Resources/Vre.csv → .../test_gen_non_colocated/resources/Vre.csv b/.../test_gen_non_colocated/Resources/Vre.csv → .../test_gen_non_colocated/resources/Vre.csv
diff --git a/...ents/Resource_capacity_reserve_margin.csv → ...ents/Resource_capacity_reserve_margin.csv b/...ents/Resource_capacity_reserve_margin.csv → ...ents/Resource_capacity_reserve_margin.csv
diff --git a/...nts/Resource_energy_share_requirement.csv → ...nts/Resource_energy_share_requirement.csv b/...nts/Resource_energy_share_requirement.csv → ...nts/Resource_energy_share_requirement.csv
diff --git a/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv b/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv
diff --git a/..._non_colocated/Settings/genx_settings.yml → ..._non_colocated/settings/genx_settings.yml b/..._non_colocated/Settings/genx_settings.yml → ..._non_colocated/settings/genx_settings.yml
diff --git a/...non_colocated/Settings/highs_settings.yml → ...non_colocated/settings/highs_settings.yml b/...non_colocated/Settings/highs_settings.yml → ...non_colocated/settings/highs_settings.yml
diff --git a/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml b/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml
diff --git a/..._gen_non_colocated/System/Demand_data.csv → ..._gen_non_colocated/system/Demand_data.csv b/..._gen_non_colocated/System/Demand_data.csv → ..._gen_non_colocated/system/Demand_data.csv
diff --git a/...t_gen_non_colocated/System/Fuels_data.csv → ...t_gen_non_colocated/system/Fuels_data.csv b/...t_gen_non_colocated/System/Fuels_data.csv → ...t_gen_non_colocated/system/Fuels_data.csv
diff --git a/...located/System/Generators_variability.csv → ...located/system/Generators_variability.csv b/...located/System/Generators_variability.csv → ...located/system/Generators_variability.csv
diff --git a/...test_gen_non_colocated/System/Network.csv → ...test_gen_non_colocated/system/Network.csv b/...test_gen_non_colocated/System/Network.csv → ...test_gen_non_colocated/system/Network.csv
diff --git a/...colocated/System/Operational_reserves.csv → ...colocated/system/Operational_reserves.csv b/...colocated/System/Operational_reserves.csv → ...colocated/system/Operational_reserves.csv
diff --git a/...t_gen_non_colocated/System/Period_map.csv → ...t_gen_non_colocated/system/Period_map.csv b/...t_gen_non_colocated/System/Period_map.csv → ...t_gen_non_colocated/system/Period_map.csv
diff --git a/...a/test_gen_vre_stor/Vre_and_stor_data.csv → ...s/test_gen_vre_stor/Vre_and_stor_data.csv b/...a/test_gen_vre_stor/Vre_and_stor_data.csv → ...s/test_gen_vre_stor/Vre_and_stor_data.csv
diff --git a/...ata/test_gen_vre_stor/generators_data.csv → ...ces/test_gen_vre_stor/generators_data.csv b/...ata/test_gen_vre_stor/generators_data.csv → ...ces/test_gen_vre_stor/generators_data.csv
diff --git a/...st_gen_vre_stor/inputs_after_loadgen.jld2 → ...st_gen_vre_stor/inputs_after_loadgen.jld2 b/...st_gen_vre_stor/inputs_after_loadgen.jld2 → ...st_gen_vre_stor/inputs_after_loadgen.jld2
diff --git a/...t_gen_vre_stor/inputs_before_loadgen.jld2 → ...t_gen_vre_stor/inputs_before_loadgen.jld2 b/...t_gen_vre_stor/inputs_before_loadgen.jld2 → ...t_gen_vre_stor/inputs_before_loadgen.jld2
diff --git a/test/VREStor/Policies/CO2_cap.csv → ...es/test_gen_vre_stor/policies/CO2_cap.csv b/test/VREStor/Policies/CO2_cap.csv → ...es/test_gen_vre_stor/policies/CO2_cap.csv
diff --git a/...Stor/Policies/Capacity_reserve_margin.csv → ...stor/policies/Capacity_reserve_margin.csv b/...Stor/Policies/Capacity_reserve_margin.csv → ...stor/policies/Capacity_reserve_margin.csv
diff --git a/...tor/Policies/Energy_share_requirement.csv → ...tor/policies/Energy_share_requirement.csv b/...tor/Policies/Energy_share_requirement.csv → ...tor/policies/Energy_share_requirement.csv
diff --git a/...Policies/Maximum_capacity_requirement.csv → ...policies/Maximum_capacity_requirement.csv b/...Policies/Maximum_capacity_requirement.csv → ...policies/Maximum_capacity_requirement.csv
diff --git a/...Policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/...Policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/test/VREStor/Resources/Flex_demand.csv → ...st_gen_vre_stor/resources/Flex_demand.csv b/test/VREStor/Resources/Flex_demand.csv → ...st_gen_vre_stor/resources/Flex_demand.csv
diff --git a/test/VREStor/Resources/Hydro.csv → ...ces/test_gen_vre_stor/resources/Hydro.csv b/test/VREStor/Resources/Hydro.csv → ...ces/test_gen_vre_stor/resources/Hydro.csv
diff --git a/test/VREStor/Resources/Must_run.csv → .../test_gen_vre_stor/resources/Must_run.csv b/test/VREStor/Resources/Must_run.csv → .../test_gen_vre_stor/resources/Must_run.csv
diff --git a/test/VREStor/Resources/Storage.csv → ...s/test_gen_vre_stor/resources/Storage.csv b/test/VREStor/Resources/Storage.csv → ...s/test_gen_vre_stor/resources/Storage.csv
diff --git a/test/VREStor/Resources/Thermal.csv → ...s/test_gen_vre_stor/resources/Thermal.csv b/test/VREStor/Resources/Thermal.csv → ...s/test_gen_vre_stor/resources/Thermal.csv
diff --git a/test/VREStor/Resources/Vre.csv → ...urces/test_gen_vre_stor/resources/Vre.csv b/test/VREStor/Resources/Vre.csv → ...urces/test_gen_vre_stor/resources/Vre.csv
diff --git a/.../test_gen_vre_stor/Resources/Vre_stor.csv → .../test_gen_vre_stor/resources/Vre_stor.csv b/.../test_gen_vre_stor/Resources/Vre_stor.csv → .../test_gen_vre_stor/resources/Vre_stor.csv
diff --git a/...ents/Resource_capacity_reserve_margin.csv → ...ents/Resource_capacity_reserve_margin.csv b/...ents/Resource_capacity_reserve_margin.csv → ...ents/Resource_capacity_reserve_margin.csv
diff --git a/...nts/Resource_energy_share_requirement.csv → ...nts/Resource_energy_share_requirement.csv b/...nts/Resource_energy_share_requirement.csv → ...nts/Resource_energy_share_requirement.csv
diff --git a/...Resource_maximum_capacity_requirement.csv → ...Resource_maximum_capacity_requirement.csv b/...Resource_maximum_capacity_requirement.csv → ...Resource_maximum_capacity_requirement.csv
diff --git a/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv b/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv
diff --git a/...t_gen_vre_stor/Settings/genx_settings.yml → ...t_gen_vre_stor/settings/genx_settings.yml b/...t_gen_vre_stor/Settings/genx_settings.yml → ...t_gen_vre_stor/settings/genx_settings.yml
diff --git a/..._gen_vre_stor/Settings/highs_settings.yml → ..._gen_vre_stor/settings/highs_settings.yml b/..._gen_vre_stor/Settings/highs_settings.yml → ..._gen_vre_stor/settings/highs_settings.yml
diff --git a/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml b/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml
diff --git a/test/VREStor/System/Demand_data.csv → .../test_gen_vre_stor/system/Demand_data.csv b/test/VREStor/System/Demand_data.csv → .../test_gen_vre_stor/system/Demand_data.csv
diff --git a/test/VREStor/System/Fuels_data.csv → ...s/test_gen_vre_stor/system/Fuels_data.csv b/test/VREStor/System/Fuels_data.csv → ...s/test_gen_vre_stor/system/Fuels_data.csv
diff --git a/...VREStor/System/Generators_variability.csv → ...re_stor/system/Generators_variability.csv b/...VREStor/System/Generators_variability.csv → ...re_stor/system/Generators_variability.csv
diff --git a/test/VREStor/System/Network.csv → ...rces/test_gen_vre_stor/system/Network.csv b/test/VREStor/System/Network.csv → ...rces/test_gen_vre_stor/system/Network.csv
diff --git a/...ata/test_gen_vre_stor/System/Reserves.csv → ...ces/test_gen_vre_stor/system/Reserves.csv b/...ata/test_gen_vre_stor/System/Reserves.csv → ...ces/test_gen_vre_stor/system/Reserves.csv
diff --git a/...System/Vre_and_stor_solar_variability.csv → ...system/Vre_and_stor_solar_variability.csv b/...System/Vre_and_stor_solar_variability.csv → ...system/Vre_and_stor_solar_variability.csv
diff --git a/.../System/Vre_and_stor_wind_variability.csv → .../system/Vre_and_stor_wind_variability.csv b/.../System/Vre_and_stor_wind_variability.csv → .../system/Vre_and_stor_wind_variability.csv
diff --git a/.../MultiStage/Can_Retire/highs_settings.yml → ...multi_stage/can_retire/highs_settings.yml b/.../MultiStage/Can_Retire/highs_settings.yml → ...multi_stage/can_retire/highs_settings.yml
diff --git a/...Can_Retire/Inputs_p1/Policies/CO2_cap.csv → ...can_retire/inputs_p1/policies/CO2_cap.csv b/...Can_Retire/Inputs_p1/Policies/CO2_cap.csv → ...can_retire/inputs_p1/policies/CO2_cap.csv
diff --git a/...p1/Resources/Resource_multistage_data.csv → ...p1/resources/Resource_multistage_data.csv b/...p1/Resources/Resource_multistage_data.csv → ...p1/resources/Resource_multistage_data.csv
diff --git a/...an_Retire/Inputs_p1/Resources/Storage.csv → ...an_retire/inputs_p1/resources/Storage.csv b/...an_Retire/Inputs_p1/Resources/Storage.csv → ...an_retire/inputs_p1/resources/Storage.csv
diff --git a/...an_Retire/Inputs_p1/Resources/Thermal.csv → ...an_retire/inputs_p1/resources/Thermal.csv b/...an_Retire/Inputs_p1/Resources/Thermal.csv → ...an_retire/inputs_p1/resources/Thermal.csv
diff --git a/...ge/Can_Retire/Inputs_p1/Resources/Vre.csv → ...ge/can_retire/inputs_p1/resources/Vre.csv b/...ge/Can_Retire/Inputs_p1/Resources/Vre.csv → ...ge/can_retire/inputs_p1/resources/Vre.csv
diff --git a/...n_Retire/Inputs_p1/System/Demand_data.csv → ...n_retire/inputs_p1/system/Demand_data.csv b/...n_Retire/Inputs_p1/System/Demand_data.csv → ...n_retire/inputs_p1/system/Demand_data.csv
diff --git a/...an_Retire/Inputs_p1/System/Fuels_data.csv → ...an_retire/inputs_p1/system/Fuels_data.csv b/...an_Retire/Inputs_p1/System/Fuels_data.csv → ...an_retire/inputs_p1/system/Fuels_data.csv
diff --git a/...puts_p1/System/Generators_variability.csv → ...puts_p1/system/Generators_variability.csv b/...puts_p1/System/Generators_variability.csv → ...puts_p1/system/Generators_variability.csv
diff --git a/...an_Retire/Inputs_p1/System/Period_map.csv → ...an_retire/inputs_p1/system/Period_map.csv b/...an_Retire/Inputs_p1/System/Period_map.csv → ...an_retire/inputs_p1/system/Period_map.csv
diff --git a/.../Can_Retire/Inputs_p1/System/Reserves.csv → .../can_retire/inputs_p1/system/Reserves.csv b/.../Can_Retire/Inputs_p1/System/Reserves.csv → .../can_retire/inputs_p1/system/Reserves.csv
diff --git a/...Can_Retire/Inputs_p2/Policies/CO2_cap.csv → ...can_retire/inputs_p2/policies/CO2_cap.csv b/...Can_Retire/Inputs_p2/Policies/CO2_cap.csv → ...can_retire/inputs_p2/policies/CO2_cap.csv
diff --git a/...p2/Resources/Resource_multistage_data.csv → ...p2/resources/Resource_multistage_data.csv b/...p2/Resources/Resource_multistage_data.csv → ...p2/resources/Resource_multistage_data.csv
diff --git a/...an_Retire/Inputs_p2/Resources/Storage.csv → ...an_retire/inputs_p2/resources/Storage.csv b/...an_Retire/Inputs_p2/Resources/Storage.csv → ...an_retire/inputs_p2/resources/Storage.csv
diff --git a/...an_Retire/Inputs_p2/Resources/Thermal.csv → ...an_retire/inputs_p2/resources/Thermal.csv b/...an_Retire/Inputs_p2/Resources/Thermal.csv → ...an_retire/inputs_p2/resources/Thermal.csv
diff --git a/...ge/Can_Retire/Inputs_p2/Resources/Vre.csv → ...ge/can_retire/inputs_p2/resources/Vre.csv b/...ge/Can_Retire/Inputs_p2/Resources/Vre.csv → ...ge/can_retire/inputs_p2/resources/Vre.csv
diff --git a/...n_Retire/Inputs_p2/System/Demand_data.csv → ...n_retire/inputs_p2/system/Demand_data.csv b/...n_Retire/Inputs_p2/System/Demand_data.csv → ...n_retire/inputs_p2/system/Demand_data.csv
diff --git a/...an_Retire/Inputs_p2/System/Fuels_data.csv → ...an_retire/inputs_p2/system/Fuels_data.csv b/...an_Retire/Inputs_p2/System/Fuels_data.csv → ...an_retire/inputs_p2/system/Fuels_data.csv
diff --git a/...puts_p2/System/Generators_variability.csv → ...puts_p2/system/Generators_variability.csv b/...puts_p2/System/Generators_variability.csv → ...puts_p2/system/Generators_variability.csv
diff --git a/...Inputs_p2/System/Operational_reserves.csv → ...inputs_p2/system/Operational_reserves.csv b/...Inputs_p2/System/Operational_reserves.csv → ...inputs_p2/system/Operational_reserves.csv
diff --git a/...an_Retire/Inputs_p2/System/Period_map.csv → ...an_retire/inputs_p2/system/Period_map.csv b/...an_Retire/Inputs_p2/System/Period_map.csv → ...an_retire/inputs_p2/system/Period_map.csv
diff --git a/...Can_Retire/Inputs_p3/Policies/CO2_cap.csv → ...can_retire/inputs_p3/policies/CO2_cap.csv b/...Can_Retire/Inputs_p3/Policies/CO2_cap.csv → ...can_retire/inputs_p3/policies/CO2_cap.csv
diff --git a/...p3/Resources/Resource_multistage_data.csv → ...p3/resources/Resource_multistage_data.csv b/...p3/Resources/Resource_multistage_data.csv → ...p3/resources/Resource_multistage_data.csv
diff --git a/...an_Retire/Inputs_p3/Resources/Storage.csv → ...an_retire/inputs_p3/resources/Storage.csv b/...an_Retire/Inputs_p3/Resources/Storage.csv → ...an_retire/inputs_p3/resources/Storage.csv
diff --git a/...an_Retire/Inputs_p3/Resources/Thermal.csv → ...an_retire/inputs_p3/resources/Thermal.csv b/...an_Retire/Inputs_p3/Resources/Thermal.csv → ...an_retire/inputs_p3/resources/Thermal.csv
diff --git a/...ge/Can_Retire/Inputs_p3/Resources/Vre.csv → ...ge/can_retire/inputs_p3/resources/Vre.csv b/...ge/Can_Retire/Inputs_p3/Resources/Vre.csv → ...ge/can_retire/inputs_p3/resources/Vre.csv
diff --git a/...n_Retire/Inputs_p3/System/Demand_data.csv → ...n_retire/inputs_p3/system/Demand_data.csv b/...n_Retire/Inputs_p3/System/Demand_data.csv → ...n_retire/inputs_p3/system/Demand_data.csv
diff --git a/...an_Retire/Inputs_p3/System/Fuels_data.csv → ...an_retire/inputs_p3/system/Fuels_data.csv b/...an_Retire/Inputs_p3/System/Fuels_data.csv → ...an_retire/inputs_p3/system/Fuels_data.csv
diff --git a/...puts_p3/System/Generators_variability.csv → ...puts_p3/system/Generators_variability.csv b/...puts_p3/System/Generators_variability.csv → ...puts_p3/system/Generators_variability.csv
diff --git a/...an_Retire/Inputs_p3/System/Period_map.csv → ...an_retire/inputs_p3/system/Period_map.csv b/...an_Retire/Inputs_p3/System/Period_map.csv → ...an_retire/inputs_p3/system/Period_map.csv
diff --git a/.../Can_Retire/Inputs_p3/System/Reserves.csv → .../can_retire/inputs_p3/system/Reserves.csv b/.../Can_Retire/Inputs_p3/System/Reserves.csv → .../can_retire/inputs_p3/system/Reserves.csv
diff --git a/test/MultiStage/New_Build/highs_settings.yml → test/multi_stage/highs_settings.yml b/test/MultiStage/New_Build/highs_settings.yml → test/multi_stage/highs_settings.yml
diff --git a/...MultiStage/Inputs_p1/Policies/CO2_cap.csv → ...ulti_stage/inputs_p1/policies/CO2_cap.csv b/...MultiStage/Inputs_p1/Policies/CO2_cap.csv → ...ulti_stage/inputs_p1/policies/CO2_cap.csv
diff --git a/...p1/Resources/Resource_multistage_data.csv → ...p1/resources/Resource_multistage_data.csv b/...p1/Resources/Resource_multistage_data.csv → ...p1/resources/Resource_multistage_data.csv
diff --git a/...ultiStage/Inputs_p1/Resources/Storage.csv → ...lti_stage/inputs_p1/resources/Storage.csv b/...ultiStage/Inputs_p1/Resources/Storage.csv → ...lti_stage/inputs_p1/resources/Storage.csv
diff --git a/...ultiStage/Inputs_p1/Resources/Thermal.csv → ...lti_stage/inputs_p1/resources/Thermal.csv b/...ultiStage/Inputs_p1/Resources/Thermal.csv → ...lti_stage/inputs_p1/resources/Thermal.csv
diff --git a/test/MultiStage/Inputs_p1/Resources/Vre.csv → test/multi_stage/inputs_p1/resources/Vre.csv b/test/MultiStage/Inputs_p1/Resources/Vre.csv → test/multi_stage/inputs_p1/resources/Vre.csv
diff --git a/...ltiStage/Inputs_p1/System/Demand_data.csv → ...ti_stage/inputs_p1/system/Demand_data.csv b/...ltiStage/Inputs_p1/System/Demand_data.csv → ...ti_stage/inputs_p1/system/Demand_data.csv
diff --git a/...ultiStage/Inputs_p1/System/Fuels_data.csv → ...lti_stage/inputs_p1/system/Fuels_data.csv b/...ultiStage/Inputs_p1/System/Fuels_data.csv → ...lti_stage/inputs_p1/system/Fuels_data.csv
diff --git a/...puts_p1/System/Generators_variability.csv → ...puts_p1/system/Generators_variability.csv b/...puts_p1/System/Generators_variability.csv → ...puts_p1/system/Generators_variability.csv
diff --git a/...Inputs_p1/System/Operational_reserves.csv → ...inputs_p1/system/Operational_reserves.csv b/...Inputs_p1/System/Operational_reserves.csv → ...inputs_p1/system/Operational_reserves.csv
diff --git a/...ultiStage/Inputs_p1/System/Period_map.csv → ...lti_stage/inputs_p1/system/Period_map.csv b/...ultiStage/Inputs_p1/System/Period_map.csv → ...lti_stage/inputs_p1/system/Period_map.csv
diff --git a/...MultiStage/Inputs_p2/Policies/CO2_cap.csv → ...ulti_stage/inputs_p2/policies/CO2_cap.csv b/...MultiStage/Inputs_p2/Policies/CO2_cap.csv → ...ulti_stage/inputs_p2/policies/CO2_cap.csv
diff --git a/...p2/Resources/Resource_multistage_data.csv → ...p2/resources/Resource_multistage_data.csv b/...p2/Resources/Resource_multistage_data.csv → ...p2/resources/Resource_multistage_data.csv
diff --git a/...ultiStage/Inputs_p2/Resources/Storage.csv → ...lti_stage/inputs_p2/resources/Storage.csv b/...ultiStage/Inputs_p2/Resources/Storage.csv → ...lti_stage/inputs_p2/resources/Storage.csv
diff --git a/...ultiStage/Inputs_p2/Resources/Thermal.csv → ...lti_stage/inputs_p2/resources/Thermal.csv b/...ultiStage/Inputs_p2/Resources/Thermal.csv → ...lti_stage/inputs_p2/resources/Thermal.csv
diff --git a/test/MultiStage/Inputs_p2/Resources/Vre.csv → test/multi_stage/inputs_p2/resources/Vre.csv b/test/MultiStage/Inputs_p2/Resources/Vre.csv → test/multi_stage/inputs_p2/resources/Vre.csv
diff --git a/...ltiStage/Inputs_p2/System/Demand_data.csv → ...ti_stage/inputs_p2/system/Demand_data.csv b/...ltiStage/Inputs_p2/System/Demand_data.csv → ...ti_stage/inputs_p2/system/Demand_data.csv
diff --git a/...ultiStage/Inputs_p2/System/Fuels_data.csv → ...lti_stage/inputs_p2/system/Fuels_data.csv b/...ultiStage/Inputs_p2/System/Fuels_data.csv → ...lti_stage/inputs_p2/system/Fuels_data.csv
diff --git a/...puts_p2/System/Generators_variability.csv → ...puts_p2/system/Generators_variability.csv b/...puts_p2/System/Generators_variability.csv → ...puts_p2/system/Generators_variability.csv
diff --git a/...Inputs_p2/System/Operational_reserves.csv → ...inputs_p2/system/Operational_reserves.csv b/...Inputs_p2/System/Operational_reserves.csv → ...inputs_p2/system/Operational_reserves.csv
diff --git a/...ultiStage/Inputs_p2/System/Period_map.csv → ...lti_stage/inputs_p2/system/Period_map.csv b/...ultiStage/Inputs_p2/System/Period_map.csv → ...lti_stage/inputs_p2/system/Period_map.csv
diff --git a/...MultiStage/Inputs_p3/Policies/CO2_cap.csv → ...ulti_stage/inputs_p3/policies/CO2_cap.csv b/...MultiStage/Inputs_p3/Policies/CO2_cap.csv → ...ulti_stage/inputs_p3/policies/CO2_cap.csv
diff --git a/...p3/Resources/Resource_multistage_data.csv → ...p3/resources/Resource_multistage_data.csv b/...p3/Resources/Resource_multistage_data.csv → ...p3/resources/Resource_multistage_data.csv
diff --git a/...ultiStage/Inputs_p3/Resources/Storage.csv → ...lti_stage/inputs_p3/resources/Storage.csv b/...ultiStage/Inputs_p3/Resources/Storage.csv → ...lti_stage/inputs_p3/resources/Storage.csv
diff --git a/...ultiStage/Inputs_p3/Resources/Thermal.csv → ...lti_stage/inputs_p3/resources/Thermal.csv b/...ultiStage/Inputs_p3/Resources/Thermal.csv → ...lti_stage/inputs_p3/resources/Thermal.csv
diff --git a/test/MultiStage/Inputs_p3/Resources/Vre.csv → test/multi_stage/inputs_p3/resources/Vre.csv b/test/MultiStage/Inputs_p3/Resources/Vre.csv → test/multi_stage/inputs_p3/resources/Vre.csv
diff --git a/...ltiStage/Inputs_p3/System/Demand_data.csv → ...ti_stage/inputs_p3/system/Demand_data.csv b/...ltiStage/Inputs_p3/System/Demand_data.csv → ...ti_stage/inputs_p3/system/Demand_data.csv
diff --git a/...ultiStage/Inputs_p3/System/Fuels_data.csv → ...lti_stage/inputs_p3/system/Fuels_data.csv b/...ultiStage/Inputs_p3/System/Fuels_data.csv → ...lti_stage/inputs_p3/system/Fuels_data.csv
diff --git a/...puts_p3/System/Generators_variability.csv → ...puts_p3/system/Generators_variability.csv b/...puts_p3/System/Generators_variability.csv → ...puts_p3/system/Generators_variability.csv
diff --git a/...Inputs_p3/System/Operational_reserves.csv → ...inputs_p3/system/Operational_reserves.csv b/...Inputs_p3/System/Operational_reserves.csv → ...inputs_p3/system/Operational_reserves.csv
diff --git a/...ultiStage/Inputs_p3/System/Period_map.csv → ...lti_stage/inputs_p3/system/Period_map.csv b/...ultiStage/Inputs_p3/System/Period_map.csv → ...lti_stage/inputs_p3/system/Period_map.csv
diff --git a/test/MultiStage/highs_settings.yml → .../multi_stage/new_build/highs_settings.yml b/test/MultiStage/highs_settings.yml → .../multi_stage/new_build/highs_settings.yml
diff --git a/.../New_Build/Inputs_p1/Policies/CO2_cap.csv → .../new_build/inputs_p1/policies/CO2_cap.csv b/.../New_Build/Inputs_p1/Policies/CO2_cap.csv → .../new_build/inputs_p1/policies/CO2_cap.csv
diff --git a/...p1/Resources/Resource_multistage_data.csv → ...p1/resources/Resource_multistage_data.csv b/...p1/Resources/Resource_multistage_data.csv → ...p1/resources/Resource_multistage_data.csv
diff --git a/...New_Build/Inputs_p1/Resources/Storage.csv → ...new_build/inputs_p1/resources/Storage.csv b/...New_Build/Inputs_p1/Resources/Storage.csv → ...new_build/inputs_p1/resources/Storage.csv
diff --git a/...New_Build/Inputs_p1/Resources/Thermal.csv → ...new_build/inputs_p1/resources/Thermal.csv b/...New_Build/Inputs_p1/Resources/Thermal.csv → ...new_build/inputs_p1/resources/Thermal.csv
diff --git a/...age/New_Build/Inputs_p1/Resources/Vre.csv → ...age/new_build/inputs_p1/resources/Vre.csv b/...age/New_Build/Inputs_p1/Resources/Vre.csv → ...age/new_build/inputs_p1/resources/Vre.csv
diff --git a/...ew_Build/Inputs_p1/System/Demand_data.csv → ...ew_build/inputs_p1/system/Demand_data.csv b/...ew_Build/Inputs_p1/System/Demand_data.csv → ...ew_build/inputs_p1/system/Demand_data.csv
diff --git a/...New_Build/Inputs_p1/System/Fuels_data.csv → ...new_build/inputs_p1/system/Fuels_data.csv b/...New_Build/Inputs_p1/System/Fuels_data.csv → ...new_build/inputs_p1/system/Fuels_data.csv
diff --git a/...puts_p1/System/Generators_variability.csv → ...puts_p1/system/Generators_variability.csv b/...puts_p1/System/Generators_variability.csv → ...puts_p1/system/Generators_variability.csv
diff --git a/...New_Build/Inputs_p1/System/Period_map.csv → ...new_build/inputs_p1/system/Period_map.csv b/...New_Build/Inputs_p1/System/Period_map.csv → ...new_build/inputs_p1/system/Period_map.csv
diff --git a/...e/New_Build/Inputs_p1/System/Reserves.csv → ...e/new_build/inputs_p1/system/Reserves.csv b/...e/New_Build/Inputs_p1/System/Reserves.csv → ...e/new_build/inputs_p1/system/Reserves.csv
diff --git a/.../New_Build/Inputs_p2/Policies/CO2_cap.csv → .../new_build/inputs_p2/policies/CO2_cap.csv b/.../New_Build/Inputs_p2/Policies/CO2_cap.csv → .../new_build/inputs_p2/policies/CO2_cap.csv
diff --git a/...p2/Resources/Resource_multistage_data.csv → ...p2/resources/Resource_multistage_data.csv b/...p2/Resources/Resource_multistage_data.csv → ...p2/resources/Resource_multistage_data.csv
diff --git a/...New_Build/Inputs_p2/Resources/Storage.csv → ...new_build/inputs_p2/resources/Storage.csv b/...New_Build/Inputs_p2/Resources/Storage.csv → ...new_build/inputs_p2/resources/Storage.csv
diff --git a/...New_Build/Inputs_p2/Resources/Thermal.csv → ...new_build/inputs_p2/resources/Thermal.csv b/...New_Build/Inputs_p2/Resources/Thermal.csv → ...new_build/inputs_p2/resources/Thermal.csv
diff --git a/...age/New_Build/Inputs_p2/Resources/Vre.csv → ...age/new_build/inputs_p2/resources/Vre.csv b/...age/New_Build/Inputs_p2/Resources/Vre.csv → ...age/new_build/inputs_p2/resources/Vre.csv
diff --git a/...ew_Build/Inputs_p2/System/Demand_data.csv → ...ew_build/inputs_p2/system/Demand_data.csv b/...ew_Build/Inputs_p2/System/Demand_data.csv → ...ew_build/inputs_p2/system/Demand_data.csv
diff --git a/...New_Build/Inputs_p2/System/Fuels_data.csv → ...new_build/inputs_p2/system/Fuels_data.csv b/...New_Build/Inputs_p2/System/Fuels_data.csv → ...new_build/inputs_p2/system/Fuels_data.csv
diff --git a/...puts_p2/System/Generators_variability.csv → ...puts_p2/system/Generators_variability.csv b/...puts_p2/System/Generators_variability.csv → ...puts_p2/system/Generators_variability.csv
diff --git a/...New_Build/Inputs_p2/System/Period_map.csv → ...new_build/inputs_p2/system/Period_map.csv b/...New_Build/Inputs_p2/System/Period_map.csv → ...new_build/inputs_p2/system/Period_map.csv
diff --git a/...e/New_Build/Inputs_p2/System/Reserves.csv → ...e/new_build/inputs_p2/system/Reserves.csv b/...e/New_Build/Inputs_p2/System/Reserves.csv → ...e/new_build/inputs_p2/system/Reserves.csv
diff --git a/.../New_Build/Inputs_p3/Policies/CO2_cap.csv → .../new_build/inputs_p3/policies/CO2_cap.csv b/.../New_Build/Inputs_p3/Policies/CO2_cap.csv → .../new_build/inputs_p3/policies/CO2_cap.csv
diff --git a/...p3/Resources/Resource_multistage_data.csv → ...p3/resources/Resource_multistage_data.csv b/...p3/Resources/Resource_multistage_data.csv → ...p3/resources/Resource_multistage_data.csv
diff --git a/...New_Build/Inputs_p3/Resources/Storage.csv → ...new_build/inputs_p3/resources/Storage.csv b/...New_Build/Inputs_p3/Resources/Storage.csv → ...new_build/inputs_p3/resources/Storage.csv
diff --git a/...New_Build/Inputs_p3/Resources/Thermal.csv → ...new_build/inputs_p3/resources/Thermal.csv b/...New_Build/Inputs_p3/Resources/Thermal.csv → ...new_build/inputs_p3/resources/Thermal.csv
diff --git a/...age/New_Build/Inputs_p3/Resources/Vre.csv → ...age/new_build/inputs_p3/resources/Vre.csv b/...age/New_Build/Inputs_p3/Resources/Vre.csv → ...age/new_build/inputs_p3/resources/Vre.csv
diff --git a/...ew_Build/Inputs_p3/System/Demand_data.csv → ...ew_build/inputs_p3/system/Demand_data.csv b/...ew_Build/Inputs_p3/System/Demand_data.csv → ...ew_build/inputs_p3/system/Demand_data.csv
diff --git a/...New_Build/Inputs_p3/System/Fuels_data.csv → ...new_build/inputs_p3/system/Fuels_data.csv b/...New_Build/Inputs_p3/System/Fuels_data.csv → ...new_build/inputs_p3/system/Fuels_data.csv
diff --git a/...puts_p3/System/Generators_variability.csv → ...puts_p3/system/Generators_variability.csv b/...puts_p3/System/Generators_variability.csv → ...puts_p3/system/Generators_variability.csv
diff --git a/...New_Build/Inputs_p3/System/Period_map.csv → ...new_build/inputs_p3/system/Period_map.csv b/...New_Build/Inputs_p3/System/Period_map.csv → ...new_build/inputs_p3/system/Period_map.csv
diff --git a/...e/New_Build/Inputs_p3/System/Reserves.csv → ...e/new_build/inputs_p3/system/Reserves.csv b/...e/New_Build/Inputs_p3/System/Reserves.csv → ...e/new_build/inputs_p3/system/Reserves.csv
diff --git a/test/PiecewiseFuel_CO2/highs_settings.yml → test/piecewise_fuel/highs_settings.yml b/test/PiecewiseFuel_CO2/highs_settings.yml → test/piecewise_fuel/highs_settings.yml
diff --git a/test/PiecewiseFuel_CO2/Policies/CO2_cap.csv → test/piecewise_fuel/policies/CO2_cap.csv b/test/PiecewiseFuel_CO2/Policies/CO2_cap.csv → test/piecewise_fuel/policies/CO2_cap.csv
diff --git a/test/PiecewiseFuel_CO2/Resources/Thermal.csv → test/piecewise_fuel/resources/Thermal.csv b/test/PiecewiseFuel_CO2/Resources/Thermal.csv → test/piecewise_fuel/resources/Thermal.csv
diff --git a/test/PiecewiseFuel_CO2/Resources/Vre.csv → test/piecewise_fuel/resources/Vre.csv b/test/PiecewiseFuel_CO2/Resources/Vre.csv → test/piecewise_fuel/resources/Vre.csv
diff --git a/.../PiecewiseFuel_CO2/System/Demand_data.csv → test/piecewise_fuel/system/Demand_data.csv b/.../PiecewiseFuel_CO2/System/Demand_data.csv → test/piecewise_fuel/system/Demand_data.csv
diff --git a/test/PiecewiseFuel_CO2/System/Fuels_data.csv → test/piecewise_fuel/system/Fuels_data.csv b/test/PiecewiseFuel_CO2/System/Fuels_data.csv → test/piecewise_fuel/system/Fuels_data.csv
diff --git a/...uel_CO2/System/Generators_variability.csv → ...se_fuel/system/Generators_variability.csv b/...uel_CO2/System/Generators_variability.csv → ...se_fuel/system/Generators_variability.csv
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -30,11 +30,11 @@ end
     end
 
     @testset "Piecewise Fuel" begin
-        include("test_piecewisefuel_CO2.jl")
+        include("test_piecewisefuel.jl")
     end
 
     @testset "VRE_STOR" begin
-        include("test_VREStor.jl")
+        include("test_VRE_storage.jl")
     end
 
     @testset "Electrolyzer" begin

diff --git a/test/test_VREStor.jl → test/test_VRE_storage.jl b/test/test_VREStor.jl → test/test_VRE_storage.jl
@@ -4,7 +4,7 @@ using Test
 include(joinpath(@__DIR__, "utilities.jl"))
 
 obj_true = 92376.060123
-test_path = "VREStor"
+test_path = "VRE_storage"
 
 # Define test inputs
 genx_setup = Dict(

diff --git a/test/test_compute_conflicts.jl b/test/test_compute_conflicts.jl
@@ -3,7 +3,7 @@ module TestConflicts
 using Test
 
 include(joinpath(@__DIR__, "utilities.jl"))
-test_path = joinpath(@__DIR__,"ComputeConflicts");
+test_path = joinpath(@__DIR__,"compute_conflicts");
 
 # Define test inputs
 genx_setup =    Dict{Any,Any}(

diff --git a/test/test_electrolyzer.jl b/test/test_electrolyzer.jl
@@ -5,7 +5,7 @@ using Test
 include(joinpath(@__DIR__, "utilities.jl"))
 
 obj_true = 6946.9618
-test_path = "Electrolyzer"
+test_path = "electrolyzer"
 
 # Define test inputs
 genx_setup = Dict(

diff --git a/test/test_load_resource_data.jl b/test/test_load_resource_data.jl
@@ -206,7 +206,7 @@ function test_load_resources_data()
     settings = GenX.default_settings()
     merge!(settings, setup)
 
-    test_path = joinpath("LoadResourceData", "test_gen_non_colocated")
+    test_path = joinpath("load_resources", "test_gen_non_colocated")
 
     # load dfGen and inputs_true to compare against
     input_true_filenames = InputsTrue("generators_data.csv", "inputs_after_loadgen.jld2")
@@ -259,7 +259,7 @@ function test_load_VRE_STOR_data()
     settings = GenX.default_settings()
     merge!(settings, setup)
 
-    test_path = joinpath("LoadResourceData","test_gen_vre_stor")
+    test_path = joinpath("load_resources","test_gen_vre_stor")
     input_true_filenames = InputsTrue("generators_data.csv", "inputs_after_loadgen.jld2")
     dfGen, inputs_true = prepare_inputs_true(test_path, input_true_filenames, settings)
 

diff --git a/test/test_multistage.jl b/test/test_multistage.jl
@@ -5,7 +5,7 @@ using Test
 include(joinpath(@__DIR__, "utilities.jl"))
 
 obj_true = [79734.80032, 41630.03494, 27855.20631]
-test_path = joinpath(@__DIR__, "MultiStage");
+test_path = joinpath(@__DIR__, "multi_stage");
 
 # Define test inputs
 multistage_setup = Dict(

diff --git a/test/test_piecewisefuel_CO2.jl → test/test_piecewisefuel.jl b/test/test_piecewisefuel_CO2.jl → test/test_piecewisefuel.jl
@@ -4,7 +4,7 @@ using Test
 include(joinpath(@__DIR__, "utilities.jl"))
 
 obj_true = 2341.82308
-test_path = "PiecewiseFuel_CO2"
+test_path = "piecewise_fuel"
 
 # Define test inputs
 genx_setup = Dict(

diff --git a/test/test_threezones.jl b/test/test_threezones.jl
@@ -5,7 +5,7 @@ using Test
 include(joinpath(@__DIR__, "utilities.jl"))
 
 obj_true = 6960.20855
-test_path = "ThreeZones"
+test_path = "three_zones"
 
 # Define test inputs
 genx_setup = Dict(

diff --git a/test/test_time_domain_reduction.jl b/test/test_time_domain_reduction.jl
@@ -12,13 +12,13 @@ console_out = stdout
 redirect_stdout(devnull)
 
 test_folder = settings_path = "TDR"
-TDR_Results_test = joinpath(test_folder, "TDR_Results_test")
+TDR_Results_test = joinpath(test_folder, "TDR_results_test")
 
 # Folder with true clustering results for LTS and non-LTS versions
 TDR_Results_true = if VERSION == v"1.6.7"
-    joinpath(test_folder, "TDR_Results_true_LTS")
+    joinpath(test_folder, "TDR_results_true_LTS")
 else 
-    joinpath(test_folder, "TDR_Results_true")
+    joinpath(test_folder, "TDR_results_true")
 end
 
 # Remove test folder if it exists
@@ -29,7 +29,7 @@ end
 # Inputs for cluster_inputs function
 genx_setup = Dict(
     "TimeDomainReduction" => 1,
-    "TimeDomainReductionFolder" => "TDR_Results_test",
+    "TimeDomainReductionFolder" => "TDR_results_test",
     "UCommit" => 2,
     "CapacityReserveMargin" => 1,
     "MinCapReq" => 1,

diff --git a/test/ThreeZones/highs_settings.yml → test/three_zones/highs_settings.yml b/test/ThreeZones/highs_settings.yml → test/three_zones/highs_settings.yml
diff --git a/test/ThreeZones/Policies/CO2_cap.csv → test/three_zones/policies/CO2_cap.csv b/test/ThreeZones/Policies/CO2_cap.csv → test/three_zones/policies/CO2_cap.csv
diff --git a/...Policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/...Policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/test/ThreeZones/Resources/Storage.csv → test/three_zones/resources/Storage.csv b/test/ThreeZones/Resources/Storage.csv → test/three_zones/resources/Storage.csv
diff --git a/test/ThreeZones/Resources/Thermal.csv → test/three_zones/resources/Thermal.csv b/test/ThreeZones/Resources/Thermal.csv → test/three_zones/resources/Thermal.csv
diff --git a/test/ThreeZones/Resources/Vre.csv → test/three_zones/resources/Vre.csv b/test/ThreeZones/Resources/Vre.csv → test/three_zones/resources/Vre.csv
diff --git a/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv b/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv
diff --git a/test/ThreeZones/System/Demand_data.csv → test/three_zones/system/Demand_data.csv b/test/ThreeZones/System/Demand_data.csv → test/three_zones/system/Demand_data.csv
diff --git a/test/ThreeZones/System/Fuels_data.csv → test/three_zones/system/Fuels_data.csv b/test/ThreeZones/System/Fuels_data.csv → test/three_zones/system/Fuels_data.csv
diff --git a/...eeZones/System/Generators_variability.csv → ...e_zones/system/Generators_variability.csv b/...eeZones/System/Generators_variability.csv → ...e_zones/system/Generators_variability.csv
diff --git a/test/ThreeZones/System/Network.csv → test/three_zones/system/Network.csv b/test/ThreeZones/System/Network.csv → test/three_zones/system/Network.csv
diff --git a/test/ThreeZones/System/Period_map.csv → test/three_zones/system/Period_map.csv b/test/ThreeZones/System/Period_map.csv → test/three_zones/system/Period_map.csv
diff --git a/test/ThreeZones/System/Reserves.csv → test/three_zones/system/Reserves.csv b/test/ThreeZones/System/Reserves.csv → test/three_zones/system/Reserves.csv