diff --git a/test_results_win64.csv b/test_results_win64.csv
index 901b1f2c0..7d9d8c3b2 100644
--- a/test_results_win64.csv
+++ b/test_results_win64.csv
@@ -30,36 +30,36 @@ 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,13534.3,16.7204,NA,; 
-PV Battery,Commercial,798953,8.52005,NA,; 
+PV Battery,Commercial,798931,8.52003,NA,; 
 PV Battery,Third Party,13587.5,NA,NA,; 
-PV Battery,Host Developer,798953,15.1254,16.2103,; 
+PV Battery,Host Developer,798931,15.1254,16.2103,; 
 PV Battery,Single Owner,219654272,9.05687,9.96064,; 
-PV Battery,Merchant Plant,185102864,10.0738,NA,; Warning: NPV is $-1.18682e+08. A negative NPV indicates project costs are higher than revenues.
-PV Battery,Leveraged Partnership Flip,185102864,10.8407,9.99956,; 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.43872e+07. A negative NPV indicates project costs are higher than revenues.
-PV Battery,All Equity Partnership Flip,185102864,12.1975,9.99956,; 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 $-4.179e+07. A negative NPV indicates project costs are higher than revenues.
-PV Battery,Sale Leaseback,185102864,12.9987,9.99956,; 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 $-5.2633e+07. A negative NPV indicates project costs are higher than revenues.
+PV Battery,Merchant Plant,185094096,10.064,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.19703e+08. A negative NPV indicates project costs are higher than revenues.
+PV Battery,Leveraged Partnership Flip,185094096,10.8346,9.97791,; 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.46606e+07. A negative NPV indicates project costs are higher than revenues.
+PV Battery,All Equity Partnership Flip,185094096,12.1871,9.97791,; 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 $-4.20003e+07. A negative NPV indicates project costs are higher than revenues.
+PV Battery,Sale Leaseback,185094096,12.9878,9.97791,; 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 $-5.28476e+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,16.8362,16.2118,; Warning: NPV is $-55146.3. A negative NPV indicates project costs are higher than revenues.
-Generic Battery,Residential,6695.48,71.6356,NA,; 
-Generic Battery,Commercial,359917,46.7374,NA,; 
-Generic Battery,Third Party,6690.41,NA,NA,; 
-Generic Battery,Host Developer,359917,25.4033,16.246,; Warning: NPV is $-322299. A negative NPV indicates project costs are higher than revenues.
-Generic Battery,Single Owner,31455232,78.591,14.6211,; 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.96297e+08. A negative NPV indicates project costs are higher than revenues.
-Generic Battery,Merchant Plant,31455232,77.5237,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 $-2.26987e+08. A negative NPV indicates project costs are higher than revenues. Warning: Debt percent is -2.83839. A debt percent less than 0% may indicate the mininum EBITDA cannot support any debt in at least one year.
-Generic Battery,Leveraged Partnership Flip,68109312,43.5005,40.5907,; 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.89244e+07. A negative NPV indicates project costs are higher than revenues.
-Generic Battery,All Equity Partnership Flip,68109312,49.0395,48.7088,; 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 $-7.17176e+06. A negative NPV indicates project costs are higher than revenues.
-Generic Battery,Sale Leaseback,68109312,49.4315,48.7088,; Warning: NPV is $-4.97933e+06. A negative NPV indicates project costs are higher than revenues. Warning: NPV is $-2.22831e+06. A negative NPV indicates project costs are higher than revenues.
-Standalone Battery,Residential,-416.207,61.5501,NA,; 
-Standalone Battery,Commercial,-11919.8,426.383,NA,; 
-Standalone Battery,Third Party,-218.89,NA,NA,; 
-Standalone Battery,Host Developer,-11919.8,59.3545,16.232,; 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 $-491945. A negative NPV indicates project costs are higher than revenues. Warning: Debt percent is -10.3599. A debt percent less than 0% may indicate the mininum EBITDA cannot support any debt in at least one year.
-Standalone Battery,Single Owner,-8397703,77.6116,72.514,; 
-Standalone Battery,Merchant Plant,-8397703,26.6181,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 $-8.63641e+07. A negative NPV indicates project costs are higher than revenues. Warning: Debt percent is -8.31789. A debt percent less than 0% may indicate the mininum EBITDA cannot support any debt in at least one year.
-Standalone Battery,Leveraged Partnership Flip,-8397703,78.2835,72.514,; 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 $-3.12112e+07. A negative NPV indicates project costs are higher than revenues.
-Standalone Battery,All Equity Partnership Flip,-8397703,79.1754,72.514,; 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 $-3.85976e+07. A negative NPV indicates project costs are higher than revenues.
-Standalone Battery,Sale Leaseback,-8397703,80.5079,72.514,; 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 $-4.61131e+07. A negative NPV indicates project costs are higher than revenues. Warning: NPV is $-8.70063e+07. A negative NPV indicates project costs are higher than revenues.
+Generic Battery,Residential,6695.44,71.6356,NA,; 
+Generic Battery,Commercial,359914,46.7374,NA,; 
+Generic Battery,Third Party,6690.4,NA,NA,; 
+Generic Battery,Host Developer,359914,25.4033,16.246,; Warning: NPV is $-322299. A negative NPV indicates project costs are higher than revenues.
+Generic Battery,Single Owner,31458298,78.5881,14.6211,; 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.96296e+08. A negative NPV indicates project costs are higher than revenues.
+Generic Battery,Merchant Plant,31458298,77.5207,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 $-2.26987e+08. A negative NPV indicates project costs are higher than revenues. Warning: Debt percent is -2.83828. A debt percent less than 0% may indicate the mininum EBITDA cannot support any debt in at least one year.
+Generic Battery,Leveraged Partnership Flip,68124544,43.4993,40.5909,; 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.89158e+07. A negative NPV indicates project costs are higher than revenues.
+Generic Battery,All Equity Partnership Flip,68124544,49.0383,48.7091,; 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 $-7.16199e+06. A negative NPV indicates project costs are higher than revenues.
+Generic Battery,Sale Leaseback,68124544,49.4303,48.7091,; Warning: NPV is $-4.96935e+06. A negative NPV indicates project costs are higher than revenues. Warning: NPV is $-2.23092e+06. A negative NPV indicates project costs are higher than revenues.
+Standalone Battery,Residential,-416.554,61.5286,NA,; 
+Standalone Battery,Commercial,-11930.4,426.385,NA,; 
+Standalone Battery,Third Party,-219.052,NA,NA,; 
+Standalone Battery,Host Developer,-11930.4,59.3521,16.2319,; 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 $-491940. A negative NPV indicates project costs are higher than revenues. Warning: Debt percent is -10.359. A debt percent less than 0% may indicate the mininum EBITDA cannot support any debt in at least one year.
+Standalone Battery,Single Owner,-8405303,77.6201,72.5124,; 
+Standalone Battery,Merchant Plant,-8405303,26.6311,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 $-8.64365e+07. A negative NPV indicates project costs are higher than revenues. Warning: Debt percent is -8.37586. A debt percent less than 0% may indicate the mininum EBITDA cannot support any debt in at least one year.
+Standalone Battery,Leveraged Partnership Flip,-8405303,78.2914,72.5124,; 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 $-3.12422e+07. A negative NPV indicates project costs are higher than revenues.
+Standalone Battery,All Equity Partnership Flip,-8405303,79.1828,72.5124,; 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 $-3.86231e+07. A negative NPV indicates project costs are higher than revenues.
+Standalone Battery,Sale Leaseback,-8405303,80.5144,72.5124,; 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 $-4.61265e+07. A negative NPV indicates project costs are higher than revenues. Warning: NPV is $-8.70197e+07. A negative NPV indicates project costs are higher than revenues.
 ETES,Single Owner,-466572064,14.7945,7.40855,; 
 PTES,Single Owner,-197595520,18.6636,10.3676,; 
 Physical Trough,Single Owner,377431488,14.4214,14.5131,; 
@@ -115,7 +115,7 @@ MSLF IPH,LCOH Calculator,926623360,NA,NA,; Notice: Piping geometry file\ \ Maxim
 MEwave,Single Owner,65589748,61.7545,60.3986,; Warning: NPV is $-9.88339e+06. A negative NPV indicates project costs are higher than revenues.
 MEwave,LCOE Calculator,59434320,NA,NA,; 
 MEwave,None,594343,NA,NA,; 
-MEwave Battery,Single Owner,64959432,63.5447,60.3968,; Warning: NPV is $-2.27322e+07. A negative NPV indicates project costs are higher than revenues.
+MEwave Battery,Single Owner,64951152,63.5479,60.3969,; Warning: NPV is $-2.27537e+07. A negative NPV indicates project costs are higher than revenues.
 MEtidal,LCOE Calculator,2.16152e+06,NA,NA,; 
 MEtidal,None,2.16152e+06,NA,NA,; 
 Wind Power,Residential,48358.4,21.9797,NA,;