Resolve some trivial ES6 test TODOs