Update remaining tests to ES6.