Merge pull request #1854 from clebertsuconic/upmaster

Fixing a few tests with issues on asynchronous .getMessageCount