Fix more tests that the pull req broke - don't copy input_dir to temp location.