Merge pull request #1845 from clebertsuconic/upmaster

fixing broken test