Ensure generic e2e test works on Widnows too
Merge branch 'new_master'