Added wind/solar functionality and test commands