Bump version

* Fix version

* sf

.github/workflows/build_and_test.yml

@@ -1,4 +1,4 @@
-name: Nuget Pack
+name: Build and Test
 
 on:
   push:
@@ -16,31 +16,22 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: |
+            6.0.x
+            8.0.x
+            9.0.x
         
-    - name: Restore dependencies
-      run: dotnet restore
-
-    - name: Build library
-      run: dotnet build
-
     - name: Run tests
       run: dotnet test
       
-    - name: Pack
-      run: dotnet pack
-
-    - name: Upload build
-      uses: actions/upload-artifact@v4
-      with:
-        name: 'Nuget Package'
-        path: 'BinaryObjectScanner/bin/Release/*.nupkg'
+    - name: Run publish script
+      run: ./publish-nix.sh -d
 
     - name: Upload to rolling
       uses: ncipollo/release-action@v1.14.0
       with:
         allowUpdates: True
-        artifacts: 'BinaryObjectScanner/bin/Release/*.nupkg'
+        artifacts: "*.nupkg,*.snupkg,*.zip"
         body: 'Last built commit: ${{ github.sha }}'
         name: 'Rolling Release'
         prerelease: True

.github/workflows/build_programs.yml

@@ -1,55 +0,0 @@
-name: Build Programs
-
-on:
-  push:
-    branches: [ "master" ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        project: [ExtractionTool, ProtectionScan]
-        runtime: [win-x86, win-x64, win-arm64, linux-x64, linux-arm64, osx-x64]
-        framework: [net9.0] #[net20, net35, net40, net452, net472, net48, netcoreapp3.1, net5.0, net6.0, net7.0, net8.0, net9.0]
-        conf: [Debug] #[Release, Debug]
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-    
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 9.0.x
-        
-    - name: Restore dependencies
-      run: dotnet restore
-      
-    - name: Build
-      run: dotnet publish ${{ matrix.project }}/${{ matrix.project }}.csproj -f ${{ matrix.framework }} -r ${{ matrix.runtime }} -c ${{ matrix.conf == 'Release' && 'Release -p:DebugType=None -p:DebugSymbols=false' || 'Debug'}} --self-contained true --version-suffix ${{ github.sha }} ${{ (startsWith(matrix.framework, 'net5') || startsWith(matrix.framework, 'net6') || startsWith(matrix.framework, 'net7') || startsWith(matrix.framework, 'net8') || startsWith(matrix.framework, 'net9')) && '-p:PublishSingleFile=true' || ''}}
-        
-    - name: Archive build
-      run: |
-        cd ${{ matrix.project }}/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/
-        zip -r ${{ github.workspace }}/${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }}.zip ./
-        
-    - name: Upload build
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }}
-        path: ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }}.zip
-
-    - name: Upload to rolling
-      uses: ncipollo/release-action@v1.14.0
-      with:
-        allowUpdates: True
-        artifacts: ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }}.zip
-        body: 'Last built commit: ${{ github.sha }}'
-        name: 'Rolling Release'
-        prerelease: True
-        replacesArtifacts: True
-        tag: "rolling"
-        updateOnlyUnreleased: True

.github/workflows/check_pr.yml

@@ -11,10 +11,13 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: |
+            6.0.x
+            8.0.x
+            9.0.x
       
     - name: Build
       run: dotnet build
 
     - name: Run tests
-      run: dotnet test
+      run: dotnet test

.gitmodules

@@ -1,9 +0,0 @@
-[submodule "BinaryObjectScanner/_EXTERNAL/stormlibsharp"]
-	path = BinaryObjectScanner/_EXTERNAL/stormlibsharp
-	url = https://github.com/robpaveza/stormlibsharp.git
-[submodule "BinaryObjectScanner/_EXTERNAL/libmspack4n"]
-	path = BinaryObjectScanner/_EXTERNAL/libmspack4n
-	url = https://github.com/activescott/libmspack4n.git
-[submodule "BinaryObjectScanner/_EXTERNAL/LessIO"]
-	path = BinaryObjectScanner/_EXTERNAL/LessIO
-	url = https://github.com/activescott/LessIO.git

.vscode/launch.json

@@ -15,20 +15,8 @@
             "cwd": "${workspaceFolder}/ProtectionScan",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
             "console": "internalConsole",
-            "stopAtEntry": false
-        },
-        {
-            "name": ".NET Core Launch (ExtractionTool)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/ExtractionTool/bin/Debug/net9.0/ExtractionTool.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/ExtractionTool",
-            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
-            "console": "internalConsole",
-            "stopAtEntry": false
+            "stopAtEntry": false,
+            "justMyCode": false,
         },
         {
             "name": ".NET Core Attach",

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "dotnet.defaultSolution": "BinaryObjectScanner.sln"
-}

BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
@@ -12,14 +12,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.2">
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-        <PackageReference Include="SabreTools.Serialization" Version="1.8.0" />
-        <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+        <PackageReference Include="SabreTools.Serialization" Version="[2.0.1]" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

BinaryObjectScanner.Test/Data/ProtectionDictionaryTests.cs

@@ -1,9 +1,10 @@
 using System.Collections.Generic;
+using BinaryObjectScanner.Data;
 using Xunit;
 
-namespace BinaryObjectScanner.Test
+namespace BinaryObjectScanner.Test.Data
 {
-    public class ScannerTests
+    public class ProtectionDictionaryTests
     {
         #region ProcessProtectionString
 
@@ -11,7 +12,7 @@ namespace BinaryObjectScanner.Test
         public void ProcessProtectionString_Null_Empty()
         {
             string? protection = null;
-            List<string> actual = Scanner.ProcessProtectionString(protection);
+            List<string> actual = ProtectionDictionary.ProcessProtectionString(protection);
             Assert.Empty(actual);
         }
 
@@ -19,7 +20,7 @@ namespace BinaryObjectScanner.Test
         public void ProcessProtectionString_Empty_Empty()
         {
             string? protection = string.Empty;
-            List<string> actual = Scanner.ProcessProtectionString(protection);
+            List<string> actual = ProtectionDictionary.ProcessProtectionString(protection);
             Assert.Empty(actual);
         }
 
@@ -27,7 +28,7 @@ namespace BinaryObjectScanner.Test
         public void ProcessProtectionString_NoIndicator_Single()
         {
             string? protection = "item1";
-            List<string> actual = Scanner.ProcessProtectionString(protection);
+            List<string> actual = ProtectionDictionary.ProcessProtectionString(protection);
             Assert.Single(actual);
         }
 
@@ -35,7 +36,7 @@ namespace BinaryObjectScanner.Test
         public void ProcessProtectionString_Indicator_Multiple()
         {
             string? protection = "item1;item2";
-            List<string> actual = Scanner.ProcessProtectionString(protection);
+            List<string> actual = ProtectionDictionary.ProcessProtectionString(protection);
             Assert.Equal(2, actual.Count);
         }
 

BinaryObjectScanner.Test/Data/StaticChecksTests.cs

@@ -9,7 +9,7 @@ namespace BinaryObjectScanner.Test.Data
         public void ContentCheckClasses_Populated()
         {
             var actual = StaticChecks.ContentCheckClasses;
-            Assert.NotEmpty(actual);
+            Assert.Equal(6, actual.Length);
         }
 
         [Fact]
@@ -30,21 +30,21 @@ namespace BinaryObjectScanner.Test.Data
         public void NewExecutableCheckClasses_Populated()
         {
             var actual = StaticChecks.NewExecutableCheckClasses;
-            Assert.NotEmpty(actual);
+            Assert.Equal(7, actual.Length);
         }
 
         [Fact]
         public void PathCheckClasses_Populated()
         {
             var actual = StaticChecks.PathCheckClasses;
-            Assert.NotEmpty(actual);
+            Assert.Equal(68, actual.Length);
         }
 
         [Fact]
         public void PortableExecutableCheckClasses_Populated()
         {
             var actual = StaticChecks.PortableExecutableCheckClasses;
-            Assert.NotEmpty(actual);
+            Assert.Equal(105, actual.Length);
         }
     }
 }

BinaryObjectScanner.Test/ExtensionsTests.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using Xunit;
 
 namespace BinaryObjectScanner.Test
@@ -33,300 +31,5 @@ namespace BinaryObjectScanner.Test
         }
 
         #endregion
-
-        #region IterateWithAction
-
-        [Fact]
-        public void IterateWithAction_EmptyEnumerable_Success()
-        {
-            List<string> set = new List<string>();
-            Action<string> action = (s) => s.ToLowerInvariant();
-
-            set.IterateWithAction(action);
-            Assert.Empty(set);
-        }
-
-        [Fact]
-        public void IterateWithAction_EmptyAction_Success()
-        {
-            List<string> set = ["a", "b", "c"];
-            Action<string> action = (s) => { };
-
-            set.IterateWithAction(action);
-            Assert.Equal(3, set.Count);
-        }
-
-        [Fact]
-        public void IterateWithAction_Valid_Success()
-        {
-            List<string> set = ["a", "b", "c"];
-            List<string> actual = new List<string>();
-
-            Action<string> action = (s) =>
-            {
-                lock (actual)
-                {
-                    actual.Add(s.ToUpperInvariant());
-                }
-            };
-
-            set.IterateWithAction(action);
-            Assert.Equal(3, set.Count);
-            Assert.Equal(3, actual.Count);
-        }
-
-        #endregion
-
-        #region OptionalContains
-
-        [Fact]
-        public void OptionalContains_NullStringNoComparison_False()
-        {
-            string? str = null;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalContains(prefix);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalContains_NullStringComparison_False()
-        {
-            string? str = null;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalContains(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalContains_EmptyStringNoComparison_False()
-        {
-            string? str = string.Empty;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalContains(prefix);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalContains_EmptyStringComparison_False()
-        {
-            string? str = string.Empty;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalContains(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalContains_NoMatchNoComparison_False()
-        {
-            string? str = "postfix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalContains(prefix);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalContains_NoMatchComparison_False()
-        {
-            string? str = "postfix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalContains(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalContains_MatchesNoComparison_True()
-        {
-            string? str = "prefix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalContains(prefix);
-            Assert.True(actual);
-        }
-
-        [Fact]
-        public void OptionalContains_MatchesComparison_True()
-        {
-            string? str = "prefix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalContains(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.True(actual);
-        }
-
-        #endregion
-
-        #region OptionalEquals
-
-        [Fact]
-        public void OptionalEquals_NullStringNoComparison_False()
-        {
-            string? str = null;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalEquals(prefix);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalEquals_NullStringComparison_False()
-        {
-            string? str = null;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalEquals(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalEquals_EmptyStringNoComparison_False()
-        {
-            string? str = string.Empty;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalEquals(prefix);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalEquals_EmptyStringComparison_False()
-        {
-            string? str = string.Empty;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalEquals(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalEquals_NoMatchNoComparison_False()
-        {
-            string? str = "postfix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalEquals(prefix);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalEquals_NoMatchComparison_False()
-        {
-            string? str = "postfix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalEquals(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalEquals_MatchesNoComparison_True()
-        {
-            string? str = "prefix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalEquals(prefix);
-            Assert.True(actual);
-        }
-
-        [Fact]
-        public void OptionalEquals_MatchesComparison_True()
-        {
-            string? str = "prefix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalEquals(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.True(actual);
-        }
-
-        #endregion
-
-        #region OptionalStartsWith
-
-        [Fact]
-        public void OptionalStartsWith_NullStringNoComparison_False()
-        {
-            string? str = null;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalStartsWith(prefix);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalStartsWith_NullStringComparison_False()
-        {
-            string? str = null;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalStartsWith(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalStartsWith_EmptyStringNoComparison_False()
-        {
-            string? str = string.Empty;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalStartsWith(prefix);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalStartsWith_EmptyStringComparison_False()
-        {
-            string? str = string.Empty;
-            string prefix = "prefix";
-
-            bool actual = str.OptionalStartsWith(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalStartsWith_NoMatchNoComparison_False()
-        {
-            string? str = "postfix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalStartsWith(prefix);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalStartsWith_NoMatchComparison_False()
-        {
-            string? str = "postfix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalStartsWith(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void OptionalStartsWith_MatchesNoComparison_True()
-        {
-            string? str = "prefix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalStartsWith(prefix);
-            Assert.True(actual);
-        }
-
-        [Fact]
-        public void OptionalStartsWith_MatchesComparison_True()
-        {
-            string? str = "prefix";
-            string prefix = "prefix";
-
-            bool actual = str.OptionalStartsWith(prefix, StringComparison.OrdinalIgnoreCase);
-            Assert.True(actual);
-        }
-
-        #endregion
     }
 }

BinaryObjectScanner.Test/FactoryTests.cs

@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using BinaryObjectScanner.Interfaces;
-using SabreTools.Serialization.Wrappers;
-using Xunit;
-
-namespace BinaryObjectScanner.Test
-{
-    public class FactoryTests
-    {
-        #region CreateDetectable
-
-        private static readonly List<WrapperType> _detectableTypes =
-        [
-            WrapperType.AACSMediaKeyBlock,
-            WrapperType.BDPlusSVM,
-            //WrapperType.CIA,
-            WrapperType.Executable,
-            WrapperType.LDSCRYPT,
-            //WrapperType.N3DS,
-            //WrapperType.Nitro,
-            WrapperType.PlayJAudioFile,
-            WrapperType.RealArcadeInstaller,
-            WrapperType.RealArcadeMezzanine,
-            WrapperType.SFFS,
-            WrapperType.Textfile,
-        ];
-
-        [Theory]
-        [MemberData(nameof(GenerateIDetectableTestData))]
-        public void CreateDetectableTests(WrapperType type, bool expectNull)
-        {
-            IDetectable? actual = Factory.CreateDetectable(type);
-
-            if (expectNull)
-                Assert.Null(actual);
-            else
-                Assert.NotNull(actual);
-        }
-
-        public static List<object?[]> GenerateIDetectableTestData()
-        {
-            var testData = new List<object?[]>() { new object?[] { null, true } };
-            foreach (WrapperType type in Enum.GetValues(typeof(WrapperType)))
-            {
-                if (_detectableTypes.Contains(type))
-                    testData.Add([type, false]);
-                else
-                    testData.Add([type, true]);
-            }
-
-            return testData;
-        }
-
-        #endregion
-
-        #region CreateExtractable
-
-        private static readonly List<WrapperType> _extractableTypes =
-        [
-            WrapperType.BFPK,
-            WrapperType.BSP,
-            WrapperType.BZip2,
-            WrapperType.CFB,
-            //WrapperType.CIA,
-            //WrapperType.Executable,
-            WrapperType.GCF,
-            WrapperType.GZIP,
-            WrapperType.InstallShieldArchiveV3,
-            WrapperType.InstallShieldCAB,
-            WrapperType.MicrosoftCAB,
-            WrapperType.MicrosoftLZ,
-            WrapperType.MoPaQ,
-            //WrapperType.N3DS,
-            //WrapperType.NCF,
-            //WrapperType.Nitro,
-            WrapperType.PAK,
-            WrapperType.PFF,
-            WrapperType.PKZIP,
-            //WrapperType.PlayJAudioFile,
-            //WrapperType.Quantum,
-            WrapperType.RAR,
-            WrapperType.SevenZip,
-            WrapperType.SFFS,
-            WrapperType.SGA,
-            WrapperType.TapeArchive,
-            WrapperType.VBSP,
-            WrapperType.VPK,
-            WrapperType.WAD,
-            WrapperType.XZ,
-            WrapperType.XZP,
-        ];
-
-        [Theory]
-        [MemberData(nameof(GenerateIExtractableTestData))]
-        public void CreateExtractableTests(WrapperType type, bool expectNull)
-        {
-            IExtractable? actual = Factory.CreateExtractable(type);
-
-            if (expectNull)
-                Assert.Null(actual);
-            else
-                Assert.NotNull(actual);
-        }
-
-        public static List<object?[]> GenerateIExtractableTestData()
-        {
-            var testData = new List<object?[]>();
-            foreach (WrapperType type in Enum.GetValues(typeof(WrapperType)))
-            {
-                if (_extractableTypes.Contains(type))
-                    testData.Add([type, false]);
-                else
-                    testData.Add([type, true]);
-            }
-
-            return testData;
-        }
-
-        #endregion
-    }
-}

BinaryObjectScanner.Test/FileType/AACSMediaKeyBlockTests.cs

@@ -6,25 +6,28 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class AACSMediaKeyBlockTests
     {
+        private static readonly SabreTools.Serialization.Wrappers.AACSMediaKeyBlock wrapper
+            = new(new SabreTools.Data.Models.AACS.MediaKeyBlock(), new MemoryStream(new byte[1024]));
+
         [Fact]
         public void DetectFile_EmptyString_Null()
         {
             string file = string.Empty;
-            var detectable = new AACSMediaKeyBlock();
+            var detectable = new AACSMediaKeyBlock(wrapper);
 
             string? actual = detectable.Detect(file, includeDebug: false);
             Assert.Null(actual);
         }
 
         [Fact]
-        public void DetectStream_EmptyStream_Null()
+        public void DetectStream_EmptyStream_DefaultValue()
         {
             Stream? stream = new MemoryStream();
             string file = string.Empty;
-            var detectable = new AACSMediaKeyBlock();
+            var detectable = new AACSMediaKeyBlock(wrapper);
 
             string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
+            Assert.Equal("AACS (Unknown Version)", actual);
         }
     }
 }

BinaryObjectScanner.Test/FileType/BDPlusSVMTests.cs

@@ -6,25 +6,28 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class BDPlusSVMTests
     {
+        private static readonly SabreTools.Serialization.Wrappers.BDPlusSVM wrapper
+            = new(new SabreTools.Data.Models.BDPlus.SVM(), new MemoryStream(new byte[1024]));
+
         [Fact]
         public void DetectFile_EmptyString_Null()
         {
             string file = string.Empty;
-            var detectable = new BDPlusSVM();
+            var detectable = new BDPlusSVM(wrapper);
 
             string? actual = detectable.Detect(file, includeDebug: false);
             Assert.Null(actual);
         }
 
         [Fact]
-        public void DetectStream_EmptyStream_Null()
+        public void DetectStream_EmptyStream_DefaultValue()
         {
             Stream? stream = new MemoryStream();
             string file = string.Empty;
-            var detectable = new BDPlusSVM();
+            var detectable = new BDPlusSVM(wrapper);
 
             string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
+            Assert.Equal("BD+ 0000-00-00", actual);
         }
     }
 }

BinaryObjectScanner.Test/FileType/BFPKTests.cs

@@ -1,68 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class BFPKTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new BFPK();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new BFPK();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new BFPK();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    
-        [Fact]
-        public void ExtractAll_EmptyModel_False()
-        {
-            var model = new SabreTools.Models.BFPK.Archive();
-            var data = new MemoryStream();
-            var item = new SabreTools.Serialization.Wrappers.BFPK(model, data);
-            string outputDirectory = string.Empty;
-
-            bool actual = BFPK.ExtractAll(item, outputDirectory);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractFile_EmptyModel_False()
-        {
-            var model = new SabreTools.Models.BFPK.Archive();
-            var data = new MemoryStream();
-            var item = new SabreTools.Serialization.Wrappers.BFPK(model, data);
-            string outputDirectory = string.Empty;
-
-            bool actual = BFPK.ExtractFile(item, 0, outputDirectory);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/BSPTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class BSPTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new BSP();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new BSP();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new BSP();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/BZip2Tests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class BZip2Tests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new BZip2();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new BZip2();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new BZip2();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/CFBTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class CFBTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new CFB();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new CFB();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new CFB();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/ExecutableTests.cs

@@ -1,43 +0,0 @@
-using System;
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class ExecutableTests
-    {
-        [Fact]
-        public void DetectFile_EmptyString_Null()
-        {
-            string file = string.Empty;
-            var detectable = new Executable();
-
-            string? actual = detectable.Detect(file, includeDebug: false);
-            Assert.Null(actual);
-        }
-
-        [Fact]
-        public void DetectStream_EmptyStream_Null()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            var detectable = new Executable();
-
-            string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
-        }
-
-        [Fact]
-        public void DetectDict_EmptyStream_Empty()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            Func<string, ProtectionDictionary>? getProtections = null;
-            var detectable = new Executable();
-
-            ProtectionDictionary actual = detectable.DetectDict(stream, file, getProtections, includeDebug: false);
-            Assert.Empty(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/GCFTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class GCFTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new GCF();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new GCF();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new GCF();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/GZIPTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class GZIPTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new GZIP();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new GZIP();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new GZIP();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/InstallShieldArchiveV3Tests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class InstallShieldArchiveV3Tests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new InstallShieldArchiveV3();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new InstallShieldArchiveV3();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new InstallShieldArchiveV3();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/InstallShieldCABTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class InstallShieldCABTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new InstallShieldCAB();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new InstallShieldCAB();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new InstallShieldCAB();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/LDSCRYPTTests.cs

@@ -6,11 +6,14 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class LDSCRYPTTests
     {
+        private static readonly SabreTools.Serialization.Wrappers.LDSCRYPT wrapper
+            = new(new SabreTools.Data.Models.LDSCRYPT.EncryptedFile(), new MemoryStream(new byte[1024]));
+
         [Fact]
         public void DetectFile_EmptyString_Null()
         {
             string file = string.Empty;
-            var detectable = new LDSCRYPT();
+            var detectable = new LDSCRYPT(wrapper);
 
             string? actual = detectable.Detect(file, includeDebug: false);
             Assert.Null(actual);
@@ -21,10 +24,10 @@ namespace BinaryObjectScanner.Test.FileType
         {
             Stream? stream = new MemoryStream();
             string file = string.Empty;
-            var detectable = new LDSCRYPT();
+            var detectable = new LDSCRYPT(wrapper);
 
             string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
+            Assert.Equal("LDSCRYPT", actual);
         }
     }
 }

BinaryObjectScanner.Test/FileType/LinearExecutableTests.cs

@@ -0,0 +1,34 @@
+using System.IO;
+using BinaryObjectScanner.FileType;
+using Xunit;
+
+namespace BinaryObjectScanner.Test.FileType
+{
+    public class LinearExecutableTests
+    {
+        private static readonly SabreTools.Serialization.Wrappers.LinearExecutable wrapper
+            = new(new SabreTools.Data.Models.LinearExecutable.Executable(), new MemoryStream(new byte[1024]));
+
+        [Fact]
+        public void DetectFile_EmptyString_Null()
+        {
+            string file = string.Empty;
+            var detectable = new LinearExecutable(wrapper);
+
+            string? actual = detectable.Detect(file, includeDebug: false);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetectStream_EmptyStream_Empty()
+        {
+            Stream? stream = new MemoryStream();
+            string file = string.Empty;
+            var detectable = new LinearExecutable(wrapper);
+
+            string? actual = detectable.Detect(stream, file, includeDebug: false);
+            Assert.NotNull(actual);
+            Assert.Empty(actual);
+        }
+    }
+}

BinaryObjectScanner.Test/FileType/MPQTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class MPQTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new MPQ();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new MPQ();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new MPQ();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/MSDOSTests.cs

@@ -0,0 +1,34 @@
+using System.IO;
+using BinaryObjectScanner.FileType;
+using Xunit;
+
+namespace BinaryObjectScanner.Test.FileType
+{
+    public class MSDOSTests
+    {
+        private static readonly SabreTools.Serialization.Wrappers.MSDOS wrapper
+            = new(new SabreTools.Data.Models.MSDOS.Executable(), new MemoryStream(new byte[1024]));
+
+        [Fact]
+        public void DetectFile_EmptyString_Null()
+        {
+            string file = string.Empty;
+            var detectable = new MSDOS(wrapper);
+
+            string? actual = detectable.Detect(file, includeDebug: false);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetectStream_EmptyStream_Empty()
+        {
+            Stream? stream = new MemoryStream();
+            string file = string.Empty;
+            var detectable = new MSDOS(wrapper);
+
+            string? actual = detectable.Detect(stream, file, includeDebug: false);
+            Assert.NotNull(actual);
+            Assert.Empty(actual);
+        }
+    }
+}

BinaryObjectScanner.Test/FileType/MicrosoftCABTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class MicrosoftCABTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new MicrosoftCAB();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new MicrosoftCAB();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new MicrosoftCAB();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/MicrosoftLZTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class MicrosoftLZTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new MicrosoftLZ();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new MicrosoftLZ();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new MicrosoftLZ();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/NewExecutableTests.cs

@@ -0,0 +1,34 @@
+using System.IO;
+using BinaryObjectScanner.FileType;
+using Xunit;
+
+namespace BinaryObjectScanner.Test.FileType
+{
+    public class NewExecutableTests
+    {
+        private static readonly SabreTools.Serialization.Wrappers.NewExecutable wrapper
+            = new(new SabreTools.Data.Models.NewExecutable.Executable(), new MemoryStream(new byte[1024]));
+
+        [Fact]
+        public void DetectFile_EmptyString_Null()
+        {
+            string file = string.Empty;
+            var detectable = new NewExecutable(wrapper);
+
+            string? actual = detectable.Detect(file, includeDebug: false);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetectStream_EmptyStream_Empty()
+        {
+            Stream? stream = new MemoryStream();
+            string file = string.Empty;
+            var detectable = new NewExecutable(wrapper);
+
+            string? actual = detectable.Detect(stream, file, includeDebug: false);
+            Assert.NotNull(actual);
+            Assert.Empty(actual);
+        }
+    }
+}

BinaryObjectScanner.Test/FileType/PAKTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class PAKTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PAK();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PAK();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PAK();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/PFFTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class PFFTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PFF();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PFF();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PFF();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/PKZIPTests.cs

@@ -1,79 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class PKZIPTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PKZIP();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractFile_LookForHeader_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PKZIP();
-
-            bool actual = extractable.Extract(file, outDir, lookForHeader: true, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PKZIP();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_LookForHeader_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PKZIP();
-
-            bool actual = extractable.Extract(stream, file, outDir, lookForHeader: true, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PKZIP();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_LookForHeader_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new PKZIP();
-
-            bool actual = extractable.Extract(stream, file, outDir, lookForHeader: true, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/PLJTests.cs

@@ -6,25 +6,28 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class PLJTests
     {
+        private static readonly SabreTools.Serialization.Wrappers.PlayJAudioFile wrapper
+            = new(new SabreTools.Data.Models.PlayJ.AudioFile(), new MemoryStream(new byte[1024]));
+
         [Fact]
         public void DetectFile_EmptyString_Null()
         {
             string file = string.Empty;
-            var detectable = new PLJ();
+            var detectable = new PLJ(wrapper);
 
             string? actual = detectable.Detect(file, includeDebug: false);
             Assert.Null(actual);
         }
 
         [Fact]
-        public void DetectStream_EmptyStream_Null()
+        public void DetectStream_EmptyStream_DefaultValue()
         {
             Stream? stream = new MemoryStream();
             string file = string.Empty;
-            var detectable = new PLJ();
+            var detectable = new PLJ(wrapper);
 
             string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
+            Assert.Equal("PlayJ Audio File", actual);
         }
     }
 }

BinaryObjectScanner.Test/FileType/PortableExecutableTests.cs

@@ -0,0 +1,34 @@
+using System.IO;
+using BinaryObjectScanner.FileType;
+using Xunit;
+
+namespace BinaryObjectScanner.Test.FileType
+{
+    public class PortableExecutableTests
+    {
+        private static readonly SabreTools.Serialization.Wrappers.PortableExecutable wrapper
+            = new(new SabreTools.Data.Models.PortableExecutable.Executable(), new MemoryStream(new byte[1024]));
+
+        [Fact]
+        public void DetectFile_EmptyString_Null()
+        {
+            string file = string.Empty;
+            var detectable = new PortableExecutable(wrapper);
+
+            string? actual = detectable.Detect(file, includeDebug: false);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetectStream_EmptyStream_Empty()
+        {
+            Stream? stream = new MemoryStream();
+            string file = string.Empty;
+            var detectable = new PortableExecutable(wrapper);
+
+            string? actual = detectable.Detect(stream, file, includeDebug: false);
+            Assert.NotNull(actual);
+            Assert.Empty(actual);
+        }
+    }
+}

BinaryObjectScanner.Test/FileType/QuantumTests.cs

@@ -1,68 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class QuantumTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new Quantum();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new Quantum();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new Quantum();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractAll_EmptyModel_False()
-        {
-            var model = new SabreTools.Models.Quantum.Archive();
-            var data = new MemoryStream();
-            var item = new SabreTools.Serialization.Wrappers.Quantum(model, data);
-            string outputDirectory = string.Empty;
-
-            bool actual = Quantum.ExtractAll(item, outputDirectory);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractFile_EmptyModel_False()
-        {
-            var model = new SabreTools.Models.Quantum.Archive();
-            var data = new MemoryStream();
-            var item = new SabreTools.Serialization.Wrappers.Quantum(model, data);
-            string outputDirectory = string.Empty;
-
-            bool actual = Quantum.ExtractFile(item, 0, outputDirectory);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/RARTests.cs

@@ -1,79 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class RARTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new RAR();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractFile_LookForHeader_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new RAR();
-
-            bool actual = extractable.Extract(file, outDir, lookForHeader: true, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new RAR();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_LookForHeader_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new RAR();
-
-            bool actual = extractable.Extract(stream, file, outDir, lookForHeader: true, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new RAR();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_LookForHeader_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new RAR();
-
-            bool actual = extractable.Extract(stream, file, outDir, lookForHeader: true, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/RealArcadeInstallerTests.cs

@@ -6,11 +6,14 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class RealArcadeInstallerTests
     {
+        private static readonly SabreTools.Serialization.Wrappers.RealArcadeInstaller wrapper
+            = new(new SabreTools.Data.Models.RealArcade.RgsFile(), new MemoryStream(new byte[1024]));
+
         [Fact]
         public void DetectFile_EmptyString_Null()
         {
             string file = string.Empty;
-            var detectable = new RealArcadeInstaller();
+            var detectable = new RealArcadeInstaller(wrapper);
 
             string? actual = detectable.Detect(file, includeDebug: false);
             Assert.Null(actual);
@@ -21,10 +24,10 @@ namespace BinaryObjectScanner.Test.FileType
         {
             Stream? stream = new MemoryStream();
             string file = string.Empty;
-            var detectable = new RealArcadeInstaller();
+            var detectable = new RealArcadeInstaller(wrapper);
 
             string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
+            Assert.Equal("RealArcade Installer", actual);
         }
     }
 }

BinaryObjectScanner.Test/FileType/RealArcadeMezzanineTests.cs

@@ -6,11 +6,14 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class RealArcadeMezzanineTests
     {
+        private static readonly SabreTools.Serialization.Wrappers.RealArcadeMezzanine wrapper
+            = new(new SabreTools.Data.Models.RealArcade.Mezzanine(), new MemoryStream(new byte[1024]));
+
         [Fact]
         public void DetectFile_EmptyString_Null()
         {
             string file = string.Empty;
-            var detectable = new RealArcadeMezzanine();
+            var detectable = new RealArcadeMezzanine(wrapper);
 
             string? actual = detectable.Detect(file, includeDebug: false);
             Assert.Null(actual);
@@ -21,10 +24,10 @@ namespace BinaryObjectScanner.Test.FileType
         {
             Stream? stream = new MemoryStream();
             string file = string.Empty;
-            var detectable = new RealArcadeMezzanine();
+            var detectable = new RealArcadeMezzanine(wrapper);
 
             string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
+            Assert.Equal("RealArcade Mezzanine", actual);
         }
     }
 }

BinaryObjectScanner.Test/FileType/SFFSTests.cs

@@ -6,11 +6,14 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class SFFSTests
     {
+        private static readonly SabreTools.Serialization.Wrappers.SFFS wrapper
+            = new(new SabreTools.Data.Models.StarForce.FileSystem(), new MemoryStream(new byte[1024]));
+
         [Fact]
         public void DetectFile_EmptyString_Null()
         {
             string file = string.Empty;
-            var detectable = new SFFS();
+            var detectable = new SFFS(wrapper);
 
             string? actual = detectable.Detect(file, includeDebug: false);
             Assert.Null(actual);
@@ -21,45 +24,10 @@ namespace BinaryObjectScanner.Test.FileType
         {
             Stream? stream = new MemoryStream();
             string file = string.Empty;
-            var detectable = new SFFS();
+            var detectable = new SFFS(wrapper);
 
             string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
-        }
-
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SFFS();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SFFS();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SFFS();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
+            Assert.Equal("StarForce Filesystem Container", actual);
         }
     }
 }

BinaryObjectScanner.Test/FileType/SGATests.cs

@@ -1,68 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class SGATests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SGA();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SGA();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SGA();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractAll_EmptyModel_False()
-        {
-            var model = new SabreTools.Models.SGA.Archive();
-            var data = new MemoryStream();
-            var item = new SabreTools.Serialization.Wrappers.SGA(model, data);
-            string outputDirectory = string.Empty;
-
-            bool actual = SGA.ExtractAll(item, outputDirectory);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractFile_EmptyModel_False()
-        {
-            var model = new SabreTools.Models.SGA.Archive();
-            var data = new MemoryStream();
-            var item = new SabreTools.Serialization.Wrappers.SGA(model, data);
-            string outputDirectory = string.Empty;
-
-            bool actual = SGA.ExtractFile(item, 0, outputDirectory);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/SevenZipTests.cs

@@ -1,79 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class SevenZipTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SevenZip();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractFile_LookForHeader_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SevenZip();
-
-            bool actual = extractable.Extract(file, outDir, lookForHeader: true, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SevenZip();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_LookForHeader_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SevenZip();
-
-            bool actual = extractable.Extract(stream, file, outDir, lookForHeader: true, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SevenZip();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_LookForHeader_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new SevenZip();
-
-            bool actual = extractable.Extract(stream, file, outDir, lookForHeader: true, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/TapeArchiveTests.cs

@@ -1,46 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class TapeArchiveTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new TapeArchive();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new TapeArchive();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_True()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new TapeArchive();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-
-            // Unexpected result -- Empty file recognized as valid in SharpCompress
-            Assert.True(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/VBSPTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class VBSPTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new VBSP();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new VBSP();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new VBSP();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/VPKTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class VPKTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new VPK();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new VPK();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new VPK();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/WAD3Tests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class WAD3Tests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new WAD3();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new WAD3();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new WAD3();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/XZPTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class XZPTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new XZP();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new XZP();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new XZP();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/FileType/XZTests.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.FileType;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.FileType
-{
-    public class XZTests
-    {
-        [Fact]
-        public void ExtractFile_EmptyString_False()
-        {
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new XZ();
-
-            bool actual = extractable.Extract(file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Null_False()
-        {
-            Stream? stream = null;
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new XZ();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractStream_Empty_False()
-        {
-            Stream? stream = new MemoryStream();
-            string file = string.Empty;
-            string outDir = string.Empty;
-            var extractable = new XZ();
-
-            bool actual = extractable.Extract(stream, file, outDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/GameEngine/RenderWareTests.cs

@@ -10,12 +10,12 @@ namespace BinaryObjectScanner.Test.GameEngine
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new RenderWare();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     }

BinaryObjectScanner.Test/Packer/ASPackTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new ASPack();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new ASPack();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/AdvancedInstallerTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new AdvancedInstaller();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new AdvancedInstaller();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/AutoPlayMediaStudioTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new AutoPlayMediaStudio();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new AutoPlayMediaStudio();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/CExeTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CExe();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new CExe();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/CrunchTests.cs

@@ -0,0 +1,22 @@
+using System.IO;
+using BinaryObjectScanner.Packer;
+using Xunit;
+
+namespace BinaryObjectScanner.Test.Packer
+{
+    public class CrunchTests
+    {
+        [Fact]
+        public void CheckPortableExecutableTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
+
+            var checker = new Crunch();
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
+            Assert.Null(actual);
+        }
+    }
+}

BinaryObjectScanner.Test/Packer/DotFuscatorTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new DotFuscator();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new DotFuscator();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/DotNetReactorTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new DotNetReactor();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new DotNetReactor();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/EXEStealthTests.cs

@@ -21,27 +21,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new EXEStealth();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new EXEStealth();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/EmbeddedArchiveTests.cs

@@ -1,36 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.Packer;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.Packer
-{
-    public class EmbeddedArchiveTests
-    {
-        [Fact]
-        public void CheckPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-
-            var checker = new EmbeddedArchive();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
-            Assert.Null(actual);
-        }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new EmbeddedArchive();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/Packer/EmbeddedExecutableTests.cs

@@ -1,36 +0,0 @@
-using System.IO;
-using BinaryObjectScanner.Packer;
-using Xunit;
-
-namespace BinaryObjectScanner.Test.Packer
-{
-    public class EmbeddedExecutableTests
-    {
-        [Fact]
-        public void CheckPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-
-            var checker = new EmbeddedExecutable();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
-            Assert.Null(actual);
-        }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new EmbeddedExecutable();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
-    }
-}

BinaryObjectScanner.Test/Packer/EmbeddedFileTests.cs

@@ -0,0 +1,22 @@
+using System.IO;
+using BinaryObjectScanner.Packer;
+using Xunit;
+
+namespace BinaryObjectScanner.Test.Packer
+{
+    public class EmbeddedFileTests
+    {
+        [Fact]
+        public void CheckPortableExecutableTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
+
+            var checker = new EmbeddedFile();
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
+            Assert.Null(actual);
+        }
+    }
+}

BinaryObjectScanner.Test/Packer/GenteeInstallerTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new GenteeInstaller();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new GenteeInstaller();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/HyperTechCrackProofTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new HyperTechCrackProof();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new HyperTechCrackProof();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/InnoSetupTests.cs

@@ -10,12 +10,12 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckNewExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.NewExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.NewExecutable nex = new(model, source);
+            SabreTools.Data.Models.NewExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source);
 
             var checker = new InnoSetup();
-            string? actual = checker.CheckExecutable(file, nex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 
@@ -23,41 +23,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new InnoSetup();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-
-        [Fact]
-        public void ExtractNewExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.NewExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.NewExecutable nex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new InnoSetup();
-            bool actual = checker.Extract(file, nex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new InnoSetup();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/InstallAnywhereTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new InstallAnywhere();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new InstallAnywhere();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/InstallerVISETests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new InstallerVISE();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new InstallerVISE();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/IntelInstallationFrameworkTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new IntelInstallationFramework();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new IntelInstallationFramework();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/MicrosoftCABSFXTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new MicrosoftCABSFX();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new MicrosoftCABSFX();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/NSISTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new NSIS();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new NSIS();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/NeoLiteTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new NeoLite();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new NeoLite();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/PECompactTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new PECompact();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new PECompact();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/PEtiteTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new PEtite();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new PEtite();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/SetupFactoryTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new SetupFactory();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new SetupFactory();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/SevenZipSFXTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new SevenZipSFX();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new SevenZipSFX();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/ShrinkerTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new Shrinker();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new Shrinker();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/UPXTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new UPX();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new UPX();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/WinRARSFXTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new WinRARSFX();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new WinRARSFX();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/WinZipSFXTests.cs

@@ -10,12 +10,12 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckNewExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.NewExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.NewExecutable nex = new(model, source);
+            SabreTools.Data.Models.NewExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source);
 
             var checker = new WinZipSFX();
-            string? actual = checker.CheckExecutable(file, nex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     
@@ -23,41 +23,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new WinZipSFX();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractNewExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.NewExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.NewExecutable nex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new WinZipSFX();
-            bool actual = checker.Extract(file, nex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new WinZipSFX();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Packer/WiseInstallerTests.cs

@@ -10,12 +10,12 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckNewExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.NewExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.NewExecutable nex = new(model, source);
+            SabreTools.Data.Models.NewExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source);
 
             var checker = new WiseInstaller();
-            string? actual = checker.CheckExecutable(file, nex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     
@@ -23,41 +23,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new WiseInstaller();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-    
-        [Fact]
-        public void ExtractNewExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.NewExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.NewExecutable nex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new WiseInstaller();
-            bool actual = checker.Extract(file, nex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
-
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new WiseInstaller();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Protection/ActiveMARKTests.cs

@@ -21,12 +21,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new ActiveMARK();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     }

BinaryObjectScanner.Test/Protection/AegiSoftTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new AegiSoft();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/AlphaROMTests.cs

@@ -10,12 +10,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new AlphaROM();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     }

BinaryObjectScanner.Test/Protection/ArmadilloTests.cs

@@ -10,27 +10,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new Armadillo();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
-
-        [Fact]
-        public void ExtractPortableExecutableTest()
-        {
-            string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
-            string outputDir = string.Empty;
-
-            var checker = new Armadillo();
-            bool actual = checker.Extract(file, pex, outputDir, includeDebug: false);
-            Assert.False(actual);
-        }
     }
 }

BinaryObjectScanner.Test/Protection/ByteShieldTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new ByteShield();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/CDCheckTests.cs

@@ -10,12 +10,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CDCheck();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     }

BinaryObjectScanner.Test/Protection/CDDVDCopsTests.cs

@@ -7,27 +7,16 @@ namespace BinaryObjectScanner.Test.Protection
 {
     public class CDDVDCopsTests
     {
-        [Fact]
-        public void CheckContentsTest()
-        {
-            string file = "filename";
-            byte[] fileContent = [0x01, 0x02, 0x03, 0x04];
-
-            var checker = new CDDVDCops();
-            string? actual = checker.CheckContents(file, fileContent, includeDebug: true);
-            Assert.Null(actual);
-        }
-
         [Fact]
         public void CheckNewExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.NewExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.NewExecutable nex = new(model, source);
+            SabreTools.Data.Models.NewExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source);
 
             var checker = new CDDVDCops();
-            string? actual = checker.CheckExecutable(file, nex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     
@@ -35,12 +24,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CDDVDCops();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     

BinaryObjectScanner.Test/Protection/CDGuardTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CDGuard();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/CDKeyTests.cs

@@ -10,12 +10,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CDKey();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     }

BinaryObjectScanner.Test/Protection/CDLockTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CDLock();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/CDSHiELDSETests.cs

@@ -10,12 +10,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CDSHiELDSE();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     }

BinaryObjectScanner.Test/Protection/CenegaProtectDVDTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CenegaProtectDVD();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/ChannelwareTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new Channelware();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/ChosenBytesCodeLockTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new ChosenBytesCodeLock();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/CopyKillerTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CopyKiller();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/CopyLokTests.cs

@@ -10,12 +10,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CopyLok();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     }

BinaryObjectScanner.Test/Protection/CopyXTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CopyX();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/CrypKeyTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new CrypKey();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/CuckoTests.cs

@@ -10,12 +10,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new Cucko();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
     }

BinaryObjectScanner.Test/Protection/DenuvoTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new Denuvo();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/DigiGuardTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new DigiGuard();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/DiscGuardTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new DiscGuard();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
 

BinaryObjectScanner.Test/Protection/EAAntiCheatTests.cs

@@ -11,12 +11,12 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
-            Stream source = new MemoryStream();
-            SabreTools.Serialization.Wrappers.PortableExecutable pex = new(model, source);
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source);
 
             var checker = new EAAntiCheat();
-            string? actual = checker.CheckExecutable(file, pex, includeDebug: false);
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }