fix test
Merge branch 'master' of https://github.com/WattTime/watttime-grid-api