Move promisified version of ext deps to one place

And fix some test oversights