Normalizes use of tmp dir accross tests
Merge pull request #676 from ruyadorno/iss-636-normalize-tmp-dir

Normalizes use of tmp dir accross tests