Fixes issue #2373

Use field if supplied, otherwise fall back to attribute (fixes issue #2373)
Sorry for not being clear about that :) - that's what tells mocha to wait for the promise chain