Small fixes to pass all 872 tests of latest promises-test package