Merge pull request #954 from FranciscoBorges/master

Use a cache instead of a concurrent system for deleting large-messages during sync
Delete TMP dir at the end of each test.