Merge pull request #774 from clebertsuconic/master

Test fixes