Propagated source changes to dist and updated tests

Updated the tests to better test the promise-based functionality.
Propagated changes from the "src" folder to their appropriate "dist"
locations ()though not min versions yet).