switch from Q to bluebird promises
testing
increased timeout