simplify code to use Promise.all([]).spread pattern
clean up test using {mocha,chai}-as-promised