Fix e2e via Grunt (and some reformat)