Replaces then(null, done) with .catch(done), OCD on blank lines

No issue
Merge pull request #3336 from javorszky/fix-catches-in-tests

Replaces then(null, done) with .catch(done), OCD on blank lines