#60 Start refactoring tests in es6.