fixing example to work with chai-as-promised 4
removing workaround since mocha-as-promised was fixed
refactoring + enriching only in promise-chain case