Refactoring tests to ES6 finished