ASSESSING COST OPTIMAL BATTERY ENERGY AND SOLAR PLUS STORAGE SYSTEMS