Merge pull request #822 from clebertsuconic/master-fix

avoid tests hanging
test repeat
isolate test
fix