Tweak tests to use Promise support in mocha 1.18.

Mocha now supports tests returning promises directly, so let's do that!
https://github.com/visionmedia/mocha/pull/329#issuecomment-37606491