Improve tests folding: remove temp files