Updating tests to use es6-style promises