fix&tests for ES3
Merge branch 'master' of https://github.com/moph/WCETExplorer