New tmp folder
Refactored test