From a774d0dc04039c7cbdd596e0ec073d8f3675af68 Mon Sep 17 00:00:00 2001
From: Mutex666 <67550369+Mutex666@users.noreply.github.com>
Date: Sun, 10 Mar 2024 21:47:09 +0100
Subject: [PATCH 1/4] Move tests in own projects

---
 src/DCS-BIOS.Tests/DCS-BIOS.Tests.csproj      |  29 +++++++++++
 .../Serialization/Common/JSonSettings.cs      |  16 +++++++
 .../Common/RepositorySerialized.cs            |  10 ++++
 .../DCSBIOSInputInterface_SerializeTests.cs   |   6 +--
 .../DCSBIOSInput_SerializeTests.cs            |   6 +--
 .../DCSBIOSOutputFormula_SerializeTests.cs    |   6 +--
 .../DCSBIOSOutput_SerializeTests.cs           |   6 +--
 .../Serialization/Resources/DCSBIOSInput.json |   0
 .../Resources/DCSBIOSInputInterface.json      |   0
 .../Resources/DCSBIOSOutput.json              |   0
 .../Resources/DCSBIOSOutputFormula.json       |   0
 .../Panels/SwitchPanelPZ55_SerializeTests.cs  |  45 ------------------
 src/DCSFlightpanels.sln                       |  28 +++++++++++
 src/NonVisuals.Tests/NonVisuals.Tests.csproj  |   3 ++
 .../ActionTypeDCSBIOS_SerializeTests.cs       |   6 ++-
 .../ActionTypeKey_SerializeTests.cs           |   7 +--
 .../ActionTypeLayer_SerializeTests.cs         |   7 +--
 .../ActionTypeOS_SerializeTests.cs            |   7 +--
 .../Serialization/BIPLight_SerializeTests.cs  |   7 +--
 .../BIPLinkFarmingPanel_SerializeTests.cs     |   7 +--
 .../BIPLinkPZ55_SerializeTests.cs             |   9 ++--
 .../BIPLinkPZ69_SerializeTests.cs             |   7 +--
 .../BIPLinkPZ70_SerializeTests.cs             |   7 +--
 .../BIPLinkTPM_SerializeTests.cs              |   7 +--
 .../Serialization/Common/JSonSettings.cs      |   9 ++--
 .../Common/RepositorySerialized.cs            |   8 ++++
 ...ctionBindingFarmingPanel_SerializeTests.cs |   6 ++-
 ...DCSBIOSActionBindingPZ55_SerializeTests.cs |   8 ++--
 ...DCSBIOSActionBindingPZ69_SerializeTests.cs |   6 ++-
 ...DCSBIOSActionBindingPZ70_SerializeTests.cs |   6 ++-
 .../DCSBIOSActionBindingTPM_SerializeTests.cs |   6 ++-
 .../DCSBIOSConverter_SerializeTests.cs        |   8 ++--
 .../DCSBIOSDecoder_SerializeTests.cs          |  10 ++--
 ...DCSBIOSOutputBindingPZ69_SerializeTests.cs |   5 +-
 ...DCSBIOSOutputBindingPZ70_SerializeTests.cs |   6 ++-
 ...OutputAndColorBindingBIP_SerializeTests.cs |   6 ++-
 ...utputAndColorBindingPZ55_SerializeTests.cs |   6 ++-
 .../FaceTypeDCSBIOSOverlay_SerializeTests.cs  |   9 ++--
 .../FaceTypeDCSBIOS_SerializeTests.cs         |   9 ++--
 .../FaceTypeImage_SerializeTests.cs           |   9 ++--
 .../FaceTypeText_SerializeTests.cs            |   9 ++--
 .../KeyBindingFarmingPanel_SerializeTests.cs  |   7 +--
 .../KeyBindingPZ55_SerializeTests.cs          |   9 ++--
 ...yBindingPZ69DialPosition_SerializeTests.cs |   7 +--
 .../KeyBindingPZ69_SerializeTests.cs          |   7 +--
 .../KeyBindingPZ70_SerializeTests.cs          |   8 ++--
 .../KeyBindingTPM_SerializeTests.cs           |   7 +--
 .../KeyPressInfo_SerializeTests.cs            |   7 +--
 .../Serialization/KeyPress_SerializeTests.cs  |   7 +--
 ...mmandBindingFarmingPanel_SerializeTests.cs |   7 +--
 .../OSCommandBindingPZ55_SerializeTests.cs    |   9 ++--
 ...mmandBindingPZ69Emulator_SerializeTests.cs |   7 +--
 ...dBindingPZ69FullEmulator_SerializeTests.cs |   7 +--
 .../OSCommandBindingPZ70_SerializeTests.cs    |   7 +--
 .../OSCommandBindingTPM_SerializeTests.cs     |   7 +--
 .../Serialization/OSCommand_SerializeTests.cs |   8 ++--
 .../Resources/ActionTypeDCSBIOS.json          |   0
 .../Resources/ActionTypeKey.json              |   0
 .../Resources/ActionTypeLayer.json            |   0
 .../Serialization/Resources/ActionTypeOS.json |   0
 .../Serialization/Resources/BIPLight.json     |   0
 .../Resources/BIPLinkFarmingPanel.json        |   0
 .../Serialization/Resources/BIPLinkPZ55.json  |   0
 .../Serialization/Resources/BIPLinkPZ69.json  |   0
 .../Serialization/Resources/BIPLinkPZ70.json  |   0
 .../Serialization/Resources/BIPLinkTPM.json   |   0
 .../DCSBIOSActionBindingFarmingPanel.json     |   0
 .../Resources/DCSBIOSActionBindingPZ55.json   |   0
 .../Resources/DCSBIOSActionBindingPZ69.json   |   0
 .../Resources/DCSBIOSActionBindingPZ70.json   |   0
 .../Resources/DCSBIOSActionBindingTPM.json    |   0
 .../Resources/DCSBIOSConverter.json           |   0
 .../Resources/DCSBIOSDecoder.json             |   0
 .../Resources/DCSBIOSOutputBindingPZ69.json   |   0
 .../Resources/DCSBIOSOutputBindingPZ70.json   |   0
 .../DcsOutputAndColorBindingBIP.json          |   0
 .../DcsOutputAndColorBindingPZ55.json         |   0
 .../Resources/FaceTypeDCSBIOS.json            |   0
 .../Resources/FaceTypeDCSBIOSOverlay.json     |   0
 .../Resources/FaceTypeImage.json              |   0
 .../Serialization/Resources/FaceTypeText.json |   0
 .../Resources/KeyBindingFarmingPanel.json     |   0
 .../Resources/KeyBindingPZ55.json             |   0
 .../Resources/KeyBindingPZ69.json             |   0
 .../Resources/KeyBindingPZ69DialPosition.json |   0
 .../Resources/KeyBindingPZ70.json             |   0
 .../Resources/KeyBindingTPM.json              |   0
 .../Serialization/Resources/KeyPress.json     |   0
 .../Serialization/Resources/KeyPressInfo.json |   0
 .../Serialization/Resources/OSCommand.json    |   0
 .../OSCommandBindingFarmingPanel.json         |   0
 .../Resources/OSCommandBindingPZ55.json       |   0
 .../OSCommandBindingPZ69Emulator.json         |   0
 .../OSCommandBindingPZ69FullEmulator.json     |   0
 .../Resources/OSCommandBindingPZ70.json       |   0
 .../Resources/OSCommandBindingTPM.json        |   0
 .../Resources/StreamDeckButton.json           |   0
 .../Resources/StreamDeckPushRotary.json       |   0
 .../Resources/SwitchPanelPZ55.json            |   0
 .../Serialization/Resources/TestImage.png     | Bin
 .../StreamDeckButton_SerializeTests.cs        |   8 ++--
 .../StreamDeckPushRotary_SerializeTests.cs    |   8 ++--
 .../Common => Tests.Common}/DeepAssert.cs     |   5 +-
 .../RepositorySerialized.cs                   |  30 +++++++-----
 src/Tests.Common/Tests.Common.csproj          |  16 +++++++
 105 files changed, 321 insertions(+), 209 deletions(-)
 create mode 100644 src/DCS-BIOS.Tests/DCS-BIOS.Tests.csproj
 create mode 100644 src/DCS-BIOS.Tests/Serialization/Common/JSonSettings.cs
 create mode 100644 src/DCS-BIOS.Tests/Serialization/Common/RepositorySerialized.cs
 rename src/{DCSFP.Tests => DCS-BIOS.Tests}/Serialization/DCSBIOSInputInterface_SerializeTests.cs (96%)
 rename src/{DCSFP.Tests => DCS-BIOS.Tests}/Serialization/DCSBIOSInput_SerializeTests.cs (94%)
 rename src/{DCSFP.Tests => DCS-BIOS.Tests}/Serialization/DCSBIOSOutputFormula_SerializeTests.cs (93%)
 rename src/{DCSFP.Tests => DCS-BIOS.Tests}/Serialization/DCSBIOSOutput_SerializeTests.cs (96%)
 rename src/{DCSFP.Tests => DCS-BIOS.Tests}/Serialization/Resources/DCSBIOSInput.json (100%)
 rename src/{DCSFP.Tests => DCS-BIOS.Tests}/Serialization/Resources/DCSBIOSInputInterface.json (100%)
 rename src/{DCSFP.Tests => DCS-BIOS.Tests}/Serialization/Resources/DCSBIOSOutput.json (100%)
 rename src/{DCSFP.Tests => DCS-BIOS.Tests}/Serialization/Resources/DCSBIOSOutputFormula.json (100%)
 delete mode 100644 src/DCSFP.Tests/Serialization/Panels/SwitchPanelPZ55_SerializeTests.cs
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/ActionTypeDCSBIOS_SerializeTests.cs (95%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/ActionTypeKey_SerializeTests.cs (96%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/ActionTypeLayer_SerializeTests.cs (95%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/ActionTypeOS_SerializeTests.cs (94%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/BIPLight_SerializeTests.cs (97%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/BIPLinkFarmingPanel_SerializeTests.cs (94%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/BIPLinkPZ55_SerializeTests.cs (93%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/BIPLinkPZ69_SerializeTests.cs (93%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/BIPLinkPZ70_SerializeTests.cs (94%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/BIPLinkTPM_SerializeTests.cs (93%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Common/JSonSettings.cs (77%)
 create mode 100644 src/NonVisuals.Tests/Serialization/Common/RepositorySerialized.cs
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/DCSBIOSActionBindingFarmingPanel_SerializeTests.cs (94%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/DCSBIOSActionBindingPZ55_SerializeTests.cs (93%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/DCSBIOSActionBindingPZ69_SerializeTests.cs (94%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/DCSBIOSActionBindingPZ70_SerializeTests.cs (94%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/DCSBIOSActionBindingTPM_SerializeTests.cs (93%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/DCSBIOSConverter_SerializeTests.cs (97%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/DCSBIOSDecoder_SerializeTests.cs (97%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/DCSBIOSOutputBindingPZ69_SerializeTests.cs (96%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/DCSBIOSOutputBindingPZ70_SerializeTests.cs (95%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/DcsOutputAndColorBindingBIP_SerializeTests.cs (94%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/DcsOutputAndColorBindingPZ55_SerializeTests.cs (95%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/FaceTypeDCSBIOSOverlay_SerializeTests.cs (96%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/FaceTypeDCSBIOS_SerializeTests.cs (96%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/FaceTypeImage_SerializeTests.cs (95%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/FaceTypeText_SerializeTests.cs (95%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/KeyBindingFarmingPanel_SerializeTests.cs (96%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/KeyBindingPZ55_SerializeTests.cs (95%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/KeyBindingPZ69DialPosition_SerializeTests.cs (96%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/KeyBindingPZ69_SerializeTests.cs (96%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/KeyBindingPZ70_SerializeTests.cs (97%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/KeyBindingTPM_SerializeTests.cs (95%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/KeyPressInfo_SerializeTests.cs (95%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/KeyPress_SerializeTests.cs (93%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/OSCommandBindingFarmingPanel_SerializeTests.cs (93%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/OSCommandBindingPZ55_SerializeTests.cs (92%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/OSCommandBindingPZ69Emulator_SerializeTests.cs (93%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/OSCommandBindingPZ69FullEmulator_SerializeTests.cs (94%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/OSCommandBindingPZ70_SerializeTests.cs (93%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/OSCommandBindingTPM_SerializeTests.cs (92%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/OSCommand_SerializeTests.cs (90%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/ActionTypeDCSBIOS.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/ActionTypeKey.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/ActionTypeLayer.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/ActionTypeOS.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/BIPLight.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/BIPLinkFarmingPanel.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/BIPLinkPZ55.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/BIPLinkPZ69.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/BIPLinkPZ70.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/BIPLinkTPM.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/DCSBIOSActionBindingFarmingPanel.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/DCSBIOSActionBindingPZ55.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/DCSBIOSActionBindingPZ69.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/DCSBIOSActionBindingPZ70.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/DCSBIOSActionBindingTPM.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/DCSBIOSConverter.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/DCSBIOSDecoder.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/DCSBIOSOutputBindingPZ69.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/DCSBIOSOutputBindingPZ70.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/DcsOutputAndColorBindingBIP.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/DcsOutputAndColorBindingPZ55.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/FaceTypeDCSBIOS.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/FaceTypeDCSBIOSOverlay.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/FaceTypeImage.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/FaceTypeText.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/KeyBindingFarmingPanel.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/KeyBindingPZ55.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/KeyBindingPZ69.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/KeyBindingPZ69DialPosition.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/KeyBindingPZ70.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/KeyBindingTPM.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/KeyPress.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/KeyPressInfo.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/OSCommand.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/OSCommandBindingFarmingPanel.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/OSCommandBindingPZ55.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/OSCommandBindingPZ69Emulator.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/OSCommandBindingPZ69FullEmulator.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/OSCommandBindingPZ70.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/OSCommandBindingTPM.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/StreamDeckButton.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/StreamDeckPushRotary.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/SwitchPanelPZ55.json (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/Resources/TestImage.png (100%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/StreamDeckButton_SerializeTests.cs (96%)
 rename src/{DCSFP.Tests => NonVisuals.Tests}/Serialization/StreamDeckPushRotary_SerializeTests.cs (95%)
 rename src/{DCSFP.Tests/Serialization/Common => Tests.Common}/DeepAssert.cs (82%)
 rename src/{DCSFP.Tests/Serialization/Common => Tests.Common}/RepositorySerialized.cs (57%)
 create mode 100644 src/Tests.Common/Tests.Common.csproj

diff --git a/src/DCS-BIOS.Tests/DCS-BIOS.Tests.csproj b/src/DCS-BIOS.Tests/DCS-BIOS.Tests.csproj
new file mode 100644
index 000000000..d9237e8b2
--- /dev/null
+++ b/src/DCS-BIOS.Tests/DCS-BIOS.Tests.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <RootNamespace>DCS_BIOS.Tests</RootNamespace>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>disable</Nullable>
+  </PropertyGroup>
+	
+	<ItemGroup>
+		<PackageReference Include="ExpectedObjects" Version="3.5.4" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="xunit" Version="2.7.0" />
+		<PackageReference Include="xunit.runner.console" Version="2.7.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
+	
+	<ItemGroup>
+	  <ProjectReference Include="..\DCSFPCommon\src\DCS-BIOS\DCS-BIOS.csproj" />
+	  <ProjectReference Include="..\Tests.Common\Tests.Common.csproj" />
+	</ItemGroup>
+	
+</Project>
diff --git a/src/DCS-BIOS.Tests/Serialization/Common/JSonSettings.cs b/src/DCS-BIOS.Tests/Serialization/Common/JSonSettings.cs
new file mode 100644
index 000000000..1570aaabc
--- /dev/null
+++ b/src/DCS-BIOS.Tests/Serialization/Common/JSonSettings.cs
@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+
+namespace DCS_BIOS.Tests.Serialization.Common {
+    public static class JSonSettings
+    {
+        public static JsonSerializerSettings JsonDefaultSettings = new()
+        {
+            TypeNameHandling = TypeNameHandling.All,
+            ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+            Error = (sender, args) =>
+            {
+                throw new System.Exception($"JSON Serialization Error.{args.ErrorContext.Error.Message}");
+            }
+        };
+    }
+}
diff --git a/src/DCS-BIOS.Tests/Serialization/Common/RepositorySerialized.cs b/src/DCS-BIOS.Tests/Serialization/Common/RepositorySerialized.cs
new file mode 100644
index 000000000..3fe9f1e52
--- /dev/null
+++ b/src/DCS-BIOS.Tests/Serialization/Common/RepositorySerialized.cs
@@ -0,0 +1,10 @@
+using System;
+using Tests.Common;
+
+namespace DCS_BIOS.Tests.Serialization.Common {
+    internal class RepositorySerialized : RepositorySerializedBase
+    {
+        public RepositorySerialized() : base(@"Serialization\Resources", "DCS-BIOS.Tests") {
+        }
+    }
+}
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSInputInterface_SerializeTests.cs b/src/DCS-BIOS.Tests/Serialization/DCSBIOSInputInterface_SerializeTests.cs
similarity index 96%
rename from src/DCSFP.Tests/Serialization/DCSBIOSInputInterface_SerializeTests.cs
rename to src/DCS-BIOS.Tests/Serialization/DCSBIOSInputInterface_SerializeTests.cs
index 479673cff..5dd50e01e 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSInputInterface_SerializeTests.cs
+++ b/src/DCS-BIOS.Tests/Serialization/DCSBIOSInputInterface_SerializeTests.cs
@@ -1,10 +1,10 @@
 using DCS_BIOS.Serialized;
-using DCSFP.Tests.Serialization.Common;
 using Newtonsoft.Json;
+using DCS_BIOS.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization
-{
+namespace DCS_BIOS.Tests.Serialization {
 
     /// <summary>
     /// Note: SelectedArgumentValue is private set but should reflect the last value passed to one of the 'Specifiedfields*'
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSInput_SerializeTests.cs b/src/DCS-BIOS.Tests/Serialization/DCSBIOSInput_SerializeTests.cs
similarity index 94%
rename from src/DCSFP.Tests/Serialization/DCSBIOSInput_SerializeTests.cs
rename to src/DCS-BIOS.Tests/Serialization/DCSBIOSInput_SerializeTests.cs
index 30b786e0c..502407bba 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSInput_SerializeTests.cs
+++ b/src/DCS-BIOS.Tests/Serialization/DCSBIOSInput_SerializeTests.cs
@@ -1,10 +1,10 @@
 using DCS_BIOS.Serialized;
-using DCSFP.Tests.Serialization.Common;
 using Newtonsoft.Json;
+using DCS_BIOS.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization
-{
+namespace DCS_BIOS.Tests.Serialization {
 
     public static class DCSBIOSInput_SerializeTests {
 
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSOutputFormula_SerializeTests.cs b/src/DCS-BIOS.Tests/Serialization/DCSBIOSOutputFormula_SerializeTests.cs
similarity index 93%
rename from src/DCSFP.Tests/Serialization/DCSBIOSOutputFormula_SerializeTests.cs
rename to src/DCS-BIOS.Tests/Serialization/DCSBIOSOutputFormula_SerializeTests.cs
index f96b85a50..a9e28a451 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSOutputFormula_SerializeTests.cs
+++ b/src/DCS-BIOS.Tests/Serialization/DCSBIOSOutputFormula_SerializeTests.cs
@@ -1,10 +1,10 @@
 using DCS_BIOS.Serialized;
-using DCSFP.Tests.Serialization.Common;
 using Newtonsoft.Json;
+using DCS_BIOS.Tests.Serialization.Common;
 using Xunit;
+using Tests.Common;
 
-namespace DCSFP.Tests.Serialization
-{
+namespace DCS_BIOS.Tests.Serialization {
 
     /// <summary>
     /// Note : Can't set 'Formula' because on how the set property calls to 'ExtractDCSBIOSOutputsInFormula' 
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSOutput_SerializeTests.cs b/src/DCS-BIOS.Tests/Serialization/DCSBIOSOutput_SerializeTests.cs
similarity index 96%
rename from src/DCSFP.Tests/Serialization/DCSBIOSOutput_SerializeTests.cs
rename to src/DCS-BIOS.Tests/Serialization/DCSBIOSOutput_SerializeTests.cs
index 38e2b228c..532573531 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSOutput_SerializeTests.cs
+++ b/src/DCS-BIOS.Tests/Serialization/DCSBIOSOutput_SerializeTests.cs
@@ -1,10 +1,10 @@
 using DCS_BIOS.Serialized;
-using DCSFP.Tests.Serialization.Common;
 using Newtonsoft.Json;
+using DCS_BIOS.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization
-{
+namespace DCS_BIOS.Tests.Serialization {
 
     public static class DCSBIOSOutput_SerializeTests {
 
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSInput.json b/src/DCS-BIOS.Tests/Serialization/Resources/DCSBIOSInput.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSInput.json
rename to src/DCS-BIOS.Tests/Serialization/Resources/DCSBIOSInput.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSInputInterface.json b/src/DCS-BIOS.Tests/Serialization/Resources/DCSBIOSInputInterface.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSInputInterface.json
rename to src/DCS-BIOS.Tests/Serialization/Resources/DCSBIOSInputInterface.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSOutput.json b/src/DCS-BIOS.Tests/Serialization/Resources/DCSBIOSOutput.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSOutput.json
rename to src/DCS-BIOS.Tests/Serialization/Resources/DCSBIOSOutput.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSOutputFormula.json b/src/DCS-BIOS.Tests/Serialization/Resources/DCSBIOSOutputFormula.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSOutputFormula.json
rename to src/DCS-BIOS.Tests/Serialization/Resources/DCSBIOSOutputFormula.json
diff --git a/src/DCSFP.Tests/Serialization/Panels/SwitchPanelPZ55_SerializeTests.cs b/src/DCSFP.Tests/Serialization/Panels/SwitchPanelPZ55_SerializeTests.cs
deleted file mode 100644
index bc87ee16e..000000000
--- a/src/DCSFP.Tests/Serialization/Panels/SwitchPanelPZ55_SerializeTests.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Linq;
-using ClassLibraryCommon;
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
-using NonVisuals.HID;
-using NonVisuals.Panels.Saitek.Panels;
-using Xunit;
-
-namespace DCSFP.Tests.Serialization.Panels {
-    public class SwitchPanelPZ55_SerializeTests {
-        [Fact]
-        public static void SwitchPanelPZ55_ShouldBeSerializable() {
-            SwitchPanelPZ55 s = GetObject();
-
-            string serializedObj = JsonConvert.SerializeObject(s, Formatting.Indented, JSonSettings.JsonDefaultSettings);
-           // SwitchPanelPZ55 d = JsonConvert.DeserializeObject<SwitchPanelPZ55>(serializedObj);
-
-            RepositorySerialized repo = new();
-            //Save sample file in project (use it only once)
-            //repo.SaveSerializedObjectToFile(s.GetType(), serializedObj);
-
-            //SwitchPanelPZ55 deseralizedObjFromFile = JsonConvert.DeserializeObject<SwitchPanelPZ55>(repo.GetSerializedObjectString(s.GetType()));
-
-           // DeepAssert.Equal(s, deseralizedObjFromFile);
-           // DeepAssert.Equal(d, deseralizedObjFromFile);
-        }
-
-        public static SwitchPanelPZ55 GetObject(int instanceNbr = 1) {
-            GamingPanelSkeleton gamingPanelSkeleton = new(GamingPanelVendorEnum.Saitek, GamingPanelEnum.PZ55SwitchPanel);
-            return new SwitchPanelPZ55(new HIDSkeleton(gamingPanelSkeleton, "FakeHidInstanceForTests"))
-            {
-                ManualLandingGearLEDs = false,
-                ManualLandingGearLEDsColorDown = BIPLight_SerializeTests.GetPanelLEDColorFromInstance(instanceNbr),
-                ManualLandingGearLEDsColorUp = BIPLight_SerializeTests.GetPanelLEDColorFromInstance(instanceNbr + 1),
-                ManualLandingGearLEDsColorTrans = BIPLight_SerializeTests.GetPanelLEDColorFromInstance(instanceNbr + 2),
-                ManualLandingGearTransTimeSeconds = instanceNbr + 6,
-                
-                DCSBiosBindings = DCSBIOSActionBindingPZ55_SerializeTests.GetObjects(),
-                KeyBindingsHashSet = KeyBindingPZ55_SerializeTests.GetObjects(),
-                OSCommandList = OSCommandBindingPZ55_SerializeTests.GetObjects().ToList(),
-                BIPLinkHashSet = BIPLinkPZ55_SerializeTests.GetObjects()
-            };
-        }
-    }
-}
diff --git a/src/DCSFlightpanels.sln b/src/DCSFlightpanels.sln
index e008b3a26..1397202fd 100644
--- a/src/DCSFlightpanels.sln
+++ b/src/DCSFlightpanels.sln
@@ -34,6 +34,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibraryCommon", "DCSFP
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NonVisuals.Tests", "NonVisuals.Tests\NonVisuals.Tests.csproj", "{973ECF33-FC33-4D4D-84C5-40DFD0B04B68}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DCS-BIOS.Tests", "DCS-BIOS.Tests\DCS-BIOS.Tests.csproj", "{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Common", "Tests.Common\Tests.Common.csproj", "{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -200,6 +204,30 @@ Global
 		{973ECF33-FC33-4D4D-84C5-40DFD0B04B68}.Release|x64.Build.0 = Release|Any CPU
 		{973ECF33-FC33-4D4D-84C5-40DFD0B04B68}.Release|x86.ActiveCfg = Release|Any CPU
 		{973ECF33-FC33-4D4D-84C5-40DFD0B04B68}.Release|x86.Build.0 = Release|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Debug|x64.Build.0 = Debug|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Debug|x86.Build.0 = Debug|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Release|x64.ActiveCfg = Release|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Release|x64.Build.0 = Release|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Release|x86.ActiveCfg = Release|Any CPU
+		{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}.Release|x86.Build.0 = Release|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Release|x64.Build.0 = Release|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/NonVisuals.Tests/NonVisuals.Tests.csproj b/src/NonVisuals.Tests/NonVisuals.Tests.csproj
index 2bd2938ff..36463a459 100644
--- a/src/NonVisuals.Tests/NonVisuals.Tests.csproj
+++ b/src/NonVisuals.Tests/NonVisuals.Tests.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="ExpectedObjects" Version="3.5.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="xunit" Version="2.7.0" />
     <PackageReference Include="xunit.runner.console" Version="2.7.0">
@@ -20,7 +21,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\DCS-BIOS.Tests\DCS-BIOS.Tests.csproj" />
     <ProjectReference Include="..\NonVisuals\NonVisuals.csproj" />
+    <ProjectReference Include="..\Tests.Common\Tests.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/DCSFP.Tests/Serialization/ActionTypeDCSBIOS_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/ActionTypeDCSBIOS_SerializeTests.cs
similarity index 95%
rename from src/DCSFP.Tests/Serialization/ActionTypeDCSBIOS_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/ActionTypeDCSBIOS_SerializeTests.cs
index 11de4abb9..bfd89451d 100644
--- a/src/DCSFP.Tests/Serialization/ActionTypeDCSBIOS_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/ActionTypeDCSBIOS_SerializeTests.cs
@@ -1,10 +1,12 @@
-using DCSFP.Tests.Serialization.Common;
+using DCS_BIOS.Tests.Serialization;
 using Newtonsoft.Json;
 using NonVisuals.Interfaces;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class ActionTypeDCSBIOS_SerializeTests {
         [Fact]
         public static void ActionTypeDCSBIOS_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/ActionTypeKey_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/ActionTypeKey_SerializeTests.cs
similarity index 96%
rename from src/DCSFP.Tests/Serialization/ActionTypeKey_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/ActionTypeKey_SerializeTests.cs
index ea1e3abd0..54987c91c 100644
--- a/src/DCSFP.Tests/Serialization/ActionTypeKey_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/ActionTypeKey_SerializeTests.cs
@@ -1,10 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.Interfaces;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
 
     public static class ActionTypeKey_SerializeTests {
 
diff --git a/src/DCSFP.Tests/Serialization/ActionTypeLayer_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/ActionTypeLayer_SerializeTests.cs
similarity index 95%
rename from src/DCSFP.Tests/Serialization/ActionTypeLayer_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/ActionTypeLayer_SerializeTests.cs
index b97cbd40c..af2887996 100644
--- a/src/DCSFP.Tests/Serialization/ActionTypeLayer_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/ActionTypeLayer_SerializeTests.cs
@@ -1,10 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.Interfaces;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class ActionTypeLayer_SerializeTests {
         [Fact]
         public static void ActionTypeLayer_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/ActionTypeOS_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/ActionTypeOS_SerializeTests.cs
similarity index 94%
rename from src/DCSFP.Tests/Serialization/ActionTypeOS_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/ActionTypeOS_SerializeTests.cs
index c30e6c0e2..81f2c48e2 100644
--- a/src/DCSFP.Tests/Serialization/ActionTypeOS_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/ActionTypeOS_SerializeTests.cs
@@ -1,10 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.Interfaces;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class ActionTypeOS_SerializeTests {
 
         [Fact]
diff --git a/src/DCSFP.Tests/Serialization/BIPLight_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/BIPLight_SerializeTests.cs
similarity index 97%
rename from src/DCSFP.Tests/Serialization/BIPLight_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/BIPLight_SerializeTests.cs
index e6c2947e5..4c1a42abe 100644
--- a/src/DCSFP.Tests/Serialization/BIPLight_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/BIPLight_SerializeTests.cs
@@ -1,10 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.Panels.Saitek;
 using NonVisuals.Panels.Saitek.Panels;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
 
     public static class BIPLight_SerializeTests {
 
diff --git a/src/DCSFP.Tests/Serialization/BIPLinkFarmingPanel_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/BIPLinkFarmingPanel_SerializeTests.cs
similarity index 94%
rename from src/DCSFP.Tests/Serialization/BIPLinkFarmingPanel_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/BIPLinkFarmingPanel_SerializeTests.cs
index 052bfd967..4c3a48bc6 100644
--- a/src/DCSFP.Tests/Serialization/BIPLinkFarmingPanel_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/BIPLinkFarmingPanel_SerializeTests.cs
@@ -1,9 +1,10 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.BindingClasses.BIP;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class BIPLinkFarmingPanel_SerializeTests {
         [Fact]
         public static void BIPLinkFarmingPanel_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/BIPLinkPZ55_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/BIPLinkPZ55_SerializeTests.cs
similarity index 93%
rename from src/DCSFP.Tests/Serialization/BIPLinkPZ55_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/BIPLinkPZ55_SerializeTests.cs
index cf4e869a4..de1f74563 100644
--- a/src/DCSFP.Tests/Serialization/BIPLinkPZ55_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/BIPLinkPZ55_SerializeTests.cs
@@ -1,10 +1,11 @@
-using System.Collections.Generic;
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.BindingClasses.BIP;
+using NonVisuals.Tests.Serialization.Common;
+using System.Collections.Generic;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class BIPLinkPZ55_SerializeTests {
 
         [Fact]
diff --git a/src/DCSFP.Tests/Serialization/BIPLinkPZ69_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/BIPLinkPZ69_SerializeTests.cs
similarity index 93%
rename from src/DCSFP.Tests/Serialization/BIPLinkPZ69_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/BIPLinkPZ69_SerializeTests.cs
index 0b56f5a8f..ab782f0e7 100644
--- a/src/DCSFP.Tests/Serialization/BIPLinkPZ69_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/BIPLinkPZ69_SerializeTests.cs
@@ -1,9 +1,10 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.BindingClasses.BIP;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class BIPLinkPZ69_SerializeTests {
         [Fact]
         public static void BIPLinkPZ69_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/BIPLinkPZ70_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/BIPLinkPZ70_SerializeTests.cs
similarity index 94%
rename from src/DCSFP.Tests/Serialization/BIPLinkPZ70_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/BIPLinkPZ70_SerializeTests.cs
index 23dfcfda2..d0040a0ae 100644
--- a/src/DCSFP.Tests/Serialization/BIPLinkPZ70_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/BIPLinkPZ70_SerializeTests.cs
@@ -1,9 +1,10 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.BindingClasses.BIP;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class BIPLinkPZ70_SerializeTests {
         [Fact]
         public static void BIPLinkPZ70_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/BIPLinkTPM_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/BIPLinkTPM_SerializeTests.cs
similarity index 93%
rename from src/DCSFP.Tests/Serialization/BIPLinkTPM_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/BIPLinkTPM_SerializeTests.cs
index 60daf8569..5bc0c6c84 100644
--- a/src/DCSFP.Tests/Serialization/BIPLinkTPM_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/BIPLinkTPM_SerializeTests.cs
@@ -1,9 +1,10 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.BindingClasses.BIP;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class BIPLinkTPM_SerializeTests {
         [Fact]
         public static void BIPLinkTPM_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/Common/JSonSettings.cs b/src/NonVisuals.Tests/Serialization/Common/JSonSettings.cs
similarity index 77%
rename from src/DCSFP.Tests/Serialization/Common/JSonSettings.cs
rename to src/NonVisuals.Tests/Serialization/Common/JSonSettings.cs
index f4052af3b..b0b6ddac0 100644
--- a/src/DCSFP.Tests/Serialization/Common/JSonSettings.cs
+++ b/src/NonVisuals.Tests/Serialization/Common/JSonSettings.cs
@@ -1,17 +1,14 @@
 using Newtonsoft.Json;
 using NonVisuals.Panels.StreamDeck;
 
-namespace DCSFP.Tests.Serialization.Common
-{
-    internal static class JSonSettings
-    {
+namespace NonVisuals.Tests.Serialization.Common {
+    internal static class JSonSettings {
         internal static JsonSerializerSettings JsonDefaultSettings = new()
         {
             ContractResolver = new ExcludeObsoletePropertiesResolver(),
             TypeNameHandling = TypeNameHandling.All,
             ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
-            Error = (sender, args) =>
-            {
+            Error = (sender, args) => {
                 throw new System.Exception($"JSON Serialization Error.{args.ErrorContext.Error.Message}");
             }
         };
diff --git a/src/NonVisuals.Tests/Serialization/Common/RepositorySerialized.cs b/src/NonVisuals.Tests/Serialization/Common/RepositorySerialized.cs
new file mode 100644
index 000000000..92b17fc15
--- /dev/null
+++ b/src/NonVisuals.Tests/Serialization/Common/RepositorySerialized.cs
@@ -0,0 +1,8 @@
+using Tests.Common;
+
+namespace NonVisuals.Tests.Serialization.Common {
+    internal class RepositorySerialized : RepositorySerializedBase {
+        public RepositorySerialized() : base(@"Serialization\Resources", "NonVisuals.Tests") {
+        }
+    }
+}
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSActionBindingFarmingPanel_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingFarmingPanel_SerializeTests.cs
similarity index 94%
rename from src/DCSFP.Tests/Serialization/DCSBIOSActionBindingFarmingPanel_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingFarmingPanel_SerializeTests.cs
index 72930b114..9a4b06dfd 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSActionBindingFarmingPanel_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingFarmingPanel_SerializeTests.cs
@@ -1,9 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
+using DCS_BIOS.Tests.Serialization;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.DCSBIOSBindings;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class DCSBIOSActionBindingFarmingPanel_SerializeTests {
         [Fact]
         public static void DCSBIOSActionBindingFarmingPanel_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSActionBindingPZ55_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingPZ55_SerializeTests.cs
similarity index 93%
rename from src/DCSFP.Tests/Serialization/DCSBIOSActionBindingPZ55_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingPZ55_SerializeTests.cs
index a36fc25e5..bf3d6ef3b 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSActionBindingPZ55_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingPZ55_SerializeTests.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using DCSFP.Tests.Serialization.Common;
+using DCS_BIOS.Tests.Serialization;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.DCSBIOSBindings;
+using NonVisuals.Tests.Serialization.Common;
+using System.Collections.Generic;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class DCSBIOSActionBindingPZ55_SerializeTests {
         [Fact]
         public static void DCSBIOSActionBindingPZ55_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSActionBindingPZ69_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingPZ69_SerializeTests.cs
similarity index 94%
rename from src/DCSFP.Tests/Serialization/DCSBIOSActionBindingPZ69_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingPZ69_SerializeTests.cs
index d59a038aa..df2af7d04 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSActionBindingPZ69_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingPZ69_SerializeTests.cs
@@ -1,9 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
+using DCS_BIOS.Tests.Serialization;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.DCSBIOSBindings;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class DCSBIOSActionBindingPZ69_SerializeTests {
         [Fact]
         public static void DCSBIOSActionBindingPZ69_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSActionBindingPZ70_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingPZ70_SerializeTests.cs
similarity index 94%
rename from src/DCSFP.Tests/Serialization/DCSBIOSActionBindingPZ70_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingPZ70_SerializeTests.cs
index fdaee3d7f..dfa783948 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSActionBindingPZ70_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingPZ70_SerializeTests.cs
@@ -1,9 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
+using DCS_BIOS.Tests.Serialization;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.DCSBIOSBindings;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class DCSBIOSActionBindingPZ70_SerializeTests {
         [Fact]
         public static void DCSBIOSActionBindingPZ70_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSActionBindingTPM_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingTPM_SerializeTests.cs
similarity index 93%
rename from src/DCSFP.Tests/Serialization/DCSBIOSActionBindingTPM_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingTPM_SerializeTests.cs
index 1352b14b3..6e664fcab 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSActionBindingTPM_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/DCSBIOSActionBindingTPM_SerializeTests.cs
@@ -1,9 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
+using DCS_BIOS.Tests.Serialization;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.DCSBIOSBindings;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class DCSBIOSActionBindingTPM_SerializeTests {
         [Fact]
         public static void DCSBIOSActionBindingTPM_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSConverter_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/DCSBIOSConverter_SerializeTests.cs
similarity index 97%
rename from src/DCSFP.Tests/Serialization/DCSBIOSConverter_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/DCSBIOSConverter_SerializeTests.cs
index ba89e61b2..48598dc28 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSConverter_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/DCSBIOSConverter_SerializeTests.cs
@@ -1,10 +1,10 @@
-using System;
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using System;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class DCSBIOSConverter_SerializeTests {
         [Fact]
         public static void DCSBIOSConverter_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSDecoder_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/DCSBIOSDecoder_SerializeTests.cs
similarity index 97%
rename from src/DCSFP.Tests/Serialization/DCSBIOSDecoder_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/DCSBIOSDecoder_SerializeTests.cs
index f436e0384..d49cba79d 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSDecoder_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/DCSBIOSDecoder_SerializeTests.cs
@@ -1,11 +1,13 @@
-using System.Drawing;
-using DCS_BIOS.Serialized;
-using DCSFP.Tests.Serialization.Common;
+using DCS_BIOS.Serialized;
+using DCS_BIOS.Tests.Serialization;
 using Newtonsoft.Json;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using System.Drawing;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class DCSBIOSDecoder_SerializeTests {
 
         [Fact]
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSOutputBindingPZ69_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/DCSBIOSOutputBindingPZ69_SerializeTests.cs
similarity index 96%
rename from src/DCSFP.Tests/Serialization/DCSBIOSOutputBindingPZ69_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/DCSBIOSOutputBindingPZ69_SerializeTests.cs
index 836f2c980..6a9b364ce 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSOutputBindingPZ69_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/DCSBIOSOutputBindingPZ69_SerializeTests.cs
@@ -1,10 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
+using DCS_BIOS.Tests.Serialization;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.DCSBIOSBindings;
 using NonVisuals.Radios;
+using NonVisuals.Tests.Serialization.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class DCSBIOSOutputBindingPZ69_SerializeTests {
         
         [Fact]
diff --git a/src/DCSFP.Tests/Serialization/DCSBIOSOutputBindingPZ70_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/DCSBIOSOutputBindingPZ70_SerializeTests.cs
similarity index 95%
rename from src/DCSFP.Tests/Serialization/DCSBIOSOutputBindingPZ70_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/DCSBIOSOutputBindingPZ70_SerializeTests.cs
index 8559886bc..b702947f9 100644
--- a/src/DCSFP.Tests/Serialization/DCSBIOSOutputBindingPZ70_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/DCSBIOSOutputBindingPZ70_SerializeTests.cs
@@ -1,9 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
+using DCS_BIOS.Tests.Serialization;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.DCSBIOSBindings;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class DCSBIOSOutputBindingPZ70_SerializeTests {
         [Fact]
         public static void DCSBIOSOutputBindingPZ70_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/DcsOutputAndColorBindingBIP_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/DcsOutputAndColorBindingBIP_SerializeTests.cs
similarity index 94%
rename from src/DCSFP.Tests/Serialization/DcsOutputAndColorBindingBIP_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/DcsOutputAndColorBindingBIP_SerializeTests.cs
index 775e69295..b51fc5d77 100644
--- a/src/DCSFP.Tests/Serialization/DcsOutputAndColorBindingBIP_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/DcsOutputAndColorBindingBIP_SerializeTests.cs
@@ -1,9 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
+using DCS_BIOS.Tests.Serialization;
 using Newtonsoft.Json;
 using NonVisuals.Panels.Saitek;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class DcsOutputAndColorBindingBIP_SerializeTests {
         [Fact]
         public static void DcsOutputAndColorBindingBIP_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/DcsOutputAndColorBindingPZ55_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/DcsOutputAndColorBindingPZ55_SerializeTests.cs
similarity index 95%
rename from src/DCSFP.Tests/Serialization/DcsOutputAndColorBindingPZ55_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/DcsOutputAndColorBindingPZ55_SerializeTests.cs
index b8a239f73..ccbd93751 100644
--- a/src/DCSFP.Tests/Serialization/DcsOutputAndColorBindingPZ55_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/DcsOutputAndColorBindingPZ55_SerializeTests.cs
@@ -1,10 +1,12 @@
-using DCSFP.Tests.Serialization.Common;
+using DCS_BIOS.Tests.Serialization;
 using Newtonsoft.Json;
 using NonVisuals.Panels.Saitek;
 using NonVisuals.Panels.Saitek.Panels;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class DcsOutputAndColorBindingPZ55_SerializeTests {
 
         [Fact]
diff --git a/src/DCSFP.Tests/Serialization/FaceTypeDCSBIOSOverlay_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/FaceTypeDCSBIOSOverlay_SerializeTests.cs
similarity index 96%
rename from src/DCSFP.Tests/Serialization/FaceTypeDCSBIOSOverlay_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/FaceTypeDCSBIOSOverlay_SerializeTests.cs
index 298ae0dbb..5dcf215e6 100644
--- a/src/DCSFP.Tests/Serialization/FaceTypeDCSBIOSOverlay_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/FaceTypeDCSBIOSOverlay_SerializeTests.cs
@@ -1,11 +1,12 @@
-using System.Drawing;
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.Interfaces;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using System.Drawing;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
 
     public static class FaceTypeDCSBIOSOverlay_SerializeTests {
 
diff --git a/src/DCSFP.Tests/Serialization/FaceTypeDCSBIOS_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/FaceTypeDCSBIOS_SerializeTests.cs
similarity index 96%
rename from src/DCSFP.Tests/Serialization/FaceTypeDCSBIOS_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/FaceTypeDCSBIOS_SerializeTests.cs
index dc5ac145f..8f5a5186f 100644
--- a/src/DCSFP.Tests/Serialization/FaceTypeDCSBIOS_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/FaceTypeDCSBIOS_SerializeTests.cs
@@ -1,11 +1,12 @@
-using System.Drawing;
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.Interfaces;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using System.Drawing;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
 
     public static class FaceTypeDCSBIOS_SerializeTests {
 
diff --git a/src/DCSFP.Tests/Serialization/FaceTypeImage_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/FaceTypeImage_SerializeTests.cs
similarity index 95%
rename from src/DCSFP.Tests/Serialization/FaceTypeImage_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/FaceTypeImage_SerializeTests.cs
index b2ba57603..0ff561aac 100644
--- a/src/DCSFP.Tests/Serialization/FaceTypeImage_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/FaceTypeImage_SerializeTests.cs
@@ -1,11 +1,12 @@
-using System.Drawing;
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.Interfaces;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using System.Drawing;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
 
     public static class FaceTypeImage_SerializeTests {
 
diff --git a/src/DCSFP.Tests/Serialization/FaceTypeText_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/FaceTypeText_SerializeTests.cs
similarity index 95%
rename from src/DCSFP.Tests/Serialization/FaceTypeText_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/FaceTypeText_SerializeTests.cs
index 43e4b5d23..56a293c1e 100644
--- a/src/DCSFP.Tests/Serialization/FaceTypeText_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/FaceTypeText_SerializeTests.cs
@@ -1,11 +1,12 @@
-using System.Drawing;
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.Interfaces;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using System.Drawing;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
 
     public static class FaceTypeText_SerializeTests {
 
diff --git a/src/DCSFP.Tests/Serialization/KeyBindingFarmingPanel_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/KeyBindingFarmingPanel_SerializeTests.cs
similarity index 96%
rename from src/DCSFP.Tests/Serialization/KeyBindingFarmingPanel_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/KeyBindingFarmingPanel_SerializeTests.cs
index 85704bdac..a89c488b2 100644
--- a/src/DCSFP.Tests/Serialization/KeyBindingFarmingPanel_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/KeyBindingFarmingPanel_SerializeTests.cs
@@ -1,10 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
-using MEF;
+using MEF;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.Key;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class KeyBindingFarmingPanel_SerializeTests {
         [Fact]
         public static void KeyBindingFarmingPanel_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/KeyBindingPZ55_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/KeyBindingPZ55_SerializeTests.cs
similarity index 95%
rename from src/DCSFP.Tests/Serialization/KeyBindingPZ55_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/KeyBindingPZ55_SerializeTests.cs
index bf81d6b6a..142750e3d 100644
--- a/src/DCSFP.Tests/Serialization/KeyBindingPZ55_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/KeyBindingPZ55_SerializeTests.cs
@@ -1,11 +1,12 @@
-using System.Collections.Generic;
-using DCSFP.Tests.Serialization.Common;
-using MEF;
+using MEF;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.Key;
+using NonVisuals.Tests.Serialization.Common;
+using System.Collections.Generic;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class KeyBindingPZ55_SerializeTests {
 
         [Fact]
diff --git a/src/DCSFP.Tests/Serialization/KeyBindingPZ69DialPosition_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/KeyBindingPZ69DialPosition_SerializeTests.cs
similarity index 96%
rename from src/DCSFP.Tests/Serialization/KeyBindingPZ69DialPosition_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/KeyBindingPZ69DialPosition_SerializeTests.cs
index 802b632a5..18eb1566f 100644
--- a/src/DCSFP.Tests/Serialization/KeyBindingPZ69DialPosition_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/KeyBindingPZ69DialPosition_SerializeTests.cs
@@ -1,10 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
-using MEF;
+using MEF;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.Key;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class KeyBindingPZ69DialPosition_SerializeTests {
         [Fact]
         public static void KeyBindingPZ69DialPosition_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/KeyBindingPZ69_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/KeyBindingPZ69_SerializeTests.cs
similarity index 96%
rename from src/DCSFP.Tests/Serialization/KeyBindingPZ69_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/KeyBindingPZ69_SerializeTests.cs
index d3531adce..0c987abc4 100644
--- a/src/DCSFP.Tests/Serialization/KeyBindingPZ69_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/KeyBindingPZ69_SerializeTests.cs
@@ -1,10 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
-using MEF;
+using MEF;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.Key;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class KeyBindingPZ69_SerializeTests {
 
         [Fact]
diff --git a/src/DCSFP.Tests/Serialization/KeyBindingPZ70_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/KeyBindingPZ70_SerializeTests.cs
similarity index 97%
rename from src/DCSFP.Tests/Serialization/KeyBindingPZ70_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/KeyBindingPZ70_SerializeTests.cs
index 87fffdc01..4b966da41 100644
--- a/src/DCSFP.Tests/Serialization/KeyBindingPZ70_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/KeyBindingPZ70_SerializeTests.cs
@@ -1,12 +1,12 @@
-using DCSFP.Tests.Serialization.Common;
-using MEF;
+using MEF;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.Key;
 using NonVisuals.Panels.Saitek.Panels;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization
-{
+namespace NonVisuals.Tests.Serialization {
     public class KeyBindingPZ70_SerializeTests
     {
         [Fact]
diff --git a/src/DCSFP.Tests/Serialization/KeyBindingTPM_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/KeyBindingTPM_SerializeTests.cs
similarity index 95%
rename from src/DCSFP.Tests/Serialization/KeyBindingTPM_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/KeyBindingTPM_SerializeTests.cs
index 78356aa60..2ca67ff6d 100644
--- a/src/DCSFP.Tests/Serialization/KeyBindingTPM_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/KeyBindingTPM_SerializeTests.cs
@@ -1,10 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
-using MEF;
+using MEF;
 using Newtonsoft.Json;
 using NonVisuals.BindingClasses.Key;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class KeyBindingTPM_SerializeTests {
         [Fact]
         public static void KeyBindingTPM_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/KeyPressInfo_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/KeyPressInfo_SerializeTests.cs
similarity index 95%
rename from src/DCSFP.Tests/Serialization/KeyPressInfo_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/KeyPressInfo_SerializeTests.cs
index ab392bef3..8b258cc51 100644
--- a/src/DCSFP.Tests/Serialization/KeyPressInfo_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/KeyPressInfo_SerializeTests.cs
@@ -1,10 +1,11 @@
-using DCSFP.Tests.Serialization.Common;
-using MEF;
+using MEF;
 using Newtonsoft.Json;
 using NonVisuals.KeyEmulation;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
 
     public static class KeyPressInfo_SerializeTests {
 
diff --git a/src/DCSFP.Tests/Serialization/KeyPress_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/KeyPress_SerializeTests.cs
similarity index 93%
rename from src/DCSFP.Tests/Serialization/KeyPress_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/KeyPress_SerializeTests.cs
index a88520bcf..77b2c3f9e 100644
--- a/src/DCSFP.Tests/Serialization/KeyPress_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/KeyPress_SerializeTests.cs
@@ -1,9 +1,10 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.KeyEmulation;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public static class KeyPress_SerializeTests {
 
         [Fact]
diff --git a/src/DCSFP.Tests/Serialization/OSCommandBindingFarmingPanel_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/OSCommandBindingFarmingPanel_SerializeTests.cs
similarity index 93%
rename from src/DCSFP.Tests/Serialization/OSCommandBindingFarmingPanel_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/OSCommandBindingFarmingPanel_SerializeTests.cs
index de1d5c883..9b48644fa 100644
--- a/src/DCSFP.Tests/Serialization/OSCommandBindingFarmingPanel_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/OSCommandBindingFarmingPanel_SerializeTests.cs
@@ -1,9 +1,10 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.BindingClasses.OSCommand;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class OSCommandBindingFarmingPanel_SerializeTests {
         [Fact]
         public static void OSCommandBindingFarmingPanel_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/OSCommandBindingPZ55_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/OSCommandBindingPZ55_SerializeTests.cs
similarity index 92%
rename from src/DCSFP.Tests/Serialization/OSCommandBindingPZ55_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/OSCommandBindingPZ55_SerializeTests.cs
index 9331ef0c6..ab060656b 100644
--- a/src/DCSFP.Tests/Serialization/OSCommandBindingPZ55_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/OSCommandBindingPZ55_SerializeTests.cs
@@ -1,10 +1,11 @@
-using System.Collections.Generic;
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.BindingClasses.OSCommand;
+using NonVisuals.Tests.Serialization.Common;
+using System.Collections.Generic;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class OSCommandBindingPZ55_SerializeTests {
         [Fact]
         public static void OSCommandBindingPZ55_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/OSCommandBindingPZ69Emulator_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/OSCommandBindingPZ69Emulator_SerializeTests.cs
similarity index 93%
rename from src/DCSFP.Tests/Serialization/OSCommandBindingPZ69Emulator_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/OSCommandBindingPZ69Emulator_SerializeTests.cs
index cdec5ced5..47c4cce86 100644
--- a/src/DCSFP.Tests/Serialization/OSCommandBindingPZ69Emulator_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/OSCommandBindingPZ69Emulator_SerializeTests.cs
@@ -1,9 +1,10 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.BindingClasses.OSCommand;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class OSCommandBindingPZ69Emulator_SerializeTests {
         [Fact]
         public static void OSCommandBindingPZ69Emulator_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/OSCommandBindingPZ69FullEmulator_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/OSCommandBindingPZ69FullEmulator_SerializeTests.cs
similarity index 94%
rename from src/DCSFP.Tests/Serialization/OSCommandBindingPZ69FullEmulator_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/OSCommandBindingPZ69FullEmulator_SerializeTests.cs
index d5606327a..45660279c 100644
--- a/src/DCSFP.Tests/Serialization/OSCommandBindingPZ69FullEmulator_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/OSCommandBindingPZ69FullEmulator_SerializeTests.cs
@@ -1,9 +1,10 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.BindingClasses.OSCommand;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class OSCommandBindingPZ69FullEmulator_SerializeTests {
         [Fact]
         public static void OSCommandBindingPZ69FullEmulator_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/OSCommandBindingPZ70_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/OSCommandBindingPZ70_SerializeTests.cs
similarity index 93%
rename from src/DCSFP.Tests/Serialization/OSCommandBindingPZ70_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/OSCommandBindingPZ70_SerializeTests.cs
index 276a2cced..9cb4498cd 100644
--- a/src/DCSFP.Tests/Serialization/OSCommandBindingPZ70_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/OSCommandBindingPZ70_SerializeTests.cs
@@ -1,9 +1,10 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.BindingClasses.OSCommand;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class OSCommandBindingPZ70_SerializeTests {
         [Fact]
         public static void OSCommandBindingPZ70_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/OSCommandBindingTPM_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/OSCommandBindingTPM_SerializeTests.cs
similarity index 92%
rename from src/DCSFP.Tests/Serialization/OSCommandBindingTPM_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/OSCommandBindingTPM_SerializeTests.cs
index 7cd87bf00..9e5ce45f3 100644
--- a/src/DCSFP.Tests/Serialization/OSCommandBindingTPM_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/OSCommandBindingTPM_SerializeTests.cs
@@ -1,9 +1,10 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NonVisuals.BindingClasses.OSCommand;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class OSCommandBindingTPM_SerializeTests {
         [Fact]
         public static void OSCommandBindingTPM_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/OSCommand_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/OSCommand_SerializeTests.cs
similarity index 90%
rename from src/DCSFP.Tests/Serialization/OSCommand_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/OSCommand_SerializeTests.cs
index 1e359085a..203de5811 100644
--- a/src/DCSFP.Tests/Serialization/OSCommand_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/OSCommand_SerializeTests.cs
@@ -1,9 +1,9 @@
-using DCSFP.Tests.Serialization.Common;
-using Newtonsoft.Json;
-using NonVisuals;
+using Newtonsoft.Json;
+using NonVisuals.Tests.Serialization.Common;
+using Tests.Common;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class OSCommand_SerializeTests {
         [Fact]
         public static void OSCommand_ShouldBeSerializable() {
diff --git a/src/DCSFP.Tests/Serialization/Resources/ActionTypeDCSBIOS.json b/src/NonVisuals.Tests/Serialization/Resources/ActionTypeDCSBIOS.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/ActionTypeDCSBIOS.json
rename to src/NonVisuals.Tests/Serialization/Resources/ActionTypeDCSBIOS.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/ActionTypeKey.json b/src/NonVisuals.Tests/Serialization/Resources/ActionTypeKey.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/ActionTypeKey.json
rename to src/NonVisuals.Tests/Serialization/Resources/ActionTypeKey.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/ActionTypeLayer.json b/src/NonVisuals.Tests/Serialization/Resources/ActionTypeLayer.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/ActionTypeLayer.json
rename to src/NonVisuals.Tests/Serialization/Resources/ActionTypeLayer.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/ActionTypeOS.json b/src/NonVisuals.Tests/Serialization/Resources/ActionTypeOS.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/ActionTypeOS.json
rename to src/NonVisuals.Tests/Serialization/Resources/ActionTypeOS.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/BIPLight.json b/src/NonVisuals.Tests/Serialization/Resources/BIPLight.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/BIPLight.json
rename to src/NonVisuals.Tests/Serialization/Resources/BIPLight.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/BIPLinkFarmingPanel.json b/src/NonVisuals.Tests/Serialization/Resources/BIPLinkFarmingPanel.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/BIPLinkFarmingPanel.json
rename to src/NonVisuals.Tests/Serialization/Resources/BIPLinkFarmingPanel.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/BIPLinkPZ55.json b/src/NonVisuals.Tests/Serialization/Resources/BIPLinkPZ55.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/BIPLinkPZ55.json
rename to src/NonVisuals.Tests/Serialization/Resources/BIPLinkPZ55.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/BIPLinkPZ69.json b/src/NonVisuals.Tests/Serialization/Resources/BIPLinkPZ69.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/BIPLinkPZ69.json
rename to src/NonVisuals.Tests/Serialization/Resources/BIPLinkPZ69.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/BIPLinkPZ70.json b/src/NonVisuals.Tests/Serialization/Resources/BIPLinkPZ70.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/BIPLinkPZ70.json
rename to src/NonVisuals.Tests/Serialization/Resources/BIPLinkPZ70.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/BIPLinkTPM.json b/src/NonVisuals.Tests/Serialization/Resources/BIPLinkTPM.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/BIPLinkTPM.json
rename to src/NonVisuals.Tests/Serialization/Resources/BIPLinkTPM.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSActionBindingFarmingPanel.json b/src/NonVisuals.Tests/Serialization/Resources/DCSBIOSActionBindingFarmingPanel.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSActionBindingFarmingPanel.json
rename to src/NonVisuals.Tests/Serialization/Resources/DCSBIOSActionBindingFarmingPanel.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSActionBindingPZ55.json b/src/NonVisuals.Tests/Serialization/Resources/DCSBIOSActionBindingPZ55.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSActionBindingPZ55.json
rename to src/NonVisuals.Tests/Serialization/Resources/DCSBIOSActionBindingPZ55.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSActionBindingPZ69.json b/src/NonVisuals.Tests/Serialization/Resources/DCSBIOSActionBindingPZ69.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSActionBindingPZ69.json
rename to src/NonVisuals.Tests/Serialization/Resources/DCSBIOSActionBindingPZ69.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSActionBindingPZ70.json b/src/NonVisuals.Tests/Serialization/Resources/DCSBIOSActionBindingPZ70.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSActionBindingPZ70.json
rename to src/NonVisuals.Tests/Serialization/Resources/DCSBIOSActionBindingPZ70.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSActionBindingTPM.json b/src/NonVisuals.Tests/Serialization/Resources/DCSBIOSActionBindingTPM.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSActionBindingTPM.json
rename to src/NonVisuals.Tests/Serialization/Resources/DCSBIOSActionBindingTPM.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSConverter.json b/src/NonVisuals.Tests/Serialization/Resources/DCSBIOSConverter.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSConverter.json
rename to src/NonVisuals.Tests/Serialization/Resources/DCSBIOSConverter.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSDecoder.json b/src/NonVisuals.Tests/Serialization/Resources/DCSBIOSDecoder.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSDecoder.json
rename to src/NonVisuals.Tests/Serialization/Resources/DCSBIOSDecoder.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSOutputBindingPZ69.json b/src/NonVisuals.Tests/Serialization/Resources/DCSBIOSOutputBindingPZ69.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSOutputBindingPZ69.json
rename to src/NonVisuals.Tests/Serialization/Resources/DCSBIOSOutputBindingPZ69.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DCSBIOSOutputBindingPZ70.json b/src/NonVisuals.Tests/Serialization/Resources/DCSBIOSOutputBindingPZ70.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DCSBIOSOutputBindingPZ70.json
rename to src/NonVisuals.Tests/Serialization/Resources/DCSBIOSOutputBindingPZ70.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DcsOutputAndColorBindingBIP.json b/src/NonVisuals.Tests/Serialization/Resources/DcsOutputAndColorBindingBIP.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DcsOutputAndColorBindingBIP.json
rename to src/NonVisuals.Tests/Serialization/Resources/DcsOutputAndColorBindingBIP.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/DcsOutputAndColorBindingPZ55.json b/src/NonVisuals.Tests/Serialization/Resources/DcsOutputAndColorBindingPZ55.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/DcsOutputAndColorBindingPZ55.json
rename to src/NonVisuals.Tests/Serialization/Resources/DcsOutputAndColorBindingPZ55.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/FaceTypeDCSBIOS.json b/src/NonVisuals.Tests/Serialization/Resources/FaceTypeDCSBIOS.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/FaceTypeDCSBIOS.json
rename to src/NonVisuals.Tests/Serialization/Resources/FaceTypeDCSBIOS.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/FaceTypeDCSBIOSOverlay.json b/src/NonVisuals.Tests/Serialization/Resources/FaceTypeDCSBIOSOverlay.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/FaceTypeDCSBIOSOverlay.json
rename to src/NonVisuals.Tests/Serialization/Resources/FaceTypeDCSBIOSOverlay.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/FaceTypeImage.json b/src/NonVisuals.Tests/Serialization/Resources/FaceTypeImage.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/FaceTypeImage.json
rename to src/NonVisuals.Tests/Serialization/Resources/FaceTypeImage.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/FaceTypeText.json b/src/NonVisuals.Tests/Serialization/Resources/FaceTypeText.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/FaceTypeText.json
rename to src/NonVisuals.Tests/Serialization/Resources/FaceTypeText.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/KeyBindingFarmingPanel.json b/src/NonVisuals.Tests/Serialization/Resources/KeyBindingFarmingPanel.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/KeyBindingFarmingPanel.json
rename to src/NonVisuals.Tests/Serialization/Resources/KeyBindingFarmingPanel.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/KeyBindingPZ55.json b/src/NonVisuals.Tests/Serialization/Resources/KeyBindingPZ55.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/KeyBindingPZ55.json
rename to src/NonVisuals.Tests/Serialization/Resources/KeyBindingPZ55.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/KeyBindingPZ69.json b/src/NonVisuals.Tests/Serialization/Resources/KeyBindingPZ69.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/KeyBindingPZ69.json
rename to src/NonVisuals.Tests/Serialization/Resources/KeyBindingPZ69.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/KeyBindingPZ69DialPosition.json b/src/NonVisuals.Tests/Serialization/Resources/KeyBindingPZ69DialPosition.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/KeyBindingPZ69DialPosition.json
rename to src/NonVisuals.Tests/Serialization/Resources/KeyBindingPZ69DialPosition.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/KeyBindingPZ70.json b/src/NonVisuals.Tests/Serialization/Resources/KeyBindingPZ70.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/KeyBindingPZ70.json
rename to src/NonVisuals.Tests/Serialization/Resources/KeyBindingPZ70.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/KeyBindingTPM.json b/src/NonVisuals.Tests/Serialization/Resources/KeyBindingTPM.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/KeyBindingTPM.json
rename to src/NonVisuals.Tests/Serialization/Resources/KeyBindingTPM.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/KeyPress.json b/src/NonVisuals.Tests/Serialization/Resources/KeyPress.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/KeyPress.json
rename to src/NonVisuals.Tests/Serialization/Resources/KeyPress.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/KeyPressInfo.json b/src/NonVisuals.Tests/Serialization/Resources/KeyPressInfo.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/KeyPressInfo.json
rename to src/NonVisuals.Tests/Serialization/Resources/KeyPressInfo.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/OSCommand.json b/src/NonVisuals.Tests/Serialization/Resources/OSCommand.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/OSCommand.json
rename to src/NonVisuals.Tests/Serialization/Resources/OSCommand.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/OSCommandBindingFarmingPanel.json b/src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingFarmingPanel.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/OSCommandBindingFarmingPanel.json
rename to src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingFarmingPanel.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/OSCommandBindingPZ55.json b/src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingPZ55.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/OSCommandBindingPZ55.json
rename to src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingPZ55.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/OSCommandBindingPZ69Emulator.json b/src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingPZ69Emulator.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/OSCommandBindingPZ69Emulator.json
rename to src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingPZ69Emulator.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/OSCommandBindingPZ69FullEmulator.json b/src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingPZ69FullEmulator.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/OSCommandBindingPZ69FullEmulator.json
rename to src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingPZ69FullEmulator.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/OSCommandBindingPZ70.json b/src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingPZ70.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/OSCommandBindingPZ70.json
rename to src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingPZ70.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/OSCommandBindingTPM.json b/src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingTPM.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/OSCommandBindingTPM.json
rename to src/NonVisuals.Tests/Serialization/Resources/OSCommandBindingTPM.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/StreamDeckButton.json b/src/NonVisuals.Tests/Serialization/Resources/StreamDeckButton.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/StreamDeckButton.json
rename to src/NonVisuals.Tests/Serialization/Resources/StreamDeckButton.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/StreamDeckPushRotary.json b/src/NonVisuals.Tests/Serialization/Resources/StreamDeckPushRotary.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/StreamDeckPushRotary.json
rename to src/NonVisuals.Tests/Serialization/Resources/StreamDeckPushRotary.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/SwitchPanelPZ55.json b/src/NonVisuals.Tests/Serialization/Resources/SwitchPanelPZ55.json
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/SwitchPanelPZ55.json
rename to src/NonVisuals.Tests/Serialization/Resources/SwitchPanelPZ55.json
diff --git a/src/DCSFP.Tests/Serialization/Resources/TestImage.png b/src/NonVisuals.Tests/Serialization/Resources/TestImage.png
similarity index 100%
rename from src/DCSFP.Tests/Serialization/Resources/TestImage.png
rename to src/NonVisuals.Tests/Serialization/Resources/TestImage.png
diff --git a/src/DCSFP.Tests/Serialization/StreamDeckButton_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/StreamDeckButton_SerializeTests.cs
similarity index 96%
rename from src/DCSFP.Tests/Serialization/StreamDeckButton_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/StreamDeckButton_SerializeTests.cs
index 7f7b5245c..ff6c4729b 100644
--- a/src/DCSFP.Tests/Serialization/StreamDeckButton_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/StreamDeckButton_SerializeTests.cs
@@ -1,12 +1,12 @@
-using System;
-using DCSFP.Tests.Serialization.Common;
-using MEF;
+using MEF;
 using Newtonsoft.Json;
 using NonVisuals.Interfaces;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using System;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
 
     public static class StreamDeckButton_SerializeTests {
 
diff --git a/src/DCSFP.Tests/Serialization/StreamDeckPushRotary_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/StreamDeckPushRotary_SerializeTests.cs
similarity index 95%
rename from src/DCSFP.Tests/Serialization/StreamDeckPushRotary_SerializeTests.cs
rename to src/NonVisuals.Tests/Serialization/StreamDeckPushRotary_SerializeTests.cs
index 4ccb5909d..047557b59 100644
--- a/src/DCSFP.Tests/Serialization/StreamDeckPushRotary_SerializeTests.cs
+++ b/src/NonVisuals.Tests/Serialization/StreamDeckPushRotary_SerializeTests.cs
@@ -1,11 +1,11 @@
-using System;
-using DCSFP.Tests.Serialization.Common;
-using MEF;
+using MEF;
 using Newtonsoft.Json;
 using NonVisuals.Panels.StreamDeck;
+using NonVisuals.Tests.Serialization.Common;
+using System;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization {
+namespace NonVisuals.Tests.Serialization {
     public class StreamDeckPushRotary_SerializeTests {
 
         [Fact]
diff --git a/src/DCSFP.Tests/Serialization/Common/DeepAssert.cs b/src/Tests.Common/DeepAssert.cs
similarity index 82%
rename from src/DCSFP.Tests/Serialization/Common/DeepAssert.cs
rename to src/Tests.Common/DeepAssert.cs
index 8a0538ab1..c2dd7a621 100644
--- a/src/DCSFP.Tests/Serialization/Common/DeepAssert.cs
+++ b/src/Tests.Common/DeepAssert.cs
@@ -1,9 +1,8 @@
 using ExpectedObjects;
 using Xunit;
 
-namespace DCSFP.Tests.Serialization.Common
-{
-    internal class DeepAssert
+namespace Tests.Common {
+    public class DeepAssert
     {
         public static void Equal<T>(T expected, T actual)
         {
diff --git a/src/DCSFP.Tests/Serialization/Common/RepositorySerialized.cs b/src/Tests.Common/RepositorySerialized.cs
similarity index 57%
rename from src/DCSFP.Tests/Serialization/Common/RepositorySerialized.cs
rename to src/Tests.Common/RepositorySerialized.cs
index a4c6b3073..b8eeb9983 100644
--- a/src/DCSFP.Tests/Serialization/Common/RepositorySerialized.cs
+++ b/src/Tests.Common/RepositorySerialized.cs
@@ -2,19 +2,23 @@
 using System.Drawing;
 using System.IO;
 
-namespace DCSFP.Tests.Serialization.Common
-{
-    internal class RepositorySerialized
+namespace Tests.Common {
+    public class RepositorySerializedBase
     {
-        private const string FOLDER_PATH = @"Serialization\Resources";
-        private const string PROJECT_FOLDER = "DCSFP.Tests";
+        private readonly string _ResourcesFolderPath = @"Serialization\Resources";
+        private readonly string _ProjectFolder = "DCS-BIOS.Tests";
+
+        public RepositorySerializedBase(string resourcesFolderPath, string projectFolder) {
+            _ResourcesFolderPath = resourcesFolderPath;
+            _ProjectFolder = projectFolder;
+        }
 
         private string GetMockFolderPath()
         {
             string path = Directory.GetCurrentDirectory();
             while (true)
             {
-                if (Path.GetFileName(path) == PROJECT_FOLDER)
+                if (Path.GetFileName(path) == _ProjectFolder)
                 {
                     break;
                 }
@@ -25,7 +29,7 @@ private string GetMockFolderPath()
 
         private string GetFile(Type objectType)
         {
-            string filePath = Path.Combine(GetMockFolderPath(), FOLDER_PATH, objectType.Name + ".json");
+            string filePath = Path.Combine(GetMockFolderPath(), _ResourcesFolderPath, objectType.Name + ".json");
 
             if (!File.Exists(filePath))
             {
@@ -34,7 +38,7 @@ private string GetFile(Type objectType)
             return filePath;
         }
 
-        internal string GetSerializedObjectString(Type objectType)
+        public string GetSerializedObjectString(Type objectType)
         {
             return File.ReadAllText(GetFile(objectType));
         }
@@ -42,20 +46,20 @@ internal string GetSerializedObjectString(Type objectType)
         /// <summary>
         /// Even if this function has 0 references, do not delete this, used in tests
         /// </summary>
-        internal void SaveSerializedObjectToFile(Type objectType, string serialized)
+        public void SaveSerializedObjectToFile(Type objectType, string serialized)
         {
             string mockFolderPath = GetMockFolderPath();
-            string filePath = Path.Combine(mockFolderPath, FOLDER_PATH, objectType.Name + ".json");
+            string filePath = Path.Combine(mockFolderPath, _ResourcesFolderPath, objectType.Name + ".json");
             File.WriteAllText(filePath, serialized);
         }
 
-        internal Bitmap GetTestImageBitmap() {
+        public Bitmap GetTestImageBitmap() {
             string mockFolderPath = GetMockFolderPath();
-            string filePath = Path.Combine(mockFolderPath, FOLDER_PATH, "TestImage.png");
+            string filePath = Path.Combine(mockFolderPath, _ResourcesFolderPath, "TestImage.png");
             return new Bitmap(filePath);
         }
 
-        internal byte[] GetTestImageBytes() {
+        public byte[] GetTestImageBytes() {
             using var stream = new MemoryStream();
             GetTestImageBitmap().Save(stream, System.Drawing.Imaging.ImageFormat.Png);
             return stream.ToArray();
diff --git a/src/Tests.Common/Tests.Common.csproj b/src/Tests.Common/Tests.Common.csproj
new file mode 100644
index 000000000..dc63dca3c
--- /dev/null
+++ b/src/Tests.Common/Tests.Common.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>disable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ExpectedObjects" Version="3.5.4" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.2" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+  </ItemGroup>
+
+</Project>

From eb36511a7dd64bd8e942c32f8385d2081a07af03 Mon Sep 17 00:00:00 2001
From: Mutex666 <67550369+Mutex666@users.noreply.github.com>
Date: Sun, 10 Mar 2024 21:52:27 +0100
Subject: [PATCH 2/4] Rename DCSFP.Test project to DCSFlightpanels.Tests

---
 .../Serialization/Common/JSonSettings.cs      |  2 +-
 .../DCSFlightpanels.Tests.csproj}             |  0
 .../NonVisuals/CloneTests.cs                  |  2 +-
 .../NonVisuals/CopyPackageTests.cs            |  2 +-
 .../EventHandlerSubscriptionTests.cs          |  2 +-
 .../PanelEventHandler2.cs                     |  3 +-
 src/DCSFlightpanels.sln                       | 32 +++++++++----------
 7 files changed, 21 insertions(+), 22 deletions(-)
 rename src/{DCSFP.Tests/DCSFP.Tests.csproj => DCSFlightpanels.Tests/DCSFlightpanels.Tests.csproj} (100%)
 rename src/{DCSFP.Tests => DCSFlightpanels.Tests}/NonVisuals/CloneTests.cs (99%)
 rename src/{DCSFP.Tests => DCSFlightpanels.Tests}/NonVisuals/CopyPackageTests.cs (95%)
 rename src/{DCSFP.Tests => DCSFlightpanels.Tests}/NonVisuals/EventHandlerSubscriptionTests.cs (99%)
 rename src/{DCSFP.Tests => DCSFlightpanels.Tests}/PanelEventHandler2.cs (97%)

diff --git a/src/DCS-BIOS.Tests/Serialization/Common/JSonSettings.cs b/src/DCS-BIOS.Tests/Serialization/Common/JSonSettings.cs
index 1570aaabc..aee0bbfde 100644
--- a/src/DCS-BIOS.Tests/Serialization/Common/JSonSettings.cs
+++ b/src/DCS-BIOS.Tests/Serialization/Common/JSonSettings.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 
 namespace DCS_BIOS.Tests.Serialization.Common {
-    public static class JSonSettings
+    internal static class JSonSettings
     {
         public static JsonSerializerSettings JsonDefaultSettings = new()
         {
diff --git a/src/DCSFP.Tests/DCSFP.Tests.csproj b/src/DCSFlightpanels.Tests/DCSFlightpanels.Tests.csproj
similarity index 100%
rename from src/DCSFP.Tests/DCSFP.Tests.csproj
rename to src/DCSFlightpanels.Tests/DCSFlightpanels.Tests.csproj
diff --git a/src/DCSFP.Tests/NonVisuals/CloneTests.cs b/src/DCSFlightpanels.Tests/NonVisuals/CloneTests.cs
similarity index 99%
rename from src/DCSFP.Tests/NonVisuals/CloneTests.cs
rename to src/DCSFlightpanels.Tests/NonVisuals/CloneTests.cs
index 09e86250d..311457592 100644
--- a/src/DCSFP.Tests/NonVisuals/CloneTests.cs
+++ b/src/DCSFlightpanels.Tests/NonVisuals/CloneTests.cs
@@ -11,7 +11,7 @@
 using NonVisuals.Panels.StreamDeck.Panels;
 using Xunit;
 
-namespace DCSFP.Tests.NonVisuals
+namespace DCSFlightpanels.Tests.NonVisuals
 {
     public class CloneTests {
 
diff --git a/src/DCSFP.Tests/NonVisuals/CopyPackageTests.cs b/src/DCSFlightpanels.Tests/NonVisuals/CopyPackageTests.cs
similarity index 95%
rename from src/DCSFP.Tests/NonVisuals/CopyPackageTests.cs
rename to src/DCSFlightpanels.Tests/NonVisuals/CopyPackageTests.cs
index 13d08ef41..c2127ebf0 100644
--- a/src/DCSFP.Tests/NonVisuals/CopyPackageTests.cs
+++ b/src/DCSFlightpanels.Tests/NonVisuals/CopyPackageTests.cs
@@ -5,7 +5,7 @@
 using NonVisuals.KeyEmulation;
 using Xunit;
 
-namespace DCSFP.Tests.NonVisuals
+namespace DCSFlightpanels.Tests.NonVisuals
 {
     public class CopyPackageTests
     {
diff --git a/src/DCSFP.Tests/NonVisuals/EventHandlerSubscriptionTests.cs b/src/DCSFlightpanels.Tests/NonVisuals/EventHandlerSubscriptionTests.cs
similarity index 99%
rename from src/DCSFP.Tests/NonVisuals/EventHandlerSubscriptionTests.cs
rename to src/DCSFlightpanels.Tests/NonVisuals/EventHandlerSubscriptionTests.cs
index 4a8e36e44..085e8d88d 100644
--- a/src/DCSFP.Tests/NonVisuals/EventHandlerSubscriptionTests.cs
+++ b/src/DCSFlightpanels.Tests/NonVisuals/EventHandlerSubscriptionTests.cs
@@ -7,7 +7,7 @@
 using NonVisuals.Panels.StreamDeck.Panels;
 using Xunit;
 
-namespace DCSFP.Tests.NonVisuals
+namespace DCSFlightpanels.Tests.NonVisuals
 {
     [Collection("Sequential")]
     public class EventHandlerSubscriptionTests
diff --git a/src/DCSFP.Tests/PanelEventHandler2.cs b/src/DCSFlightpanels.Tests/PanelEventHandler2.cs
similarity index 97%
rename from src/DCSFP.Tests/PanelEventHandler2.cs
rename to src/DCSFlightpanels.Tests/PanelEventHandler2.cs
index 71304dbc0..e7dd9fc83 100644
--- a/src/DCSFP.Tests/PanelEventHandler2.cs
+++ b/src/DCSFlightpanels.Tests/PanelEventHandler2.cs
@@ -4,8 +4,7 @@
 using System.Windows.Forms;
 using MEF;
 
-namespace DCSFP.Tests
-{
+namespace DCSFlightpanels.Tests {
     /*
      * Use this class as a template for your plugin.
      * Reference the MEF project where the interface and necessary files are located.
diff --git a/src/DCSFlightpanels.sln b/src/DCSFlightpanels.sln
index 1397202fd..0d96391cd 100644
--- a/src/DCSFlightpanels.sln
+++ b/src/DCSFlightpanels.sln
@@ -16,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DCSFP.Tests", "DCSFP.Tests\DCSFP.Tests.csproj", "{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HidLibrary", "HidLibrary\HidLibrary.csproj", "{727A27D0-6A57-48E3-B704-A47FA93F66BE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplePanelEventPlugin2", "SamplePanelEventPlugin2\SamplePanelEventPlugin2.csproj", "{09DB3707-5B46-41CF-AC10-B1ADCD0087A6}"
@@ -34,9 +32,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibraryCommon", "DCSFP
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NonVisuals.Tests", "NonVisuals.Tests\NonVisuals.Tests.csproj", "{973ECF33-FC33-4D4D-84C5-40DFD0B04B68}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DCS-BIOS.Tests", "DCS-BIOS.Tests\DCS-BIOS.Tests.csproj", "{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DCS-BIOS.Tests", "DCS-BIOS.Tests\DCS-BIOS.Tests.csproj", "{00A76CB2-FDD8-42DB-A9EB-FDCF8EED01DA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.Common", "Tests.Common\Tests.Common.csproj", "{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Common", "Tests.Common\Tests.Common.csproj", "{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DCSFlightpanels.Tests", "DCSFlightpanels.Tests\DCSFlightpanels.Tests.csproj", "{7792092E-4A93-4F54-880B-ABB014CB4624}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -96,18 +96,6 @@ Global
 		{0C0196B3-2442-4838-A587-C51660136F9C}.Release|x64.Build.0 = Release|Any CPU
 		{0C0196B3-2442-4838-A587-C51660136F9C}.Release|x86.ActiveCfg = Release|Any CPU
 		{0C0196B3-2442-4838-A587-C51660136F9C}.Release|x86.Build.0 = Release|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Debug|x64.Build.0 = Debug|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Debug|x86.Build.0 = Debug|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Release|x64.ActiveCfg = Release|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Release|x64.Build.0 = Release|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Release|x86.ActiveCfg = Release|Any CPU
-		{D80E361D-35C3-4DBD-855B-B6E5F93FC9A5}.Release|x86.Build.0 = Release|Any CPU
 		{727A27D0-6A57-48E3-B704-A47FA93F66BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{727A27D0-6A57-48E3-B704-A47FA93F66BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{727A27D0-6A57-48E3-B704-A47FA93F66BE}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -228,6 +216,18 @@ Global
 		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Release|x64.Build.0 = Release|Any CPU
 		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Release|x86.ActiveCfg = Release|Any CPU
 		{E5DCEEF2-CD72-4AD2-BDB7-969160FD3E1C}.Release|x86.Build.0 = Release|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Debug|x64.Build.0 = Debug|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Debug|x86.Build.0 = Debug|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Release|x64.ActiveCfg = Release|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Release|x64.Build.0 = Release|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Release|x86.ActiveCfg = Release|Any CPU
+		{7792092E-4A93-4F54-880B-ABB014CB4624}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 162b83c1681f3d8b0c55fb375e0bcbd9c44e4dad Mon Sep 17 00:00:00 2001
From: Mutex666 <67550369+Mutex666@users.noreply.github.com>
Date: Sun, 10 Mar 2024 22:08:46 +0100
Subject: [PATCH 3/4] Update Publish script

---
 .../SwitchPanelPZ55_SerializeTests.cs         | 45 +++++++++++++++++++
 src/PublishReleaseDCSFP.ps1                   | 23 ++++++++--
 2 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 src/NonVisuals.Tests/Serialization/SwitchPanelPZ55_SerializeTests.cs

diff --git a/src/NonVisuals.Tests/Serialization/SwitchPanelPZ55_SerializeTests.cs b/src/NonVisuals.Tests/Serialization/SwitchPanelPZ55_SerializeTests.cs
new file mode 100644
index 000000000..c0a23e93f
--- /dev/null
+++ b/src/NonVisuals.Tests/Serialization/SwitchPanelPZ55_SerializeTests.cs
@@ -0,0 +1,45 @@
+using System.Linq;
+using ClassLibraryCommon;
+using Newtonsoft.Json;
+using NonVisuals.HID;
+using NonVisuals.Panels.Saitek.Panels;
+using NonVisuals.Tests.Serialization.Common;
+using Xunit;
+
+namespace NonVisuals.Tests.Serialization.Panels {
+    public class SwitchPanelPZ55_SerializeTests {
+        [Fact]
+        public static void SwitchPanelPZ55_ShouldBeSerializable() {
+            SwitchPanelPZ55 s = GetObject();
+
+            string serializedObj = JsonConvert.SerializeObject(s, Formatting.Indented, JSonSettings.JsonDefaultSettings);
+           // SwitchPanelPZ55 d = JsonConvert.DeserializeObject<SwitchPanelPZ55>(serializedObj);
+
+            RepositorySerialized repo = new();
+            //Save sample file in project (use it only once)
+            //repo.SaveSerializedObjectToFile(s.GetType(), serializedObj);
+
+            //SwitchPanelPZ55 deseralizedObjFromFile = JsonConvert.DeserializeObject<SwitchPanelPZ55>(repo.GetSerializedObjectString(s.GetType()));
+
+           // DeepAssert.Equal(s, deseralizedObjFromFile);
+           // DeepAssert.Equal(d, deseralizedObjFromFile);
+        }
+
+        public static SwitchPanelPZ55 GetObject(int instanceNbr = 1) {
+            GamingPanelSkeleton gamingPanelSkeleton = new(GamingPanelVendorEnum.Saitek, GamingPanelEnum.PZ55SwitchPanel);
+            return new SwitchPanelPZ55(new HIDSkeleton(gamingPanelSkeleton, "FakeHidInstanceForTests"))
+            {
+                ManualLandingGearLEDs = false,
+                ManualLandingGearLEDsColorDown = BIPLight_SerializeTests.GetPanelLEDColorFromInstance(instanceNbr),
+                ManualLandingGearLEDsColorUp = BIPLight_SerializeTests.GetPanelLEDColorFromInstance(instanceNbr + 1),
+                ManualLandingGearLEDsColorTrans = BIPLight_SerializeTests.GetPanelLEDColorFromInstance(instanceNbr + 2),
+                ManualLandingGearTransTimeSeconds = instanceNbr + 6,
+                
+                DCSBiosBindings = DCSBIOSActionBindingPZ55_SerializeTests.GetObjects(),
+                KeyBindingsHashSet = KeyBindingPZ55_SerializeTests.GetObjects(),
+                OSCommandList = OSCommandBindingPZ55_SerializeTests.GetObjects().ToList(),
+                BIPLinkHashSet = BIPLinkPZ55_SerializeTests.GetObjects()
+            };
+        }
+    }
+}
diff --git a/src/PublishReleaseDCSFP.ps1 b/src/PublishReleaseDCSFP.ps1
index c603b4040..63e1e2ee9 100644
--- a/src/PublishReleaseDCSFP.ps1
+++ b/src/PublishReleaseDCSFP.ps1
@@ -62,10 +62,10 @@ if (($env:dcsfpReleaseDestinationFolderPath -eq $null) -or (-not (Test-Path $env
 }
 
 #---------------------------------
-# Tests execution For DCSFP
+# Tests execution For DCSFlightpanels
 #---------------------------------
-Write-Host "Starting tests execution for DCSFP" -foregroundcolor "Green"
-$testPath = $scriptPath + "\DCSFP.Tests"
+Write-Host "Starting tests execution for DCSFlightpanels" -foregroundcolor "Green"
+$testPath = $scriptPath + "\DCSFlightpanels.Tests"
 Set-Location -Path $testPath
 dotnet test
 $testsLastExitCode = $LastExitCode
@@ -74,7 +74,22 @@ if ( 0 -ne $testsLastExitCode ) {
 	Write-Host "Fatal error. Some unit tests failed." -foregroundcolor "Red"
 	exit
 }
-Write-Host "Finished tests execution for DCSFP" -foregroundcolor "Green"
+Write-Host "Finished tests execution for DCSFlightpanels" -foregroundcolor "Green"
+
+#---------------------------------
+# Tests execution For DCS-BIOS
+#---------------------------------
+Write-Host "Starting tests execution for DCS-BIOS" -foregroundcolor "Green"
+$testPath = $scriptPath + "\DCS-BIOS.Tests"
+Set-Location -Path $testPath
+dotnet test
+$testsLastExitCode = $LastExitCode
+Write-Host "Tests LastExitCode: $testsLastExitCode" -foregroundcolor "Green"
+if ( 0 -ne $testsLastExitCode ) {
+	Write-Host "Fatal error. Some unit tests failed." -foregroundcolor "Red"
+	exit
+}
+Write-Host "Finished tests execution for DCS-BIOS" -foregroundcolor "Green"
 
 #---------------------------------
 # Tests execution For NonVisuals

From 68547e2eb7a64628795dcc57cf98b2cff644ba83 Mon Sep 17 00:00:00 2001
From: Jerker Dahlblom <jdahlblom@users.noreply.github.com>
Date: Mon, 11 Mar 2024 09:01:41 +0200
Subject: [PATCH 4/4] Add System.Configuration.ConfigurationManager

---
 src/DCS-BIOS.Tests/DCS-BIOS.Tests.csproj     | 1 +
 src/NonVisuals.Tests/NonVisuals.Tests.csproj | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/DCS-BIOS.Tests/DCS-BIOS.Tests.csproj b/src/DCS-BIOS.Tests/DCS-BIOS.Tests.csproj
index d9237e8b2..6011bf8f5 100644
--- a/src/DCS-BIOS.Tests/DCS-BIOS.Tests.csproj
+++ b/src/DCS-BIOS.Tests/DCS-BIOS.Tests.csproj
@@ -10,6 +10,7 @@
 	<ItemGroup>
 		<PackageReference Include="ExpectedObjects" Version="3.5.4" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
 		<PackageReference Include="xunit" Version="2.7.0" />
 		<PackageReference Include="xunit.runner.console" Version="2.7.0">
 			<PrivateAssets>all</PrivateAssets>
diff --git a/src/NonVisuals.Tests/NonVisuals.Tests.csproj b/src/NonVisuals.Tests/NonVisuals.Tests.csproj
index 36463a459..fb6614679 100644
--- a/src/NonVisuals.Tests/NonVisuals.Tests.csproj
+++ b/src/NonVisuals.Tests/NonVisuals.Tests.csproj
@@ -9,6 +9,7 @@
   <ItemGroup>
     <PackageReference Include="ExpectedObjects" Version="3.5.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
     <PackageReference Include="xunit" Version="2.7.0" />
     <PackageReference Include="xunit.runner.console" Version="2.7.0">
       <PrivateAssets>all</PrivateAssets>