Fix tests broken as a result of Bluebird upgrade