Fix integration test for ES6
Rewrite parser to ES6