Tweak tests to use Promise support in mocha 1.18.

Mocha now supports tests returning promises directly, so let's do that!