GPII-71: updated tests to clear tmp files.