Ensure working_dir gets removed