Tests update

Just few ideas.
I guess this is not needed, as it is already called in createTempDir(). Right?