Fix tests

pushing for @fivetanley as he has free time ATM

also: many fixes on: https://github.com/stefanpenner/promises-tests