Merge pull request #1886 from clebertsuconic/master-pr

fixes on the testsuite
Orphaned test consumer