Cleanup more ES6'ed runtime tests.