diff --git a/ImageSharp.sln.DotSettings b/ImageSharp.sln.DotSettings
new file mode 100644
index 0000000000..3ee9cd4145
--- /dev/null
+++ b/ImageSharp.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IncorrectConstantExpectedAnnotation/@EntryIndexedValue">HINT</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/ImageSharp/ColorProfiles/Icc/Calculators/GrayTrcCalculator.cs b/src/ImageSharp/ColorProfiles/Icc/Calculators/GrayTrcCalculator.cs
index 8d823c1e95..1016f829be 100644
--- a/src/ImageSharp/ColorProfiles/Icc/Calculators/GrayTrcCalculator.cs
+++ b/src/ImageSharp/ColorProfiles/Icc/Calculators/GrayTrcCalculator.cs
@@ -12,7 +12,7 @@ internal class GrayTrcCalculator : IVector4Calculator
     private readonly TrcCalculator calculator;
 
     public GrayTrcCalculator(IccTagDataEntry grayTrc, bool toPcs)
-        => this.calculator = new TrcCalculator(new IccTagDataEntry[] { grayTrc }, !toPcs);
+        => this.calculator = new TrcCalculator([grayTrc], !toPcs);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public Vector4 Calculate(Vector4 value) => this.calculator.Calculate(value);
diff --git a/src/ImageSharp/Common/Helpers/TestHelpers.cs b/src/ImageSharp/Common/Helpers/TestHelpers.cs
deleted file mode 100644
index d358b9f016..0000000000
--- a/src/ImageSharp/Common/Helpers/TestHelpers.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-namespace SixLabors.ImageSharp.Common.Helpers;
-
-/// <summary>
-/// Internal utilities intended to be only used in tests.
-/// </summary>
-internal static class TestHelpers
-{
-    /// <summary>
-    /// This constant is useful to verify the target framework ImageSharp has been built against.
-    /// Only intended to be used in tests!
-    /// </summary>
-    internal const string ImageSharpBuiltAgainst =
-#if NETCOREAPP3_1
-        "netcoreapp3.1";
-#elif NETCOREAPP2_1
-        "netcoreapp2.1";
-#elif NETSTANDARD2_1
-        "netstandard2.1";
-#elif NETSTANDARD2_0
-        "netstandard2.0";
-#elif NETSTANDARD1_3
-        "netstandard1.3";
-#else
-        "net472";
-#endif
-}
diff --git a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.FrameConfig.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.FrameConfig.cs
index 98b6dd30a6..d86d5cad12 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.FrameConfig.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.FrameConfig.cs
@@ -21,175 +21,159 @@ private static JpegFrameConfig[] CreateFrameConfigs()
         JpegQuantizationTableConfig defaultLuminanceQuantTable = new(0, Quantization.LuminanceTable);
         JpegQuantizationTableConfig defaultChrominanceQuantTable = new(1, Quantization.ChrominanceTable);
 
-        JpegHuffmanTableConfig[] yCbCrHuffmanConfigs = new JpegHuffmanTableConfig[]
-        {
+        JpegHuffmanTableConfig[] yCbCrHuffmanConfigs =
+        [
             defaultLuminanceHuffmanDC,
             defaultLuminanceHuffmanAC,
             defaultChrominanceHuffmanDC,
-            defaultChrominanceHuffmanAC,
-        };
+            defaultChrominanceHuffmanAC
+        ];
 
-        JpegQuantizationTableConfig[] yCbCrQuantTableConfigs = new JpegQuantizationTableConfig[]
-        {
+        JpegQuantizationTableConfig[] yCbCrQuantTableConfigs =
+        [
             defaultLuminanceQuantTable,
-            defaultChrominanceQuantTable,
-        };
+            defaultChrominanceQuantTable
+        ];
+
+        return
+        [
 
-        return new JpegFrameConfig[]
-        {
             // YCbCr 4:4:4
-            new(
+            new JpegFrameConfig(
                 JpegColorSpace.YCbCr,
                 JpegColorType.YCbCrRatio444,
-                new JpegComponentConfig[]
-                {
-                    new(id: 1, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 2, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
-                    new(id: 3, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
-                },
+                [
+                    new JpegComponentConfig(id: 1, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 2, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
+                    new JpegComponentConfig(id: 3, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1)
+                ],
                 yCbCrHuffmanConfigs,
                 yCbCrQuantTableConfigs),
 
             // YCbCr 4:2:2
-            new(
+            new JpegFrameConfig(
                 JpegColorSpace.YCbCr,
                 JpegColorType.YCbCrRatio422,
-                new JpegComponentConfig[]
-                {
-                    new(id: 1, hsf: 2, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 2, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
-                    new(id: 3, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
-                },
+                [
+                    new JpegComponentConfig(id: 1, hsf: 2, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 2, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
+                    new JpegComponentConfig(id: 3, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1)
+                ],
                 yCbCrHuffmanConfigs,
                 yCbCrQuantTableConfigs),
 
             // YCbCr 4:2:0
-            new(
+            new JpegFrameConfig(
                 JpegColorSpace.YCbCr,
                 JpegColorType.YCbCrRatio420,
-                new JpegComponentConfig[]
-                {
-                    new(id: 1, hsf: 2, vsf: 2, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 2, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
-                    new(id: 3, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
-                },
+                [
+                    new JpegComponentConfig(id: 1, hsf: 2, vsf: 2, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 2, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
+                    new JpegComponentConfig(id: 3, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1)
+                ],
                 yCbCrHuffmanConfigs,
                 yCbCrQuantTableConfigs),
 
             // YCbCr 4:1:1
-            new(
+            new JpegFrameConfig(
                 JpegColorSpace.YCbCr,
                 JpegColorType.YCbCrRatio411,
-                new JpegComponentConfig[]
-                {
-                    new(id: 1, hsf: 4, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 2, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
-                    new(id: 3, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
-                },
+                [
+                    new JpegComponentConfig(id: 1, hsf: 4, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 2, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
+                    new JpegComponentConfig(id: 3, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1)
+                ],
                 yCbCrHuffmanConfigs,
                 yCbCrQuantTableConfigs),
 
             // YCbCr 4:1:0
-            new(
+            new JpegFrameConfig(
                 JpegColorSpace.YCbCr,
                 JpegColorType.YCbCrRatio410,
-                new JpegComponentConfig[]
-                {
-                    new(id: 1, hsf: 4, vsf: 2, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 2, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
-                    new(id: 3, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
-                },
+                [
+                    new JpegComponentConfig(id: 1, hsf: 4, vsf: 2, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 2, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1),
+                    new JpegComponentConfig(id: 3, hsf: 1, vsf: 1, quantIndex: 1, dcIndex: 1, acIndex: 1)
+                ],
                 yCbCrHuffmanConfigs,
                 yCbCrQuantTableConfigs),
 
             // Luminance
-            new(
+            new JpegFrameConfig(
                 JpegColorSpace.Grayscale,
                 JpegColorType.Luminance,
-                new JpegComponentConfig[]
-                {
-                    new(id: 0, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                },
-                new JpegHuffmanTableConfig[]
-                {
+                [
+                    new JpegComponentConfig(id: 0, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0)
+                ],
+                [
                     defaultLuminanceHuffmanDC,
                     defaultLuminanceHuffmanAC
-                },
-                new JpegQuantizationTableConfig[]
-                {
+                ],
+                [
                     defaultLuminanceQuantTable
-                }),
+                ]),
 
             // Rgb
-            new(
+            new JpegFrameConfig(
                 JpegColorSpace.RGB,
                 JpegColorType.Rgb,
-                new JpegComponentConfig[]
-                {
-                    new(id: 82, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 71, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 66, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                },
-                new JpegHuffmanTableConfig[]
-                {
+                [
+                    new JpegComponentConfig(id: 82, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 71, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 66, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0)
+                ],
+                [
                     defaultLuminanceHuffmanDC,
                     defaultLuminanceHuffmanAC
-                },
-                new JpegQuantizationTableConfig[]
-                {
+                ],
+                [
                     defaultLuminanceQuantTable
-                })
+                ])
             {
                 AdobeColorTransformMarkerFlag = JpegConstants.Adobe.ColorTransformUnknown
             },
 
             // Cmyk
-            new(
+            new JpegFrameConfig(
                 JpegColorSpace.Cmyk,
                 JpegColorType.Cmyk,
-                new JpegComponentConfig[]
-                {
-                    new(id: 1, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 2, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 3, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 4, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                },
-                new JpegHuffmanTableConfig[]
-                {
+                [
+                    new JpegComponentConfig(id: 1, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 2, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 3, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 4, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0)
+                ],
+                [
                     defaultLuminanceHuffmanDC,
                     defaultLuminanceHuffmanAC
-                },
-                new JpegQuantizationTableConfig[]
-                {
+                ],
+                [
                     defaultLuminanceQuantTable
-                })
+                ])
             {
                 AdobeColorTransformMarkerFlag = JpegConstants.Adobe.ColorTransformUnknown,
             },
 
             // YccK
-            new(
+            new JpegFrameConfig(
                 JpegColorSpace.Ycck,
                 JpegColorType.Ycck,
-                new JpegComponentConfig[]
-                {
-                    new(id: 1, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 2, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 3, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                    new(id: 4, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
-                },
-                new JpegHuffmanTableConfig[]
-                {
+                [
+                    new JpegComponentConfig(id: 1, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 2, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 3, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0),
+                    new JpegComponentConfig(id: 4, hsf: 1, vsf: 1, quantIndex: 0, dcIndex: 0, acIndex: 0)
+                ],
+                [
                     defaultLuminanceHuffmanDC,
                     defaultLuminanceHuffmanAC
-                },
-                new JpegQuantizationTableConfig[]
-                {
+                ],
+                [
                     defaultLuminanceQuantTable
-                })
+                ])
             {
                 AdobeColorTransformMarkerFlag = JpegConstants.Adobe.ColorTransformYcck,
-            },
-        };
+            }
+        ];
     }
 }
diff --git a/src/ImageSharp/Metadata/Profiles/ICC/TagDataEntries/IccTextDescriptionTagDataEntry.cs b/src/ImageSharp/Metadata/Profiles/ICC/TagDataEntries/IccTextDescriptionTagDataEntry.cs
index 7db26e5c58..5f94961409 100644
--- a/src/ImageSharp/Metadata/Profiles/ICC/TagDataEntries/IccTextDescriptionTagDataEntry.cs
+++ b/src/ImageSharp/Metadata/Profiles/ICC/TagDataEntries/IccTextDescriptionTagDataEntry.cs
@@ -102,7 +102,7 @@ public static explicit operator IccMultiLocalizedUnicodeTagDataEntry(IccTextDesc
             localString = new IccLocalizedString(string.Empty);
         }
 
-        return new IccMultiLocalizedUnicodeTagDataEntry(new[] { localString }, textEntry.TagSignature);
+        return new IccMultiLocalizedUnicodeTagDataEntry([localString], textEntry.TagSignature);
 
         static CultureInfo GetCulture(uint value)
         {
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs b/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs
index 59f5773cf1..aec6c3c276 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs
@@ -35,7 +35,7 @@ public AffineTransformProcessor(Configuration configuration, AffineTransformProc
     {
         this.destinationSize = definition.DestinationSize;
         this.transformMatrix = definition.TransformMatrix;
-        this.transformMatrix4x4 = new(this.transformMatrix);
+        this.transformMatrix4x4 = new Matrix4x4(this.transformMatrix);
         this.resampler = definition.Sampler;
     }
 
diff --git a/tests/ImageSharp.Tests/Common/EncoderExtensionsTests.cs b/tests/ImageSharp.Tests/Common/EncoderExtensionsTests.cs
index 8421c1fd74..e6bf32e4d2 100644
--- a/tests/ImageSharp.Tests/Common/EncoderExtensionsTests.cs
+++ b/tests/ImageSharp.Tests/Common/EncoderExtensionsTests.cs
@@ -20,7 +20,7 @@ public void GetString_EmptyBuffer_ReturnsEmptyString()
     [Fact]
     public void GetString_Buffer_ReturnsString()
     {
-        ReadOnlySpan<byte> buffer = new(new byte[] { 73, 109, 97, 103, 101, 83, 104, 97, 114, 112 });
+        ReadOnlySpan<byte> buffer = new("ImageSharp"u8.ToArray());
 
         string result = Encoding.UTF8.GetString(buffer);
 
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegMetadataTests.cs
index 37be0f8f56..6ea5288182 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegMetadataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegMetadataTests.cs
@@ -71,7 +71,7 @@ public void Comment_EmptyComment()
     public void Comment_OnlyComment()
     {
         string comment = "test comment";
-        Collection<string> expectedCollection = new() { comment };
+        Collection<string> expectedCollection = [comment];
 
         JpegMetadata meta = new();
         meta.Comments.Add(JpegComData.FromString(comment));
diff --git a/tests/ImageSharp.Tests/Formats/WebP/Vp8HistogramTests.cs b/tests/ImageSharp.Tests/Formats/WebP/Vp8HistogramTests.cs
index 990c583856..d397fc60c8 100644
--- a/tests/ImageSharp.Tests/Formats/WebP/Vp8HistogramTests.cs
+++ b/tests/ImageSharp.Tests/Formats/WebP/Vp8HistogramTests.cs
@@ -13,55 +13,60 @@ public static IEnumerable<object[]> Data
     {
         get
         {
-            List<object[]> result = new();
-            result.Add(new object[]
-            {
-                new byte[]
-                {
-                    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 128, 128, 128, 128, 128, 128,
-                    128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-                    16, 16, 16, 19, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-                    128, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 128, 128, 128, 128, 128,
-                    128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-                    16, 16, 16, 16, 19, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-                    128, 128, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 128, 128, 128, 128,
-                    128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-                    16, 16, 16, 16, 16, 19, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-                    128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 128, 128, 128,
-                    128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16,
-                    16, 16, 16, 16, 16, 16, 19, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-                    128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 204, 204, 204,
-                    204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 16, 16, 16, 16, 16, 16, 16, 16,
-                    16, 16, 16, 16, 16, 16, 19, 16, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
-                    204, 204, 204, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 204, 204, 204,
-                    204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 16, 16, 16, 16, 16, 16, 16, 16,
-                    16, 16, 16, 16, 16, 16, 19, 16, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
-                    204, 204, 204, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 204, 204, 204,
-                    204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 16, 16, 16, 16, 16, 16, 16, 16,
-                    16, 16, 16, 16, 16, 16, 19, 16, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
-                    204, 204, 204, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 24, 16, 204, 204, 204,
-                    204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 16, 16, 16, 16, 16, 16, 16, 16,
-                    16, 16, 16, 16, 16, 16, 16, 16, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
-                    204, 204, 204
-                },
-                new byte[]
-                {
-                    128, 128, 128, 128, 129, 129, 129, 129, 127, 127, 127, 127, 129, 129, 129, 129, 128, 127, 127,
-                    127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 128, 128, 128, 128, 129, 129,
-                    129, 129, 127, 127, 127, 127, 129, 129, 129, 129, 129, 128, 127, 127, 128, 127, 127, 127, 127,
-                    127, 127, 127, 127, 127, 127, 127, 128, 128, 128, 128, 129, 129, 129, 129, 127, 127, 127, 127,
-                    129, 129, 129, 129, 129, 129, 128, 127, 129, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-                    127, 128, 128, 128, 128, 129, 129, 129, 129, 127, 127, 127, 127, 129, 129, 129, 129, 129, 129,
-                    129, 128, 129, 128, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 128, 128, 127, 127, 129,
-                    129, 129, 129, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
-                    204, 204, 204, 204, 204, 204, 204, 204, 129, 129, 128, 128, 129, 129, 129, 129, 204, 204, 204,
-                    204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
-                    204, 204, 129, 129, 129, 129, 129, 129, 129, 129, 204, 204, 204, 204, 204, 204, 204, 204, 204,
-                    204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 129, 129, 129, 129,
-                    129, 129, 129, 129, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
-                    204, 204, 204, 204, 204, 204, 204, 204, 204
-                }
-            });
+            List<object[]> result =
+            [
+                [
+                    new byte[]
+                    {
+                        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 128, 128, 128, 128, 128,
+                        128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16,
+                        16, 16, 16, 16, 16, 16, 19, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+                        128, 128, 128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16,
+                        128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 16, 16,
+                        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 128, 128, 128, 128, 128, 128,
+                        128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+                        16, 16, 16, 16, 16, 19, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+                        128, 128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 128,
+                        128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 16, 16, 16,
+                        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 128, 128, 128, 128, 128, 128, 128,
+                        128, 128, 128, 128, 128, 128, 128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+                        16, 16, 16, 19, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+                        128, 128, 128, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 204, 204,
+                        204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 16, 16, 16, 16,
+                        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 204, 204, 204, 204, 204, 204, 204, 204,
+                        204, 204, 204, 204, 204, 204, 204, 204, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+                        16, 16, 19, 16, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
+                        204, 204, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 204, 204, 204,
+                        204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 16, 16, 16, 16, 16, 16,
+                        16, 16, 16, 16, 16, 16, 16, 16, 19, 16, 204, 204, 204, 204, 204, 204, 204, 204, 204,
+                        204, 204, 204, 204, 204, 204, 204, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+                        16, 19, 16, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
+                        204, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 24, 16, 204, 204, 204, 204,
+                        204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 16, 16, 16, 16, 16, 16, 16,
+                        16, 16, 16, 16, 16, 16, 16, 16, 16, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
+                        204, 204, 204, 204, 204, 204
+                    },
+                    new byte[]
+                    {
+                        128, 128, 128, 128, 129, 129, 129, 129, 127, 127, 127, 127, 129, 129, 129, 129, 128,
+                        127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 128, 128,
+                        128, 128, 129, 129, 129, 129, 127, 127, 127, 127, 129, 129, 129, 129, 129, 128, 127,
+                        127, 128, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 128, 128, 128, 128,
+                        129, 129, 129, 129, 127, 127, 127, 127, 129, 129, 129, 129, 129, 129, 128, 127, 129,
+                        127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 128, 128, 128, 128, 129, 129,
+                        129, 129, 127, 127, 127, 127, 129, 129, 129, 129, 129, 129, 129, 128, 129, 128, 127,
+                        127, 127, 127, 127, 127, 127, 127, 127, 127, 128, 128, 127, 127, 129, 129, 129, 129,
+                        204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
+                        204, 204, 204, 204, 204, 204, 204, 129, 129, 128, 128, 129, 129, 129, 129, 204, 204,
+                        204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
+                        204, 204, 204, 204, 204, 129, 129, 129, 129, 129, 129, 129, 129, 204, 204, 204, 204,
+                        204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
+                        204, 204, 204, 129, 129, 129, 129, 129, 129, 129, 129, 204, 204, 204, 204, 204, 204,
+                        204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204
+                    }
+                ]
+
+            ];
             return result;
         }
     }
@@ -72,7 +77,7 @@ private static void RunCollectHistogramTest()
         Vp8Histogram histogram = new();
 
         byte[] reference =
-        {
+        [
             154, 154, 151, 151, 149, 148, 151, 157, 163, 163, 154, 132, 102, 98, 104, 108, 107, 104, 104, 103,
             101, 106, 123, 119, 170, 171, 172, 171, 168, 175, 171, 173, 151, 151, 149, 150, 147, 147, 146, 159,
             164, 165, 154, 129, 92, 90, 101, 105, 104, 103, 104, 101, 100, 105, 123, 117, 172, 172, 172, 168,
@@ -99,9 +104,9 @@ private static void RunCollectHistogramTest()
             95, 102, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 151, 130,
             82, 82, 89, 134, 154, 161, 161, 157, 152, 129, 81, 77, 95, 102, 204, 204, 204, 204, 204, 204, 204,
             204, 204, 204, 204, 204, 204, 204, 204, 204
-        };
+        ];
         byte[] pred =
-        {
+        [
             128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
             129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 128, 128, 128, 128, 128, 128, 128, 128,
             128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
@@ -154,7 +159,7 @@ private static void RunCollectHistogramTest()
             129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 127, 127, 127, 127, 127, 127, 127, 127,
             127, 127, 127, 127, 127, 127, 127, 127, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
             129, 129, 129, 129
-        };
+        ];
         int expectedAlpha = 146;
 
         // act
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs b/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs
index 6322e65aaa..ca0b2b7cf3 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs
@@ -570,7 +570,6 @@ public unsafe void WrapMemory_Pointer_Null(int size, int height, int width)
         }
 
         private static bool ShouldSkipBitmapTest =>
-            !TestEnvironment.Is64BitProcess || (TestHelpers.ImageSharpBuiltAgainst != "netcoreapp3.1" &&
-                                                TestHelpers.ImageSharpBuiltAgainst != "netcoreapp2.1");
+            !TestEnvironment.Is64BitProcess || true;
     }
 }
diff --git a/tests/ImageSharp.Tests/Memory/DiscontiguousBuffers/MemoryGroupTests.cs b/tests/ImageSharp.Tests/Memory/DiscontiguousBuffers/MemoryGroupTests.cs
index fe1867f20c..d5dc014c55 100644
--- a/tests/ImageSharp.Tests/Memory/DiscontiguousBuffers/MemoryGroupTests.cs
+++ b/tests/ImageSharp.Tests/Memory/DiscontiguousBuffers/MemoryGroupTests.cs
@@ -99,9 +99,9 @@ public void TransformInplace(int totalLength, int bufferLength)
     [Fact]
     public void Wrap()
     {
-        int[] data0 = { 1, 2, 3, 4 };
-        int[] data1 = { 5, 6, 7, 8 };
-        int[] data2 = { 9, 10 };
+        int[] data0 = [1, 2, 3, 4];
+        int[] data1 = [5, 6, 7, 8];
+        int[] data2 = [9, 10];
         using TestMemoryManager<int> mgr0 = new(data0);
         using TestMemoryManager<int> mgr1 = new(data1);
 
@@ -116,7 +116,7 @@ public void Wrap()
         Assert.True(group[2].Span.SequenceEqual(data2));
 
         int cnt = 0;
-        int[][] allData = { data0, data1, data2 };
+        int[][] allData = [data0, data1, data2];
         foreach (Memory<int> memory in group)
         {
             Assert.True(memory.Span.SequenceEqual(allData[cnt]));
diff --git a/tests/ImageSharp.Tests/Metadata/Profiles/Exif/ExifReaderTests.cs b/tests/ImageSharp.Tests/Metadata/Profiles/Exif/ExifReaderTests.cs
index 983ff44937..db9566dae8 100644
--- a/tests/ImageSharp.Tests/Metadata/Profiles/Exif/ExifReaderTests.cs
+++ b/tests/ImageSharp.Tests/Metadata/Profiles/Exif/ExifReaderTests.cs
@@ -21,7 +21,7 @@ public void Read_DataIsEmpty_ReturnsEmptyCollection()
     [Fact]
     public void Read_DataIsMinimal_ReturnsEmptyCollection()
     {
-        ExifReader reader = new(new byte[] { 69, 120, 105, 102, 0, 0 });
+        ExifReader reader = new("Exif\0\0"u8.ToArray());
 
         IList<IExifValue> result = reader.ReadValues();
 
diff --git a/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs b/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs
index d7d6741baf..4d733a8ebf 100644
--- a/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs
+++ b/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs
@@ -458,7 +458,7 @@ public void ExifNumberTests(ExifTag tag)
     [MemberData(nameof(NumberArrayTags))]
     public void ExifNumberArrayTests(ExifTag tag)
     {
-        Number[] expected = [new Number(uint.MaxValue)];
+        Number[] expected = [new(uint.MaxValue)];
         ExifValue value = ExifValues.Create(tag);
 
         Assert.False(value.TrySetValue(expected.ToString()));
@@ -496,7 +496,7 @@ public void ExifRationalTests(ExifTag tag)
     [MemberData(nameof(RationalArrayTags))]
     public void ExifRationalArrayTests(ExifTag tag)
     {
-        Rational[] expected = [new Rational(21, 42)];
+        Rational[] expected = [new(21, 42)];
         ExifValue value = ExifValues.Create(tag);
 
         Assert.False(value.TrySetValue(expected.ToString()));
@@ -554,7 +554,7 @@ public void ExifSignedRationalTests(ExifTag tag)
     [MemberData(nameof(SignedRationalArrayTags))]
     public void ExifSignedRationalArrayTests(ExifTag tag)
     {
-        SignedRational[] expected = [new SignedRational(21, 42)];
+        SignedRational[] expected = [new(21, 42)];
         ExifValue value = ExifValues.Create(tag);
 
         Assert.False(value.TrySetValue(expected.ToString()));
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTestsTPixel.cs b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTestsTPixel.cs
index 2c97cbde07..ecc241edc7 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTestsTPixel.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTestsTPixel.cs
@@ -12,7 +12,7 @@ public class PorterDuffFunctionsTestsTPixel
     private static Span<T> AsSpan<T>(T value)
         where T : struct
     {
-        return new Span<T>(new[] { value });
+        return new Span<T>([value]);
     }
 
     public static TheoryData<object, object, float, object> NormalBlendFunctionData = new()
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs
index f045c981eb..70ad20ec9c 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs
@@ -47,10 +47,10 @@ public void VerifyBokehBlurProcessorArguments_Fail(int radius, int components, f
     public void VerifyComplexComponents()
     {
         // Get the saved components
-        List<Complex64[]> components = new();
+        List<Complex64[]> components = [];
         foreach (Match match in Regex.Matches(Components10x2, @"\[\[(.*?)\]\]", RegexOptions.Singleline))
         {
-            string[] values = match.Groups[1].Value.Trim().Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+            string[] values = match.Groups[1].Value.Trim().Split([' '], StringSplitOptions.RemoveEmptyEntries);
             Complex64[] component = values.Select(
                 value =>
                     {
@@ -114,12 +114,12 @@ public void Serialize(IXunitSerializationInfo info)
     };
 
     public static readonly string[] TestFiles =
-        {
-            TestImages.Png.CalliphoraPartial,
+    [
+        TestImages.Png.CalliphoraPartial,
             TestImages.Png.Bike,
             TestImages.Png.BikeGrayscale,
-            TestImages.Png.Cross,
-        };
+            TestImages.Png.Cross
+    ];
 
     [Theory]
     [WithFileCollection(nameof(TestFiles), nameof(BokehBlurValues), PixelTypes.Rgba32)]
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs
index 56e9a5201b..8387601448 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs
@@ -35,7 +35,7 @@ public void CropUpdatesSubject<TPixel>(TestImageProvider<TPixel> provider)
     {
         using Image<TPixel> image = provider.GetImage();
 
-        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile = new ExifProfile();
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectLocation, [5, 15]);
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectArea, [5, 15, 50, 50]);
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
index 9aa04e370a..abb4443b91 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
@@ -50,7 +50,7 @@ public void FlipVerticalUpdatesSubject<TPixel>(TestImageProvider<TPixel> provide
     {
         using Image<TPixel> image = provider.GetImage();
 
-        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile = new ExifProfile();
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectLocation, [5, 15]);
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectArea, [5, 15, 50, 50]);
 
@@ -79,7 +79,7 @@ public void FlipHorizontalUpdatesSubject<TPixel>(TestImageProvider<TPixel> provi
     {
         using Image<TPixel> image = provider.GetImage();
 
-        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile = new ExifProfile();
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectLocation, [5, 15]);
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectArea, [5, 15, 50, 50]);
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs
index 2e580ea9fa..ffbab87e2b 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs
@@ -239,7 +239,7 @@ public void TransformUpdatesSubject<TPixel>(TestImageProvider<TPixel> provider)
     {
         using Image<TPixel> image = provider.GetImage();
 
-        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile = new ExifProfile();
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectLocation, [5, 15]);
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectArea, [5, 15, 50, 50]);
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
index 1e0e66965a..080bba2bfc 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
@@ -639,7 +639,7 @@ public void ResizeUpdatesSubject<TPixel>(TestImageProvider<TPixel> provider)
     {
         using Image<TPixel> image = provider.GetImage();
 
-        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile = new ExifProfile();
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectLocation, [5, 15]);
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectArea, [5, 15, 20, 20]);
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
index dfa263fec0..f67f368a16 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
@@ -48,7 +48,7 @@ public void RotateUpdatesSubject<TPixel>(TestImageProvider<TPixel> provider)
     {
         using Image<TPixel> image = provider.GetImage();
 
-        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile = new ExifProfile();
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectLocation, [5, 15]);
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectArea, [5, 15, 50, 50]);
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/SwizzleTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/SwizzleTests.cs
index 33e22d3644..6b69d20b18 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/SwizzleTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/SwizzleTests.cs
@@ -60,7 +60,7 @@ public void SwizzleUpdatesSubject<TPixel>(TestImageProvider<TPixel> provider)
     {
         using Image<TPixel> image = provider.GetImage();
 
-        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile = new ExifProfile();
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectLocation, [5, 15]);
         image.Metadata.ExifProfile.SetValue(ExifTag.SubjectArea, [5, 15, 20, 20]);
 
diff --git a/tests/ImageSharp.Tests/TestDataIcc/Conversion/IccConversionDataMultiProcessElement.cs b/tests/ImageSharp.Tests/TestDataIcc/Conversion/IccConversionDataMultiProcessElement.cs
index f79666e3e3..39a6bbcd24 100644
--- a/tests/ImageSharp.Tests/TestDataIcc/Conversion/IccConversionDataMultiProcessElement.cs
+++ b/tests/ImageSharp.Tests/TestDataIcc/Conversion/IccConversionDataMultiProcessElement.cs
@@ -9,15 +9,14 @@ public class IccConversionDataMultiProcessElement
 {
     private static readonly IccMatrixProcessElement Matrix = new(
         new float[,]
-    {
-        { 2, 4, 6 },
-        { 3, 5, 7 },
-    },
-        new float[] { 3, 4, 5 });
+        {
+            { 2, 4, 6 },
+            { 3, 5, 7 },
+        },
+        [3, 4, 5]);
 
     private static readonly IccClut Clut = new(
-        new[]
-        {
+        [
             0.2f, 0.3f,
             0.4f, 0.2f,
 
@@ -28,9 +27,9 @@ public class IccConversionDataMultiProcessElement
             0.42f, 0.52f,
 
             0.23f, 0.33f,
-            0.43f, 0.53f,
-        },
-        new byte[] { 2, 2, 2 },
+            0.43f, 0.53f
+        ],
+        [2, 2, 2],
         IccClutDataType.Float,
         outputChannelCount: 2);
 
@@ -42,39 +41,39 @@ public class IccConversionDataMultiProcessElement
     private static readonly IccCurveSetProcessElement CurveSet1DFormula2 = Create1DSingleCurveSet(FormulaCurveElement2);
     private static readonly IccCurveSetProcessElement CurveSet1DFormula3 = Create1DSingleCurveSet(FormulaCurveElement3);
 
-    private static readonly IccCurveSetProcessElement CurveSet1DFormula1And2 = Create1DMultiCurveSet(new[] { 0.5f }, FormulaCurveElement1, FormulaCurveElement2);
+    private static readonly IccCurveSetProcessElement CurveSet1DFormula1And2 = Create1DMultiCurveSet([0.5f], FormulaCurveElement1, FormulaCurveElement2);
 
     private static readonly IccClutProcessElement ClutElement = new(Clut);
 
     private static IccCurveSetProcessElement Create1DSingleCurveSet(IccCurveSegment segment)
     {
-        IccOneDimensionalCurve curve = new(new float[0], new[] { segment });
-        return new IccCurveSetProcessElement(new[] { curve });
+        IccOneDimensionalCurve curve = new([], [segment]);
+        return new IccCurveSetProcessElement([curve]);
     }
 
     private static IccCurveSetProcessElement Create1DMultiCurveSet(float[] breakPoints, params IccCurveSegment[] segments)
     {
         IccOneDimensionalCurve curve = new(breakPoints, segments);
-        return new IccCurveSetProcessElement(new[] { curve });
+        return new IccCurveSetProcessElement([curve]);
     }
 
     public static object[][] MpeCurveConversionTestData =
-    {
-        new object[] { CurveSet1DFormula1, new[] { 0.51f }, new[] { 0.575982451f } },
-        new object[] { CurveSet1DFormula2, new[] { 0.52f }, new[] { -0.4684991f } },
-        new object[] { CurveSet1DFormula3, new[] { 0.53f }, new[] { 0.86126f } },
+    [
+        [CurveSet1DFormula1, new[] { 0.51f }, new[] { 0.575982451f }],
+        [CurveSet1DFormula2, new[] { 0.52f }, new[] { -0.4684991f }],
+        [CurveSet1DFormula3, new[] { 0.53f }, new[] { 0.86126f }],
 
-        new object[] { CurveSet1DFormula1And2, new[] { 0.31f }, new[] { 0.445982f } },
-        new object[] { CurveSet1DFormula1And2, new[] { 0.61f }, new[] { -0.341274023f } },
-    };
+        [CurveSet1DFormula1And2, new[] { 0.31f }, new[] { 0.445982f }],
+        [CurveSet1DFormula1And2, new[] { 0.61f }, new[] { -0.341274023f }]
+    ];
 
     public static object[][] MpeMatrixConversionTestData =
-    {
-        new object[] { Matrix, new float[] { 2, 4 }, new float[] { 19, 32, 45 } }
-    };
+    [
+        [Matrix, new float[] { 2, 4 }, new float[] { 19, 32, 45 }]
+    ];
 
     public static object[][] MpeClutConversionTestData =
-    {
-        new object[] { ClutElement, new[] { 0.5f, 0.5f, 0.5f }, new[] { 0.5f, 0.5f } }
-    };
+    [
+        [ClutElement, new[] { 0.5f, 0.5f, 0.5f }, new[] { 0.5f, 0.5f }]
+    ];
 }