From 893356ef1220d3b838c642be0eae0600ec01252c Mon Sep 17 00:00:00 2001
From: Krisztian Fekete <1246751+e3krisztian@users.noreply.github.com>
Date: Thu, 31 Mar 2022 18:14:50 +0200
Subject: [PATCH 1/2] Eliminate carving whole file chunks

---
 tests/test_cleanup.py | 16 ++++++------
 unblob/extractor.py   | 25 +++---------------
 unblob/processing.py  | 59 +++++++++++++++++++++++++------------------
 3 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/tests/test_cleanup.py b/tests/test_cleanup.py
index 274085cf76..8d5e439cee 100644
--- a/tests/test_cleanup.py
+++ b/tests/test_cleanup.py
@@ -3,7 +3,6 @@
 The tests use zip files as inputs - for simplicity
 """
 import io
-import os
 import zipfile
 from pathlib import Path
 
@@ -17,16 +16,20 @@
 _DAMAGED_ZIP_CONTENT = b"*BAD*file"
 
 
-def _zip_bytes() -> bytes:
+def wrapzip(filename: str, content: bytes) -> bytes:
+    """Create an in-memory zip archive with a single file"""
     bio = io.BytesIO()
     z = zipfile.ZipFile(bio, mode="w", compression=zipfile.ZIP_STORED)
-    z.writestr("content.txt", _ZIP_CONTENT)
+    z.writestr(filename, content)
     z.close()
     return bio.getvalue()
 
 
-ZIP_BYTES = _zip_bytes()
+ZIP_BYTES = b"prefix to force carving the zip archive " + wrapzip(
+    "content.txt", _ZIP_CONTENT
+)
 DAMAGED_ZIP_BYTES = ZIP_BYTES.replace(_ZIP_CONTENT, _DAMAGED_ZIP_CONTENT)
+assert ZIP_BYTES != DAMAGED_ZIP_BYTES
 
 
 @pytest.fixture()
@@ -92,10 +95,7 @@ class _HandlerWithNullExtractor(Handler):
     """
 
     def calculate_chunk(self, file: io.BufferedIOBase, start_offset: int) -> ValidChunk:
-        pos = file.tell()
-        length = file.seek(0, os.SEEK_END)
-        file.seek(pos, os.SEEK_SET)
-        return ValidChunk(start_offset=0, end_offset=length)
+        return ValidChunk(start_offset=start_offset, end_offset=start_offset + 1)
 
 
 def test_keep_chunks_with_null_extractor(input_dir: Path, output_dir: Path):
diff --git a/unblob/extractor.py b/unblob/extractor.py
index 9df360cb88..b78f24293c 100644
--- a/unblob/extractor.py
+++ b/unblob/extractor.py
@@ -4,7 +4,7 @@
 import io
 import os
 from pathlib import Path
-from typing import List, Tuple
+from typing import List
 
 from structlog import get_logger
 
@@ -15,21 +15,11 @@
 logger = get_logger()
 
 
-APPEND_NAME = "_extract"
-
-
-def make_extract_dir(root: Path, path: Path, extract_root: Path) -> Path:
-    """Create extraction dir under root with the name of path."""
-    relative_path = path.relative_to(root)
-    extract_name = relative_path.name + APPEND_NAME
-    extract_dir = extract_root / relative_path.with_name(extract_name)
-    extract_dir.mkdir(parents=True, exist_ok=True)
-    logger.debug("Created extraction dir", path=extract_dir)
-    return extract_dir.expanduser().resolve()
-
-
 def carve_chunk_to_file(carve_path: Path, file: io.BufferedIOBase, chunk: Chunk):
     """Extract valid chunk to a file, which we then pass to another tool to extract it."""
+    carve_path.parent.mkdir(parents=True, exist_ok=True)
+    logger.debug("Carving chunk", path=carve_path)
+
     with carve_path.open("wb") as f:
         for data in iterate_file(file, chunk.start_offset, chunk.size):
             f.write(data)
@@ -106,13 +96,6 @@ def fix_extracted_directory(outdir: Path, task_result: TaskResult):
             fix_permission(path)
 
 
-def get_extract_paths(extract_dir: Path, carved_path: Path) -> Tuple[Path, Path]:
-    content_dir = extract_dir / (carved_path.name + APPEND_NAME)
-    inpath = carved_path.expanduser().resolve()
-    outdir = content_dir.expanduser().resolve()
-    return inpath, outdir
-
-
 def carve_unknown_chunks(
     extract_dir: Path, file: io.BufferedIOBase, unknown_chunks: List[UnknownChunk]
 ) -> List[Path]:
diff --git a/unblob/processing.py b/unblob/processing.py
index a52a0b0704..27519512eb 100644
--- a/unblob/processing.py
+++ b/unblob/processing.py
@@ -11,13 +11,7 @@
 
 from unblob.handlers import BUILTIN_HANDLERS, Handlers
 
-from .extractor import (
-    carve_unknown_chunks,
-    carve_valid_chunk,
-    fix_extracted_directory,
-    get_extract_paths,
-    make_extract_dir,
-)
+from .extractor import carve_unknown_chunks, carve_valid_chunk, fix_extracted_directory
 from .file_utils import iterate_file, valid_path
 from .finder import search_chunks_by_priority
 from .iter_utils import pairwise
@@ -42,6 +36,7 @@ class ExtractionConfig:
     max_depth: int = DEFAULT_DEPTH
     process_num: int = DEFAULT_PROCESS_NUM
     keep_extracted_chunks: bool = False
+    extract_suffix: str = "_extract"
     handlers: Handlers = BUILTIN_HANDLERS
 
 
@@ -127,7 +122,11 @@ def _process_task(self, result: TaskResult, task: Task):
             log.debug("Ignoring empty file")
             return
 
-        _FileTask(self._config, task, size, result).process()
+        filetask = _FileTask(self._config, task, size, result)
+        filetask.process()
+        # ensure that the root extraction directory is created even for empty extractions
+        if task.depth == 0:
+            filetask.extract_dir.mkdir(parents=True, exist_ok=True)
 
 
 class _FileTask:
@@ -143,6 +142,15 @@ def __init__(
         self.size = size
         self.result = result
 
+        self.extract_dir = self._get_extract_dir()
+
+    def _get_extract_dir(self) -> Path:
+        """Extraction dir under root with the name of path."""
+        relative_path = self.task.path.relative_to(self.task.root)
+        extract_name = relative_path.name + self.config.extract_suffix
+        extract_dir = self.config.extract_root / relative_path.with_name(extract_name)
+        return extract_dir.expanduser().resolve()
+
     def process(self):
         logger.debug("Processing file", path=self.task.path, size=self.size)
 
@@ -163,35 +171,38 @@ def process(self):
     def _process_chunks(
         self, file, outer_chunks: List[ValidChunk], unknown_chunks: List[UnknownChunk]
     ):
-        extract_dir = make_extract_dir(
-            self.task.root, self.task.path, self.config.extract_root
+        carved_unknown_paths = carve_unknown_chunks(
+            self.extract_dir, file, unknown_chunks
         )
-
-        carved_unknown_paths = carve_unknown_chunks(extract_dir, file, unknown_chunks)
         self._calculate_entropies(carved_unknown_paths)
 
         for chunk in outer_chunks:
-            self._extract_chunk(extract_dir, file, chunk)
+            self._extract_chunk(file, chunk)
 
     def _calculate_entropies(self, paths: List[Path]):
         if self.task.depth < self.config.entropy_depth:
             for path in paths:
                 calculate_entropy(path, draw_plot=self.config.entropy_plot)
 
-    def _extract_chunk(
-        self,
-        extract_dir: Path,
-        file,
-        chunk: ValidChunk,
-    ):
-        carved_path = carve_valid_chunk(extract_dir, file, chunk)
-        inpath, outdir = get_extract_paths(extract_dir, carved_path)
+    def _extract_chunk(self, file, chunk: ValidChunk):
+        # Skip carving whole file and thus duplicating the file and creating more directories
+        is_whole_file_chunk = chunk.start_offset == 0 and chunk.end_offset == self.size
+        skip_carving = is_whole_file_chunk
+        if skip_carving:
+            inpath = self.task.path
+            outdir = self.extract_dir
+            carved_path = None
+        else:
+            inpath = carve_valid_chunk(self.extract_dir, file, chunk)
+            outdir = self.extract_dir / (inpath.name + self.config.extract_suffix)
+            carved_path = inpath
 
         try:
             chunk.extract(inpath, outdir)
-            if not self.config.keep_extracted_chunks:
-                logger.debug("Removing extracted chunk", path=inpath)
-                inpath.unlink()
+
+            if carved_path and not self.config.keep_extracted_chunks:
+                logger.debug("Removing extracted chunk", path=carved_path)
+                carved_path.unlink()
 
         except ExtractError as e:
             for report in e.reports:

From 3b5f2d05fe83b200d3e6a8a5c25ee5127d538f31 Mon Sep 17 00:00:00 2001
From: Krisztian Fekete <1246751+e3krisztian@users.noreply.github.com>
Date: Mon, 4 Apr 2022 12:37:50 +0200
Subject: [PATCH 2/2]     Eliminate carving whole file chunks during tests

    This is done with the below script and looking through the resulting git change.

    $ cat recreate_outputs.sh
    #!/bin/bash

    set -e

    cd tests/integration

    find -name __output__ | xargs rm -rf

    find -name __input__ |
        while read input; do
            (
            cd "$input"
            mkdir ../__output__
            cd ../__output__
            find ../__input__ -type f |
                while read fw; do
                    unblob --keep-extracted-chunks "$fw"
                done
            )
        done

    # empty, but extracted directories
    find -type d | rg __output__ |
        while read dir; do
            rmdir --ignore-fail-on-non-empty "$dir"
            if [ ! -d "$dir" ]; then
                mkdir "$dir"
                touch "$dir/.gitkeep"
            fi
        done

    git add .
---
 .../archive/ar/__output__/durian.ar_extract/0-280.ar           | 3 ---
 .../durian.ar_extract/{0-280.ar_extract => }/durian1.txt       | 0
 .../durian.ar_extract/{0-280.ar_extract => }/durian2.txt       | 0
 .../durian.ar_extract/{0-280.ar_extract => }/durian3.txt       | 0
 .../durian.ar_extract/{0-280.ar_extract => }/durian4.txt       | 0
 .../archive/ar/__output__/offset_malformed.ar_extract/.gitkeep | 0
 .../archive/arc/__output__/fruits.arc_extract/0-106.arc        | 3 ---
 .../{0-106.arc_extract/0-106 => fruits}/aaaaaaaa.txt           | 0
 .../{0-106.arc_extract/0-106 => fruits}/apple.txt              | 0
 .../{0-106.arc_extract/0-106 => fruits}/cherry.txt             | 0
 .../archive/arj/__output__/kaki.arj_extract/0-350.arj          | 3 ---
 .../kaki.arj_extract/{0-350.arj_extract => }/kaki1.txt         | 0
 .../kaki.arj_extract/{0-350.arj_extract => }/kaki2.txt         | 0
 .../kaki.arj_extract/{0-350.arj_extract => }/kaki3.txt         | 0
 .../kaki.arj_extract/{0-350.arj_extract => }/kaki4.txt         | 0
 .../archive/cab/__output__/banana.cab_extract/0-224.cab        | 3 ---
 .../{0-224.cab_extract => }/banana/banana1.txt                 | 0
 .../{0-224.cab_extract => }/banana/banana2.txt                 | 0
 .../{0-224.cab_extract => }/banana/banana3.txt                 | 0
 .../{0-224.cab_extract => }/banana/banana4.txt                 | 0
 .../__output__/apple.cpio-bin_extract/0-512.cpio_binary        | 3 ---
 .../{0-512.cpio_binary_extract => }/apple1.txt                 | 0
 .../{0-512.cpio_binary_extract => }/apple2.txt                 | 0
 .../{0-512.cpio_binary_extract => }/apple3.txt                 | 0
 .../{0-512.cpio_binary_extract => }/apple4.txt                 | 0
 .../__output__/empty.cpio-bin_extract/0-512.cpio_binary        | 3 ---
 .../{0-512.cpio_binary_extract => }/apple1.txt                 | 0
 .../{0-512.cpio_binary_extract => }/dev/console                | 0
 .../{0-512.cpio_binary_extract => }/empty.txt                  | 0
 .../{0-512.cpio_binary_extract => }/hello1.txt                 | 0
 .../apple.cpio-newc_extract/0-1024.cpio_portable_ascii         | 3 ---
 .../{0-1024.cpio_portable_ascii_extract => }/apple1.txt        | 0
 .../{0-1024.cpio_portable_ascii_extract => }/apple2.txt        | 0
 .../{0-1024.cpio_portable_ascii_extract => }/apple3.txt        | 0
 .../{0-1024.cpio_portable_ascii_extract => }/apple4.txt        | 0
 .../empty.cpio-newc_extract/0-1024.cpio_portable_ascii         | 3 ---
 .../{0-1024.cpio_portable_ascii_extract => }/apple1.txt        | 0
 .../{0-1024.cpio_portable_ascii_extract => }/dev/console       | 0
 .../{0-1024.cpio_portable_ascii_extract => }/empty.txt         | 0
 .../{0-1024.cpio_portable_ascii_extract => }/hello1.txt        | 0
 .../apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc      | 3 ---
 .../{0-1024.cpio_portable_ascii_crc_extract => }/apple1.txt    | 0
 .../{0-1024.cpio_portable_ascii_crc_extract => }/apple2.txt    | 0
 .../{0-1024.cpio_portable_ascii_crc_extract => }/apple3.txt    | 0
 .../{0-1024.cpio_portable_ascii_crc_extract => }/apple4.txt    | 0
 .../empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc      | 3 ---
 .../{0-1024.cpio_portable_ascii_crc_extract => }/apple1.txt    | 0
 .../{0-1024.cpio_portable_ascii_crc_extract => }/dev/console   | 0
 .../{0-1024.cpio_portable_ascii_crc_extract => }/empty.txt     | 0
 .../{0-1024.cpio_portable_ascii_crc_extract => }/hello1.txt    | 0
 .../apple.cpio-odc_extract/0-512.cpio_portable_old_ascii       | 3 ---
 .../{0-512.cpio_portable_old_ascii_extract => }/apple1.txt     | 0
 .../{0-512.cpio_portable_old_ascii_extract => }/apple2.txt     | 0
 .../{0-512.cpio_portable_old_ascii_extract => }/apple3.txt     | 0
 .../{0-512.cpio_portable_old_ascii_extract => }/apple4.txt     | 0
 .../empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii      | 3 ---
 .../{0-1024.cpio_portable_old_ascii_extract => }/apple1.txt    | 0
 .../{0-1024.cpio_portable_old_ascii_extract => }/dev/console   | 0
 .../{0-1024.cpio_portable_old_ascii_extract => }/empty.txt     | 0
 .../{0-1024.cpio_portable_old_ascii_extract => }/hello1.txt    | 0
 .../archive/dmg/__output__/fruits.dmg_extract/0-26280.dmg      | 3 ---
 .../{0-26280.dmg_extract => }/fruits/apple.txt                 | 0
 .../{0-26280.dmg_extract => }/fruits/cherry.txt                | 0
 .../__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg   | 3 ---
 .../fruits/.HFS+ Private Directory Data\r/.gitkeep"            | 0
 .../fruits_osx.compressed.dmg_extract/fruits/.Trashes/.gitkeep | 0
 .../{0-18518.dmg_extract => }/fruits/apple1.txt                | 0
 .../{0-18518.dmg_extract => }/fruits/apple2.txt                | 0
 .../{0-18518.dmg_extract => }/fruits/apple3.txt                | 0
 .../{0-18518.dmg_extract => }/fruits/apple4.txt                | 0
 .../archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg  | 3 ---
 .../fruits/.HFS+ Private Directory Data\r/.gitkeep"            | 0
 .../fruits_osx.dmg_extract/fruits/.Trashes}/.gitkeep           | 0
 .../{0-20158.dmg_extract => }/fruits/apple1.txt                | 0
 .../{0-20158.dmg_extract => }/fruits/apple2.txt                | 0
 .../{0-20158.dmg_extract => }/fruits/apple3.txt                | 0
 .../{0-20158.dmg_extract => }/fruits/apple4.txt                | 0
 .../rar/default/__output__/erdbeere.rar_extract/0-263.rar      | 3 ---
 .../{0-263.rar_extract/0-263 => erdbeere}/erdbeere1.txt        | 0
 .../{0-263.rar_extract/0-263 => erdbeere}/erdbeere2.txt        | 0
 .../{0-263.rar_extract/0-263 => erdbeere}/erdbeere3.txt        | 0
 .../{0-263.rar_extract/0-263 => erdbeere}/erdbeere4.txt        | 0
 .../password/__output__/cherry_password.rar_extract}/.gitkeep  | 0
 .../password/__output__/cherry_password.rar_extract/0-539.rar  | 3 ---
 .../sevenzip/__output__/cherry.7z_extract/0-212.sevenzip       | 3 ---
 .../cherry.7z_extract/{0-212.sevenzip_extract => }/cherry1.txt | 0
 .../cherry.7z_extract/{0-212.sevenzip_extract => }/cherry2.txt | 0
 .../cherry.7z_extract/{0-212.sevenzip_extract => }/cherry3.txt | 0
 .../cherry.7z_extract/{0-212.sevenzip_extract => }/cherry4.txt | 0
 .../stuffit5/__output__/plum.sit5_extract/0-534.stuffit5       | 3 ---
 .../{0-534.stuffit5_extract/0-534 => plum}/plum1.txt           | 0
 .../{0-534.stuffit5_extract/0-534 => plum}/plum2.txt           | 0
 .../{0-534.stuffit5_extract/0-534 => plum}/plum3.txt           | 0
 .../{0-534.stuffit5_extract/0-534 => plum}/plum4.txt           | 0
 .../archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar  | 3 ---
 .../0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar     | 3 ---
 .../0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar      | 3 ---
 .../0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar    | 3 ---
 .../0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar   | 3 ---
 .../0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar      | 3 ---
 .../0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar    | 3 ---
 .../{0-81920.tar_extract => }/banana.gnu.tar                   | 0
 .../apple.gnu.tar                                              | 0
 .../apple.gnu.tar_extract}/apple1.txt                          | 0
 .../apple.gnu.tar_extract}/apple2.txt                          | 0
 .../apple.gnu.tar_extract}/apple3.txt                          | 0
 .../apple.gnu.tar_extract}/apple4.txt                          | 0
 .../apple.posix.tar                                            | 0
 .../apple.posix.tar_extract}/apple1.txt                        | 0
 .../apple.posix.tar_extract}/apple2.txt                        | 0
 .../apple.posix.tar_extract}/apple3.txt                        | 0
 .../apple.posix.tar_extract}/apple4.txt                        | 0
 .../0-30720.tar_extract => banana.gnu.tar_extract}/banana1.txt | 0
 .../0-30720.tar_extract => banana.gnu.tar_extract}/banana2.txt | 0
 .../0-30720.tar_extract => banana.gnu.tar_extract}/banana3.txt | 0
 .../0-30720.tar_extract => banana.gnu.tar_extract}/banana4.txt | 0
 .../{0-81920.tar_extract => }/banana.posix.tar                 | 0
 .../apple.gnu.tar                                              | 0
 .../apple.gnu.tar_extract}/apple1.txt                          | 0
 .../apple.gnu.tar_extract}/apple2.txt                          | 0
 .../apple.gnu.tar_extract}/apple3.txt                          | 0
 .../apple.gnu.tar_extract}/apple4.txt                          | 0
 .../apple.posix.tar                                            | 0
 .../apple.posix.tar_extract}/apple1.txt                        | 0
 .../apple.posix.tar_extract}/apple2.txt                        | 0
 .../apple.posix.tar_extract}/apple3.txt                        | 0
 .../apple.posix.tar_extract}/apple4.txt                        | 0
 .../banana1.txt                                                | 0
 .../banana2.txt                                                | 0
 .../banana3.txt                                                | 0
 .../banana4.txt                                                | 0
 .../{0-81920.tar_extract => }/cherry1.txt                      | 0
 .../{0-81920.tar_extract => }/cherry2.txt                      | 0
 .../{0-81920.tar_extract => }/cherry3.txt                      | 0
 .../{0-81920.tar_extract => }/cherry4.txt                      | 0
 .../tar/__output__/cherry.posix.tar_extract/0-92160.tar        | 3 ---
 .../0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar     | 3 ---
 .../0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar      | 3 ---
 .../0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar    | 3 ---
 .../0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar   | 3 ---
 .../0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar      | 3 ---
 .../0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar    | 3 ---
 .../{0-92160.tar_extract => }/banana.gnu.tar                   | 0
 .../apple.gnu.tar                                              | 0
 .../apple.gnu.tar_extract}/apple1.txt                          | 0
 .../apple.gnu.tar_extract}/apple2.txt                          | 0
 .../apple.gnu.tar_extract}/apple3.txt                          | 0
 .../apple.gnu.tar_extract}/apple4.txt                          | 0
 .../apple.posix.tar                                            | 0
 .../apple.posix.tar_extract}/apple1.txt                        | 0
 .../apple.posix.tar_extract}/apple2.txt                        | 0
 .../apple.posix.tar_extract}/apple3.txt                        | 0
 .../apple.posix.tar_extract}/apple4.txt                        | 0
 .../0-30720.tar_extract => banana.gnu.tar_extract}/banana1.txt | 0
 .../0-30720.tar_extract => banana.gnu.tar_extract}/banana2.txt | 0
 .../0-30720.tar_extract => banana.gnu.tar_extract}/banana3.txt | 0
 .../0-30720.tar_extract => banana.gnu.tar_extract}/banana4.txt | 0
 .../{0-92160.tar_extract => }/banana.posix.tar                 | 0
 .../apple.gnu.tar                                              | 0
 .../apple.gnu.tar_extract}/apple1.txt                          | 0
 .../apple.gnu.tar_extract}/apple2.txt                          | 0
 .../apple.gnu.tar_extract}/apple3.txt                          | 0
 .../apple.gnu.tar_extract}/apple4.txt                          | 0
 .../apple.posix.tar                                            | 0
 .../apple.posix.tar_extract}/apple1.txt                        | 0
 .../apple.posix.tar_extract}/apple2.txt                        | 0
 .../apple.posix.tar_extract}/apple3.txt                        | 0
 .../apple.posix.tar_extract}/apple4.txt                        | 0
 .../banana1.txt                                                | 0
 .../banana2.txt                                                | 0
 .../banana3.txt                                                | 0
 .../banana4.txt                                                | 0
 .../{0-92160.tar_extract => }/cherry1.txt                      | 0
 .../{0-92160.tar_extract => }/cherry2.txt                      | 0
 .../{0-92160.tar_extract => }/cherry3.txt                      | 0
 .../{0-92160.tar_extract => }/cherry4.txt                      | 0
 .../encrypted/__output__/apple_encrypted.zip_extract}/.gitkeep | 0
 .../encrypted/__output__/apple_encrypted.zip_extract/0-754.zip | 3 ---
 .../__output__/kaki1_aes.zip_extract}/.gitkeep                 | 0
 .../__output__/kaki1_aes.zip_extract/0-616.zip                 | 3 ---
 .../archive/zip/regular/__output__/apple.zip_extract/0-642.zip | 3 ---
 .../apple.zip_extract/{0-642.zip_extract => }/apple1.txt       | 0
 .../apple.zip_extract/{0-642.zip_extract => }/apple2.txt       | 0
 .../apple.zip_extract/{0-642.zip_extract => }/apple3.txt       | 0
 .../apple.zip_extract/{0-642.zip_extract => }/apple4.txt       | 0
 .../bzip2/__output__/lorem.txt.bz2_extract/0-2545.bzip2        | 3 ---
 .../{0-2545.bzip2_extract/0-2545 => lorem.txt}                 | 0
 .../compress/__output__/apple1.z_extract/0-11.compress         | 3 ---
 .../{0-11.compress_extract/0-11/0-11 => apple1/apple1}         | 0
 .../compression/gzip/__output__/durian.gz_extract/0-43.gzip    | 3 ---
 .../durian.gz_extract/{0-43.gzip_extract => }/durian1.txt      | 0
 .../lorem.block_checksum.lz4_extract/0-3944.lz4_default        | 3 ---
 .../0-3944 => lorem.block_checksum}                            | 0
 .../__output__/lorem.csize.lz4_extract/0-3948.lz4_default      | 3 ---
 .../{0-3948.lz4_default_extract/0-3948 => lorem.csize}         | 0
 .../lorem.no_block_checksum.lz4_extract/0-3940.lz4_default     | 3 ---
 .../0-3940 => lorem.no_block_checksum}                         | 0
 .../__output__/lorem.nocsize.lz4_extract/0-3940.lz4_default    | 3 ---
 .../{0-3940.lz4_default_extract/0-3940 => lorem.nocsize}       | 0
 .../__output__/lorem.noframecrc.lz4_extract/0-3936.lz4_default | 3 ---
 .../{0-3936.lz4_default_extract/0-3936 => lorem.noframecrc}    | 0
 .../__output__/lorem.legacy.lz4_extract/0-3929.lz4_legacy      | 3 ---
 .../{0-3929.lz4_legacy_extract/0-3929 => lorem.legacy}         | 0
 .../__output__/skippable.lz4_extract/0-108.lz4_skippable       | 3 ---
 .../{0-108.lz4_skippable_extract/0-108 => skippable}           | 0
 .../lzip/__output__/lorem.txt.lz_extract/0-2520.lzip           | 3 ---
 .../{0-2520.lzip_extract/0-2520 => lorem.txt}                  | 0
 .../__output__/lorem.txt.known_size.lzma_extract/0-2518.lzma   | 3 ---
 .../{0-2518.lzma_extract/0-2518 => lorem.txt.known_size}       | 0
 .../__output__/lorem.txt.unknown_size.lzma_extract/0-2550.lzma | 3 ---
 .../{0-2550.lzma_extract/0-2550 => lorem.txt.unknown_size}     | 0
 .../0-29563.lzo                                                | 3 ---
 .../{0-29563.lzo_extract => }/big256k.txt                      | 0
 .../0-29552.lzo                                                | 3 ---
 .../0-29552 => lorem.adler.checksum.filter.multi-block.stdin}  | 0
 .../0-4341.lzo                                                 | 3 ---
 .../{0-4341.lzo_extract => }/lorem.txt                         | 0
 .../0-4332.lzo                                                 | 3 ---
 .../0-4332 => lorem.adler.checksum.filter.simple.stdin}        | 0
 .../0-26504.lzo                                                | 3 ---
 .../{0-26504.lzo_extract => }/big256k.txt                      | 0
 .../0-26493.lzo                                                | 3 ---
 ...-26493 => lorem.adler.checksum.no-filter.multi-block.stdin} | 0
 .../0-3933.lzo                                                 | 3 ---
 .../{0-3933.lzo_extract => }/lorem.txt                         | 0
 .../0-3924.lzo                                                 | 3 ---
 .../0-3924 => lorem.adler.checksum.no-filter.simple.stdin}     | 0
 .../0-29555.lzo                                                | 3 ---
 .../{0-29555.lzo_extract => }/big256k.txt                      | 0
 .../0-29544.lzo                                                | 3 ---
 ...-29544 => lorem.adler.no-checksum.filter.multi-block.stdin} | 0
 .../0-4337.lzo                                                 | 3 ---
 .../{0-4337.lzo_extract => }/lorem.txt                         | 0
 .../0-4328.lzo                                                 | 3 ---
 .../0-4328 => lorem.adler.no-checksum.filter.simple.stdin}     | 0
 .../0-26496.lzo                                                | 3 ---
 .../{0-26496.lzo_extract => }/big256k.txt                      | 0
 .../0-26485.lzo                                                | 3 ---
 ...485 => lorem.adler.no-checksum.no-filter.multi-block.stdin} | 0
 .../0-3929.lzo                                                 | 3 ---
 .../{0-3929.lzo_extract => }/lorem.txt                         | 0
 .../0-3920.lzo                                                 | 3 ---
 .../0-3920 => lorem.adler.no-checksum.no-filter.simple.stdin}  | 0
 .../0-29563.lzo                                                | 3 ---
 .../{0-29563.lzo_extract => }/big256k.txt                      | 0
 .../0-29552.lzo                                                | 3 ---
 .../0-29552 => lorem.crc32.checksum.filter.multi-block.stdin}  | 0
 .../0-4341.lzo                                                 | 3 ---
 .../{0-4341.lzo_extract => }/lorem.txt                         | 0
 .../0-4332.lzo                                                 | 3 ---
 .../0-4332 => lorem.crc32.checksum.filter.simple.stdin}        | 0
 .../0-26504.lzo                                                | 3 ---
 .../{0-26504.lzo_extract => }/big256k.txt                      | 0
 .../0-26493.lzo                                                | 3 ---
 ...-26493 => lorem.crc32.checksum.no-filter.multi-block.stdin} | 0
 .../0-3933.lzo                                                 | 3 ---
 .../{0-3933.lzo_extract => }/lorem.txt                         | 0
 .../0-3924.lzo                                                 | 3 ---
 .../0-3924 => lorem.crc32.checksum.no-filter.simple.stdin}     | 0
 .../0-29555.lzo                                                | 3 ---
 .../{0-29555.lzo_extract => }/big256k.txt                      | 0
 .../0-29544.lzo                                                | 3 ---
 ...-29544 => lorem.crc32.no-checksum.filter.multi-block.stdin} | 0
 .../0-4337.lzo                                                 | 3 ---
 .../{0-4337.lzo_extract => }/lorem.txt                         | 0
 .../0-4328.lzo                                                 | 3 ---
 .../0-4328 => lorem.crc32.no-checksum.filter.simple.stdin}     | 0
 .../0-26496.lzo                                                | 3 ---
 .../{0-26496.lzo_extract => }/big256k.txt                      | 0
 .../0-26485.lzo                                                | 3 ---
 ...485 => lorem.crc32.no-checksum.no-filter.multi-block.stdin} | 0
 .../0-3929.lzo                                                 | 3 ---
 .../{0-3929.lzo_extract => }/lorem.txt                         | 0
 .../0-3920.lzo                                                 | 3 ---
 .../0-3920 => lorem.crc32.no-checksum.no-filter.simple.stdin}  | 0
 .../lzo/__output__/lorem.filter.lzo_extract/0-6352.lzo         | 3 ---
 .../{0-6352.lzo_extract => }/lorem.txt                         | 0
 .../compression/lzo/__output__/lorem.lzo_extract/0-3093.lzo    | 3 ---
 .../lorem.lzo_extract/{0-3093.lzo_extract => }/lorem.txt       | 0
 .../compression/xz/__output__/lorem.txt.xz_extract/0-2632.xz   | 3 ---
 .../{0-2632.xz_extract/0-2632 => lorem.txt}                    | 0
 .../xz/__output__/multiblock.padded.xz_extract/0-2168.xz       | 3 ---
 .../{0-2168.xz_extract/0-2168 => multiblock.padded}            | 0
 .../sparse/__output__/fruits.sparse_extract/0-41084.sparse     | 3 ---
 .../{0-41084.sparse_extract/0-41084 => fruits}                 | 0
 .../__output__/fruits.cramfs_be_extract/0-4096.cramfs          | 3 ---
 .../{0-4096.cramfs_extract => }/apple.txt                      | 0
 .../{0-4096.cramfs_extract => }/cherry.txt                     | 0
 .../__output__/fruits.cramfs_le_extract/0-4096.cramfs          | 3 ---
 .../{0-4096.cramfs_extract => }/apple.txt                      | 0
 .../{0-4096.cramfs_extract => }/cherry.txt                     | 0
 .../extfs/__output__/ext2.1024.img_extract/0-524288.extfs      | 3 ---
 .../{0-524288.extfs_extract => }/apple.txt                     | 0
 .../{0-524288.extfs_extract => }/banana.txt                    | 0
 .../{0-524288.extfs_extract => }/cherry.txt                    | 0
 .../lost+found/.gitkeep                                        | 0
 .../extfs/__output__/ext2.2048.img_extract/0-524288.extfs      | 3 ---
 .../{0-524288.extfs_extract => }/apple.txt                     | 0
 .../{0-524288.extfs_extract => }/banana.txt                    | 0
 .../{0-524288.extfs_extract => }/cherry.txt                    | 0
 .../lost+found/.gitkeep                                        | 0
 .../extfs/__output__/ext2.4096.img_extract/0-524288.extfs      | 3 ---
 .../{0-524288.extfs_extract => }/apple.txt                     | 0
 .../{0-524288.extfs_extract => }/banana.txt                    | 0
 .../{0-524288.extfs_extract => }/cherry.txt                    | 0
 .../lost+found/.gitkeep                                        | 0
 .../extfs/__output__/ext3.1024.img_extract/0-524288.extfs      | 3 ---
 .../{0-524288.extfs_extract => }/apple.txt                     | 0
 .../{0-524288.extfs_extract => }/banana.txt                    | 0
 .../{0-524288.extfs_extract => }/cherry.txt                    | 0
 .../lost+found/.gitkeep                                        | 0
 .../extfs/__output__/ext3.2048.img_extract/0-524288.extfs      | 3 ---
 .../{0-524288.extfs_extract => }/apple.txt                     | 0
 .../{0-524288.extfs_extract => }/banana.txt                    | 0
 .../{0-524288.extfs_extract => }/cherry.txt                    | 0
 .../lost+found/.gitkeep                                        | 0
 .../extfs/__output__/ext3.4096.img_extract/0-524288.extfs      | 3 ---
 .../{0-524288.extfs_extract => }/apple.txt                     | 0
 .../{0-524288.extfs_extract => }/banana.txt                    | 0
 .../{0-524288.extfs_extract => }/cherry.txt                    | 0
 .../__output__/ext3.4096.img_extract/lost+found}/.gitkeep      | 0
 .../extfs/__output__/ext4.1024.img_extract/0-524288.extfs      | 3 ---
 .../{0-524288.extfs_extract => }/apple.txt                     | 0
 .../{0-524288.extfs_extract => }/banana.txt                    | 0
 .../{0-524288.extfs_extract => }/cherry.txt                    | 0
 .../__output__/ext4.1024.img_extract/lost+found}/.gitkeep      | 0
 .../extfs/__output__/ext4.2048.img_extract/0-524288.extfs      | 3 ---
 .../{0-524288.extfs_extract => }/apple.txt                     | 0
 .../{0-524288.extfs_extract => }/banana.txt                    | 0
 .../{0-524288.extfs_extract => }/cherry.txt                    | 0
 .../__output__/ext4.2048.img_extract/lost+found}/.gitkeep      | 0
 .../extfs/__output__/ext4.4096.img_extract/0-524288.extfs      | 3 ---
 .../{0-524288.extfs_extract => }/apple.txt                     | 0
 .../{0-524288.extfs_extract => }/banana.txt                    | 0
 .../{0-524288.extfs_extract => }/cherry.txt                    | 0
 .../__output__/ext4.4096.img_extract/lost+found}/.gitkeep      | 0
 .../fat/fat12/__output__/cherry.fat12_extract/0-65536.fat      | 3 ---
 .../cherry.fat12_extract/{0-65536.fat_extract => }/cherry1.txt | 0
 .../cherry.fat12_extract/{0-65536.fat_extract => }/cherry2.txt | 0
 .../cherry.fat12_extract/{0-65536.fat_extract => }/cherry3.txt | 0
 .../cherry.fat12_extract/{0-65536.fat_extract => }/cherry4.txt | 0
 .../fat/fat16/__output__/banana.fat16_extract/0-65536.fat      | 3 ---
 .../banana.fat16_extract/{0-65536.fat_extract => }/banana1.txt | 0
 .../banana.fat16_extract/{0-65536.fat_extract => }/banana2.txt | 0
 .../banana.fat16_extract/{0-65536.fat_extract => }/banana3.txt | 0
 .../banana.fat16_extract/{0-65536.fat_extract => }/banana4.txt | 0
 .../fat/fat32/__output__/banana.fat32_extract/0-34603008.fat   | 3 ---
 .../{0-34603008.fat_extract => }/banana1.txt                   | 0
 .../{0-34603008.fat_extract => }/banana2.txt                   | 0
 .../{0-34603008.fat_extract => }/banana3.txt                   | 0
 .../{0-34603008.fat_extract => }/banana4.txt                   | 0
 .../iso9660/__output__/fruits.iso_extract/0-360448.iso9660     | 3 ---
 .../{0-360448.iso9660_extract => }/APPLE.TXT                   | 0
 .../{0-360448.iso9660_extract => }/CHERRY.TXT                  | 0
 .../__output__/fruits.new.be.lzo.jffs2_extract/0-400.jffs2_new | 3 ---
 .../{0-400.jffs2_new_extract => }/fs_1/apple.txt               | 0
 .../{0-400.jffs2_new_extract => }/fs_1/banana.txt              | 0
 .../{0-400.jffs2_new_extract => }/fs_1/cherry.txt              | 0
 .../fruits.new.be.lzo.padded.jffs2_extract/0-65536.jffs2_new   | 3 ---
 .../{0-65536.jffs2_new_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/cherry.txt            | 0
 .../fruits.new.be.nocomp.jffs2_extract/0-416.jffs2_new         | 3 ---
 .../{0-416.jffs2_new_extract => }/fs_1/apple.txt               | 0
 .../{0-416.jffs2_new_extract => }/fs_1/banana.txt              | 0
 .../{0-416.jffs2_new_extract => }/fs_1/cherry.txt              | 0
 .../0-65536.jffs2_new                                          | 3 ---
 .../{0-65536.jffs2_new_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/cherry.txt            | 0
 .../fruits.new.be.rtime.jffs2_extract/0-392.jffs2_new          | 3 ---
 .../{0-392.jffs2_new_extract => }/fs_1/apple.txt               | 0
 .../{0-392.jffs2_new_extract => }/fs_1/banana.txt              | 0
 .../{0-392.jffs2_new_extract => }/fs_1/cherry.txt              | 0
 .../fruits.new.be.rtime.padded.jffs2_extract/0-65536.jffs2_new | 3 ---
 .../{0-65536.jffs2_new_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/cherry.txt            | 0
 .../fruits.new.be.zlib.jffs2_extract/0-484.jffs2_new           | 3 ---
 .../{0-484.jffs2_new_extract => }/fs_1/apple.txt               | 0
 .../{0-484.jffs2_new_extract => }/fs_1/banana.txt              | 0
 .../{0-484.jffs2_new_extract => }/fs_1/cherry.txt              | 0
 .../fruits.new.be.zlib.padded.jffs2_extract/0-65536.jffs2_new  | 3 ---
 .../{0-65536.jffs2_new_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/cherry.txt            | 0
 .../__output__/fruits.new.le.lzo.jffs2_extract/0-400.jffs2_new | 3 ---
 .../{0-400.jffs2_new_extract => }/fs_1/apple.txt               | 0
 .../{0-400.jffs2_new_extract => }/fs_1/banana.txt              | 0
 .../{0-400.jffs2_new_extract => }/fs_1/cherry.txt              | 0
 .../fruits.new.le.lzo.padded.jffs2_extract/0-65536.jffs2_new   | 3 ---
 .../{0-65536.jffs2_new_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/cherry.txt            | 0
 .../fruits.new.le.nocomp.jffs2_extract/0-416.jffs2_new         | 3 ---
 .../{0-416.jffs2_new_extract => }/fs_1/apple.txt               | 0
 .../{0-416.jffs2_new_extract => }/fs_1/banana.txt              | 0
 .../{0-416.jffs2_new_extract => }/fs_1/cherry.txt              | 0
 .../0-65536.jffs2_new                                          | 3 ---
 .../{0-65536.jffs2_new_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/cherry.txt            | 0
 .../fruits.new.le.rtime.jffs2_extract/0-392.jffs2_new          | 3 ---
 .../{0-392.jffs2_new_extract => }/fs_1/apple.txt               | 0
 .../{0-392.jffs2_new_extract => }/fs_1/banana.txt              | 0
 .../{0-392.jffs2_new_extract => }/fs_1/cherry.txt              | 0
 .../fruits.new.le.rtime.padded.jffs2_extract/0-65536.jffs2_new | 3 ---
 .../{0-65536.jffs2_new_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/cherry.txt            | 0
 .../fruits.new.le.zlib.jffs2_extract/0-484.jffs2_new           | 3 ---
 .../{0-484.jffs2_new_extract => }/fs_1/apple.txt               | 0
 .../{0-484.jffs2_new_extract => }/fs_1/banana.txt              | 0
 .../{0-484.jffs2_new_extract => }/fs_1/cherry.txt              | 0
 .../fruits.new.le.zlib.padded.jffs2_extract/0-65536.jffs2_new  | 3 ---
 .../{0-65536.jffs2_new_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_new_extract => }/fs_1/cherry.txt            | 0
 .../__output__/fruits.old.be.lzo.jffs2_extract/0-400.jffs2_old | 3 ---
 .../{0-400.jffs2_old_extract => }/fs_1/apple.txt               | 0
 .../{0-400.jffs2_old_extract => }/fs_1/banana.txt              | 0
 .../{0-400.jffs2_old_extract => }/fs_1/cherry.txt              | 0
 .../fruits.old.be.lzo.padded.jffs2_extract/0-65536.jffs2_old   | 3 ---
 .../{0-65536.jffs2_old_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/cherry.txt            | 0
 .../fruits.old.be.nocomp.jffs2_extract/0-416.jffs2_old         | 3 ---
 .../{0-416.jffs2_old_extract => }/fs_1/apple.txt               | 0
 .../{0-416.jffs2_old_extract => }/fs_1/banana.txt              | 0
 .../{0-416.jffs2_old_extract => }/fs_1/cherry.txt              | 0
 .../0-65536.jffs2_old                                          | 3 ---
 .../{0-65536.jffs2_old_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/cherry.txt            | 0
 .../fruits.old.be.rtime.jffs2_extract/0-392.jffs2_old          | 3 ---
 .../{0-392.jffs2_old_extract => }/fs_1/apple.txt               | 0
 .../{0-392.jffs2_old_extract => }/fs_1/banana.txt              | 0
 .../{0-392.jffs2_old_extract => }/fs_1/cherry.txt              | 0
 .../fruits.old.be.rtime.padded.jffs2_extract/0-65536.jffs2_old | 3 ---
 .../{0-65536.jffs2_old_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/cherry.txt            | 0
 .../fruits.old.be.zlib.jffs2_extract/0-484.jffs2_old           | 3 ---
 .../{0-484.jffs2_old_extract => }/fs_1/apple.txt               | 0
 .../{0-484.jffs2_old_extract => }/fs_1/banana.txt              | 0
 .../{0-484.jffs2_old_extract => }/fs_1/cherry.txt              | 0
 .../fruits.old.be.zlib.padded.jffs2_extract/0-65536.jffs2_old  | 3 ---
 .../{0-65536.jffs2_old_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/cherry.txt            | 0
 .../__output__/fruits.old.le.lzo.jffs2_extract/0-400.jffs2_old | 3 ---
 .../{0-400.jffs2_old_extract => }/fs_1/apple.txt               | 0
 .../{0-400.jffs2_old_extract => }/fs_1/banana.txt              | 0
 .../{0-400.jffs2_old_extract => }/fs_1/cherry.txt              | 0
 .../fruits.old.le.lzo.padded.jffs2_extract/0-65536.jffs2_old   | 3 ---
 .../{0-65536.jffs2_old_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/cherry.txt            | 0
 .../fruits.old.le.nocomp.jffs2_extract/0-416.jffs2_old         | 3 ---
 .../{0-416.jffs2_old_extract => }/fs_1/apple.txt               | 0
 .../{0-416.jffs2_old_extract => }/fs_1/banana.txt              | 0
 .../{0-416.jffs2_old_extract => }/fs_1/cherry.txt              | 0
 .../0-65536.jffs2_old                                          | 3 ---
 .../{0-65536.jffs2_old_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/cherry.txt            | 0
 .../fruits.old.le.rtime.jffs2_extract/0-392.jffs2_old          | 3 ---
 .../{0-392.jffs2_old_extract => }/fs_1/apple.txt               | 0
 .../{0-392.jffs2_old_extract => }/fs_1/banana.txt              | 0
 .../{0-392.jffs2_old_extract => }/fs_1/cherry.txt              | 0
 .../fruits.old.le.rtime.padded.jffs2_extract/0-65536.jffs2_old | 3 ---
 .../{0-65536.jffs2_old_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/cherry.txt            | 0
 .../fruits.old.le.zlib.jffs2_extract/0-484.jffs2_old           | 3 ---
 .../{0-484.jffs2_old_extract => }/fs_1/apple.txt               | 0
 .../{0-484.jffs2_old_extract => }/fs_1/banana.txt              | 0
 .../{0-484.jffs2_old_extract => }/fs_1/cherry.txt              | 0
 .../fruits.old.le.zlib.padded.jffs2_extract/0-65536.jffs2_old  | 3 ---
 .../{0-65536.jffs2_old_extract => }/fs_1/apple.txt             | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/banana.txt            | 0
 .../{0-65536.jffs2_old_extract => }/fs_1/cherry.txt            | 0
 .../romfs/__output__/fruits.romfs_extract/0-5120.romfs         | 3 ---
 .../{0-5120.romfs_extract => }/dir_1/file_1.txt                | 0
 .../{0-5120.romfs_extract => }/dir_1/file_2.txt                | 0
 .../{0-5120.romfs_extract => }/dir_1/file_3.txt                | 0
 .../{0-5120.romfs_extract => }/dir_1/file_4.txt                | 0
 .../{0-5120.romfs_extract => }/dir_1/file_5.txt                | 0
 .../{0-5120.romfs_extract => }/dir_1/hosts                     | 0
 .../{0-5120.romfs_extract => }/dir_1/passwd                    | 0
 .../{0-5120.romfs_extract => }/dir_2/file_1.txt                | 0
 .../{0-5120.romfs_extract => }/dir_2/file_2.txt                | 0
 .../{0-5120.romfs_extract => }/dir_2/file_3.txt                | 0
 .../{0-5120.romfs_extract => }/dir_2/file_4.txt                | 0
 .../{0-5120.romfs_extract => }/dir_2/file_5.txt                | 0
 .../{0-5120.romfs_extract => }/dir_2/hosts                     | 0
 .../{0-5120.romfs_extract => }/dir_2/passwd                    | 0
 .../{0-5120.romfs_extract => }/dir_3/file_1.txt                | 0
 .../{0-5120.romfs_extract => }/dir_3/file_2.txt                | 0
 .../{0-5120.romfs_extract => }/dir_3/file_3.txt                | 0
 .../{0-5120.romfs_extract => }/dir_3/file_4.txt                | 0
 .../{0-5120.romfs_extract => }/dir_3/file_5.txt                | 0
 .../{0-5120.romfs_extract => }/dir_3/hosts                     | 0
 .../{0-5120.romfs_extract => }/dir_3/passwd                    | 0
 .../{0-5120.romfs_extract => }/dir_4/file_1.txt                | 0
 .../{0-5120.romfs_extract => }/dir_4/file_2.txt                | 0
 .../{0-5120.romfs_extract => }/dir_4/file_3.txt                | 0
 .../{0-5120.romfs_extract => }/dir_4/file_4.txt                | 0
 .../{0-5120.romfs_extract => }/dir_4/file_5.txt                | 0
 .../{0-5120.romfs_extract => }/dir_4/hosts                     | 0
 .../{0-5120.romfs_extract => }/dir_4/passwd                    | 0
 .../{0-5120.romfs_extract => }/dir_5/file_1.txt                | 0
 .../{0-5120.romfs_extract => }/dir_5/file_2.txt                | 0
 .../{0-5120.romfs_extract => }/dir_5/file_3.txt                | 0
 .../{0-5120.romfs_extract => }/dir_5/file_4.txt                | 0
 .../{0-5120.romfs_extract => }/dir_5/file_5.txt                | 0
 .../{0-5120.romfs_extract => }/dir_5/hosts                     | 0
 .../{0-5120.romfs_extract => }/dir_5/passwd                    | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_1_1  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_1_2  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_1_3  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_1_4  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_1_5  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_2_1  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_2_2  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_2_3  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_2_4  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_2_5  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_3_1  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_3_2  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_3_3  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_3_4  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_3_5  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_4_1  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_4_2  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_4_3  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_4_4  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_4_5  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_5_1  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_5_2  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_5_3  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_5_4  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_5_5  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_1_1  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_1_2  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_1_3  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_1_4  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_1_5  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_2_1  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_2_2  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_2_3  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_2_4  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_2_5  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_3_1  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_3_2  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_3_3  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_3_4  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_3_5  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_4_1  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_4_2  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_4_3  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_4_4  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_4_5  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_5_1  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_5_2  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_5_3  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_5_4  | 0
 .../fruits.romfs_extract/{0-5120.romfs_extract => }/slink_5_5  | 0
 .../squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3        | 3 ---
 .../{0-1024.squashfs_v3_extract => }/apple1.txt                | 0
 .../{0-1024.squashfs_v3_extract => }/apple2.txt                | 0
 .../{0-1024.squashfs_v3_extract => }/apple3.txt                | 0
 .../{0-1024.squashfs_v3_extract => }/apple4.txt                | 0
 .../squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3        | 3 ---
 .../{0-4096.squashfs_v3_extract => }/apple1.txt                | 0
 .../{0-4096.squashfs_v3_extract => }/apple2.txt                | 0
 .../{0-4096.squashfs_v3_extract => }/apple3.txt                | 0
 .../{0-4096.squashfs_v3_extract => }/apple4.txt                | 0
 .../squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3         | 3 ---
 .../{0-320.squashfs_v3_extract => }/apple1.txt                 | 0
 .../{0-320.squashfs_v3_extract => }/apple2.txt                 | 0
 .../{0-320.squashfs_v3_extract => }/apple3.txt                 | 0
 .../{0-320.squashfs_v3_extract => }/apple4.txt                 | 0
 .../__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3   | 3 ---
 .../{0-4096.squashfs_v3_extract => }/apple.txt                 | 0
 .../{0-4096.squashfs_v3_extract => }/cherry.txt                | 0
 .../squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3        | 3 ---
 .../{0-1024.squashfs_v3_extract => }/apple1.txt                | 0
 .../{0-1024.squashfs_v3_extract => }/apple2.txt                | 0
 .../{0-1024.squashfs_v3_extract => }/apple3.txt                | 0
 .../{0-1024.squashfs_v3_extract => }/apple4.txt                | 0
 .../squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3        | 3 ---
 .../{0-4096.squashfs_v3_extract => }/apple1.txt                | 0
 .../{0-4096.squashfs_v3_extract => }/apple2.txt                | 0
 .../{0-4096.squashfs_v3_extract => }/apple3.txt                | 0
 .../{0-4096.squashfs_v3_extract => }/apple4.txt                | 0
 .../squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3         | 3 ---
 .../{0-320.squashfs_v3_extract => }/apple1.txt                 | 0
 .../{0-320.squashfs_v3_extract => }/apple2.txt                 | 0
 .../{0-320.squashfs_v3_extract => }/apple3.txt                 | 0
 .../{0-320.squashfs_v3_extract => }/apple4.txt                 | 0
 .../__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3   | 3 ---
 .../{0-4096.squashfs_v3_extract => }/apple.txt                 | 0
 .../{0-4096.squashfs_v3_extract => }/cherry.txt                | 0
 .../0-1024.squashfs_v3_broadcom                                | 3 ---
 .../{0-1024.squashfs_v3_broadcom_extract => }/apple1.txt       | 0
 .../{0-1024.squashfs_v3_broadcom_extract => }/apple2.txt       | 0
 .../{0-1024.squashfs_v3_broadcom_extract => }/apple3.txt       | 0
 .../{0-1024.squashfs_v3_broadcom_extract => }/apple4.txt       | 0
 .../0-4096.squashfs_v3_broadcom                                | 3 ---
 .../{0-4096.squashfs_v3_broadcom_extract => }/apple1.txt       | 0
 .../{0-4096.squashfs_v3_broadcom_extract => }/apple2.txt       | 0
 .../{0-4096.squashfs_v3_broadcom_extract => }/apple3.txt       | 0
 .../{0-4096.squashfs_v3_broadcom_extract => }/apple4.txt       | 0
 .../0-320.squashfs_v3_broadcom                                 | 3 ---
 .../{0-320.squashfs_v3_broadcom_extract => }/apple1.txt        | 0
 .../{0-320.squashfs_v3_broadcom_extract => }/apple2.txt        | 0
 .../{0-320.squashfs_v3_broadcom_extract => }/apple3.txt        | 0
 .../{0-320.squashfs_v3_broadcom_extract => }/apple4.txt        | 0
 .../__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3   | 3 ---
 .../{0-4096.squashfs_v3_extract => }/apple.txt                 | 0
 .../{0-4096.squashfs_v3_extract => }/cherry.txt                | 0
 .../0-1024.squashfs_v3_broadcom                                | 3 ---
 .../{0-1024.squashfs_v3_broadcom_extract => }/apple1.txt       | 0
 .../{0-1024.squashfs_v3_broadcom_extract => }/apple2.txt       | 0
 .../{0-1024.squashfs_v3_broadcom_extract => }/apple3.txt       | 0
 .../{0-1024.squashfs_v3_broadcom_extract => }/apple4.txt       | 0
 .../0-4096.squashfs_v3_broadcom                                | 3 ---
 .../{0-4096.squashfs_v3_broadcom_extract => }/apple1.txt       | 0
 .../{0-4096.squashfs_v3_broadcom_extract => }/apple2.txt       | 0
 .../{0-4096.squashfs_v3_broadcom_extract => }/apple3.txt       | 0
 .../{0-4096.squashfs_v3_broadcom_extract => }/apple4.txt       | 0
 .../0-320.squashfs_v3_broadcom                                 | 3 ---
 .../{0-320.squashfs_v3_broadcom_extract => }/apple1.txt        | 0
 .../{0-320.squashfs_v3_broadcom_extract => }/apple2.txt        | 0
 .../{0-320.squashfs_v3_broadcom_extract => }/apple3.txt        | 0
 .../{0-320.squashfs_v3_broadcom_extract => }/apple4.txt        | 0
 .../squashfs_v3_le.bin_extract/0-4096.squashfs_v3_broadcom     | 3 ---
 .../{0-4096.squashfs_v3_broadcom_extract => }/apple.txt        | 0
 .../{0-4096.squashfs_v3_broadcom_extract => }/cherry.txt       | 0
 .../__output__/squashfs_v3.be.1kpad.bin_extract/.gitkeep       | 0
 .../__output__/squashfs_v3.be.4kpad.bin_extract/.gitkeep       | 0
 .../big_endian/__output__/squashfs_v3.be.bin_extract/.gitkeep  | 0
 .../__output__/squashfs_v3.be.nopad.bin_extract/.gitkeep       | 0
 .../__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3   | 3 ---
 .../{0-4096.squashfs_v3_extract => }/apple.txt                 | 0
 .../{0-4096.squashfs_v3_extract => }/cherry.txt                | 0
 .../squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt  | 3 ---
 .../{0-1024.squashfs_v3_ddwrt_extract => }/apple1.txt          | 0
 .../{0-1024.squashfs_v3_ddwrt_extract => }/apple2.txt          | 0
 .../{0-1024.squashfs_v3_ddwrt_extract => }/apple3.txt          | 0
 .../{0-1024.squashfs_v3_ddwrt_extract => }/apple4.txt          | 0
 .../squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt  | 3 ---
 .../{0-4096.squashfs_v3_ddwrt_extract => }/apple1.txt          | 0
 .../{0-4096.squashfs_v3_ddwrt_extract => }/apple2.txt          | 0
 .../{0-4096.squashfs_v3_ddwrt_extract => }/apple3.txt          | 0
 .../{0-4096.squashfs_v3_ddwrt_extract => }/apple4.txt          | 0
 .../__output__/squashfs_v3.le.bin_extract/.gitkeep             | 0
 .../squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt   | 3 ---
 .../{0-320.squashfs_v3_ddwrt_extract => }/apple1.txt           | 0
 .../{0-320.squashfs_v3_ddwrt_extract => }/apple2.txt           | 0
 .../{0-320.squashfs_v3_ddwrt_extract => }/apple3.txt           | 0
 .../{0-320.squashfs_v3_ddwrt_extract => }/apple4.txt           | 0
 .../__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3   | 3 ---
 .../{0-4096.squashfs_v3_extract => }/apple.txt                 | 0
 .../{0-4096.squashfs_v3_extract => }/cherry.txt                | 0
 .../0-1024.squashfs_v3_nonstandard                             | 3 ---
 .../{0-1024.squashfs_v3_nonstandard_extract => }/apple1.txt    | 0
 .../{0-1024.squashfs_v3_nonstandard_extract => }/apple2.txt    | 0
 .../{0-1024.squashfs_v3_nonstandard_extract => }/apple3.txt    | 0
 .../{0-1024.squashfs_v3_nonstandard_extract => }/apple4.txt    | 0
 .../0-4096.squashfs_v3_nonstandard                             | 3 ---
 .../{0-4096.squashfs_v3_nonstandard_extract => }/apple1.txt    | 0
 .../{0-4096.squashfs_v3_nonstandard_extract => }/apple2.txt    | 0
 .../{0-4096.squashfs_v3_nonstandard_extract => }/apple3.txt    | 0
 .../{0-4096.squashfs_v3_nonstandard_extract => }/apple4.txt    | 0
 .../0-320.squashfs_v3_nonstandard                              | 3 ---
 .../{0-320.squashfs_v3_nonstandard_extract => }/apple1.txt     | 0
 .../{0-320.squashfs_v3_nonstandard_extract => }/apple2.txt     | 0
 .../{0-320.squashfs_v3_nonstandard_extract => }/apple3.txt     | 0
 .../{0-320.squashfs_v3_nonstandard_extract => }/apple4.txt     | 0
 .../squashfs_v3_be.bin_extract/0-4096.squashfs_v3_nonstandard  | 3 ---
 .../{0-4096.squashfs_v3_nonstandard_extract => }/apple.txt     | 0
 .../{0-4096.squashfs_v3_nonstandard_extract => }/cherry.txt    | 0
 .../0-1024.squashfs_v3_nonstandard                             | 3 ---
 .../{0-1024.squashfs_v3_nonstandard_extract => }/apple1.txt    | 0
 .../{0-1024.squashfs_v3_nonstandard_extract => }/apple2.txt    | 0
 .../{0-1024.squashfs_v3_nonstandard_extract => }/apple3.txt    | 0
 .../{0-1024.squashfs_v3_nonstandard_extract => }/apple4.txt    | 0
 .../0-4096.squashfs_v3_nonstandard                             | 3 ---
 .../{0-4096.squashfs_v3_nonstandard_extract => }/apple1.txt    | 0
 .../{0-4096.squashfs_v3_nonstandard_extract => }/apple2.txt    | 0
 .../{0-4096.squashfs_v3_nonstandard_extract => }/apple3.txt    | 0
 .../{0-4096.squashfs_v3_nonstandard_extract => }/apple4.txt    | 0
 .../0-320.squashfs_v3_nonstandard                              | 3 ---
 .../{0-320.squashfs_v3_nonstandard_extract => }/apple1.txt     | 0
 .../{0-320.squashfs_v3_nonstandard_extract => }/apple2.txt     | 0
 .../{0-320.squashfs_v3_nonstandard_extract => }/apple3.txt     | 0
 .../{0-320.squashfs_v3_nonstandard_extract => }/apple4.txt     | 0
 .../squashfs_v3_le.bin_extract/0-4096.squashfs_v3_nonstandard  | 3 ---
 .../{0-4096.squashfs_v3_nonstandard_extract => }/apple.txt     | 0
 .../{0-4096.squashfs_v3_nonstandard_extract => }/cherry.txt    | 0
 .../squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be        | 3 ---
 .../{0-1024.squashfs_v4_be_extract => }/apple1.txt             | 0
 .../{0-1024.squashfs_v4_be_extract => }/apple2.txt             | 0
 .../{0-1024.squashfs_v4_be_extract => }/apple3.txt             | 0
 .../{0-1024.squashfs_v4_be_extract => }/apple4.txt             | 0
 .../squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le        | 3 ---
 .../{0-4096.squashfs_v4_le_extract => }/apple1.txt             | 0
 .../{0-4096.squashfs_v4_le_extract => }/apple2.txt             | 0
 .../{0-4096.squashfs_v4_le_extract => }/apple3.txt             | 0
 .../{0-4096.squashfs_v4_le_extract => }/apple4.txt             | 0
 .../__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be   | 3 ---
 .../{0-4096.squashfs_v4_be_extract => }/apple1.txt             | 0
 .../{0-4096.squashfs_v4_be_extract => }/apple2.txt             | 0
 .../{0-4096.squashfs_v4_be_extract => }/apple3.txt             | 0
 .../{0-4096.squashfs_v4_be_extract => }/apple4.txt             | 0
 .../squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be         | 3 ---
 .../{0-307.squashfs_v4_be_extract => }/apple1.txt              | 0
 .../{0-307.squashfs_v4_be_extract => }/apple2.txt              | 0
 .../{0-307.squashfs_v4_be_extract => }/apple3.txt              | 0
 .../{0-307.squashfs_v4_be_extract => }/apple4.txt              | 0
 .../squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le        | 3 ---
 .../{0-1024.squashfs_v4_le_extract => }/apple1.txt             | 0
 .../{0-1024.squashfs_v4_le_extract => }/apple2.txt             | 0
 .../{0-1024.squashfs_v4_le_extract => }/apple3.txt             | 0
 .../{0-1024.squashfs_v4_le_extract => }/apple4.txt             | 0
 .../squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le        | 3 ---
 .../{0-4096.squashfs_v4_le_extract => }/apple1.txt             | 0
 .../{0-4096.squashfs_v4_le_extract => }/apple2.txt             | 0
 .../{0-4096.squashfs_v4_le_extract => }/apple3.txt             | 0
 .../{0-4096.squashfs_v4_le_extract => }/apple4.txt             | 0
 .../__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_le   | 3 ---
 .../{0-4096.squashfs_v4_le_extract => }/apple.txt              | 0
 .../{0-4096.squashfs_v4_le_extract => }/cherry.txt             | 0
 .../squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le     | 3 ---
 .../{0-4096.squashfs_v4_le_extract => }/apple1.txt             | 0
 .../{0-4096.squashfs_v4_le_extract => }/apple2.txt             | 0
 .../{0-4096.squashfs_v4_le_extract => }/apple3.txt             | 0
 .../{0-4096.squashfs_v4_le_extract => }/apple4.txt             | 0
 .../squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le         | 3 ---
 .../{0-308.squashfs_v4_le_extract => }/apple1.txt              | 0
 .../{0-308.squashfs_v4_le_extract => }/apple2.txt              | 0
 .../{0-308.squashfs_v4_le_extract => }/apple3.txt              | 0
 .../{0-308.squashfs_v4_le_extract => }/apple4.txt              | 0
 .../ubi/ubi/__output__/fruits.ubi_extract/0-4096.ubi           | 3 ---
 .../0-4096.ubi => fruits.ubi}/img-1180426539_vol-apple.ubifs   | 0
 .../0-4096.ubi => fruits.ubi}/img-1180426539_vol-data.ubifs    | 0
 .../ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs   | 3 ---
 .../{0-168960.ubifs_extract => }/banana1.txt                   | 0
 .../{0-168960.ubifs_extract => }/banana2.txt                   | 0
 .../{0-168960.ubifs_extract => }/banana3.txt                   | 0
 .../{0-168960.ubifs_extract => }/banana4.txt                   | 0
 .../yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs   | 3 ---
 .../{0-4224.yaffs_extract => }/apple.txt                       | 0
 .../{0-4224.yaffs_extract => }/banana.txt                      | 0
 .../{0-4224.yaffs_extract => }/cherry.txt                      | 0
 .../yaffs/__output__/fruits.dir.be.yffs_extract/dir/.gitkeep   | 0
 .../yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs   | 3 ---
 .../{0-4224.yaffs_extract => }/apple.txt                       | 0
 .../{0-4224.yaffs_extract => }/banana.txt                      | 0
 .../{0-4224.yaffs_extract => }/cherry.txt                      | 0
 .../yaffs/__output__/fruits.dir.le.yffs_extract/dir/.gitkeep   | 0
 .../__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs      | 3 ---
 .../{0-135168.yaffs_extract => }/apple.txt                     | 0
 .../{0-135168.yaffs_extract => }/banana.txt                    | 0
 .../{0-135168.yaffs_extract => }/cherry.txt                    | 0
 .../yaffs2/__output__/fruits.dir.be.yffs2_extract/dir/.gitkeep | 0
 .../__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs      | 3 ---
 .../{0-135168.yaffs_extract => }/dir/apple.txt                 | 0
 .../{0-135168.yaffs_extract => }/dir/banana.txt                | 0
 .../{0-135168.yaffs_extract => }/dir/cherry.txt                | 0
 772 files changed, 534 deletions(-)
 delete mode 100644 tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar
 rename tests/integration/archive/ar/__output__/durian.ar_extract/{0-280.ar_extract => }/durian1.txt (100%)
 rename tests/integration/archive/ar/__output__/durian.ar_extract/{0-280.ar_extract => }/durian2.txt (100%)
 rename tests/integration/archive/ar/__output__/durian.ar_extract/{0-280.ar_extract => }/durian3.txt (100%)
 rename tests/integration/archive/ar/__output__/durian.ar_extract/{0-280.ar_extract => }/durian4.txt (100%)
 rename "tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep" => tests/integration/archive/ar/__output__/offset_malformed.ar_extract/.gitkeep (100%)
 delete mode 100644 tests/integration/archive/arc/__output__/fruits.arc_extract/0-106.arc
 rename tests/integration/archive/arc/__output__/fruits.arc_extract/{0-106.arc_extract/0-106 => fruits}/aaaaaaaa.txt (100%)
 rename tests/integration/archive/arc/__output__/fruits.arc_extract/{0-106.arc_extract/0-106 => fruits}/apple.txt (100%)
 rename tests/integration/archive/arc/__output__/fruits.arc_extract/{0-106.arc_extract/0-106 => fruits}/cherry.txt (100%)
 delete mode 100644 tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj
 rename tests/integration/archive/arj/__output__/kaki.arj_extract/{0-350.arj_extract => }/kaki1.txt (100%)
 rename tests/integration/archive/arj/__output__/kaki.arj_extract/{0-350.arj_extract => }/kaki2.txt (100%)
 rename tests/integration/archive/arj/__output__/kaki.arj_extract/{0-350.arj_extract => }/kaki3.txt (100%)
 rename tests/integration/archive/arj/__output__/kaki.arj_extract/{0-350.arj_extract => }/kaki4.txt (100%)
 delete mode 100644 tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab
 rename tests/integration/archive/cab/__output__/banana.cab_extract/{0-224.cab_extract => }/banana/banana1.txt (100%)
 rename tests/integration/archive/cab/__output__/banana.cab_extract/{0-224.cab_extract => }/banana/banana2.txt (100%)
 rename tests/integration/archive/cab/__output__/banana.cab_extract/{0-224.cab_extract => }/banana/banana3.txt (100%)
 rename tests/integration/archive/cab/__output__/banana.cab_extract/{0-224.cab_extract => }/banana/banana4.txt (100%)
 delete mode 100644 tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary
 rename tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/{0-512.cpio_binary_extract => }/apple1.txt (100%)
 rename tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/{0-512.cpio_binary_extract => }/apple2.txt (100%)
 rename tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/{0-512.cpio_binary_extract => }/apple3.txt (100%)
 rename tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/{0-512.cpio_binary_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary
 rename tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/{0-512.cpio_binary_extract => }/apple1.txt (100%)
 rename tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/{0-512.cpio_binary_extract => }/dev/console (100%)
 rename tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/{0-512.cpio_binary_extract => }/empty.txt (100%)
 rename tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/{0-512.cpio_binary_extract => }/hello1.txt (100%)
 delete mode 100644 tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii
 rename tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/{0-1024.cpio_portable_ascii_extract => }/apple1.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/{0-1024.cpio_portable_ascii_extract => }/apple2.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/{0-1024.cpio_portable_ascii_extract => }/apple3.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/{0-1024.cpio_portable_ascii_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii
 rename tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/{0-1024.cpio_portable_ascii_extract => }/apple1.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/{0-1024.cpio_portable_ascii_extract => }/dev/console (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/{0-1024.cpio_portable_ascii_extract => }/empty.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/{0-1024.cpio_portable_ascii_extract => }/hello1.txt (100%)
 delete mode 100644 tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc
 rename tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/{0-1024.cpio_portable_ascii_crc_extract => }/apple1.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/{0-1024.cpio_portable_ascii_crc_extract => }/apple2.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/{0-1024.cpio_portable_ascii_crc_extract => }/apple3.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/{0-1024.cpio_portable_ascii_crc_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc
 rename tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/{0-1024.cpio_portable_ascii_crc_extract => }/apple1.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/{0-1024.cpio_portable_ascii_crc_extract => }/dev/console (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/{0-1024.cpio_portable_ascii_crc_extract => }/empty.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/{0-1024.cpio_portable_ascii_crc_extract => }/hello1.txt (100%)
 delete mode 100644 tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii
 rename tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/{0-512.cpio_portable_old_ascii_extract => }/apple1.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/{0-512.cpio_portable_old_ascii_extract => }/apple2.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/{0-512.cpio_portable_old_ascii_extract => }/apple3.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/{0-512.cpio_portable_old_ascii_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii
 rename tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/{0-1024.cpio_portable_old_ascii_extract => }/apple1.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/{0-1024.cpio_portable_old_ascii_extract => }/dev/console (100%)
 rename tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/{0-1024.cpio_portable_old_ascii_extract => }/empty.txt (100%)
 rename tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/{0-1024.cpio_portable_old_ascii_extract => }/hello1.txt (100%)
 delete mode 100644 tests/integration/archive/dmg/__output__/fruits.dmg_extract/0-26280.dmg
 rename tests/integration/archive/dmg/__output__/fruits.dmg_extract/{0-26280.dmg_extract => }/fruits/apple.txt (100%)
 rename tests/integration/archive/dmg/__output__/fruits.dmg_extract/{0-26280.dmg_extract => }/fruits/cherry.txt (100%)
 delete mode 100644 tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg
 rename tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/.Trashes/.gitkeep => "tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep" (100%)
 rename "tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep" => tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/.Trashes/.gitkeep (100%)
 rename tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/{0-18518.dmg_extract => }/fruits/apple1.txt (100%)
 rename tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/{0-18518.dmg_extract => }/fruits/apple2.txt (100%)
 rename tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/{0-18518.dmg_extract => }/fruits/apple3.txt (100%)
 rename tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/{0-18518.dmg_extract => }/fruits/apple4.txt (100%)
 delete mode 100644 tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg
 rename tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/.Trashes/.gitkeep => "tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep" (100%)
 rename tests/integration/{filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs_extract/lost+found => archive/dmg/__output__/fruits_osx.dmg_extract/fruits/.Trashes}/.gitkeep (100%)
 rename tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/{0-20158.dmg_extract => }/fruits/apple1.txt (100%)
 rename tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/{0-20158.dmg_extract => }/fruits/apple2.txt (100%)
 rename tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/{0-20158.dmg_extract => }/fruits/apple3.txt (100%)
 rename tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/{0-20158.dmg_extract => }/fruits/apple4.txt (100%)
 delete mode 100644 tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar
 rename tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/{0-263.rar_extract/0-263 => erdbeere}/erdbeere1.txt (100%)
 rename tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/{0-263.rar_extract/0-263 => erdbeere}/erdbeere2.txt (100%)
 rename tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/{0-263.rar_extract/0-263 => erdbeere}/erdbeere3.txt (100%)
 rename tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/{0-263.rar_extract/0-263 => erdbeere}/erdbeere4.txt (100%)
 rename tests/integration/{filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs_extract/lost+found => archive/rar/password/__output__/cherry_password.rar_extract}/.gitkeep (100%)
 delete mode 100644 tests/integration/archive/rar/password/__output__/cherry_password.rar_extract/0-539.rar
 delete mode 100644 tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip
 rename tests/integration/archive/sevenzip/__output__/cherry.7z_extract/{0-212.sevenzip_extract => }/cherry1.txt (100%)
 rename tests/integration/archive/sevenzip/__output__/cherry.7z_extract/{0-212.sevenzip_extract => }/cherry2.txt (100%)
 rename tests/integration/archive/sevenzip/__output__/cherry.7z_extract/{0-212.sevenzip_extract => }/cherry3.txt (100%)
 rename tests/integration/archive/sevenzip/__output__/cherry.7z_extract/{0-212.sevenzip_extract => }/cherry4.txt (100%)
 delete mode 100644 tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5
 rename tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/{0-534.stuffit5_extract/0-534 => plum}/plum1.txt (100%)
 rename tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/{0-534.stuffit5_extract/0-534 => plum}/plum2.txt (100%)
 rename tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/{0-534.stuffit5_extract/0-534 => plum}/plum3.txt (100%)
 rename tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/{0-534.stuffit5_extract/0-534 => plum}/plum4.txt (100%)
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract => }/banana.gnu.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/apple.gnu.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.gnu.tar_extract}/apple1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.gnu.tar_extract}/apple2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.gnu.tar_extract}/apple3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.gnu.tar_extract}/apple4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/apple.posix.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.posix.tar_extract}/apple1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.posix.tar_extract}/apple2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.posix.tar_extract}/apple3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.posix.tar_extract}/apple4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/banana1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/banana2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/banana3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/banana4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract => }/banana.posix.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/apple.gnu.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.gnu.tar_extract}/apple1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.gnu.tar_extract}/apple2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.gnu.tar_extract}/apple3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.gnu.tar_extract}/apple4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/apple.posix.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.posix.tar_extract}/apple1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.posix.tar_extract}/apple2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.posix.tar_extract}/apple3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.posix.tar_extract}/apple4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/banana1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/banana2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/banana3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/banana4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract => }/cherry1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract => }/cherry2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract => }/cherry3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/{0-81920.tar_extract => }/cherry4.txt (100%)
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar
 delete mode 100644 tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract => }/banana.gnu.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/apple.gnu.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.gnu.tar_extract}/apple1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.gnu.tar_extract}/apple2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.gnu.tar_extract}/apple3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.gnu.tar_extract}/apple4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/apple.posix.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.posix.tar_extract}/apple1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.posix.tar_extract}/apple2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.posix.tar_extract}/apple3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.gnu.tar_extract/apple.posix.tar_extract}/apple4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/banana1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/banana2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/banana3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract => banana.gnu.tar_extract}/banana4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract => }/banana.posix.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/apple.gnu.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.gnu.tar_extract}/apple1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.gnu.tar_extract}/apple2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.gnu.tar_extract}/apple3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.gnu.tar_extract}/apple4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/apple.posix.tar (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.posix.tar_extract}/apple1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.posix.tar_extract}/apple2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.posix.tar_extract}/apple3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract => banana.posix.tar_extract/apple.posix.tar_extract}/apple4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/banana1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/banana2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/banana3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract => banana.posix.tar_extract}/banana4.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract => }/cherry1.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract => }/cherry2.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract => }/cherry3.txt (100%)
 rename tests/integration/archive/tar/__output__/cherry.posix.tar_extract/{0-92160.tar_extract => }/cherry4.txt (100%)
 rename tests/integration/{filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs_extract/lost+found => archive/zip/encrypted/__output__/apple_encrypted.zip_extract}/.gitkeep (100%)
 delete mode 100644 tests/integration/archive/zip/encrypted/__output__/apple_encrypted.zip_extract/0-754.zip
 rename tests/integration/{filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs_extract/lost+found => archive/zip/partly_encrypted/__output__/kaki1_aes.zip_extract}/.gitkeep (100%)
 delete mode 100644 tests/integration/archive/zip/partly_encrypted/__output__/kaki1_aes.zip_extract/0-616.zip
 delete mode 100644 tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip
 rename tests/integration/archive/zip/regular/__output__/apple.zip_extract/{0-642.zip_extract => }/apple1.txt (100%)
 rename tests/integration/archive/zip/regular/__output__/apple.zip_extract/{0-642.zip_extract => }/apple2.txt (100%)
 rename tests/integration/archive/zip/regular/__output__/apple.zip_extract/{0-642.zip_extract => }/apple3.txt (100%)
 rename tests/integration/archive/zip/regular/__output__/apple.zip_extract/{0-642.zip_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/compression/bzip2/__output__/lorem.txt.bz2_extract/0-2545.bzip2
 rename tests/integration/compression/bzip2/__output__/lorem.txt.bz2_extract/{0-2545.bzip2_extract/0-2545 => lorem.txt} (100%)
 delete mode 100644 tests/integration/compression/compress/__output__/apple1.z_extract/0-11.compress
 rename tests/integration/compression/compress/__output__/apple1.z_extract/{0-11.compress_extract/0-11/0-11 => apple1/apple1} (100%)
 delete mode 100644 tests/integration/compression/gzip/__output__/durian.gz_extract/0-43.gzip
 rename tests/integration/compression/gzip/__output__/durian.gz_extract/{0-43.gzip_extract => }/durian1.txt (100%)
 delete mode 100644 tests/integration/compression/lz4/lz4_default/__output__/lorem.block_checksum.lz4_extract/0-3944.lz4_default
 rename tests/integration/compression/lz4/lz4_default/__output__/lorem.block_checksum.lz4_extract/{0-3944.lz4_default_extract/0-3944 => lorem.block_checksum} (100%)
 delete mode 100644 tests/integration/compression/lz4/lz4_default/__output__/lorem.csize.lz4_extract/0-3948.lz4_default
 rename tests/integration/compression/lz4/lz4_default/__output__/lorem.csize.lz4_extract/{0-3948.lz4_default_extract/0-3948 => lorem.csize} (100%)
 delete mode 100644 tests/integration/compression/lz4/lz4_default/__output__/lorem.no_block_checksum.lz4_extract/0-3940.lz4_default
 rename tests/integration/compression/lz4/lz4_default/__output__/lorem.no_block_checksum.lz4_extract/{0-3940.lz4_default_extract/0-3940 => lorem.no_block_checksum} (100%)
 delete mode 100644 tests/integration/compression/lz4/lz4_default/__output__/lorem.nocsize.lz4_extract/0-3940.lz4_default
 rename tests/integration/compression/lz4/lz4_default/__output__/lorem.nocsize.lz4_extract/{0-3940.lz4_default_extract/0-3940 => lorem.nocsize} (100%)
 delete mode 100644 tests/integration/compression/lz4/lz4_default/__output__/lorem.noframecrc.lz4_extract/0-3936.lz4_default
 rename tests/integration/compression/lz4/lz4_default/__output__/lorem.noframecrc.lz4_extract/{0-3936.lz4_default_extract/0-3936 => lorem.noframecrc} (100%)
 delete mode 100644 tests/integration/compression/lz4/lz4_legacy/__output__/lorem.legacy.lz4_extract/0-3929.lz4_legacy
 rename tests/integration/compression/lz4/lz4_legacy/__output__/lorem.legacy.lz4_extract/{0-3929.lz4_legacy_extract/0-3929 => lorem.legacy} (100%)
 delete mode 100644 tests/integration/compression/lz4/lz4_skippable/__output__/skippable.lz4_extract/0-108.lz4_skippable
 rename tests/integration/compression/lz4/lz4_skippable/__output__/skippable.lz4_extract/{0-108.lz4_skippable_extract/0-108 => skippable} (100%)
 delete mode 100644 tests/integration/compression/lzip/__output__/lorem.txt.lz_extract/0-2520.lzip
 rename tests/integration/compression/lzip/__output__/lorem.txt.lz_extract/{0-2520.lzip_extract/0-2520 => lorem.txt} (100%)
 delete mode 100644 tests/integration/compression/lzma/__output__/lorem.txt.known_size.lzma_extract/0-2518.lzma
 rename tests/integration/compression/lzma/__output__/lorem.txt.known_size.lzma_extract/{0-2518.lzma_extract/0-2518 => lorem.txt.known_size} (100%)
 delete mode 100644 tests/integration/compression/lzma/__output__/lorem.txt.unknown_size.lzma_extract/0-2550.lzma
 rename tests/integration/compression/lzma/__output__/lorem.txt.unknown_size.lzma_extract/{0-2550.lzma_extract/0-2550 => lorem.txt.unknown_size} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.file.lzo_extract/{0-29563.lzo_extract => }/big256k.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.stdin.lzo_extract/{0-29552.lzo_extract/0-29552 => lorem.adler.checksum.filter.multi-block.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.file.lzo_extract/0-4341.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.file.lzo_extract/{0-4341.lzo_extract => }/lorem.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.stdin.lzo_extract/{0-4332.lzo_extract/0-4332 => lorem.adler.checksum.filter.simple.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.file.lzo_extract/{0-26504.lzo_extract => }/big256k.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.stdin.lzo_extract/{0-26493.lzo_extract/0-26493 => lorem.adler.checksum.no-filter.multi-block.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.file.lzo_extract/{0-3933.lzo_extract => }/lorem.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.stdin.lzo_extract/{0-3924.lzo_extract/0-3924 => lorem.adler.checksum.no-filter.simple.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.file.lzo_extract/{0-29555.lzo_extract => }/big256k.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.stdin.lzo_extract/{0-29544.lzo_extract/0-29544 => lorem.adler.no-checksum.filter.multi-block.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.file.lzo_extract/{0-4337.lzo_extract => }/lorem.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.stdin.lzo_extract/{0-4328.lzo_extract/0-4328 => lorem.adler.no-checksum.filter.simple.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.file.lzo_extract/{0-26496.lzo_extract => }/big256k.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.stdin.lzo_extract/{0-26485.lzo_extract/0-26485 => lorem.adler.no-checksum.no-filter.multi-block.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.file.lzo_extract/{0-3929.lzo_extract => }/lorem.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo
 rename tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.stdin.lzo_extract/{0-3920.lzo_extract/0-3920 => lorem.adler.no-checksum.no-filter.simple.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.file.lzo_extract/{0-29563.lzo_extract => }/big256k.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.stdin.lzo_extract/{0-29552.lzo_extract/0-29552 => lorem.crc32.checksum.filter.multi-block.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.file.lzo_extract/0-4341.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.file.lzo_extract/{0-4341.lzo_extract => }/lorem.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.stdin.lzo_extract/{0-4332.lzo_extract/0-4332 => lorem.crc32.checksum.filter.simple.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.file.lzo_extract/{0-26504.lzo_extract => }/big256k.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.stdin.lzo_extract/{0-26493.lzo_extract/0-26493 => lorem.crc32.checksum.no-filter.multi-block.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.file.lzo_extract/{0-3933.lzo_extract => }/lorem.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.stdin.lzo_extract/{0-3924.lzo_extract/0-3924 => lorem.crc32.checksum.no-filter.simple.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.file.lzo_extract/{0-29555.lzo_extract => }/big256k.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.stdin.lzo_extract/{0-29544.lzo_extract/0-29544 => lorem.crc32.no-checksum.filter.multi-block.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.file.lzo_extract/{0-4337.lzo_extract => }/lorem.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.stdin.lzo_extract/{0-4328.lzo_extract/0-4328 => lorem.crc32.no-checksum.filter.simple.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.file.lzo_extract/{0-26496.lzo_extract => }/big256k.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.stdin.lzo_extract/{0-26485.lzo_extract/0-26485 => lorem.crc32.no-checksum.no-filter.multi-block.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.file.lzo_extract/{0-3929.lzo_extract => }/lorem.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo
 rename tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.stdin.lzo_extract/{0-3920.lzo_extract/0-3920 => lorem.crc32.no-checksum.no-filter.simple.stdin} (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.filter.lzo_extract/0-6352.lzo
 rename tests/integration/compression/lzo/__output__/lorem.filter.lzo_extract/{0-6352.lzo_extract => }/lorem.txt (100%)
 delete mode 100644 tests/integration/compression/lzo/__output__/lorem.lzo_extract/0-3093.lzo
 rename tests/integration/compression/lzo/__output__/lorem.lzo_extract/{0-3093.lzo_extract => }/lorem.txt (100%)
 delete mode 100644 tests/integration/compression/xz/__output__/lorem.txt.xz_extract/0-2632.xz
 rename tests/integration/compression/xz/__output__/lorem.txt.xz_extract/{0-2632.xz_extract/0-2632 => lorem.txt} (100%)
 delete mode 100644 tests/integration/compression/xz/__output__/multiblock.padded.xz_extract/0-2168.xz
 rename tests/integration/compression/xz/__output__/multiblock.padded.xz_extract/{0-2168.xz_extract/0-2168 => multiblock.padded} (100%)
 delete mode 100644 tests/integration/filesystem/android/sparse/__output__/fruits.sparse_extract/0-41084.sparse
 rename tests/integration/filesystem/android/sparse/__output__/fruits.sparse_extract/{0-41084.sparse_extract/0-41084 => fruits} (100%)
 delete mode 100644 tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/0-4096.cramfs
 rename tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/{0-4096.cramfs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/{0-4096.cramfs_extract => }/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/0-4096.cramfs
 rename tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/{0-4096.cramfs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/{0-4096.cramfs_extract => }/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs
 rename tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/{0-524288.extfs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/{0-524288.extfs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/{0-524288.extfs_extract => }/cherry.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/{ext3.2048.img_extract/0-524288.extfs_extract => ext2.1024.img_extract}/lost+found/.gitkeep (100%)
 delete mode 100644 tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs
 rename tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/{0-524288.extfs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/{0-524288.extfs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/{0-524288.extfs_extract => }/cherry.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/{ext3.4096.img_extract/0-524288.extfs_extract => ext2.2048.img_extract}/lost+found/.gitkeep (100%)
 delete mode 100644 tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs
 rename tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/{0-524288.extfs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/{0-524288.extfs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/{0-524288.extfs_extract => }/cherry.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/{ext4.1024.img_extract/0-524288.extfs_extract => ext2.4096.img_extract}/lost+found/.gitkeep (100%)
 delete mode 100644 tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs
 rename tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/{0-524288.extfs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/{0-524288.extfs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/{0-524288.extfs_extract => }/cherry.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/{ext4.2048.img_extract/0-524288.extfs_extract => ext3.1024.img_extract}/lost+found/.gitkeep (100%)
 delete mode 100644 tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs
 rename tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/{0-524288.extfs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/{0-524288.extfs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/{0-524288.extfs_extract => }/cherry.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/{ext4.4096.img_extract/0-524288.extfs_extract => ext3.2048.img_extract}/lost+found/.gitkeep (100%)
 delete mode 100644 tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs
 rename tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/{0-524288.extfs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/{0-524288.extfs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/{0-524288.extfs_extract => }/cherry.txt (100%)
 rename tests/integration/filesystem/{yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs_extract/dir => extfs/__output__/ext3.4096.img_extract/lost+found}/.gitkeep (100%)
 delete mode 100644 tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs
 rename tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/{0-524288.extfs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/{0-524288.extfs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/{0-524288.extfs_extract => }/cherry.txt (100%)
 rename tests/integration/filesystem/{yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs_extract/dir => extfs/__output__/ext4.1024.img_extract/lost+found}/.gitkeep (100%)
 delete mode 100644 tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs
 rename tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/{0-524288.extfs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/{0-524288.extfs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/{0-524288.extfs_extract => }/cherry.txt (100%)
 rename tests/integration/filesystem/{yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs_extract/dir => extfs/__output__/ext4.2048.img_extract/lost+found}/.gitkeep (100%)
 delete mode 100644 tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs
 rename tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/{0-524288.extfs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/{0-524288.extfs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/{0-524288.extfs_extract => }/cherry.txt (100%)
 rename tests/integration/filesystem/{yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs_extract/dir => extfs/__output__/ext4.4096.img_extract/lost+found}/.gitkeep (100%)
 delete mode 100644 tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat
 rename tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/{0-65536.fat_extract => }/cherry1.txt (100%)
 rename tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/{0-65536.fat_extract => }/cherry2.txt (100%)
 rename tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/{0-65536.fat_extract => }/cherry3.txt (100%)
 rename tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/{0-65536.fat_extract => }/cherry4.txt (100%)
 delete mode 100644 tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat
 rename tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/{0-65536.fat_extract => }/banana1.txt (100%)
 rename tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/{0-65536.fat_extract => }/banana2.txt (100%)
 rename tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/{0-65536.fat_extract => }/banana3.txt (100%)
 rename tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/{0-65536.fat_extract => }/banana4.txt (100%)
 delete mode 100644 tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat
 rename tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/{0-34603008.fat_extract => }/banana1.txt (100%)
 rename tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/{0-34603008.fat_extract => }/banana2.txt (100%)
 rename tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/{0-34603008.fat_extract => }/banana3.txt (100%)
 rename tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/{0-34603008.fat_extract => }/banana4.txt (100%)
 delete mode 100644 tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/0-360448.iso9660
 rename tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/{0-360448.iso9660_extract => }/APPLE.TXT (100%)
 rename tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/{0-360448.iso9660_extract => }/CHERRY.TXT (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/0-400.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/{0-400.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/{0-400.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/{0-400.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/0-65536.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/0-416.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/{0-416.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/{0-416.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/{0-416.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/0-65536.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/0-392.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/{0-392.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/{0-392.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/{0-392.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/0-65536.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/0-484.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/{0-484.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/{0-484.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/{0-484.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/0-65536.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/0-400.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/{0-400.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/{0-400.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/{0-400.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/0-65536.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/0-416.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/{0-416.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/{0-416.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/{0-416.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/0-65536.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/0-392.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/{0-392.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/{0-392.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/{0-392.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/0-65536.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/0-484.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/{0-484.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/{0-484.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/{0-484.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/0-65536.jffs2_new
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/{0-65536.jffs2_new_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/0-400.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/{0-400.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/{0-400.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/{0-400.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/0-65536.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/0-416.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/{0-416.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/{0-416.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/{0-416.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/0-65536.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/0-392.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/{0-392.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/{0-392.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/{0-392.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/0-65536.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/0-484.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/{0-484.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/{0-484.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/{0-484.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/0-65536.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/0-400.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/{0-400.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/{0-400.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/{0-400.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/0-65536.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/0-416.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/{0-416.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/{0-416.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/{0-416.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/0-65536.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/0-392.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/{0-392.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/{0-392.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/{0-392.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/0-65536.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/0-484.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/{0-484.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/{0-484.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/{0-484.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/0-65536.jffs2_old
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/apple.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/banana.txt (100%)
 rename tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/{0-65536.jffs2_old_extract => }/fs_1/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_1/file_1.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_1/file_2.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_1/file_3.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_1/file_4.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_1/file_5.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_1/hosts (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_1/passwd (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_2/file_1.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_2/file_2.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_2/file_3.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_2/file_4.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_2/file_5.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_2/hosts (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_2/passwd (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_3/file_1.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_3/file_2.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_3/file_3.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_3/file_4.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_3/file_5.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_3/hosts (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_3/passwd (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_4/file_1.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_4/file_2.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_4/file_3.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_4/file_4.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_4/file_5.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_4/hosts (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_4/passwd (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_5/file_1.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_5/file_2.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_5/file_3.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_5/file_4.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_5/file_5.txt (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_5/hosts (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/dir_5/passwd (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_1_1 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_1_2 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_1_3 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_1_4 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_1_5 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_2_1 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_2_2 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_2_3 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_2_4 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_2_5 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_3_1 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_3_2 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_3_3 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_3_4 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_3_5 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_4_1 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_4_2 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_4_3 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_4_4 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_4_5 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_5_1 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_5_2 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_5_3 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_5_4 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/hlink_5_5 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_1_1 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_1_2 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_1_3 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_1_4 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_1_5 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_2_1 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_2_2 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_2_3 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_2_4 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_2_5 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_3_1 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_3_2 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_3_3 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_3_4 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_3_5 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_4_1 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_4_2 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_4_3 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_4_4 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_4_5 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_5_1 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_5_2 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_5_3 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_5_4 (100%)
 rename tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/{0-5120.romfs_extract => }/slink_5_5 (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/{0-4096.squashfs_v3_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/{0-4096.squashfs_v3_extract => }/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/{0-4096.squashfs_v3_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/{0-4096.squashfs_v3_extract => }/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_broadcom_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_broadcom_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_broadcom_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_broadcom_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_broadcom_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_broadcom_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_broadcom_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_broadcom_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_broadcom_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_broadcom_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_broadcom_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_broadcom_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/{0-4096.squashfs_v3_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/{0-4096.squashfs_v3_extract => }/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_broadcom_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_broadcom_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_broadcom_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_broadcom_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_broadcom_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_broadcom_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_broadcom_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_broadcom_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_broadcom_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_broadcom_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_broadcom_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_broadcom_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_broadcom
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/{0-4096.squashfs_v3_broadcom_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/{0-4096.squashfs_v3_broadcom_extract => }/cherry.txt (100%)
 create mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/.gitkeep
 create mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/.gitkeep
 create mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.bin_extract/.gitkeep
 create mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/.gitkeep
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/{0-4096.squashfs_v3_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/{0-4096.squashfs_v3_extract => }/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_ddwrt_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_ddwrt_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_ddwrt_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_ddwrt_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_ddwrt_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_ddwrt_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_ddwrt_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_ddwrt_extract => }/apple4.txt (100%)
 create mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.bin_extract/.gitkeep
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_ddwrt_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_ddwrt_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_ddwrt_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_ddwrt_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/{0-4096.squashfs_v3_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/{0-4096.squashfs_v3_extract => }/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_nonstandard_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_nonstandard_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_nonstandard_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/{0-1024.squashfs_v3_nonstandard_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_nonstandard_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_nonstandard_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_nonstandard_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/{0-320.squashfs_v3_nonstandard_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_nonstandard
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_nonstandard_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_nonstandard_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_nonstandard_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/{0-1024.squashfs_v3_nonstandard_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_nonstandard_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_nonstandard_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_nonstandard_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/{0-320.squashfs_v3_nonstandard_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_nonstandard
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/{0-4096.squashfs_v3_nonstandard_extract => }/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/{0-1024.squashfs_v4_be_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/{0-1024.squashfs_v4_be_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/{0-1024.squashfs_v4_be_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/{0-1024.squashfs_v4_be_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/{0-4096.squashfs_v4_be_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/{0-4096.squashfs_v4_be_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/{0-4096.squashfs_v4_be_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/{0-4096.squashfs_v4_be_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/{0-307.squashfs_v4_be_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/{0-307.squashfs_v4_be_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/{0-307.squashfs_v4_be_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/{0-307.squashfs_v4_be_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/{0-1024.squashfs_v4_le_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/{0-1024.squashfs_v4_le_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/{0-1024.squashfs_v4_le_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/{0-1024.squashfs_v4_le_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_le
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/{0-4096.squashfs_v4_le_extract => }/cherry.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/{0-4096.squashfs_v4_le_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/{0-308.squashfs_v4_le_extract => }/apple1.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/{0-308.squashfs_v4_le_extract => }/apple2.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/{0-308.squashfs_v4_le_extract => }/apple3.txt (100%)
 rename tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/{0-308.squashfs_v4_le_extract => }/apple4.txt (100%)
 delete mode 100644 tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/0-4096.ubi
 rename tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/{0-4096.ubi_extract/0-4096.ubi => fruits.ubi}/img-1180426539_vol-apple.ubifs (100%)
 rename tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/{0-4096.ubi_extract/0-4096.ubi => fruits.ubi}/img-1180426539_vol-data.ubifs (100%)
 delete mode 100644 tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs
 rename tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/{0-168960.ubifs_extract => }/banana1.txt (100%)
 rename tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/{0-168960.ubifs_extract => }/banana2.txt (100%)
 rename tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/{0-168960.ubifs_extract => }/banana3.txt (100%)
 rename tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/{0-168960.ubifs_extract => }/banana4.txt (100%)
 delete mode 100644 tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs
 rename tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/{0-4224.yaffs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/{0-4224.yaffs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/{0-4224.yaffs_extract => }/cherry.txt (100%)
 create mode 100644 tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/dir/.gitkeep
 delete mode 100644 tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs
 rename tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/{0-4224.yaffs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/{0-4224.yaffs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/{0-4224.yaffs_extract => }/cherry.txt (100%)
 create mode 100644 tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/dir/.gitkeep
 delete mode 100644 tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs
 rename tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/{0-135168.yaffs_extract => }/apple.txt (100%)
 rename tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/{0-135168.yaffs_extract => }/banana.txt (100%)
 rename tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/{0-135168.yaffs_extract => }/cherry.txt (100%)
 create mode 100644 tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/dir/.gitkeep
 delete mode 100644 tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs
 rename tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/{0-135168.yaffs_extract => }/dir/apple.txt (100%)
 rename tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/{0-135168.yaffs_extract => }/dir/banana.txt (100%)
 rename tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/{0-135168.yaffs_extract => }/dir/cherry.txt (100%)

diff --git a/tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar b/tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar
deleted file mode 100644
index f5877ac3cb..0000000000
--- a/tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:626382d49aa29cd0e9688b64169d98f2403d08484c8e79241dd5e36c60ec8b5b
-size 280
diff --git a/tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar_extract/durian1.txt b/tests/integration/archive/ar/__output__/durian.ar_extract/durian1.txt
similarity index 100%
rename from tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar_extract/durian1.txt
rename to tests/integration/archive/ar/__output__/durian.ar_extract/durian1.txt
diff --git a/tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar_extract/durian2.txt b/tests/integration/archive/ar/__output__/durian.ar_extract/durian2.txt
similarity index 100%
rename from tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar_extract/durian2.txt
rename to tests/integration/archive/ar/__output__/durian.ar_extract/durian2.txt
diff --git a/tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar_extract/durian3.txt b/tests/integration/archive/ar/__output__/durian.ar_extract/durian3.txt
similarity index 100%
rename from tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar_extract/durian3.txt
rename to tests/integration/archive/ar/__output__/durian.ar_extract/durian3.txt
diff --git a/tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar_extract/durian4.txt b/tests/integration/archive/ar/__output__/durian.ar_extract/durian4.txt
similarity index 100%
rename from tests/integration/archive/ar/__output__/durian.ar_extract/0-280.ar_extract/durian4.txt
rename to tests/integration/archive/ar/__output__/durian.ar_extract/durian4.txt
diff --git "a/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep" b/tests/integration/archive/ar/__output__/offset_malformed.ar_extract/.gitkeep
similarity index 100%
rename from "tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep"
rename to tests/integration/archive/ar/__output__/offset_malformed.ar_extract/.gitkeep
diff --git a/tests/integration/archive/arc/__output__/fruits.arc_extract/0-106.arc b/tests/integration/archive/arc/__output__/fruits.arc_extract/0-106.arc
deleted file mode 100644
index 23a0470bb6..0000000000
--- a/tests/integration/archive/arc/__output__/fruits.arc_extract/0-106.arc
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22b0c8db75eef1138af9604ac29eb25175a5a5d8a61b30f66ea8d84f01605da8
-size 106
diff --git a/tests/integration/archive/arc/__output__/fruits.arc_extract/0-106.arc_extract/0-106/aaaaaaaa.txt b/tests/integration/archive/arc/__output__/fruits.arc_extract/fruits/aaaaaaaa.txt
similarity index 100%
rename from tests/integration/archive/arc/__output__/fruits.arc_extract/0-106.arc_extract/0-106/aaaaaaaa.txt
rename to tests/integration/archive/arc/__output__/fruits.arc_extract/fruits/aaaaaaaa.txt
diff --git a/tests/integration/archive/arc/__output__/fruits.arc_extract/0-106.arc_extract/0-106/apple.txt b/tests/integration/archive/arc/__output__/fruits.arc_extract/fruits/apple.txt
similarity index 100%
rename from tests/integration/archive/arc/__output__/fruits.arc_extract/0-106.arc_extract/0-106/apple.txt
rename to tests/integration/archive/arc/__output__/fruits.arc_extract/fruits/apple.txt
diff --git a/tests/integration/archive/arc/__output__/fruits.arc_extract/0-106.arc_extract/0-106/cherry.txt b/tests/integration/archive/arc/__output__/fruits.arc_extract/fruits/cherry.txt
similarity index 100%
rename from tests/integration/archive/arc/__output__/fruits.arc_extract/0-106.arc_extract/0-106/cherry.txt
rename to tests/integration/archive/arc/__output__/fruits.arc_extract/fruits/cherry.txt
diff --git a/tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj b/tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj
deleted file mode 100644
index 8d01d33e0a..0000000000
--- a/tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6c012c1ec87ce400b1e8a04eaab10c5c7eb312781e00cf5efd818d237bccc02
-size 350
diff --git a/tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj_extract/kaki1.txt b/tests/integration/archive/arj/__output__/kaki.arj_extract/kaki1.txt
similarity index 100%
rename from tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj_extract/kaki1.txt
rename to tests/integration/archive/arj/__output__/kaki.arj_extract/kaki1.txt
diff --git a/tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj_extract/kaki2.txt b/tests/integration/archive/arj/__output__/kaki.arj_extract/kaki2.txt
similarity index 100%
rename from tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj_extract/kaki2.txt
rename to tests/integration/archive/arj/__output__/kaki.arj_extract/kaki2.txt
diff --git a/tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj_extract/kaki3.txt b/tests/integration/archive/arj/__output__/kaki.arj_extract/kaki3.txt
similarity index 100%
rename from tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj_extract/kaki3.txt
rename to tests/integration/archive/arj/__output__/kaki.arj_extract/kaki3.txt
diff --git a/tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj_extract/kaki4.txt b/tests/integration/archive/arj/__output__/kaki.arj_extract/kaki4.txt
similarity index 100%
rename from tests/integration/archive/arj/__output__/kaki.arj_extract/0-350.arj_extract/kaki4.txt
rename to tests/integration/archive/arj/__output__/kaki.arj_extract/kaki4.txt
diff --git a/tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab b/tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab
deleted file mode 100644
index 4594c4b86c..0000000000
--- a/tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:24e31ee21861048f29c5f8c910817b077b8671255fdd1c696084d028fce0287d
-size 224
diff --git a/tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab_extract/banana/banana1.txt b/tests/integration/archive/cab/__output__/banana.cab_extract/banana/banana1.txt
similarity index 100%
rename from tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab_extract/banana/banana1.txt
rename to tests/integration/archive/cab/__output__/banana.cab_extract/banana/banana1.txt
diff --git a/tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab_extract/banana/banana2.txt b/tests/integration/archive/cab/__output__/banana.cab_extract/banana/banana2.txt
similarity index 100%
rename from tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab_extract/banana/banana2.txt
rename to tests/integration/archive/cab/__output__/banana.cab_extract/banana/banana2.txt
diff --git a/tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab_extract/banana/banana3.txt b/tests/integration/archive/cab/__output__/banana.cab_extract/banana/banana3.txt
similarity index 100%
rename from tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab_extract/banana/banana3.txt
rename to tests/integration/archive/cab/__output__/banana.cab_extract/banana/banana3.txt
diff --git a/tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab_extract/banana/banana4.txt b/tests/integration/archive/cab/__output__/banana.cab_extract/banana/banana4.txt
similarity index 100%
rename from tests/integration/archive/cab/__output__/banana.cab_extract/0-224.cab_extract/banana/banana4.txt
rename to tests/integration/archive/cab/__output__/banana.cab_extract/banana/banana4.txt
diff --git a/tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary b/tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary
deleted file mode 100644
index b7086fd9fd..0000000000
--- a/tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49725992a46398165f977c90501d0543079e0fa7ba4c9a64ae92a453d7d885ae
-size 512
diff --git a/tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary_extract/apple1.txt b/tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary_extract/apple1.txt
rename to tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/apple1.txt
diff --git a/tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary_extract/apple2.txt b/tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary_extract/apple2.txt
rename to tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/apple2.txt
diff --git a/tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary_extract/apple3.txt b/tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary_extract/apple3.txt
rename to tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/apple3.txt
diff --git a/tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary_extract/apple4.txt b/tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/0-512.cpio_binary_extract/apple4.txt
rename to tests/integration/archive/cpio/cpio_binary/__output__/apple.cpio-bin_extract/apple4.txt
diff --git a/tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary b/tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary
deleted file mode 100644
index 7430c6c467..0000000000
--- a/tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7b338690a805496df348fa7f60efc1c00db56bbc4e7dfca891951b12e041327
-size 512
diff --git a/tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary_extract/apple1.txt b/tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary_extract/apple1.txt
rename to tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/apple1.txt
diff --git a/tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary_extract/dev/console b/tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/dev/console
similarity index 100%
rename from tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary_extract/dev/console
rename to tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/dev/console
diff --git a/tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary_extract/empty.txt b/tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/empty.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary_extract/empty.txt
rename to tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/empty.txt
diff --git a/tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary_extract/hello1.txt b/tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/hello1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/0-512.cpio_binary_extract/hello1.txt
rename to tests/integration/archive/cpio/cpio_binary/__output__/empty.cpio-bin_extract/hello1.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii
deleted file mode 100644
index a73da66547..0000000000
--- a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:218d9d3814bff138320a843a5944c920ff2c58faad8a581c1fb0d78ea556833e
-size 1024
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/apple1.txt b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/apple1.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/apple1.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/apple2.txt b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/apple2.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/apple2.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/apple3.txt b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/apple3.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/apple3.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/apple4.txt b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/apple4.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii/__output__/apple.cpio-newc_extract/apple4.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii
deleted file mode 100644
index 3d3b06a8d7..0000000000
--- a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11e34f549812bd330872fa5f86f0cd658c4f3c9e5e2ef11d973614c69bcfa71c
-size 1024
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/apple1.txt b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/apple1.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/apple1.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/dev/console b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/dev/console
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/dev/console
rename to tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/dev/console
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/empty.txt b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/empty.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/empty.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/empty.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/hello1.txt b/tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/hello1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/0-1024.cpio_portable_ascii_extract/hello1.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii/__output__/empty.cpio-newc_extract/hello1.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc b/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc
deleted file mode 100644
index fa25ebbd7d..0000000000
--- a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de5971e6a7ca8a072aeec2933952d143cf27b309914b0228d549579fb995d1b8
-size 1024
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/apple1.txt b/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/apple1.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/apple1.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/apple2.txt b/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/apple2.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/apple2.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/apple3.txt b/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/apple3.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/apple3.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/apple4.txt b/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/apple4.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/apple.cpio-crc_extract/apple4.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc b/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc
deleted file mode 100644
index 53e22a0c32..0000000000
--- a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63d0c2e5a250a39018b0769462de20125298b220f5a8a1fa375c855784322095
-size 1024
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/apple1.txt b/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/apple1.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/apple1.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/dev/console b/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/dev/console
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/dev/console
rename to tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/dev/console
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/empty.txt b/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/empty.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/empty.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/empty.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/hello1.txt b/tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/hello1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/0-1024.cpio_portable_ascii_crc_extract/hello1.txt
rename to tests/integration/archive/cpio/cpio_portable_ascii_crc/__output__/empty.cpio-crc_extract/hello1.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii b/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii
deleted file mode 100644
index 2bd0c60215..0000000000
--- a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:57e00a5acf5e7dabed6619c90143499e9655a8cc6a814762324d0be43b3fce68
-size 512
diff --git a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii_extract/apple1.txt b/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii_extract/apple1.txt
rename to tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/apple1.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii_extract/apple2.txt b/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii_extract/apple2.txt
rename to tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/apple2.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii_extract/apple3.txt b/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii_extract/apple3.txt
rename to tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/apple3.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii_extract/apple4.txt b/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/0-512.cpio_portable_old_ascii_extract/apple4.txt
rename to tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/apple.cpio-odc_extract/apple4.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii b/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii
deleted file mode 100644
index 20d0536319..0000000000
--- a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:88d26a54bbce74f46c3b0e87db53ae641dd833f8b612cfb0d174a28822a52c95
-size 1024
diff --git a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii_extract/apple1.txt b/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii_extract/apple1.txt
rename to tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/apple1.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii_extract/dev/console b/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/dev/console
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii_extract/dev/console
rename to tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/dev/console
diff --git a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii_extract/empty.txt b/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/empty.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii_extract/empty.txt
rename to tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/empty.txt
diff --git a/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii_extract/hello1.txt b/tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/hello1.txt
similarity index 100%
rename from tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/0-1024.cpio_portable_old_ascii_extract/hello1.txt
rename to tests/integration/archive/cpio/cpio_portable_old_ascii/__output__/empty.cpio-odc_extract/hello1.txt
diff --git a/tests/integration/archive/dmg/__output__/fruits.dmg_extract/0-26280.dmg b/tests/integration/archive/dmg/__output__/fruits.dmg_extract/0-26280.dmg
deleted file mode 100644
index aaa76a742e..0000000000
--- a/tests/integration/archive/dmg/__output__/fruits.dmg_extract/0-26280.dmg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1eed98d54f31fc7d976866e9ad32253dc64de332e46013c1e00949a9234206a5
-size 26280
diff --git a/tests/integration/archive/dmg/__output__/fruits.dmg_extract/0-26280.dmg_extract/fruits/apple.txt b/tests/integration/archive/dmg/__output__/fruits.dmg_extract/fruits/apple.txt
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits.dmg_extract/0-26280.dmg_extract/fruits/apple.txt
rename to tests/integration/archive/dmg/__output__/fruits.dmg_extract/fruits/apple.txt
diff --git a/tests/integration/archive/dmg/__output__/fruits.dmg_extract/0-26280.dmg_extract/fruits/cherry.txt b/tests/integration/archive/dmg/__output__/fruits.dmg_extract/fruits/cherry.txt
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits.dmg_extract/0-26280.dmg_extract/fruits/cherry.txt
rename to tests/integration/archive/dmg/__output__/fruits.dmg_extract/fruits/cherry.txt
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg b/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg
deleted file mode 100644
index 43b08e770c..0000000000
--- a/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:135d11d36d343a1f45b719bacb5898c8db7cbf1bdfea828512aa463dfc90f649
-size 18518
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/.Trashes/.gitkeep "b/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep"
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/.Trashes/.gitkeep
rename to "tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep"
diff --git "a/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep" b/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/.Trashes/.gitkeep
similarity index 100%
rename from "tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep"
rename to tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/.Trashes/.gitkeep
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/apple1.txt b/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/apple1.txt
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/apple1.txt
rename to tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/apple1.txt
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/apple2.txt b/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/apple2.txt
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/apple2.txt
rename to tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/apple2.txt
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/apple3.txt b/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/apple3.txt
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/apple3.txt
rename to tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/apple3.txt
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/apple4.txt b/tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/apple4.txt
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/0-18518.dmg_extract/fruits/apple4.txt
rename to tests/integration/archive/dmg/__output__/fruits_osx.compressed.dmg_extract/fruits/apple4.txt
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg b/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg
deleted file mode 100644
index a2ee40f4dc..0000000000
--- a/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:606a9da1fe62fa405a8526b02919e0df8635b518f43ff4dcaae20956c5a54ed8
-size 20158
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/.Trashes/.gitkeep "b/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep"
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/.Trashes/.gitkeep
rename to "tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/.HFS+ Private Directory Data\r/.gitkeep"
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/.Trashes/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
rename to tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/.Trashes/.gitkeep
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/apple1.txt b/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/apple1.txt
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/apple1.txt
rename to tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/apple1.txt
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/apple2.txt b/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/apple2.txt
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/apple2.txt
rename to tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/apple2.txt
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/apple3.txt b/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/apple3.txt
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/apple3.txt
rename to tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/apple3.txt
diff --git a/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/apple4.txt b/tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/apple4.txt
similarity index 100%
rename from tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/0-20158.dmg_extract/fruits/apple4.txt
rename to tests/integration/archive/dmg/__output__/fruits_osx.dmg_extract/fruits/apple4.txt
diff --git a/tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar b/tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar
deleted file mode 100644
index 980a604609..0000000000
--- a/tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c1386f0c7d57d7b29fe8566b5ffd685b54193d9b640d61833522dbe00d0e4841
-size 263
diff --git a/tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar_extract/0-263/erdbeere1.txt b/tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/erdbeere/erdbeere1.txt
similarity index 100%
rename from tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar_extract/0-263/erdbeere1.txt
rename to tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/erdbeere/erdbeere1.txt
diff --git a/tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar_extract/0-263/erdbeere2.txt b/tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/erdbeere/erdbeere2.txt
similarity index 100%
rename from tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar_extract/0-263/erdbeere2.txt
rename to tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/erdbeere/erdbeere2.txt
diff --git a/tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar_extract/0-263/erdbeere3.txt b/tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/erdbeere/erdbeere3.txt
similarity index 100%
rename from tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar_extract/0-263/erdbeere3.txt
rename to tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/erdbeere/erdbeere3.txt
diff --git a/tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar_extract/0-263/erdbeere4.txt b/tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/erdbeere/erdbeere4.txt
similarity index 100%
rename from tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/0-263.rar_extract/0-263/erdbeere4.txt
rename to tests/integration/archive/rar/default/__output__/erdbeere.rar_extract/erdbeere/erdbeere4.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/tests/integration/archive/rar/password/__output__/cherry_password.rar_extract/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
rename to tests/integration/archive/rar/password/__output__/cherry_password.rar_extract/.gitkeep
diff --git a/tests/integration/archive/rar/password/__output__/cherry_password.rar_extract/0-539.rar b/tests/integration/archive/rar/password/__output__/cherry_password.rar_extract/0-539.rar
deleted file mode 100644
index fd6d9e55f9..0000000000
--- a/tests/integration/archive/rar/password/__output__/cherry_password.rar_extract/0-539.rar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a3f2e2173102420c4e954b3d107d7ffc7215cb6f87eddba403b7d99d5fa53c3f
-size 539
diff --git a/tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip b/tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip
deleted file mode 100644
index 5589c67f1e..0000000000
--- a/tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4196e7066d9df28386dd6a8907d2f3b28bfa3a6c4e6f26bcc2826afb2ed368c
-size 212
diff --git a/tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip_extract/cherry1.txt b/tests/integration/archive/sevenzip/__output__/cherry.7z_extract/cherry1.txt
similarity index 100%
rename from tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip_extract/cherry1.txt
rename to tests/integration/archive/sevenzip/__output__/cherry.7z_extract/cherry1.txt
diff --git a/tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip_extract/cherry2.txt b/tests/integration/archive/sevenzip/__output__/cherry.7z_extract/cherry2.txt
similarity index 100%
rename from tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip_extract/cherry2.txt
rename to tests/integration/archive/sevenzip/__output__/cherry.7z_extract/cherry2.txt
diff --git a/tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip_extract/cherry3.txt b/tests/integration/archive/sevenzip/__output__/cherry.7z_extract/cherry3.txt
similarity index 100%
rename from tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip_extract/cherry3.txt
rename to tests/integration/archive/sevenzip/__output__/cherry.7z_extract/cherry3.txt
diff --git a/tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip_extract/cherry4.txt b/tests/integration/archive/sevenzip/__output__/cherry.7z_extract/cherry4.txt
similarity index 100%
rename from tests/integration/archive/sevenzip/__output__/cherry.7z_extract/0-212.sevenzip_extract/cherry4.txt
rename to tests/integration/archive/sevenzip/__output__/cherry.7z_extract/cherry4.txt
diff --git a/tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5 b/tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5
deleted file mode 100644
index 5aa2c53e8a..0000000000
--- a/tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:170c8d226dad8fd1802c735911893b7774ce8fec4d6acb3170eec0eca3ddf64a
-size 534
diff --git a/tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5_extract/0-534/plum1.txt b/tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/plum/plum1.txt
similarity index 100%
rename from tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5_extract/0-534/plum1.txt
rename to tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/plum/plum1.txt
diff --git a/tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5_extract/0-534/plum2.txt b/tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/plum/plum2.txt
similarity index 100%
rename from tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5_extract/0-534/plum2.txt
rename to tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/plum/plum2.txt
diff --git a/tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5_extract/0-534/plum3.txt b/tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/plum/plum3.txt
similarity index 100%
rename from tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5_extract/0-534/plum3.txt
rename to tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/plum/plum3.txt
diff --git a/tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5_extract/0-534/plum4.txt b/tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/plum/plum4.txt
similarity index 100%
rename from tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/0-534.stuffit5_extract/0-534/plum4.txt
rename to tests/integration/archive/stuffit/stuffit5/__output__/plum.sit5_extract/plum/plum4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar
deleted file mode 100644
index ebad08246a..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee4f4478f41dad5ae4662f8ed24b06fab836213b18573386cce0bd00e75aba55
-size 81920
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar
deleted file mode 100644
index 27afa124a5..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:851dd2e0848a989be0483cec20355c9ef383e16a6b7e1acfa99bfb219a9a6690
-size 30720
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar
deleted file mode 100644
index 38d1123b67..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26d544f72787a611a28119c9c1b6d801c1c9fb2cc486c26e135b5062210166df
-size 10240
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar
deleted file mode 100644
index f48a19de22..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4986b6c581042cef9fd3031cae71d595cb6cf78b253c8af3d2db16f0c909957
-size 10240
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar
deleted file mode 100644
index c85706092c..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d9a6f8e49976475b836a417571b6c7e6be44a12b8cb6d6d4885f6171ea0f371
-size 40960
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar
deleted file mode 100644
index 38d1123b67..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26d544f72787a611a28119c9c1b6d801c1c9fb2cc486c26e135b5062210166df
-size 10240
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar
deleted file mode 100644
index f48a19de22..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4986b6c581042cef9fd3031cae71d595cb6cf78b253c8af3d2db16f0c909957
-size 10240
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.gnu.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.gnu.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple1.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple1.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple2.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple2.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple3.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple3.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple4.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple4.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.posix.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.posix.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple1.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple1.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple2.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple2.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple3.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple3.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple4.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple4.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana1.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/banana1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana1.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/banana1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana2.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/banana2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana2.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/banana2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana3.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/banana3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana3.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/banana3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana4.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/banana4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana4.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.gnu.tar_extract/banana4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.gnu.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.gnu.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple1.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple1.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple2.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple2.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple3.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple3.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple4.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple4.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.posix.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.posix.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple1.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple1.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple2.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple2.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple3.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple3.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple4.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple4.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana1.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/banana1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana1.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/banana1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana2.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/banana2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana2.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/banana2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana3.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/banana3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana3.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/banana3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana4.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/banana4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana4.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/banana.posix.tar_extract/banana4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/cherry1.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/cherry1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/cherry1.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/cherry1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/cherry2.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/cherry2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/cherry2.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/cherry2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/cherry3.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/cherry3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/cherry3.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/cherry3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/cherry4.txt b/tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/cherry4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/0-81920.tar_extract/cherry4.txt
rename to tests/integration/archive/tar/__output__/cherry.gnu.tar_extract/cherry4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar
deleted file mode 100644
index ea70f598f0..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:964ddc59907703f52f3904529be730b259fc73032f7bfdba1930f3508fd1f0bc
-size 92160
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar
deleted file mode 100644
index 27afa124a5..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:851dd2e0848a989be0483cec20355c9ef383e16a6b7e1acfa99bfb219a9a6690
-size 30720
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar
deleted file mode 100644
index 38d1123b67..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26d544f72787a611a28119c9c1b6d801c1c9fb2cc486c26e135b5062210166df
-size 10240
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar
deleted file mode 100644
index f48a19de22..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4986b6c581042cef9fd3031cae71d595cb6cf78b253c8af3d2db16f0c909957
-size 10240
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar
deleted file mode 100644
index c85706092c..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d9a6f8e49976475b836a417571b6c7e6be44a12b8cb6d6d4885f6171ea0f371
-size 40960
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar
deleted file mode 100644
index 38d1123b67..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26d544f72787a611a28119c9c1b6d801c1c9fb2cc486c26e135b5062210166df
-size 10240
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar
deleted file mode 100644
index f48a19de22..0000000000
--- a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4986b6c581042cef9fd3031cae71d595cb6cf78b253c8af3d2db16f0c909957
-size 10240
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.gnu.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.gnu.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple1.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple1.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple2.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple2.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple3.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple3.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple4.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple4.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.gnu.tar_extract/apple4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.posix.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.posix.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple1.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple1.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple2.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple2.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple3.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple3.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple4.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple4.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/apple.posix.tar_extract/apple4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana1.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/banana1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana1.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/banana1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana2.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/banana2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana2.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/banana2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana3.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/banana3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana3.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/banana3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana4.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/banana4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.gnu.tar_extract/0-30720.tar_extract/banana4.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.gnu.tar_extract/banana4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.gnu.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.gnu.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple1.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple1.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple2.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple2.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple3.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple3.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple4.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.gnu.tar_extract/0-10240.tar_extract/apple4.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.gnu.tar_extract/apple4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.posix.tar
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.posix.tar
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple1.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple1.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple2.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple2.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple3.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple3.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple4.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/apple.posix.tar_extract/0-10240.tar_extract/apple4.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/apple.posix.tar_extract/apple4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana1.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/banana1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana1.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/banana1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana2.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/banana2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana2.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/banana2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana3.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/banana3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana3.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/banana3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana4.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/banana4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/banana.posix.tar_extract/0-40960.tar_extract/banana4.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/banana.posix.tar_extract/banana4.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/cherry1.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/cherry1.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/cherry1.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/cherry1.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/cherry2.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/cherry2.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/cherry2.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/cherry2.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/cherry3.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/cherry3.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/cherry3.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/cherry3.txt
diff --git a/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/cherry4.txt b/tests/integration/archive/tar/__output__/cherry.posix.tar_extract/cherry4.txt
similarity index 100%
rename from tests/integration/archive/tar/__output__/cherry.posix.tar_extract/0-92160.tar_extract/cherry4.txt
rename to tests/integration/archive/tar/__output__/cherry.posix.tar_extract/cherry4.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/tests/integration/archive/zip/encrypted/__output__/apple_encrypted.zip_extract/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
rename to tests/integration/archive/zip/encrypted/__output__/apple_encrypted.zip_extract/.gitkeep
diff --git a/tests/integration/archive/zip/encrypted/__output__/apple_encrypted.zip_extract/0-754.zip b/tests/integration/archive/zip/encrypted/__output__/apple_encrypted.zip_extract/0-754.zip
deleted file mode 100644
index 0fd7516b64..0000000000
--- a/tests/integration/archive/zip/encrypted/__output__/apple_encrypted.zip_extract/0-754.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9fe02598c0337abf702f6abce2f324e5167dc07e2ddec9de594e9a549e5e7aaa
-size 754
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/tests/integration/archive/zip/partly_encrypted/__output__/kaki1_aes.zip_extract/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
rename to tests/integration/archive/zip/partly_encrypted/__output__/kaki1_aes.zip_extract/.gitkeep
diff --git a/tests/integration/archive/zip/partly_encrypted/__output__/kaki1_aes.zip_extract/0-616.zip b/tests/integration/archive/zip/partly_encrypted/__output__/kaki1_aes.zip_extract/0-616.zip
deleted file mode 100644
index 2b6b1b7c5d..0000000000
--- a/tests/integration/archive/zip/partly_encrypted/__output__/kaki1_aes.zip_extract/0-616.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b8270ed4a2ec34339dac0617a5d562c082cfc09c75bc4ebd77633ba73e33b62f
-size 616
diff --git a/tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip b/tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip
deleted file mode 100644
index f8e7a29179..0000000000
--- a/tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f52063e15f6d658f079349d07ed9343bbffef9cd946649a9477c0234c2d5f69c
-size 642
diff --git a/tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip_extract/apple1.txt b/tests/integration/archive/zip/regular/__output__/apple.zip_extract/apple1.txt
similarity index 100%
rename from tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip_extract/apple1.txt
rename to tests/integration/archive/zip/regular/__output__/apple.zip_extract/apple1.txt
diff --git a/tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip_extract/apple2.txt b/tests/integration/archive/zip/regular/__output__/apple.zip_extract/apple2.txt
similarity index 100%
rename from tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip_extract/apple2.txt
rename to tests/integration/archive/zip/regular/__output__/apple.zip_extract/apple2.txt
diff --git a/tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip_extract/apple3.txt b/tests/integration/archive/zip/regular/__output__/apple.zip_extract/apple3.txt
similarity index 100%
rename from tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip_extract/apple3.txt
rename to tests/integration/archive/zip/regular/__output__/apple.zip_extract/apple3.txt
diff --git a/tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip_extract/apple4.txt b/tests/integration/archive/zip/regular/__output__/apple.zip_extract/apple4.txt
similarity index 100%
rename from tests/integration/archive/zip/regular/__output__/apple.zip_extract/0-642.zip_extract/apple4.txt
rename to tests/integration/archive/zip/regular/__output__/apple.zip_extract/apple4.txt
diff --git a/tests/integration/compression/bzip2/__output__/lorem.txt.bz2_extract/0-2545.bzip2 b/tests/integration/compression/bzip2/__output__/lorem.txt.bz2_extract/0-2545.bzip2
deleted file mode 100644
index 3079fad745..0000000000
--- a/tests/integration/compression/bzip2/__output__/lorem.txt.bz2_extract/0-2545.bzip2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:92cf0f3476c5cd45d112985624be66a543fbb92f46142cd579a778795f1cea03
-size 2545
diff --git a/tests/integration/compression/bzip2/__output__/lorem.txt.bz2_extract/0-2545.bzip2_extract/0-2545 b/tests/integration/compression/bzip2/__output__/lorem.txt.bz2_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/bzip2/__output__/lorem.txt.bz2_extract/0-2545.bzip2_extract/0-2545
rename to tests/integration/compression/bzip2/__output__/lorem.txt.bz2_extract/lorem.txt
diff --git a/tests/integration/compression/compress/__output__/apple1.z_extract/0-11.compress b/tests/integration/compression/compress/__output__/apple1.z_extract/0-11.compress
deleted file mode 100644
index 5cea367139..0000000000
--- a/tests/integration/compression/compress/__output__/apple1.z_extract/0-11.compress
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:baf2f5824deabee1e5f66493c4e1b89bdc5596c16b8a427d90434b6cad28626d
-size 11
diff --git a/tests/integration/compression/compress/__output__/apple1.z_extract/0-11.compress_extract/0-11/0-11 b/tests/integration/compression/compress/__output__/apple1.z_extract/apple1/apple1
similarity index 100%
rename from tests/integration/compression/compress/__output__/apple1.z_extract/0-11.compress_extract/0-11/0-11
rename to tests/integration/compression/compress/__output__/apple1.z_extract/apple1/apple1
diff --git a/tests/integration/compression/gzip/__output__/durian.gz_extract/0-43.gzip b/tests/integration/compression/gzip/__output__/durian.gz_extract/0-43.gzip
deleted file mode 100644
index 595ff59d71..0000000000
--- a/tests/integration/compression/gzip/__output__/durian.gz_extract/0-43.gzip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be0c9ca3ac8e90a5211663e6b8bce1f3c8ea102c349a0a36386e61ce543f9de4
-size 43
diff --git a/tests/integration/compression/gzip/__output__/durian.gz_extract/0-43.gzip_extract/durian1.txt b/tests/integration/compression/gzip/__output__/durian.gz_extract/durian1.txt
similarity index 100%
rename from tests/integration/compression/gzip/__output__/durian.gz_extract/0-43.gzip_extract/durian1.txt
rename to tests/integration/compression/gzip/__output__/durian.gz_extract/durian1.txt
diff --git a/tests/integration/compression/lz4/lz4_default/__output__/lorem.block_checksum.lz4_extract/0-3944.lz4_default b/tests/integration/compression/lz4/lz4_default/__output__/lorem.block_checksum.lz4_extract/0-3944.lz4_default
deleted file mode 100644
index f4626d6f40..0000000000
--- a/tests/integration/compression/lz4/lz4_default/__output__/lorem.block_checksum.lz4_extract/0-3944.lz4_default
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b129044b7d809bce4bb8e49afd07b7d1f5833de5c6f40991416bb5e85c69170c
-size 3944
diff --git a/tests/integration/compression/lz4/lz4_default/__output__/lorem.block_checksum.lz4_extract/0-3944.lz4_default_extract/0-3944 b/tests/integration/compression/lz4/lz4_default/__output__/lorem.block_checksum.lz4_extract/lorem.block_checksum
similarity index 100%
rename from tests/integration/compression/lz4/lz4_default/__output__/lorem.block_checksum.lz4_extract/0-3944.lz4_default_extract/0-3944
rename to tests/integration/compression/lz4/lz4_default/__output__/lorem.block_checksum.lz4_extract/lorem.block_checksum
diff --git a/tests/integration/compression/lz4/lz4_default/__output__/lorem.csize.lz4_extract/0-3948.lz4_default b/tests/integration/compression/lz4/lz4_default/__output__/lorem.csize.lz4_extract/0-3948.lz4_default
deleted file mode 100644
index a746c44a6b..0000000000
--- a/tests/integration/compression/lz4/lz4_default/__output__/lorem.csize.lz4_extract/0-3948.lz4_default
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f918be07c7598f1a7a3b3af932fade86baf05bd49967a26b233c2f169b11427e
-size 3948
diff --git a/tests/integration/compression/lz4/lz4_default/__output__/lorem.csize.lz4_extract/0-3948.lz4_default_extract/0-3948 b/tests/integration/compression/lz4/lz4_default/__output__/lorem.csize.lz4_extract/lorem.csize
similarity index 100%
rename from tests/integration/compression/lz4/lz4_default/__output__/lorem.csize.lz4_extract/0-3948.lz4_default_extract/0-3948
rename to tests/integration/compression/lz4/lz4_default/__output__/lorem.csize.lz4_extract/lorem.csize
diff --git a/tests/integration/compression/lz4/lz4_default/__output__/lorem.no_block_checksum.lz4_extract/0-3940.lz4_default b/tests/integration/compression/lz4/lz4_default/__output__/lorem.no_block_checksum.lz4_extract/0-3940.lz4_default
deleted file mode 100644
index 0d464bfe91..0000000000
--- a/tests/integration/compression/lz4/lz4_default/__output__/lorem.no_block_checksum.lz4_extract/0-3940.lz4_default
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56dd0270e37aea2fe0ff159aa36c03b84ecfe70e45487762adf43446ca0327fd
-size 3940
diff --git a/tests/integration/compression/lz4/lz4_default/__output__/lorem.no_block_checksum.lz4_extract/0-3940.lz4_default_extract/0-3940 b/tests/integration/compression/lz4/lz4_default/__output__/lorem.no_block_checksum.lz4_extract/lorem.no_block_checksum
similarity index 100%
rename from tests/integration/compression/lz4/lz4_default/__output__/lorem.no_block_checksum.lz4_extract/0-3940.lz4_default_extract/0-3940
rename to tests/integration/compression/lz4/lz4_default/__output__/lorem.no_block_checksum.lz4_extract/lorem.no_block_checksum
diff --git a/tests/integration/compression/lz4/lz4_default/__output__/lorem.nocsize.lz4_extract/0-3940.lz4_default b/tests/integration/compression/lz4/lz4_default/__output__/lorem.nocsize.lz4_extract/0-3940.lz4_default
deleted file mode 100644
index 0d464bfe91..0000000000
--- a/tests/integration/compression/lz4/lz4_default/__output__/lorem.nocsize.lz4_extract/0-3940.lz4_default
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56dd0270e37aea2fe0ff159aa36c03b84ecfe70e45487762adf43446ca0327fd
-size 3940
diff --git a/tests/integration/compression/lz4/lz4_default/__output__/lorem.nocsize.lz4_extract/0-3940.lz4_default_extract/0-3940 b/tests/integration/compression/lz4/lz4_default/__output__/lorem.nocsize.lz4_extract/lorem.nocsize
similarity index 100%
rename from tests/integration/compression/lz4/lz4_default/__output__/lorem.nocsize.lz4_extract/0-3940.lz4_default_extract/0-3940
rename to tests/integration/compression/lz4/lz4_default/__output__/lorem.nocsize.lz4_extract/lorem.nocsize
diff --git a/tests/integration/compression/lz4/lz4_default/__output__/lorem.noframecrc.lz4_extract/0-3936.lz4_default b/tests/integration/compression/lz4/lz4_default/__output__/lorem.noframecrc.lz4_extract/0-3936.lz4_default
deleted file mode 100644
index f8dbd266dd..0000000000
--- a/tests/integration/compression/lz4/lz4_default/__output__/lorem.noframecrc.lz4_extract/0-3936.lz4_default
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3cd7d2cebfdd25ae33113fdcc885e4b5df0f7e20ca496ee3fb16ed3852812514
-size 3936
diff --git a/tests/integration/compression/lz4/lz4_default/__output__/lorem.noframecrc.lz4_extract/0-3936.lz4_default_extract/0-3936 b/tests/integration/compression/lz4/lz4_default/__output__/lorem.noframecrc.lz4_extract/lorem.noframecrc
similarity index 100%
rename from tests/integration/compression/lz4/lz4_default/__output__/lorem.noframecrc.lz4_extract/0-3936.lz4_default_extract/0-3936
rename to tests/integration/compression/lz4/lz4_default/__output__/lorem.noframecrc.lz4_extract/lorem.noframecrc
diff --git a/tests/integration/compression/lz4/lz4_legacy/__output__/lorem.legacy.lz4_extract/0-3929.lz4_legacy b/tests/integration/compression/lz4/lz4_legacy/__output__/lorem.legacy.lz4_extract/0-3929.lz4_legacy
deleted file mode 100644
index eee3e21aa0..0000000000
--- a/tests/integration/compression/lz4/lz4_legacy/__output__/lorem.legacy.lz4_extract/0-3929.lz4_legacy
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:174728566a2e5a268d16873ecc3de115239d99129177556d6dbd507719f336c8
-size 3929
diff --git a/tests/integration/compression/lz4/lz4_legacy/__output__/lorem.legacy.lz4_extract/0-3929.lz4_legacy_extract/0-3929 b/tests/integration/compression/lz4/lz4_legacy/__output__/lorem.legacy.lz4_extract/lorem.legacy
similarity index 100%
rename from tests/integration/compression/lz4/lz4_legacy/__output__/lorem.legacy.lz4_extract/0-3929.lz4_legacy_extract/0-3929
rename to tests/integration/compression/lz4/lz4_legacy/__output__/lorem.legacy.lz4_extract/lorem.legacy
diff --git a/tests/integration/compression/lz4/lz4_skippable/__output__/skippable.lz4_extract/0-108.lz4_skippable b/tests/integration/compression/lz4/lz4_skippable/__output__/skippable.lz4_extract/0-108.lz4_skippable
deleted file mode 100644
index 4a9f737cca..0000000000
--- a/tests/integration/compression/lz4/lz4_skippable/__output__/skippable.lz4_extract/0-108.lz4_skippable
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65090d5f19366d988768d5b10f3e5bc6d51dcd6c0459b4784b1ee71a4bc3a081
-size 108
diff --git a/tests/integration/compression/lz4/lz4_skippable/__output__/skippable.lz4_extract/0-108.lz4_skippable_extract/0-108 b/tests/integration/compression/lz4/lz4_skippable/__output__/skippable.lz4_extract/skippable
similarity index 100%
rename from tests/integration/compression/lz4/lz4_skippable/__output__/skippable.lz4_extract/0-108.lz4_skippable_extract/0-108
rename to tests/integration/compression/lz4/lz4_skippable/__output__/skippable.lz4_extract/skippable
diff --git a/tests/integration/compression/lzip/__output__/lorem.txt.lz_extract/0-2520.lzip b/tests/integration/compression/lzip/__output__/lorem.txt.lz_extract/0-2520.lzip
deleted file mode 100644
index f79e30b79c..0000000000
--- a/tests/integration/compression/lzip/__output__/lorem.txt.lz_extract/0-2520.lzip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b92a810e9381f7103ba177c36e39033984153347a4be0104aa824c571b3bf366
-size 2520
diff --git a/tests/integration/compression/lzip/__output__/lorem.txt.lz_extract/0-2520.lzip_extract/0-2520 b/tests/integration/compression/lzip/__output__/lorem.txt.lz_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/lzip/__output__/lorem.txt.lz_extract/0-2520.lzip_extract/0-2520
rename to tests/integration/compression/lzip/__output__/lorem.txt.lz_extract/lorem.txt
diff --git a/tests/integration/compression/lzma/__output__/lorem.txt.known_size.lzma_extract/0-2518.lzma b/tests/integration/compression/lzma/__output__/lorem.txt.known_size.lzma_extract/0-2518.lzma
deleted file mode 100644
index b7d891e21f..0000000000
--- a/tests/integration/compression/lzma/__output__/lorem.txt.known_size.lzma_extract/0-2518.lzma
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3836a2dd10664672ca16984c885369fe76d91bb6cbf39b056c9d243b96efddd2
-size 2518
diff --git a/tests/integration/compression/lzma/__output__/lorem.txt.known_size.lzma_extract/0-2518.lzma_extract/0-2518 b/tests/integration/compression/lzma/__output__/lorem.txt.known_size.lzma_extract/lorem.txt.known_size
similarity index 100%
rename from tests/integration/compression/lzma/__output__/lorem.txt.known_size.lzma_extract/0-2518.lzma_extract/0-2518
rename to tests/integration/compression/lzma/__output__/lorem.txt.known_size.lzma_extract/lorem.txt.known_size
diff --git a/tests/integration/compression/lzma/__output__/lorem.txt.unknown_size.lzma_extract/0-2550.lzma b/tests/integration/compression/lzma/__output__/lorem.txt.unknown_size.lzma_extract/0-2550.lzma
deleted file mode 100644
index eb185330f8..0000000000
--- a/tests/integration/compression/lzma/__output__/lorem.txt.unknown_size.lzma_extract/0-2550.lzma
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:70c73589d48f0330532803fa18b227e534eef005d298405bd6e63024d5d5c148
-size 2550
diff --git a/tests/integration/compression/lzma/__output__/lorem.txt.unknown_size.lzma_extract/0-2550.lzma_extract/0-2550 b/tests/integration/compression/lzma/__output__/lorem.txt.unknown_size.lzma_extract/lorem.txt.unknown_size
similarity index 100%
rename from tests/integration/compression/lzma/__output__/lorem.txt.unknown_size.lzma_extract/0-2550.lzma_extract/0-2550
rename to tests/integration/compression/lzma/__output__/lorem.txt.unknown_size.lzma_extract/lorem.txt.unknown_size
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo
deleted file mode 100644
index 624dbfbec3..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1abbbad17e7cd7797cfb39456491ae475964f29d2593ba6156e00ead5a30ec93
-size 29563
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo_extract/big256k.txt b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.file.lzo_extract/big256k.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo_extract/big256k.txt
rename to tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.file.lzo_extract/big256k.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo
deleted file mode 100644
index 5640a44105..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:393a4d16ffb51f3c57f59ea7757bd43f6a4ecddf04fb3466cbe07eece4d38443
-size 29552
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo_extract/0-29552 b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.stdin.lzo_extract/lorem.adler.checksum.filter.multi-block.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo_extract/0-29552
rename to tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.multi-block.stdin.lzo_extract/lorem.adler.checksum.filter.multi-block.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.file.lzo_extract/0-4341.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.file.lzo_extract/0-4341.lzo
deleted file mode 100644
index 518c9cd8f5..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.file.lzo_extract/0-4341.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:426d9ae4da14218e19762e60b6bbe725cceda268e0f9928bc5dbf5faa5540936
-size 4341
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.file.lzo_extract/0-4341.lzo_extract/lorem.txt b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.file.lzo_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.file.lzo_extract/0-4341.lzo_extract/lorem.txt
rename to tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.file.lzo_extract/lorem.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo
deleted file mode 100644
index 2523d9de62..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c94cb829cb19ac0638843ae589751a86f004b77efc13396f592ae71434c4146
-size 4332
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo_extract/0-4332 b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.stdin.lzo_extract/lorem.adler.checksum.filter.simple.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo_extract/0-4332
rename to tests/integration/compression/lzo/__output__/lorem.adler.checksum.filter.simple.stdin.lzo_extract/lorem.adler.checksum.filter.simple.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo
deleted file mode 100644
index f831f5c093..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:61c2985578d8a5bc1373dc8b2eb5b9994f0d96adc0dfa8b5bd589c4865db1cfd
-size 26504
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo_extract/big256k.txt b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.file.lzo_extract/big256k.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo_extract/big256k.txt
rename to tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.file.lzo_extract/big256k.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo
deleted file mode 100644
index 5b99792d90..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c7bca3a6931885ecd267b7b590fb07c58454bd6b2ea2da4a6fbe0966b46cb88
-size 26493
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo_extract/0-26493 b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.stdin.lzo_extract/lorem.adler.checksum.no-filter.multi-block.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo_extract/0-26493
rename to tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.multi-block.stdin.lzo_extract/lorem.adler.checksum.no-filter.multi-block.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo
deleted file mode 100644
index 766b581c6b..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:697effcea2d396ef729eb5e4332ce07b9fdc950e1537500ffd668b17dc5b9b33
-size 3933
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo_extract/lorem.txt b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.file.lzo_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo_extract/lorem.txt
rename to tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.file.lzo_extract/lorem.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo
deleted file mode 100644
index e713d8d3c9..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:94e4034e3b10c3c7ce35aa19de73c20467a7219ce4aae5389a681d5c4af7250b
-size 3924
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo_extract/0-3924 b/tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.stdin.lzo_extract/lorem.adler.checksum.no-filter.simple.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo_extract/0-3924
rename to tests/integration/compression/lzo/__output__/lorem.adler.checksum.no-filter.simple.stdin.lzo_extract/lorem.adler.checksum.no-filter.simple.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo
deleted file mode 100644
index d15c39ff3e..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e8de0059a998cd8c420aa3b174c23589de0e847feb6a8dae50ae1f38cdd0a96
-size 29555
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo_extract/big256k.txt b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.file.lzo_extract/big256k.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo_extract/big256k.txt
rename to tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.file.lzo_extract/big256k.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo
deleted file mode 100644
index 2dd832bb62..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:109210635aa01328fbd2430a4b9e357f05b1af5ed7f15ea9a43b8bbac5ce7d7f
-size 29544
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo_extract/0-29544 b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.stdin.lzo_extract/lorem.adler.no-checksum.filter.multi-block.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo_extract/0-29544
rename to tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.multi-block.stdin.lzo_extract/lorem.adler.no-checksum.filter.multi-block.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo
deleted file mode 100644
index 3f0eb7ee1d..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77ebf487dc139f07c9c82b4c42c1c1454be881bae96797b4d8b3cbbb094132ea
-size 4337
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo_extract/lorem.txt b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.file.lzo_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo_extract/lorem.txt
rename to tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.file.lzo_extract/lorem.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo
deleted file mode 100644
index 3a4bc1ebb6..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:984414dc7ad12aa77892cc3084dfef0798d2c16368e0c15aeb616b598c6c3c03
-size 4328
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo_extract/0-4328 b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.stdin.lzo_extract/lorem.adler.no-checksum.filter.simple.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo_extract/0-4328
rename to tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.filter.simple.stdin.lzo_extract/lorem.adler.no-checksum.filter.simple.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo
deleted file mode 100644
index ab9afb4482..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c91a9d1f537c856e3762354c0f98293515ddaeea78584027e6476556d88fb09f
-size 26496
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo_extract/big256k.txt b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.file.lzo_extract/big256k.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo_extract/big256k.txt
rename to tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.file.lzo_extract/big256k.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo
deleted file mode 100644
index a6cf9a719d..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b4bb40768094fb8321326a5f1b4995b24d7c9d3a09f075b34f06f91b05623c79
-size 26485
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo_extract/0-26485 b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.stdin.lzo_extract/lorem.adler.no-checksum.no-filter.multi-block.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo_extract/0-26485
rename to tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.multi-block.stdin.lzo_extract/lorem.adler.no-checksum.no-filter.multi-block.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo
deleted file mode 100644
index 23160f7c0e..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf8b6357674ddfb0b5acd6235ebe27739ff3a469c7d0aa8c17a1a4eb1cf5d513
-size 3929
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo_extract/lorem.txt b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.file.lzo_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo_extract/lorem.txt
rename to tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.file.lzo_extract/lorem.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo
deleted file mode 100644
index c714dbb1c7..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c6ba5380b25eec121a749c96fce8a274333358016443584f5afad25ebb85c86
-size 3920
diff --git a/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo_extract/0-3920 b/tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.stdin.lzo_extract/lorem.adler.no-checksum.no-filter.simple.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo_extract/0-3920
rename to tests/integration/compression/lzo/__output__/lorem.adler.no-checksum.no-filter.simple.stdin.lzo_extract/lorem.adler.no-checksum.no-filter.simple.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo
deleted file mode 100644
index bb8f8f46af..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23418cf1fc9cdee8ff830f9f813b79b7928f3294ebe5c60dad084aa276c82b25
-size 29563
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo_extract/big256k.txt b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.file.lzo_extract/big256k.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.file.lzo_extract/0-29563.lzo_extract/big256k.txt
rename to tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.file.lzo_extract/big256k.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo
deleted file mode 100644
index fbf21a803a..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7dd871103d2e271734fa42aefa998b11652212483e8fd77f8149f57eb666ef02
-size 29552
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo_extract/0-29552 b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.stdin.lzo_extract/lorem.crc32.checksum.filter.multi-block.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.stdin.lzo_extract/0-29552.lzo_extract/0-29552
rename to tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.multi-block.stdin.lzo_extract/lorem.crc32.checksum.filter.multi-block.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.file.lzo_extract/0-4341.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.file.lzo_extract/0-4341.lzo
deleted file mode 100644
index c2e996e282..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.file.lzo_extract/0-4341.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17fc219db084d5bffca8d1c561c774a4f7829cf6925c233bd4f45a54aeea6d00
-size 4341
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.file.lzo_extract/0-4341.lzo_extract/lorem.txt b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.file.lzo_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.file.lzo_extract/0-4341.lzo_extract/lorem.txt
rename to tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.file.lzo_extract/lorem.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo
deleted file mode 100644
index 81a23abc5d..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af949ad1fd4f5b0e5c1197cc87a5622d3eb56a88a3f141818b00aefb5de1ad85
-size 4332
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo_extract/0-4332 b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.stdin.lzo_extract/lorem.crc32.checksum.filter.simple.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.stdin.lzo_extract/0-4332.lzo_extract/0-4332
rename to tests/integration/compression/lzo/__output__/lorem.crc32.checksum.filter.simple.stdin.lzo_extract/lorem.crc32.checksum.filter.simple.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo
deleted file mode 100644
index 8952b08ae6..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fa9a110c9e701a9ec7ad8a8ba0833c66810cc745732278dca5dded3409e2535
-size 26504
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo_extract/big256k.txt b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.file.lzo_extract/big256k.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.file.lzo_extract/0-26504.lzo_extract/big256k.txt
rename to tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.file.lzo_extract/big256k.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo
deleted file mode 100644
index 8e76ee0ced..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e60f885e6229ed84dbee1596533d884c9cc26826707e278441300eeaf5c6936b
-size 26493
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo_extract/0-26493 b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.stdin.lzo_extract/lorem.crc32.checksum.no-filter.multi-block.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.stdin.lzo_extract/0-26493.lzo_extract/0-26493
rename to tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.multi-block.stdin.lzo_extract/lorem.crc32.checksum.no-filter.multi-block.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo
deleted file mode 100644
index 673b0590bc..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e52ebeb5264726d0d91f14161a55ae410aff4de05500ebf6db81f1b4397c330e
-size 3933
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo_extract/lorem.txt b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.file.lzo_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.file.lzo_extract/0-3933.lzo_extract/lorem.txt
rename to tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.file.lzo_extract/lorem.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo
deleted file mode 100644
index 72f8f415e9..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:96a7d15a2b83aa92af9ba906bb3e5eaf40235f3f231119d6e12377d065d8f183
-size 3924
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo_extract/0-3924 b/tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.stdin.lzo_extract/lorem.crc32.checksum.no-filter.simple.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.stdin.lzo_extract/0-3924.lzo_extract/0-3924
rename to tests/integration/compression/lzo/__output__/lorem.crc32.checksum.no-filter.simple.stdin.lzo_extract/lorem.crc32.checksum.no-filter.simple.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo
deleted file mode 100644
index 003ab560fb..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5bc7216558ef0abc7aeedf04d59dcdb77eeaed1b459d1c7ff6b3e91e9e28115a
-size 29555
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo_extract/big256k.txt b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.file.lzo_extract/big256k.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.file.lzo_extract/0-29555.lzo_extract/big256k.txt
rename to tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.file.lzo_extract/big256k.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo
deleted file mode 100644
index 3df9250040..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b242ac69370b74ca087782e18058444f9cac1ce5813ede3e42074d7797bd8e5
-size 29544
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo_extract/0-29544 b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.stdin.lzo_extract/lorem.crc32.no-checksum.filter.multi-block.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.stdin.lzo_extract/0-29544.lzo_extract/0-29544
rename to tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.multi-block.stdin.lzo_extract/lorem.crc32.no-checksum.filter.multi-block.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo
deleted file mode 100644
index b694e92439..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:53842103ec1b4e88518c7696ed87ae854baf965452fcd71cdd57707c66b43a5a
-size 4337
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo_extract/lorem.txt b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.file.lzo_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.file.lzo_extract/0-4337.lzo_extract/lorem.txt
rename to tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.file.lzo_extract/lorem.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo
deleted file mode 100644
index 3ead8125b8..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:291c172d45bf33eec2bf1ad7b33913e32eac8c129041ec6a5fea39fe6ee9f569
-size 4328
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo_extract/0-4328 b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.stdin.lzo_extract/lorem.crc32.no-checksum.filter.simple.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.stdin.lzo_extract/0-4328.lzo_extract/0-4328
rename to tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.filter.simple.stdin.lzo_extract/lorem.crc32.no-checksum.filter.simple.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo
deleted file mode 100644
index dae14384fa..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:079e3ffdee84712d90ef20576c62ba10005c4730eb9b1544da9e823452ada609
-size 26496
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo_extract/big256k.txt b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.file.lzo_extract/big256k.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.file.lzo_extract/0-26496.lzo_extract/big256k.txt
rename to tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.file.lzo_extract/big256k.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo
deleted file mode 100644
index 44244a0c59..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1e581e7c125348fc64d17318e5fd581337601d8cc5b25662f7d3af5b7d6e62a
-size 26485
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo_extract/0-26485 b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.stdin.lzo_extract/lorem.crc32.no-checksum.no-filter.multi-block.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.stdin.lzo_extract/0-26485.lzo_extract/0-26485
rename to tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.multi-block.stdin.lzo_extract/lorem.crc32.no-checksum.no-filter.multi-block.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo
deleted file mode 100644
index 2aa824c76a..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:206c895a3ccd906487078fe288115d3896db7339653fa7052d9952c9a160d1fc
-size 3929
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo_extract/lorem.txt b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.file.lzo_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.file.lzo_extract/0-3929.lzo_extract/lorem.txt
rename to tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.file.lzo_extract/lorem.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo
deleted file mode 100644
index 8501d2aabe..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b81386ecfbdea5cd8299ac231259dd084333e1a6cd8899a403772228e1126db2
-size 3920
diff --git a/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo_extract/0-3920 b/tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.stdin.lzo_extract/lorem.crc32.no-checksum.no-filter.simple.stdin
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.stdin.lzo_extract/0-3920.lzo_extract/0-3920
rename to tests/integration/compression/lzo/__output__/lorem.crc32.no-checksum.no-filter.simple.stdin.lzo_extract/lorem.crc32.no-checksum.no-filter.simple.stdin
diff --git a/tests/integration/compression/lzo/__output__/lorem.filter.lzo_extract/0-6352.lzo b/tests/integration/compression/lzo/__output__/lorem.filter.lzo_extract/0-6352.lzo
deleted file mode 100644
index b908c6fc98..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.filter.lzo_extract/0-6352.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:69d7b295ff217234203cb4a9b4d60385a295e4f3feca1be42714de0086a26584
-size 6352
diff --git a/tests/integration/compression/lzo/__output__/lorem.filter.lzo_extract/0-6352.lzo_extract/lorem.txt b/tests/integration/compression/lzo/__output__/lorem.filter.lzo_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.filter.lzo_extract/0-6352.lzo_extract/lorem.txt
rename to tests/integration/compression/lzo/__output__/lorem.filter.lzo_extract/lorem.txt
diff --git a/tests/integration/compression/lzo/__output__/lorem.lzo_extract/0-3093.lzo b/tests/integration/compression/lzo/__output__/lorem.lzo_extract/0-3093.lzo
deleted file mode 100644
index ddee9e9590..0000000000
--- a/tests/integration/compression/lzo/__output__/lorem.lzo_extract/0-3093.lzo
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:480e2c273d8d9106bb3cea12f918978d45db94dab5ba6603c201b1029eb33931
-size 3093
diff --git a/tests/integration/compression/lzo/__output__/lorem.lzo_extract/0-3093.lzo_extract/lorem.txt b/tests/integration/compression/lzo/__output__/lorem.lzo_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/lzo/__output__/lorem.lzo_extract/0-3093.lzo_extract/lorem.txt
rename to tests/integration/compression/lzo/__output__/lorem.lzo_extract/lorem.txt
diff --git a/tests/integration/compression/xz/__output__/lorem.txt.xz_extract/0-2632.xz b/tests/integration/compression/xz/__output__/lorem.txt.xz_extract/0-2632.xz
deleted file mode 100644
index 794f3f9627..0000000000
--- a/tests/integration/compression/xz/__output__/lorem.txt.xz_extract/0-2632.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:697759ccdb7e21ee1a099e2fbf9eeb888935b6753c8837c8ab3dba1bc5e2a9c7
-size 2632
diff --git a/tests/integration/compression/xz/__output__/lorem.txt.xz_extract/0-2632.xz_extract/0-2632 b/tests/integration/compression/xz/__output__/lorem.txt.xz_extract/lorem.txt
similarity index 100%
rename from tests/integration/compression/xz/__output__/lorem.txt.xz_extract/0-2632.xz_extract/0-2632
rename to tests/integration/compression/xz/__output__/lorem.txt.xz_extract/lorem.txt
diff --git a/tests/integration/compression/xz/__output__/multiblock.padded.xz_extract/0-2168.xz b/tests/integration/compression/xz/__output__/multiblock.padded.xz_extract/0-2168.xz
deleted file mode 100644
index 860a2ff550..0000000000
--- a/tests/integration/compression/xz/__output__/multiblock.padded.xz_extract/0-2168.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0856a2ca40f1b89f1f6b1e7d35b45d68eb8cd71132c9f77ea2a46e1348d8436c
-size 2168
diff --git a/tests/integration/compression/xz/__output__/multiblock.padded.xz_extract/0-2168.xz_extract/0-2168 b/tests/integration/compression/xz/__output__/multiblock.padded.xz_extract/multiblock.padded
similarity index 100%
rename from tests/integration/compression/xz/__output__/multiblock.padded.xz_extract/0-2168.xz_extract/0-2168
rename to tests/integration/compression/xz/__output__/multiblock.padded.xz_extract/multiblock.padded
diff --git a/tests/integration/filesystem/android/sparse/__output__/fruits.sparse_extract/0-41084.sparse b/tests/integration/filesystem/android/sparse/__output__/fruits.sparse_extract/0-41084.sparse
deleted file mode 100644
index aae77cacbf..0000000000
--- a/tests/integration/filesystem/android/sparse/__output__/fruits.sparse_extract/0-41084.sparse
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0558c885fb6761134e273cca6939774c920c4503dc5461ed2590fc2c50e21025
-size 41084
diff --git a/tests/integration/filesystem/android/sparse/__output__/fruits.sparse_extract/0-41084.sparse_extract/0-41084 b/tests/integration/filesystem/android/sparse/__output__/fruits.sparse_extract/fruits
similarity index 100%
rename from tests/integration/filesystem/android/sparse/__output__/fruits.sparse_extract/0-41084.sparse_extract/0-41084
rename to tests/integration/filesystem/android/sparse/__output__/fruits.sparse_extract/fruits
diff --git a/tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/0-4096.cramfs b/tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/0-4096.cramfs
deleted file mode 100644
index b597cb72af..0000000000
--- a/tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/0-4096.cramfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de1d6be79d816470ff54836760a0a1574fba6c2efa9ed13108f0669eb329d749
-size 4096
diff --git a/tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/0-4096.cramfs_extract/apple.txt b/tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/0-4096.cramfs_extract/apple.txt
rename to tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/apple.txt
diff --git a/tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/0-4096.cramfs_extract/cherry.txt b/tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/0-4096.cramfs_extract/cherry.txt
rename to tests/integration/filesystem/cramfs/big_endian/__output__/fruits.cramfs_be_extract/cherry.txt
diff --git a/tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/0-4096.cramfs b/tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/0-4096.cramfs
deleted file mode 100644
index 7c8bcbca7c..0000000000
--- a/tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/0-4096.cramfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e594657cd8a394eb7abb2a10041681a925edb95e829d37a7a4ac5168f026b9e
-size 4096
diff --git a/tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/0-4096.cramfs_extract/apple.txt b/tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/0-4096.cramfs_extract/apple.txt
rename to tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/apple.txt
diff --git a/tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/0-4096.cramfs_extract/cherry.txt b/tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/0-4096.cramfs_extract/cherry.txt
rename to tests/integration/filesystem/cramfs/little_endian/__output__/fruits.cramfs_le_extract/cherry.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs
deleted file mode 100644
index 43f6a0ca08..0000000000
--- a/tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:217a2eac24381eab669c8268929409de7735f4cb59b69e99b98a4cfba4d59c8c
-size 524288
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs_extract/apple.txt b/tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs_extract/apple.txt
rename to tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/apple.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs_extract/banana.txt b/tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs_extract/banana.txt
rename to tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/banana.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs_extract/cherry.txt b/tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/0-524288.extfs_extract/cherry.txt
rename to tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/cherry.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/lost+found/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
rename to tests/integration/filesystem/extfs/__output__/ext2.1024.img_extract/lost+found/.gitkeep
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs
deleted file mode 100644
index 8c840cbb71..0000000000
--- a/tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca6122ab09193915c29dd93dc43319381c712f3a1cd809ab0844a419fe43b308
-size 524288
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs_extract/apple.txt b/tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs_extract/apple.txt
rename to tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/apple.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs_extract/banana.txt b/tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs_extract/banana.txt
rename to tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/banana.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs_extract/cherry.txt b/tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/0-524288.extfs_extract/cherry.txt
rename to tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/cherry.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/lost+found/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
rename to tests/integration/filesystem/extfs/__output__/ext2.2048.img_extract/lost+found/.gitkeep
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs
deleted file mode 100644
index a5522c9b2e..0000000000
--- a/tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:579b31578b8ba892ccb97cc4d8162959162573695fe480bbb56556244bad8eca
-size 524288
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs_extract/apple.txt b/tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs_extract/apple.txt
rename to tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/apple.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs_extract/banana.txt b/tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs_extract/banana.txt
rename to tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/banana.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs_extract/cherry.txt b/tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/0-524288.extfs_extract/cherry.txt
rename to tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/cherry.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/lost+found/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
rename to tests/integration/filesystem/extfs/__output__/ext2.4096.img_extract/lost+found/.gitkeep
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs
deleted file mode 100644
index b604cfc776..0000000000
--- a/tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44c49a20980ae3d55c147583e9fb7d34d79e6406f2fbdbd606a9c8376000807b
-size 524288
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs_extract/apple.txt b/tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs_extract/apple.txt
rename to tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/apple.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs_extract/banana.txt b/tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs_extract/banana.txt
rename to tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/banana.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs_extract/cherry.txt b/tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/0-524288.extfs_extract/cherry.txt
rename to tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/cherry.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/lost+found/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
rename to tests/integration/filesystem/extfs/__output__/ext3.1024.img_extract/lost+found/.gitkeep
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs
deleted file mode 100644
index 077186dc46..0000000000
--- a/tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd7fc5ff2830061e04a2a397b4a0cf2837b75c2677d267d3910f39ed6a23b866
-size 524288
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs_extract/apple.txt b/tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs_extract/apple.txt
rename to tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/apple.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs_extract/banana.txt b/tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs_extract/banana.txt
rename to tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/banana.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs_extract/cherry.txt b/tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/0-524288.extfs_extract/cherry.txt
rename to tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/cherry.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/lost+found/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
rename to tests/integration/filesystem/extfs/__output__/ext3.2048.img_extract/lost+found/.gitkeep
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs
deleted file mode 100644
index b8e845277a..0000000000
--- a/tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0876e7a3dd701c9cefea1363c94d1d3a5eaedb331bdc616c0d1199a6a05e8c2a
-size 524288
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs_extract/apple.txt b/tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs_extract/apple.txt
rename to tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/apple.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs_extract/banana.txt b/tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs_extract/banana.txt
rename to tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/banana.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs_extract/cherry.txt b/tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/0-524288.extfs_extract/cherry.txt
rename to tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/cherry.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs_extract/dir/.gitkeep b/tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/lost+found/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs_extract/dir/.gitkeep
rename to tests/integration/filesystem/extfs/__output__/ext3.4096.img_extract/lost+found/.gitkeep
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs
deleted file mode 100644
index 810db260dc..0000000000
--- a/tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f8e4a871471fe3bc469a22615d08033d870f0a920a243323a680b6a1d117790
-size 524288
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs_extract/apple.txt b/tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs_extract/apple.txt
rename to tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/apple.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs_extract/banana.txt b/tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs_extract/banana.txt
rename to tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/banana.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs_extract/cherry.txt b/tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/0-524288.extfs_extract/cherry.txt
rename to tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/cherry.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs_extract/dir/.gitkeep b/tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/lost+found/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs_extract/dir/.gitkeep
rename to tests/integration/filesystem/extfs/__output__/ext4.1024.img_extract/lost+found/.gitkeep
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs
deleted file mode 100644
index a84f57aad6..0000000000
--- a/tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad0366a489ab25bbc2c664fb6b39adaae4040520e99d1b78a7461c58c50e8856
-size 524288
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs_extract/apple.txt b/tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs_extract/apple.txt
rename to tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/apple.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs_extract/banana.txt b/tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs_extract/banana.txt
rename to tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/banana.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs_extract/cherry.txt b/tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/0-524288.extfs_extract/cherry.txt
rename to tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/cherry.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs_extract/dir/.gitkeep b/tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/lost+found/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs_extract/dir/.gitkeep
rename to tests/integration/filesystem/extfs/__output__/ext4.2048.img_extract/lost+found/.gitkeep
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs
deleted file mode 100644
index cb9abd80b3..0000000000
--- a/tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccc49d73c71d17dc67495228467adcfff3018aa1c05c582ccbb273f29931d5c9
-size 524288
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs_extract/apple.txt b/tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs_extract/apple.txt
rename to tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/apple.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs_extract/banana.txt b/tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs_extract/banana.txt
rename to tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/banana.txt
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs_extract/cherry.txt b/tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/0-524288.extfs_extract/cherry.txt
rename to tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/cherry.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs_extract/dir/.gitkeep b/tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/lost+found/.gitkeep
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs_extract/dir/.gitkeep
rename to tests/integration/filesystem/extfs/__output__/ext4.4096.img_extract/lost+found/.gitkeep
diff --git a/tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat b/tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat
deleted file mode 100644
index c739862a56..0000000000
--- a/tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:968222d707637f778dadff97d823164f8749b6c3f248f0bf36ee995c275aa05f
-size 65536
diff --git a/tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat_extract/cherry1.txt b/tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/cherry1.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat_extract/cherry1.txt
rename to tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/cherry1.txt
diff --git a/tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat_extract/cherry2.txt b/tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/cherry2.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat_extract/cherry2.txt
rename to tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/cherry2.txt
diff --git a/tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat_extract/cherry3.txt b/tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/cherry3.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat_extract/cherry3.txt
rename to tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/cherry3.txt
diff --git a/tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat_extract/cherry4.txt b/tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/cherry4.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/0-65536.fat_extract/cherry4.txt
rename to tests/integration/filesystem/fat/fat12/__output__/cherry.fat12_extract/cherry4.txt
diff --git a/tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat b/tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat
deleted file mode 100644
index a284505020..0000000000
--- a/tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3617997297a9588c7ec140e4b1ce05b222d0429372395586534d3ab4a52cf2af
-size 65536
diff --git a/tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat_extract/banana1.txt b/tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/banana1.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat_extract/banana1.txt
rename to tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/banana1.txt
diff --git a/tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat_extract/banana2.txt b/tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/banana2.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat_extract/banana2.txt
rename to tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/banana2.txt
diff --git a/tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat_extract/banana3.txt b/tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/banana3.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat_extract/banana3.txt
rename to tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/banana3.txt
diff --git a/tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat_extract/banana4.txt b/tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/banana4.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/0-65536.fat_extract/banana4.txt
rename to tests/integration/filesystem/fat/fat16/__output__/banana.fat16_extract/banana4.txt
diff --git a/tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat b/tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat
deleted file mode 100644
index 8b86aff308..0000000000
--- a/tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dae1517af329c11a38014e1c574d985d393591921a8833f1f2ea9828cb6b9150
-size 34603008
diff --git a/tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat_extract/banana1.txt b/tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/banana1.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat_extract/banana1.txt
rename to tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/banana1.txt
diff --git a/tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat_extract/banana2.txt b/tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/banana2.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat_extract/banana2.txt
rename to tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/banana2.txt
diff --git a/tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat_extract/banana3.txt b/tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/banana3.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat_extract/banana3.txt
rename to tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/banana3.txt
diff --git a/tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat_extract/banana4.txt b/tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/banana4.txt
similarity index 100%
rename from tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/0-34603008.fat_extract/banana4.txt
rename to tests/integration/filesystem/fat/fat32/__output__/banana.fat32_extract/banana4.txt
diff --git a/tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/0-360448.iso9660 b/tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/0-360448.iso9660
deleted file mode 100644
index 9a88c22836..0000000000
--- a/tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/0-360448.iso9660
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:893f567030ad7376a9238c36377195d1898ce2714836a37a276494a6bb8f9c31
-size 360448
diff --git a/tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/0-360448.iso9660_extract/APPLE.TXT b/tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/APPLE.TXT
similarity index 100%
rename from tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/0-360448.iso9660_extract/APPLE.TXT
rename to tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/APPLE.TXT
diff --git a/tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/0-360448.iso9660_extract/CHERRY.TXT b/tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/CHERRY.TXT
similarity index 100%
rename from tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/0-360448.iso9660_extract/CHERRY.TXT
rename to tests/integration/filesystem/iso9660/__output__/fruits.iso_extract/CHERRY.TXT
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/0-400.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/0-400.jffs2_new
deleted file mode 100644
index 0b183c237e..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/0-400.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bcb08d0b067c9bd86b8e3836858af5e3ef7047b6b13420739b6e23a48150de2
-size 400
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/0-65536.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/0-65536.jffs2_new
deleted file mode 100644
index 8caa9844c7..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/0-65536.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:933f971afbb838c6b4eac967829b900ad06c77ad52e1e5d4c22d3f4dfef908ec
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/0-416.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/0-416.jffs2_new
deleted file mode 100644
index 267a21b939..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/0-416.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d6f55d6425951df98b183f0352ccace3a6b63fc7e34bd913bb522507d4e0e87d
-size 416
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/0-65536.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/0-65536.jffs2_new
deleted file mode 100644
index 0382c64792..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/0-65536.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3ed98c9e2183f06cf74ae9bc3226c5c73dc8fa4a50ce23e3ded8bba7cb9a0fcd
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/0-392.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/0-392.jffs2_new
deleted file mode 100644
index c89517335a..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/0-392.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a7fc72cf2264c33fe5297d5d2d2246e346705e50b711ebf54a03b62a9e28e14
-size 392
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/0-65536.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/0-65536.jffs2_new
deleted file mode 100644
index cf14bc18dd..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/0-65536.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:995de45ee0823e3121eca4310f1938b8cf4db315f267d8af6efc940f7dc58ba8
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/0-484.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/0-484.jffs2_new
deleted file mode 100644
index 28608dc590..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/0-484.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6a4da9831a5ab98e03f81d829793e3119eb3a3ffb05227b4b98bc604cc7f3dc
-size 484
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/0-65536.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/0-65536.jffs2_new
deleted file mode 100644
index 808aeba13f..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/0-65536.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0dfbb9d9f3cae2d3f81a7064a65b9f6d018963af0a46cf1aa2e84dd0c7aa2c7c
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/0-400.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/0-400.jffs2_new
deleted file mode 100644
index fe31f21dd6..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/0-400.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0fbb0c52d2b6b37c491bdd9c708eb4872d5cc0568eeed91bfdf9b1491a486bdd
-size 400
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/0-400.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/0-65536.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/0-65536.jffs2_new
deleted file mode 100644
index fafab52e27..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/0-65536.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3ab8976689fc2f1140f576c6371ec27ead1a8d014906aa8e91ddd6d0b48f9864
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/0-416.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/0-416.jffs2_new
deleted file mode 100644
index ca655555dc..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/0-416.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:774b980c212ce26c8abb63dece066480334d430daf2957ebfd35250e5f436e08
-size 416
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/0-416.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/0-65536.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/0-65536.jffs2_new
deleted file mode 100644
index 453614bb9e..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/0-65536.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2fc7aa0aa8041098371454c3159d19808289cda3e7426cd07f8fb1e9b7e21e5d
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/0-392.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/0-392.jffs2_new
deleted file mode 100644
index a9b196eea7..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/0-392.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16ef9cb45826fe1c5a2fc13627c321b606342b94cce05a7a02fe5fd4ef175646
-size 392
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/0-392.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/0-65536.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/0-65536.jffs2_new
deleted file mode 100644
index 4246c662da..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/0-65536.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c46076c550ef7567dc01ffa412b98cd78e1940466a1b252b33b21ed1f7e3ec47
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/0-484.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/0-484.jffs2_new
deleted file mode 100644
index 9f3e02e197..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/0-484.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c1f77e27694761fa6e8e1264318792db43314f1af9d5e3f14f88e862eece44e
-size 484
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/0-484.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/0-65536.jffs2_new b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/0-65536.jffs2_new
deleted file mode 100644
index 6580a38f5f..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/0-65536.jffs2_new
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08cceee3614d27227e19ccfe1b7f0b6abf1731d87fd3dc5ce7e2c7051a9621c1
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/0-65536.jffs2_new_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/0-400.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/0-400.jffs2_old
deleted file mode 100644
index e8e6025767..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/0-400.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63c9508ba3e12cf17aeba103503219f169d85ffffa9e857b2ab75cac1f50f7c7
-size 400
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/0-65536.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/0-65536.jffs2_old
deleted file mode 100644
index 3109f7d86d..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/0-65536.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2990007afc9f25cf921049bacb270299a90924ec2f099f7590449db0ad55b4a6
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/0-416.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/0-416.jffs2_old
deleted file mode 100644
index 81046283e0..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/0-416.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df20f5f7d7514b1e589e214ca34e9ed6ba67e7057d0177c3bf76881cdd9b9ac4
-size 416
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/0-65536.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/0-65536.jffs2_old
deleted file mode 100644
index b12592cc01..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/0-65536.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72d8e15ba41457c90fa4eb8dc6364106fdf8308b344eb8c187555569a2ebe1c5
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/0-392.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/0-392.jffs2_old
deleted file mode 100644
index 22a4c0ff49..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/0-392.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a06e24175d7fefb27fdcb0f1d128d7d2ba85730f15c6ca156e67b071899e4c4e
-size 392
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/0-65536.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/0-65536.jffs2_old
deleted file mode 100644
index c358563c1d..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/0-65536.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7f486ea423eabc1c7a7405e89aeab04357d97a88bb3d541fe3a18c43698e7a5
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/0-484.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/0-484.jffs2_old
deleted file mode 100644
index ebfda43d37..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/0-484.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:528445f72ef3d8d3fec86c47b15ea59b7962ed276cef4cb472b29bfdfdb1a997
-size 484
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/0-65536.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/0-65536.jffs2_old
deleted file mode 100644
index f3fd1fb039..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/0-65536.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4f0937a3297e6821a8e982b86842df54d41ee475fbd051d4faef1c695ffd7b4
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/0-400.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/0-400.jffs2_old
deleted file mode 100644
index 8703ea12a9..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/0-400.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37b8c26ba08848f8f4c39550578f19c62b9da7a0bd026c8d0ac4cafa198ac1a9
-size 400
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/0-400.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/0-65536.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/0-65536.jffs2_old
deleted file mode 100644
index 518af99b79..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/0-65536.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a935d9394038576115b771a91c1711f0da55d1e47ee1e2a8ee4ff38b8343dbe4
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/0-416.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/0-416.jffs2_old
deleted file mode 100644
index 4025c4a62e..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/0-416.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6e000b9e834c476b1ccd6f0cacfdb7f1b4f637b4b0ae4c4faca6e77fc037402
-size 416
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/0-416.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/0-65536.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/0-65536.jffs2_old
deleted file mode 100644
index f4569e179f..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/0-65536.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c2b833f05e67d78e36d5a448c28dafb23a5e009584f105f39b7d5a8aed287a9f
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/0-392.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/0-392.jffs2_old
deleted file mode 100644
index c42f0dfdd3..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/0-392.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e2fd74855cd80a93926d9a77287ce15cc356fc10fe4231f04c2988ea3429104
-size 392
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/0-392.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/0-65536.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/0-65536.jffs2_old
deleted file mode 100644
index 5f0b21abef..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/0-65536.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd6b783078b0b1e6d584dec198b3ed38d787f43cfca9e97deedaed3276d02b08
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/0-484.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/0-484.jffs2_old
deleted file mode 100644
index f6ca78b12c..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/0-484.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a52e17d5735fc785f14c9015cb48e3102bb23a220e9646c9c577bd01bcd5c321
-size 484
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/0-484.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/0-65536.jffs2_old b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/0-65536.jffs2_old
deleted file mode 100644
index 5ea289eae0..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/0-65536.jffs2_old
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e967993964882a32ed168428ad30442c037f1a9e79ed8bb6a84a583a6c5593e
-size 65536
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/0-65536.jffs2_old_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/cherry.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs
deleted file mode 100644
index 9f457024e0..0000000000
--- a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9839fae63043a9a97581761a35053a5a606be3855201e09a24637b7383070959
-size 5120
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/file_1.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/file_1.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/file_1.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/file_1.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/file_2.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/file_2.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/file_2.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/file_2.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/file_3.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/file_3.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/file_3.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/file_3.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/file_4.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/file_4.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/file_4.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/file_4.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/file_5.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/file_5.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/file_5.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/file_5.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/hosts b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/hosts
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/hosts
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/hosts
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/passwd b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/passwd
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_1/passwd
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_1/passwd
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/file_1.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/file_1.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/file_1.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/file_1.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/file_2.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/file_2.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/file_2.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/file_2.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/file_3.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/file_3.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/file_3.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/file_3.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/file_4.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/file_4.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/file_4.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/file_4.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/file_5.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/file_5.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/file_5.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/file_5.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/hosts b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/hosts
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/hosts
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/hosts
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/passwd b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/passwd
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_2/passwd
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_2/passwd
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/file_1.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/file_1.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/file_1.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/file_1.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/file_2.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/file_2.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/file_2.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/file_2.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/file_3.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/file_3.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/file_3.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/file_3.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/file_4.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/file_4.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/file_4.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/file_4.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/file_5.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/file_5.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/file_5.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/file_5.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/hosts b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/hosts
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/hosts
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/hosts
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/passwd b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/passwd
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_3/passwd
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_3/passwd
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/file_1.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/file_1.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/file_1.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/file_1.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/file_2.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/file_2.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/file_2.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/file_2.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/file_3.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/file_3.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/file_3.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/file_3.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/file_4.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/file_4.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/file_4.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/file_4.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/file_5.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/file_5.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/file_5.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/file_5.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/hosts b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/hosts
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/hosts
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/hosts
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/passwd b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/passwd
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_4/passwd
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_4/passwd
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/file_1.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/file_1.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/file_1.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/file_1.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/file_2.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/file_2.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/file_2.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/file_2.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/file_3.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/file_3.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/file_3.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/file_3.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/file_4.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/file_4.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/file_4.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/file_4.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/file_5.txt b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/file_5.txt
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/file_5.txt
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/file_5.txt
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/hosts b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/hosts
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/hosts
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/hosts
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/passwd b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/passwd
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/dir_5/passwd
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/dir_5/passwd
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_1_1 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_1_1
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_1_1
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_1_1
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_1_2 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_1_2
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_1_2
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_1_2
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_1_3 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_1_3
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_1_3
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_1_3
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_1_4 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_1_4
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_1_4
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_1_4
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_1_5 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_1_5
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_1_5
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_1_5
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_2_1 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_2_1
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_2_1
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_2_1
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_2_2 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_2_2
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_2_2
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_2_2
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_2_3 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_2_3
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_2_3
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_2_3
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_2_4 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_2_4
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_2_4
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_2_4
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_2_5 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_2_5
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_2_5
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_2_5
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_3_1 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_3_1
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_3_1
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_3_1
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_3_2 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_3_2
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_3_2
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_3_2
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_3_3 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_3_3
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_3_3
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_3_3
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_3_4 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_3_4
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_3_4
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_3_4
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_3_5 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_3_5
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_3_5
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_3_5
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_4_1 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_4_1
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_4_1
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_4_1
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_4_2 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_4_2
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_4_2
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_4_2
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_4_3 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_4_3
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_4_3
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_4_3
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_4_4 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_4_4
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_4_4
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_4_4
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_4_5 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_4_5
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_4_5
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_4_5
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_5_1 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_5_1
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_5_1
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_5_1
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_5_2 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_5_2
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_5_2
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_5_2
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_5_3 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_5_3
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_5_3
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_5_3
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_5_4 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_5_4
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_5_4
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_5_4
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_5_5 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_5_5
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/hlink_5_5
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/hlink_5_5
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_1_1 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_1_1
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_1_1
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_1_1
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_1_2 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_1_2
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_1_2
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_1_2
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_1_3 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_1_3
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_1_3
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_1_3
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_1_4 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_1_4
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_1_4
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_1_4
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_1_5 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_1_5
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_1_5
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_1_5
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_2_1 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_2_1
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_2_1
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_2_1
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_2_2 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_2_2
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_2_2
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_2_2
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_2_3 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_2_3
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_2_3
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_2_3
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_2_4 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_2_4
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_2_4
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_2_4
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_2_5 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_2_5
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_2_5
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_2_5
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_3_1 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_3_1
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_3_1
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_3_1
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_3_2 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_3_2
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_3_2
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_3_2
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_3_3 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_3_3
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_3_3
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_3_3
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_3_4 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_3_4
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_3_4
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_3_4
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_3_5 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_3_5
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_3_5
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_3_5
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_4_1 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_4_1
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_4_1
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_4_1
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_4_2 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_4_2
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_4_2
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_4_2
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_4_3 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_4_3
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_4_3
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_4_3
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_4_4 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_4_4
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_4_4
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_4_4
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_4_5 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_4_5
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_4_5
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_4_5
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_5_1 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_5_1
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_5_1
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_5_1
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_5_2 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_5_2
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_5_2
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_5_2
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_5_3 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_5_3
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_5_3
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_5_3
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_5_4 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_5_4
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_5_4
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_5_4
diff --git a/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_5_5 b/tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_5_5
similarity index 100%
rename from tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/0-5120.romfs_extract/slink_5_5
rename to tests/integration/filesystem/romfs/__output__/fruits.romfs_extract/slink_5_5
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3 b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3
deleted file mode 100644
index 8b560446f8..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d178985d5fee1412443306d6baf74da6a19cd3a306138308a4fac6ebbf34c187
-size 1024
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3 b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3
deleted file mode 100644
index c550f24f31..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:90b2f247ba105eabe5bd8dcca087519c87850e2bd51dc7025d144cae42d7c9e9
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3 b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3
deleted file mode 100644
index 1474569abf..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c1eb3ac360e453701bf080c7a6dd7486afbf1d218bc3193944292dd8f88392f0
-size 320
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3 b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3
deleted file mode 100644
index 77c08f6161..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e9493d9c6f868005dea8f11992129c3399e0bcb8f3a966c750cb925989ca97c
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/apple.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/apple.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/apple.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/cherry.txt b/tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/cherry.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/big_endian/__output__/squashfs_v3_be.bin_extract/cherry.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3 b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3
deleted file mode 100644
index 58ae6d97a2..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5109f62ffdee08cf862b258c41804d9a523479706a2bc2fc520ded78affe4723
-size 1024
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3 b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3
deleted file mode 100644
index 1bca515687..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5afb4387d027baa3948d88f22db1d905beea10dfd83cf0cbaa489e5f242b6dda
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3 b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3
deleted file mode 100644
index 29766229ed..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:314d4bbe07b83f491e9987d7db39d8560945b2ae273ed23ead7e9d92250deb3c
-size 320
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3 b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3
deleted file mode 100644
index 7785ec7fe9..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0161351caec8e9da6e3e5ac7b046fd11d832efb18eb09e33011e6d19d50cd1f7
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_extract/apple.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_extract/apple.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/apple.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_extract/cherry.txt b/tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_extract/cherry.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3/little_endian/__output__/squashfs_v3_le.bin_extract/cherry.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom
deleted file mode 100644
index e1df63d8f5..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2120dcca995ab247d2a90dcf2d240b8070dcf73563df05bfeffa6e2ec8b6e4bf
-size 1024
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom
deleted file mode 100644
index f39cc68cf0..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f9d832fe73cf4cb648e61cffd2c5ad42646393a5d1794ae239af83a4423b3fb
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom
deleted file mode 100644
index 794526edfa..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5baee74f14d4b5b80a2a09ce1d5cb90c1fced592fd971edb854a9df130b42282
-size 320
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3 b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3
deleted file mode 100644
index 77c08f6161..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e9493d9c6f868005dea8f11992129c3399e0bcb8f3a966c750cb925989ca97c
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/apple.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/apple.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/apple.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/cherry.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/cherry.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/big_endian/__output__/squashfs_v3_be.bin_extract/cherry.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom
deleted file mode 100644
index 15b42ab45e..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa9102933ca39bd929f4061c7704d364f7ccfb176e6dda2b4eab7fcc0cbfd09c
-size 1024
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_broadcom_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom
deleted file mode 100644
index cb1eb49921..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f999054ee3fb233652a122bb0f58d8af92b96767e61ba2d8c534425f789d0da5
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom
deleted file mode 100644
index b961ea1bba..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e763240ca30dae3e630a5313a5d3a22923a9bb019d62a6e8c2888ee487d01e58
-size 320
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_broadcom_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_broadcom b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_broadcom
deleted file mode 100644
index e2b21e5076..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_broadcom
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6baad4387dd51c8010de694420a35b6709706a268f7ba9e96e6417fb969f37d3
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_broadcom_extract/apple.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/apple.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_broadcom_extract/cherry.txt b/tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_broadcom_extract/cherry.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_broadcom/little_endian/__output__/squashfs_v3_le.bin_extract/cherry.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/.gitkeep b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/.gitkeep b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.bin_extract/.gitkeep b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.bin_extract/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/.gitkeep b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3 b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3
deleted file mode 100644
index 77c08f6161..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e9493d9c6f868005dea8f11992129c3399e0bcb8f3a966c750cb925989ca97c
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/apple.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/apple.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/apple.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/cherry.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_extract/cherry.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/big_endian/__output__/squashfs_v3_be.bin_extract/cherry.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt
deleted file mode 100644
index ff36187148..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d340b84b25c9adea2e4cceb3f3d17c8465d78e5e99796c1866e2cc1605b9e72
-size 1024
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_ddwrt_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt
deleted file mode 100644
index 9cacd89fac..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cca294fd76e46e5856f51d1b7c60903bb8e2c2d66dfa6d4e0859ab55a60b217e
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_ddwrt_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.bin_extract/.gitkeep b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.bin_extract/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt
deleted file mode 100644
index b1410036b4..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7482db480f923189d649d6452d5c9c2cab267570dd88110dde2dfa1bdfa3b42
-size 320
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_ddwrt_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3 b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3
deleted file mode 100644
index 7785ec7fe9..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0161351caec8e9da6e3e5ac7b046fd11d832efb18eb09e33011e6d19d50cd1f7
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_extract/apple.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_extract/apple.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/apple.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_extract/cherry.txt b/tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_extract/cherry.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_ddwrt/little_endian/__output__/squashfs_v3_le.bin_extract/cherry.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard
deleted file mode 100644
index 161c23cb2f..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d18ea9e97713ba57b5db6ce67a5953e4f14abd18ec5b91e9c4fe6d3ef104ba9f
-size 1024
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.1kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard
deleted file mode 100644
index 2052ea66e4..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:93f3114d1474462dabffcac1cd0267b3746870d98fbab5ee4acbac69ed6f1959
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.4kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard
deleted file mode 100644
index a3abca288d..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed6b0d13cfb40171fa0b575d62192e904412cea2531ded2bf0c0a6de2e778fbb
-size 320
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3.be.nopad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_nonstandard b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_nonstandard
deleted file mode 100644
index 3d7121e89d..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_nonstandard
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01b2792bd5b5fb3455282cb84351f2e0c7e67de9b861de5a3503cdc7710c3661
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/apple.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_nonstandard_extract/cherry.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/0-4096.squashfs_v3_nonstandard_extract/cherry.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/big_endian/__output__/squashfs_v3_be.bin_extract/cherry.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard
deleted file mode 100644
index 883ab8a271..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1db4b787d231c17875b811505227ca2af41136189edb204cb5a899efedf902e5
-size 1024
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/0-1024.squashfs_v3_nonstandard_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.1kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard
deleted file mode 100644
index c3f9ee494f..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7deb245c6c252915a37931c71beaadd519941ba25519c99515b50e54ff558aa2
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.4kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard
deleted file mode 100644
index 1dac4cc2a1..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c7ed2e81dd0f50539cfecb187a73788bbb3e2bc79f6bb9a3073d78cb7fbf50a
-size 320
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/0-320.squashfs_v3_nonstandard_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3.le.nopad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_nonstandard b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_nonstandard
deleted file mode 100644
index b925673654..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_nonstandard
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3bce6ae378319fd2ac08c73ede9b3890a6d0f78c16392f09117cc3ffd70d1acb
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_nonstandard_extract/apple.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/apple.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_nonstandard_extract/cherry.txt b/tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/0-4096.squashfs_v3_nonstandard_extract/cherry.txt
rename to tests/integration/filesystem/squashfs/squashfs_v3_nonstandard/little_endian/__output__/squashfs_v3_le.bin_extract/cherry.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be
deleted file mode 100644
index 18f1fb50c7..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d0bd6f90610d139aafe2f33f7002e742700d15c423f7b34c7292a220641cfa42
-size 1024
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_be_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.1kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le
deleted file mode 100644
index 499a8979af..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3160d5cec42b3e7dfb61f153f9222ef1d0c95339568b8dc61869003e3dc5a4fa
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.4kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be
deleted file mode 100644
index 88ef7cc6fd..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c7c523c5d1d1cafc0b679af9092ce0289d9656f6a24bc3bd0009f95b69397c0
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_be_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be
deleted file mode 100644
index 9f2fc996a7..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a29ddc15f5a6abcabf28b7161837eb56b34111e48420e7392e648f2fdfe956ed
-size 307
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/0-307.squashfs_v4_be_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_be/__output__/squashfs_v4.nopad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le
deleted file mode 100644
index d3c874d261..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4714b7a4e1aa8af11290a3f84d59a04fcd173f67479e2c206abc2ffce10b497d
-size 1024
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/0-1024.squashfs_v4_le_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.1kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le
deleted file mode 100644
index 499a8979af..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3160d5cec42b3e7dfb61f153f9222ef1d0c95339568b8dc61869003e3dc5a4fa
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/0-4096.squashfs_v4_le_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.4kpad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_le b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_le
deleted file mode 100644
index b4d2d4d593..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_le
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a754b315013874eaa07f67f918278a699b8503ece1c6bbf11f153c62d7f49c69
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_le_extract/apple.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_le_extract/apple.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/apple.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_le_extract/cherry.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/0-4096.squashfs_v4_le_extract/cherry.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.bin_extract/cherry.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le
deleted file mode 100644
index bf38dcba71..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6c9ef1e9ee095dbb72597fc0270fbd38adef4e7805118f63b84323146393a68
-size 4096
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/0-4096.squashfs_v4_le_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.blockdev.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le
deleted file mode 100644
index 163dc82db8..0000000000
--- a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c72ddaa56a78b3d901a037acb47eb9be4b6f5303654cf3e7d5cfed1321fbd874
-size 308
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le_extract/apple1.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/apple1.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le_extract/apple1.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/apple1.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le_extract/apple2.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/apple2.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le_extract/apple2.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/apple2.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le_extract/apple3.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/apple3.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le_extract/apple3.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/apple3.txt
diff --git a/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le_extract/apple4.txt b/tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/apple4.txt
similarity index 100%
rename from tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/0-308.squashfs_v4_le_extract/apple4.txt
rename to tests/integration/filesystem/squashfs/squashfs_v4_le/__output__/squashfs_v4.nopad.bin_extract/apple4.txt
diff --git a/tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/0-4096.ubi b/tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/0-4096.ubi
deleted file mode 100644
index e3f4acf198..0000000000
--- a/tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/0-4096.ubi
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4cd14263eb03cb63d75b97ea376f4c903c55657351dfafb85ed5c2cb69925573
-size 4096
diff --git a/tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/0-4096.ubi_extract/0-4096.ubi/img-1180426539_vol-apple.ubifs b/tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/fruits.ubi/img-1180426539_vol-apple.ubifs
similarity index 100%
rename from tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/0-4096.ubi_extract/0-4096.ubi/img-1180426539_vol-apple.ubifs
rename to tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/fruits.ubi/img-1180426539_vol-apple.ubifs
diff --git a/tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/0-4096.ubi_extract/0-4096.ubi/img-1180426539_vol-data.ubifs b/tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/fruits.ubi/img-1180426539_vol-data.ubifs
similarity index 100%
rename from tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/0-4096.ubi_extract/0-4096.ubi/img-1180426539_vol-data.ubifs
rename to tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/fruits.ubi/img-1180426539_vol-data.ubifs
diff --git a/tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs b/tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs
deleted file mode 100644
index 6bcc2292d8..0000000000
--- a/tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:87b05f653d717736b766a9cca10b75656cc14c1d9442c61fdc514cc275a8a634
-size 168960
diff --git a/tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs_extract/banana1.txt b/tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/banana1.txt
similarity index 100%
rename from tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs_extract/banana1.txt
rename to tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/banana1.txt
diff --git a/tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs_extract/banana2.txt b/tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/banana2.txt
similarity index 100%
rename from tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs_extract/banana2.txt
rename to tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/banana2.txt
diff --git a/tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs_extract/banana3.txt b/tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/banana3.txt
similarity index 100%
rename from tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs_extract/banana3.txt
rename to tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/banana3.txt
diff --git a/tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs_extract/banana4.txt b/tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/banana4.txt
similarity index 100%
rename from tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/0-168960.ubifs_extract/banana4.txt
rename to tests/integration/filesystem/ubi/ubifs/__output__/banana.ubifs_extract/banana4.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs b/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs
deleted file mode 100644
index 083fe24d0f..0000000000
--- a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b07b888a645dd30b0891d1147505fb35a27f1df52b3710c40dc7d9ed418e60c9
-size 4224
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs_extract/apple.txt b/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs_extract/apple.txt
rename to tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/apple.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs_extract/banana.txt b/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs_extract/banana.txt
rename to tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/banana.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs_extract/cherry.txt b/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/0-4224.yaffs_extract/cherry.txt
rename to tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/cherry.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/dir/.gitkeep b/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.be.yffs_extract/dir/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs b/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs
deleted file mode 100644
index 401b0e826b..0000000000
--- a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30ac92e89b1bc5a9260ca69093093537574e14a4dcb87a79259538762b9f8060
-size 4224
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs_extract/apple.txt b/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs_extract/apple.txt
rename to tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/apple.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs_extract/banana.txt b/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs_extract/banana.txt
rename to tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/banana.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs_extract/cherry.txt b/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/0-4224.yaffs_extract/cherry.txt
rename to tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/cherry.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/dir/.gitkeep b/tests/integration/filesystem/yaffs/yaffs/__output__/fruits.dir.le.yffs_extract/dir/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs b/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs
deleted file mode 100644
index eebcf354e7..0000000000
--- a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5df1908e127abc2480639e71309c2869071826c0e67b9a2d462e41d275669dac
-size 135168
diff --git a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs_extract/apple.txt b/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs_extract/apple.txt
rename to tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs_extract/banana.txt b/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs_extract/banana.txt
rename to tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs_extract/cherry.txt b/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/0-135168.yaffs_extract/cherry.txt
rename to tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/dir/.gitkeep b/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.be.yffs2_extract/dir/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs b/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs
deleted file mode 100644
index 4ac8008a16..0000000000
--- a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29e332cbd5f71a85d3d788ffbe4e64407431acb77bdf7c945498c638e16d5e10
-size 135168
diff --git a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs_extract/dir/apple.txt b/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/dir/apple.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs_extract/dir/apple.txt
rename to tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/dir/apple.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs_extract/dir/banana.txt b/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/dir/banana.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs_extract/dir/banana.txt
rename to tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/dir/banana.txt
diff --git a/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs_extract/dir/cherry.txt b/tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/dir/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/0-135168.yaffs_extract/dir/cherry.txt
rename to tests/integration/filesystem/yaffs/yaffs2/__output__/fruits.dir.le.yffs2_extract/dir/cherry.txt