diff --git a/test_results_win64.csv b/test_results_win64.csv
index ee47ab1a2..387333119 100644
--- a/test_results_win64.csv
+++ b/test_results_win64.csv
@@ -1,27 +1,27 @@
 TECHNOLOGY,FINANCING,ANNUAL_OUTPUT,LCOE_NOM,LPPA_NOM,MESSAGES
-Flat Plate PV,Residential,13700.6,8.67416,NA,; 
-Flat Plate PV,Commercial,808617,4.08413,NA,; 
-Flat Plate PV,Third Party,13700.6,NA,NA,; 
-Flat Plate PV,Host Developer,808617,10.3366,11.4551,; 
-Flat Plate PV,Single Owner,193152944,5.09575,4.64696,; Warning: NPV is $-8.14542e+06. A negative NPV indicates project costs are higher than revenues.
-Flat Plate PV,Merchant Plant,193152944,4.83352,NA,; Warning: NPV is $-4.77926e+07. A negative NPV indicates project costs are higher than revenues.
-Flat Plate PV,Leveraged Partnership Flip,193152944,5.26334,4.64696,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.09634e+07. A negative NPV indicates project costs are higher than revenues.
-Flat Plate PV,All Equity Partnership Flip,193152944,5.75883,4.64696,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-2.20049e+07. A negative NPV indicates project costs are higher than revenues.
-Flat Plate PV,Sale Leaseback,193152944,6.53523,4.64696,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-3.44267e+07. A negative NPV indicates project costs are higher than revenues.
-Flat Plate PV,LCOE Calculator,193152944,NA,NA,; 
-Flat Plate PV,None,155942864,NA,NA,; 
-PVWatts,Residential,13904.6,9.69892,NA,; 
-PVWatts,Commercial,938557,3.76665,NA,; 
-PVWatts,Third Party,11123.6,NA,NA,; 
-PVWatts,Host Developer,938557,9.52331,10.2664,; 
-PVWatts,Single Owner,211907456,4.50702,4.64739,; 
-PVWatts,Community Solar,211907456,4.72857,NA,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-6.50779e+07. A negative NPV indicates project costs are higher than revenues.
-PVWatts,Merchant Plant,211907456,4.23759,NA,; Warning: NPV is $-4.18393e+07. A negative NPV indicates project costs are higher than revenues.
-PVWatts,Leveraged Partnership Flip,211907456,4.65964,4.64739,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-239153. A negative NPV indicates project costs are higher than revenues.
-PVWatts,All Equity Partnership Flip,211907456,5.17504,4.64739,; Warning: NPV is $-1.25365e+07. A negative NPV indicates project costs are higher than revenues.
-PVWatts,Sale Leaseback,211907456,5.8821,4.64739,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-2.4762e+07. A negative NPV indicates project costs are higher than revenues.
-PVWatts,LCOE Calculator,211907456,NA,NA,; 
-PVWatts,None,173806896,NA,NA,; 
+Flat Plate PV,Residential,13707.6,8.66951,NA,; 
+Flat Plate PV,Commercial,808628,4.08407,NA,; 
+Flat Plate PV,Third Party,13707.6,NA,NA,; 
+Flat Plate PV,Host Developer,808628,10.3364,11.4551,; 
+Flat Plate PV,Single Owner,193154176,5.09571,4.64696,; Warning: NPV is $-8.1447e+06. A negative NPV indicates project costs are higher than revenues.
+Flat Plate PV,Merchant Plant,193154176,4.83348,NA,; Warning: NPV is $-4.77921e+07. A negative NPV indicates project costs are higher than revenues.
+Flat Plate PV,Leveraged Partnership Flip,193154176,5.2633,4.64696,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.09627e+07. A negative NPV indicates project costs are higher than revenues.
+Flat Plate PV,All Equity Partnership Flip,193154176,5.75879,4.64696,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-2.20043e+07. A negative NPV indicates project costs are higher than revenues.
+Flat Plate PV,Sale Leaseback,193154176,6.53518,4.64696,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-3.44261e+07. A negative NPV indicates project costs are higher than revenues.
+Flat Plate PV,LCOE Calculator,193154176,NA,NA,; 
+Flat Plate PV,None,155941152,NA,NA,; 
+PVWatts,Residential,13916.2,9.69083,NA,; 
+PVWatts,Commercial,939340,3.76351,NA,; 
+PVWatts,Third Party,11132.9,NA,NA,; 
+PVWatts,Host Developer,939340,9.51537,10.2578,; 
+PVWatts,Single Owner,211972144,4.50518,4.64739,; 
+PVWatts,Community Solar,211972144,4.72724,NA,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-6.50717e+07. A negative NPV indicates project costs are higher than revenues.
+PVWatts,Merchant Plant,211972144,4.23577,NA,; Warning: NPV is $-4.18125e+07. A negative NPV indicates project costs are higher than revenues.
+PVWatts,Leveraged Partnership Flip,211972144,4.65775,4.64739,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-202441. A negative NPV indicates project costs are higher than revenues.
+PVWatts,All Equity Partnership Flip,211972144,5.17321,4.64739,; Warning: NPV is $-1.25226e+07. A negative NPV indicates project costs are higher than revenues.
+PVWatts,Sale Leaseback,211972144,5.88006,4.64739,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-2.47289e+07. A negative NPV indicates project costs are higher than revenues.
+PVWatts,LCOE Calculator,211972144,NA,NA,; 
+PVWatts,None,173951936,NA,NA,; 
 High-X Concentrating PV,Single Owner,2.39082e+06,20.4395,25.9389,; 
 High-X Concentrating PV,Merchant Plant,2.39082e+06,17.6309,NA,; Warning: NPV is $-3.52769e+06. A negative NPV indicates project costs are higher than revenues.
 High-X Concentrating PV,Leveraged Partnership Flip,2.39082e+06,21.7795,25.9389,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs.
@@ -29,19 +29,19 @@ High-X Concentrating PV,All Equity Partnership Flip,2.39082e+06,25.1955,25.9389,
 High-X Concentrating PV,Sale Leaseback,2.39082e+06,25.5293,25.9389,; 
 High-X Concentrating PV,LCOE Calculator,2.39082e+06,NA,NA,; 
 High-X Concentrating PV,None,2.39082e+06,NA,NA,; 
-PV Battery,Residential,13541.8,16.6191,NA,; 
-PV Battery,Commercial,932779,7.30421,NA,; 
-PV Battery,Third Party,13590.4,NA,NA,; 
-PV Battery,Host Developer,932779,13.5466,16.2099,; 
-PV Battery,Single Owner,219654272,9.28589,9.96064,; 
-PV Battery,Merchant Plant,219654272,8.57912,NA,; Warning: NPV is $-1.09451e+08. A negative NPV indicates project costs are higher than revenues.
-PV Battery,Leveraged Partnership Flip,219654272,9.47926,9.96064,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs.
-PV Battery,All Equity Partnership Flip,219654272,10.7012,9.96064,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.92491e+07. A negative NPV indicates project costs are higher than revenues.
-PV Battery,Sale Leaseback,219654272,11.3474,9.96064,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-2.90538e+07. A negative NPV indicates project costs are higher than revenues.
-PVWatts Battery,Residential,13662.6,19.6469,NA,; 
-PVWatts Battery,Commercial,929768,13.1177,NA,; 
-PVWatts Battery,Third Party,10996.8,NA,NA,; 
-PVWatts Battery,Host Developer,929768,17.1749,16.2118,; Warning: NPV is $-85059. A negative NPV indicates project costs are higher than revenues.
+PV Battery,Residential,13551.8,16.6065,NA,; 
+PV Battery,Commercial,933472,7.29864,NA,; 
+PV Battery,Third Party,13600.5,NA,NA,; 
+PV Battery,Host Developer,933472,13.5376,16.2099,; 
+PV Battery,Single Owner,219717520,9.28267,9.95982,; 
+PV Battery,Merchant Plant,219717520,8.576,NA,; Warning: NPV is $-1.0943e+08. A negative NPV indicates project costs are higher than revenues.
+PV Battery,Leveraged Partnership Flip,219717520,9.47597,9.95982,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs.
+PV Battery,All Equity Partnership Flip,219717520,10.6979,9.95982,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.92052e+07. A negative NPV indicates project costs are higher than revenues.
+PV Battery,Sale Leaseback,219717520,11.3439,9.95982,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-2.90091e+07. A negative NPV indicates project costs are higher than revenues.
+PVWatts Battery,Residential,13674.2,19.6307,NA,; 
+PVWatts Battery,Commercial,930542,13.098,NA,; 
+PVWatts Battery,Third Party,11006,NA,NA,; 
+PVWatts Battery,Host Developer,930542,17.1626,16.2118,; Warning: NPV is $-84044.4. A negative NPV indicates project costs are higher than revenues.
 Custom Generation Battery,Residential,6695.3,71.0582,NA,; 
 Custom Generation Battery,Commercial,359955,46.743,NA,; 
 Custom Generation Battery,Third Party,6692.59,NA,NA,; 
@@ -127,8 +127,8 @@ Wind Power,All Equity Partnership Flip,818888256,3.18297,4.33226,;
 Wind Power,Sale Leaseback,818888256,3.55152,4.33226,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs.
 Wind Power,LCOE Calculator,818888256,NA,NA,; 
 Wind Power,None,201595968,NA,NA,; 
-Fuel Cell,Commercial,1.93447e+06,9.76483,NA,; 
-Fuel Cell,Single Owner,213518784,11.1822,6.53631,; Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-9.64119e+07. A negative NPV indicates project costs are higher than revenues.
+Fuel Cell,Commercial,1.93478e+06,9.7631,NA,; 
+Fuel Cell,Single Owner,213583472,11.1789,6.53631,; Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-9.63738e+07. A negative NPV indicates project costs are higher than revenues.
 Geothermal Power,Single Owner,248258560,11.1464,8.61147,; Warning: NPV is $-5.53849e+07. A negative NPV indicates project costs are higher than revenues.
 Geothermal Power,Merchant Plant,248258560,10.542,NA,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.45989e+08. A negative NPV indicates project costs are higher than revenues. Warning: Debt percent is -3.64621. A debt percent less than 0% may indicate the mininum EBITDA cannot support any debt in at least one year.
 Geothermal Power,Leveraged Partnership Flip,248258560,11.3103,8.61147,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-5.77863e+07. A negative NPV indicates project costs are higher than revenues.
@@ -158,12 +158,12 @@ Custom Generation Profile,All Equity Partnership Flip,756864000,29.9102,25.9936,
 Custom Generation Profile,Sale Leaseback,756864000,29.5291,25.9936,; Warning: NPV is $-2.70226e+08. A negative NPV indicates project costs are higher than revenues. Warning: NPV is $-3.1105e+07. A negative NPV indicates project costs are higher than revenues.
 Custom Generation Profile,LCOE Calculator,756864000,NA,NA,; 
 Custom Generation Profile,None,756864000,NA,NA,; 
-PVWatts Wind Battery Hybrid,Single Owner,578883008,10.0463,5.91853,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
-PVWatts Wind Battery Hybrid,Host Developer,1.12532e+06,18.2673,16.542,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
-PVWatts Wind FuelCell Battery Hybrid,Single Owner,579660736,10.6149,5.41105,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
-PVWatts Wind FuelCell Battery Hybrid,Host Developer,2.68732e+06,46.0736,47.5377,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
-Photovoltaic Wind Battery Hybrid,Single Owner,594070784,8.55013,5.95228,; Notice: Simulation time step is 60 minutes for pvsamv1. Notice: Simulation time step is 60 minutes for windpower.
-Photovoltaic Wind Battery Hybrid,Host Developer,1.01627e+06,18.3245,16.5709,; Notice: Simulation time step is 60 minutes for pvsamv1. Notice: Simulation time step is 60 minutes for windpower.
-CustomGeneration PVWatts Wind FuelCell Battery Hybrid,Single Owner,1337309056,11.9768,5.41349,; Notice: Simulation time step is 60 minutes for custom_generation. Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
-CustomGeneration PVWatts Wind FuelCell Battery Hybrid,Host Developer,759756416,1.01012,1.01835,; Notice: Simulation time step is 60 minutes for custom_generation. Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
+PVWatts Wind Battery Hybrid,Single Owner,578947712,10.0452,5.91842,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
+PVWatts Wind Battery Hybrid,Host Developer,1.12611e+06,18.2556,16.542,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
+PVWatts Wind FuelCell Battery Hybrid,Single Owner,579702464,10.6142,5.41105,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
+PVWatts Wind FuelCell Battery Hybrid,Host Developer,2.6881e+06,46.0485,47.5122,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
+Photovoltaic Wind Battery Hybrid,Single Owner,594135232,8.54916,5.95229,; Notice: Simulation time step is 60 minutes for pvsamv1. Notice: Simulation time step is 60 minutes for windpower.
+Photovoltaic Wind Battery Hybrid,Host Developer,1.01701e+06,18.3122,16.5709,; Notice: Simulation time step is 60 minutes for pvsamv1. Notice: Simulation time step is 60 minutes for windpower.
+CustomGeneration PVWatts Wind FuelCell Battery Hybrid,Single Owner,1337373696,11.9763,5.41348,; Notice: Simulation time step is 60 minutes for custom_generation. Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
+CustomGeneration PVWatts Wind FuelCell Battery Hybrid,Host Developer,759756800,1.01012,1.01835,; Notice: Simulation time step is 60 minutes for custom_generation. Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
 final_configuration_eof,none,NA,NA,NA,