Use the shorter helper method for Promises.
Tweaks and cleanup and adding a test for HTTP support.