diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs
index 6db2b88f..3a65110e 100644
--- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs
@@ -13,153 +13,61 @@ using mRemoteNGTests.TestHelpers;
 using NSubstitute;
 using NUnit.Framework;
 
-namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv;
-
-public class CsvConnectionsDeserializerMremotengFormatTests
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
 {
-    private CsvConnectionsDeserializerMremotengFormat _deserializer;
-    private CsvConnectionsSerializerMremotengFormat _serializer;
-
-    [SetUp]
-    public void Setup()
+    public class CsvConnectionsDeserializerMremotengFormatTests
     {
-        _deserializer = new CsvConnectionsDeserializerMremotengFormat();
-        var credentialRepositoryList = Substitute.For<ICredentialRepositoryList>();
-        _serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), credentialRepositoryList);
-    }
+        private CsvConnectionsDeserializerMremotengFormat _deserializer;
+        private CsvConnectionsSerializerMremotengFormat _serializer;
 
-    [TestCaseSource(typeof(DeserializationTestSource), nameof(DeserializationTestSource.ConnectionPropertyTestCases))]
-    public object ConnectionPropertiesDeserializedCorrectly(string propertyToCheck)
-    {
-        var csv = _serializer.Serialize(GetTestConnection());
-        var deserializedConnections = _deserializer.Deserialize(csv);
-        var connection = deserializedConnections.GetRecursiveChildList().FirstOrDefault();
-        var propertyValue = typeof(ConnectionInfo).GetProperty(propertyToCheck)?.GetValue(connection);
-        return propertyValue;
-    }
-
-    [TestCaseSource(typeof(DeserializationTestSource), nameof(DeserializationTestSource.InheritanceTestCases))]
-    public object InheritancePropertiesDeserializedCorrectly(string propertyToCheck)
-    {
-        var csv = _serializer.Serialize(GetTestConnectionWithAllInherited());
-        var deserializedConnections = _deserializer.Deserialize(csv);
-        var connection = deserializedConnections.GetRecursiveChildList().FirstOrDefault();
-        connection?.RemoveParent();
-        var propertyValue = typeof(ConnectionInfoInheritance).GetProperty(propertyToCheck)
-            ?.GetValue(connection?.Inheritance);
-        return propertyValue;
-    }
-
-    [Test]
-    public void TreeStructureDeserializedCorrectly()
-    {
-        //Root
-        // |- folder1
-        // |   |- Con1
-        // |- Con2
-        var treeModel = new ConnectionTreeModelBuilder().Build();
-        var csv = _serializer.Serialize(treeModel);
-        var deserializedConnections = _deserializer.Deserialize(csv);
-        var con1 = deserializedConnections.GetRecursiveChildList().First(info => info.Name == "Con1");
-        var folder1 = deserializedConnections.GetRecursiveChildList().First(info => info.Name == "folder1");
-        Assert.That(con1.Parent, Is.EqualTo(folder1));
-    }
-
-    internal static ConnectionInfo GetTestConnection()
-    {
-        return new ConnectionInfo
+        [SetUp]
+        public void Setup()
         {
-            Name = "SomeName",
-            Description = "SomeDescription",
-            Icon = "SomeIcon",
-            Panel = "SomePanel",
-            Username = "SomeUsername",
-            Password = "SomePassword",
-            Domain = "SomeDomain",
-            Hostname = "SomeHostname",
-            PuttySession = "SomePuttySession",
-            LoadBalanceInfo = "SomeLoadBalanceInfo",
-            OpeningCommand = "SomeOpeningCommand",
-            PreExtApp = "SomePreExtApp",
-            PostExtApp = "SomePostExtApp",
-            MacAddress = "SomeMacAddress",
-            UserField = "SomeUserField",
-            VmId = "SomeVmId",
-            ExtApp = "SomeExtApp",
-            VNCProxyUsername = "SomeVNCProxyUsername",
-            VNCProxyPassword = "SomeVNCProxyPassword",
-            RDGatewayUsername = "SomeRDGatewayUsername",
-            RDGatewayPassword = "SomeRDGatewayPassword",
-            RDGatewayDomain = "SomeRDGatewayDomain",
-            VNCProxyIP = "SomeVNCProxyIP",
-            RDGatewayHostname = "SomeRDGatewayHostname",
-            RDGatewayExternalCredentialProvider = ExternalCredentialProvider.None,
-            RDGatewayUserViaAPI = "123",
-            Protocol = ProtocolType.RDP,
-            Port = 999,
-            Favorite = true,
-            UseConsoleSession = true,
-            UseCredSsp = true,
-            UseRestrictedAdmin = true,
-            UseRCG = true,
-            UseVmId = false,
-            UseEnhancedMode = false,
-            RenderingEngine = HTTPBase.RenderingEngine.EdgeChromium,
-            RDPAuthenticationLevel = AuthenticationLevel.WarnOnFailedAuth,
-            Colors = RDPColors.Colors16Bit,
-            Resolution = RDPResolutions.Res1366x768,
-            AutomaticResize = true,
-            DisplayWallpaper = true,
-            DisplayThemes = true,
-            EnableFontSmoothing = true,
-            EnableDesktopComposition = true,
-            DisableFullWindowDrag = false,
-            DisableMenuAnimations = false,
-            DisableCursorShadow = false,
-            DisableCursorBlinking = false,
-            CacheBitmaps = true,
-            RedirectDiskDrives = true,
-            RedirectPorts = true,
-            RedirectPrinters = true,
-            RedirectSmartCards = true,
-            RedirectSound = RDPSounds.LeaveAtRemoteComputer,
-            RedirectAudioCapture = true,
-            RedirectKeys = true,
-            VNCCompression = ProtocolVNC.Compression.Comp4,
-            VNCEncoding = ProtocolVNC.Encoding.EncRRE,
-            VNCAuthMode = ProtocolVNC.AuthMode.AuthVNC,
-            VNCProxyType = ProtocolVNC.ProxyType.ProxySocks5,
-            VNCProxyPort = 123,
-            VNCColors = ProtocolVNC.Colors.Col8Bit,
-            VNCSmartSizeMode = ProtocolVNC.SmartSizeMode.SmartSAspect,
-            VNCViewOnly = true,
-            RDGatewayUsageMethod = RDGatewayUsageMethod.Detect,
-            RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.SmartCard,
-            UserViaAPI = "",
-            EC2InstanceId = "",
-            EC2Region = "eu-central-1",
-            ExternalAddressProvider = ExternalAddressProvider.None,
-            ExternalCredentialProvider = ExternalCredentialProvider.None
-        };
-    }
+            _deserializer = new CsvConnectionsDeserializerMremotengFormat();
+            var credentialRepositoryList = Substitute.For<ICredentialRepositoryList>();
+            _serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), credentialRepositoryList);
+        }
 
-    internal static ConnectionInfo GetTestConnectionWithAllInherited()
-    {
-        var connectionInfo = new ConnectionInfo();
-        connectionInfo.Inheritance.TurnOnInheritanceCompletely();
-        return connectionInfo;
-    }
+        [TestCaseSource(typeof(DeserializationTestSource), nameof(DeserializationTestSource.ConnectionPropertyTestCases))]
+        public object ConnectionPropertiesDeserializedCorrectly(string propertyToCheck)
+        {
+            var csv = _serializer.Serialize(GetTestConnection());
+            var deserializedConnections = _deserializer.Deserialize(csv);
+            var connection = deserializedConnections.GetRecursiveChildList().FirstOrDefault();
+            var propertyValue = typeof(ConnectionInfo).GetProperty(propertyToCheck)?.GetValue(connection);
+            return propertyValue;
+        }
+
+        [TestCaseSource(typeof(DeserializationTestSource), nameof(DeserializationTestSource.InheritanceTestCases))]
+        public object InheritancePropertiesDeserializedCorrectly(string propertyToCheck)
+        {
+            var csv = _serializer.Serialize(GetTestConnectionWithAllInherited());
+            var deserializedConnections = _deserializer.Deserialize(csv);
+            var connection = deserializedConnections.GetRecursiveChildList().FirstOrDefault();
+            connection?.RemoveParent();
+            var propertyValue = typeof(ConnectionInfoInheritance).GetProperty(propertyToCheck)?.GetValue(connection?.Inheritance);
+            return propertyValue;
+        }
+
+        [Test]
+        public void TreeStructureDeserializedCorrectly()
+        {
+            //Root
+            // |- folder1
+            // |   |- Con1
+            // |- Con2
+            var treeModel = new ConnectionTreeModelBuilder().Build();
+            var csv = _serializer.Serialize(treeModel);
+            var deserializedConnections = _deserializer.Deserialize(csv);
+            var con1 = deserializedConnections.GetRecursiveChildList().First(info => info.Name == "Con1");
+            var folder1 = deserializedConnections.GetRecursiveChildList().First(info => info.Name == "folder1");
+            Assert.That(con1.Parent, Is.EqualTo(folder1));
+        }
 
-    private class DeserializationTestSource
-    {
-        public static IEnumerable ConnectionPropertyTestCases()
         private static ConnectionInfo GetTestConnection()
         {
-            var ignoreProperties = new[]
+            return new ConnectionInfo
             {
-                nameof(ConnectionInfo.Inheritance),
-                nameof(ConnectionInfo.ConstantID),
-                nameof(ConnectionInfo.Parent)
                 Name = "SomeName",
                 Description = "SomeDescription",
                 Icon = "SomeIcon",
@@ -233,15 +141,8 @@ public class CsvConnectionsDeserializerMremotengFormatTests
                 ExternalAddressProvider = ExternalAddressProvider.None,
                 ExternalCredentialProvider = ExternalCredentialProvider.None
             };
-            var properties = typeof(ConnectionInfo)
-                .GetProperties()
-                .Where(property => !ignoreProperties.Contains(property.Name));
-            var testCases = new List<TestCaseData>();
-            var testConnectionInfo = GetTestConnection();
+        }
 
-            foreach (var property in properties)
-                testCases.Add(
-                    new TestCaseData(property.Name)
         private static ConnectionInfo GetTestConnectionWithAllInherited()
         {
             var connectionInfo = new ConnectionInfo();
@@ -281,7 +182,7 @@ public class CsvConnectionsDeserializerMremotengFormatTests
                 {
                     nameof(ConnectionInfoInheritance.EverythingInherited),
                     nameof(ConnectionInfoInheritance.Parent),
-					nameof(ConnectionInfoInheritance.EverythingInherited)
+                    nameof(ConnectionInfoInheritance.EverythingInherited)
                 };
                 var properties = typeof(ConnectionInfoInheritance)
                     .GetProperties()
@@ -290,11 +191,11 @@ public class CsvConnectionsDeserializerMremotengFormatTests
                 var testInheritance = GetTestConnectionWithAllInherited().Inheritance;
 
                 return properties
-	                .Select(property => 
-		                new TestCaseData(property.Name)
-			                .Returns(property.GetValue(testInheritance)))
-	                .ToList();
+                    .Select(property =>
+                        new TestCaseData(property.Name)
+                            .Returns(property.GetValue(testInheritance)))
+                    .ToList();
             }
         }
     }
-}
+}
\ No newline at end of file