diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestDiscoveryExtensionManager.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestDiscoveryExtensionManager.cs
index 7c8dd21d9f..a3635d4cc0 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestDiscoveryExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestDiscoveryExtensionManager.cs
@@ -63,7 +63,6 @@ public static TestDiscoveryExtensionManager Create()
     {
         if (s_testDiscoveryExtensionManager == null)
         {
-
             TestPluginManager.GetSpecificTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
                     TestPlatformConstants.TestAdapterEndsWithPattern,
                     out var unfilteredTestExtensions,
diff --git a/src/vstest.console/CommandLine/CommandLineOptions.cs b/src/vstest.console/CommandLine/CommandLineOptions.cs
index bbaccb8909..9609885629 100644
--- a/src/vstest.console/CommandLine/CommandLineOptions.cs
+++ b/src/vstest.console/CommandLine/CommandLineOptions.cs
@@ -56,17 +56,7 @@ internal class CommandLineOptions
     /// Gets the instance.
     /// </summary>
     internal static CommandLineOptions Instance
-    {
-        get
-        {
-            if (s_instance == null)
-            {
-                s_instance = new CommandLineOptions();
-            }
-
-            return s_instance;
-        }
-    }
+        => s_instance ??= new CommandLineOptions();
 
     /// <summary>
     /// Default constructor.
@@ -78,7 +68,7 @@ internal CommandLineOptions()
         FileHelper = new FileHelper();
         FilePatternParser = new FilePatternParser();
 #if TODO
-            UseVsixExtensions = Utilities.GetAppSettingValue(UseVsixExtensionsKey, false);
+        UseVsixExtensions = Utilities.GetAppSettingValue(UseVsixExtensionsKey, false);
 #endif
     }
 
diff --git a/src/vstest.console/CommandLine/TestRunResultAggregator.cs b/src/vstest.console/CommandLine/TestRunResultAggregator.cs
index 05b0505558..e2f8f0dc88 100644
--- a/src/vstest.console/CommandLine/TestRunResultAggregator.cs
+++ b/src/vstest.console/CommandLine/TestRunResultAggregator.cs
@@ -31,17 +31,7 @@ protected internal TestRunResultAggregator()
     /// </summary>
     /// <returns>Instance of the test run result aggregator.</returns>
     public static TestRunResultAggregator Instance
-    {
-        get
-        {
-            if (s_instance == null)
-            {
-                s_instance = new TestRunResultAggregator();
-            }
-
-            return s_instance;
-        }
-    }
+        => s_instance ??= new TestRunResultAggregator();
 
     /// <summary>
     /// The current test run outcome.
diff --git a/src/vstest.console/Processors/ArtifactProcessingCollectModeProcessor.cs b/src/vstest.console/Processors/ArtifactProcessingCollectModeProcessor.cs
index d8da6d5723..4ccf55239e 100644
--- a/src/vstest.console/Processors/ArtifactProcessingCollectModeProcessor.cs
+++ b/src/vstest.console/Processors/ArtifactProcessingCollectModeProcessor.cs
@@ -25,37 +25,18 @@ internal class ArtifactProcessingCollectModeProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ArtifactProcessingCollectModeProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ArtifactProcessingCollectModeProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new ArtifactProcessingCollectModeProcessorExecutor(CommandLineOptions.Instance));
-            }
-
-            return _executor;
-        }
-
-        set
-        {
-            _executor = value;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ArtifactProcessingCollectModeProcessorExecutor(CommandLineOptions.Instance));
+
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/ArtifactProcessingPostProcessModeProcessor.cs b/src/vstest.console/Processors/ArtifactProcessingPostProcessModeProcessor.cs
index 482d2d03c2..67781ae30b 100644
--- a/src/vstest.console/Processors/ArtifactProcessingPostProcessModeProcessor.cs
+++ b/src/vstest.console/Processors/ArtifactProcessingPostProcessModeProcessor.cs
@@ -29,38 +29,19 @@ internal class ArtifactProcessingPostProcessModeProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ArtifactProcessingPostProcessModeProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ArtifactProcessingPostProcessModeProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new ArtifactProcessingPostProcessModeProcessorExecutor(CommandLineOptions.Instance,
-                    new ArtifactProcessingManager(CommandLineOptions.Instance.TestSessionCorrelationId)));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ArtifactProcessingPostProcessModeProcessorExecutor(CommandLineOptions.Instance,
+                new ArtifactProcessingManager(CommandLineOptions.Instance.TestSessionCorrelationId)));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 
     public static bool ContainsPostProcessCommand(string[]? args, IFeatureFlag? featureFlag = null)
diff --git a/src/vstest.console/Processors/CLIRunSettingsArgumentProcessor.cs b/src/vstest.console/Processors/CLIRunSettingsArgumentProcessor.cs
index 76e776061a..d9859c844c 100644
--- a/src/vstest.console/Processors/CLIRunSettingsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/CLIRunSettingsArgumentProcessor.cs
@@ -36,37 +36,18 @@ internal class CliRunSettingsArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new CliRunSettingsArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new CliRunSettingsArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new CliRunSettingsArgumentExecutor(RunSettingsManager.Instance, CommandLineOptions.Instance));
-            }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new CliRunSettingsArgumentExecutor(RunSettingsManager.Instance, CommandLineOptions.Instance));
 
-            return _executor;
-        }
-
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
@@ -141,7 +122,7 @@ private void CreateOrOverwriteRunSettings(IRunSettingsProvider runSettingsProvid
 
         foreach (var arg in args)
         {
-            // when we see that the parameter begins with TestRunParameters 
+            // when we see that the parameter begins with TestRunParameters
             // but does not end with ") we start merging the params
             if (arg.StartsWith("TestRunParameters", StringComparison.OrdinalIgnoreCase))
             {
@@ -180,7 +161,7 @@ private void CreateOrOverwriteRunSettings(IRunSettingsProvider runSettingsProvid
 
         if (merge)
         {
-            // we tried to merge but never found the end of that 
+            // we tried to merge but never found the end of that
             // test paramter, add what we merged up until now
             mergedArgs.Add(mergedArg);
         }
diff --git a/src/vstest.console/Processors/CollectArgumentProcessor.cs b/src/vstest.console/Processors/CollectArgumentProcessor.cs
index e7461b8059..3b894b9095 100644
--- a/src/vstest.console/Processors/CollectArgumentProcessor.cs
+++ b/src/vstest.console/Processors/CollectArgumentProcessor.cs
@@ -42,37 +42,18 @@ internal class CollectArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new CollectArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new CollectArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new CollectArgumentExecutor(RunSettingsManager.Instance, new FileHelper()));
-            }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new CollectArgumentExecutor(RunSettingsManager.Instance, new FileHelper()));
 
-            return _executor;
-        }
-
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/DisableAutoFakesArgumentProcessor.cs b/src/vstest.console/Processors/DisableAutoFakesArgumentProcessor.cs
index 2a275fbee1..6828bada23 100644
--- a/src/vstest.console/Processors/DisableAutoFakesArgumentProcessor.cs
+++ b/src/vstest.console/Processors/DisableAutoFakesArgumentProcessor.cs
@@ -23,24 +23,15 @@ internal class DisableAutoFakesArgumentProcessor : IArgumentProcessor
 
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            return _executor ??= new Lazy<IArgumentExecutor>(
-                () => new DisableAutoFakesArgumentExecutor(
-                    CommandLineOptions.Instance));
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new DisableAutoFakesArgumentExecutor(CommandLineOptions.Instance));
 
         set => _executor = value;
     }
 
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            return _metadata ??= new Lazy<IArgumentProcessorCapabilities>(
-                () => new DisableAutoFakesArgumentProcessorCapabilities());
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new DisableAutoFakesArgumentProcessorCapabilities());
 }
 
 internal class DisableAutoFakesArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
diff --git a/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs b/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs
index f207df710f..5c61f86737 100644
--- a/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs
+++ b/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs
@@ -44,36 +44,18 @@ public EnableBlameArgumentProcessor()
     }
 
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new EnableBlameArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new EnableBlameArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new EnableBlameArgumentExecutor(RunSettingsManager.Instance, new PlatformEnvironment(), new FileHelper()));
-            }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new EnableBlameArgumentExecutor(RunSettingsManager.Instance, new PlatformEnvironment(), new FileHelper()));
 
-            return _executor;
-        }
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/EnableCodeCoverageArgumentProcessor.cs b/src/vstest.console/Processors/EnableCodeCoverageArgumentProcessor.cs
index 234488247e..49cbbc6b44 100644
--- a/src/vstest.console/Processors/EnableCodeCoverageArgumentProcessor.cs
+++ b/src/vstest.console/Processors/EnableCodeCoverageArgumentProcessor.cs
@@ -37,37 +37,18 @@ internal class EnableCodeCoverageArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new EnableCodeCoverageArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new EnableCodeCoverageArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new EnableCodeCoverageArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, new FileHelper()));
-            }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new EnableCodeCoverageArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, new FileHelper()));
 
-            return _executor;
-        }
-
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/EnableDiagArgumentProcessor.cs b/src/vstest.console/Processors/EnableDiagArgumentProcessor.cs
index 9b9096c310..18e89a7503 100644
--- a/src/vstest.console/Processors/EnableDiagArgumentProcessor.cs
+++ b/src/vstest.console/Processors/EnableDiagArgumentProcessor.cs
@@ -50,37 +50,17 @@ protected EnableDiagArgumentProcessor(IFileHelper fileHelper)
     }
 
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new EnableDiagArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new EnableDiagArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new EnableDiagArgumentExecutor(_fileHelper));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() => new EnableDiagArgumentExecutor(_fileHelper));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
@@ -155,7 +135,7 @@ public void Initialize(string argument)
         // Initialize diag logging.
         InitializeDiagLogging(diagFilePath, diagParameters);
 
-        // Write version to the log here, because that is the 
+        // Write version to the log here, because that is the
         // first place where we know if we log or not.
         EqtTrace.Verbose($"Version: {Product.Version}");
     }
diff --git a/src/vstest.console/Processors/EnableLoggerArgumentProcessor.cs b/src/vstest.console/Processors/EnableLoggerArgumentProcessor.cs
index 9cbc487f31..fa65d8afc2 100644
--- a/src/vstest.console/Processors/EnableLoggerArgumentProcessor.cs
+++ b/src/vstest.console/Processors/EnableLoggerArgumentProcessor.cs
@@ -36,38 +36,18 @@ internal class EnableLoggerArgumentProcessor : IArgumentProcessor
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new EnableLoggerArgumentExecutor(RunSettingsManager.Instance));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new EnableLoggerArgumentExecutor(RunSettingsManager.Instance));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 
     /// <summary>
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new EnableLoggerArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
-
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new EnableLoggerArgumentProcessorCapabilities());
 }
 
 internal class EnableLoggerArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
diff --git a/src/vstest.console/Processors/EnvironmentArgumentProcessor.cs b/src/vstest.console/Processors/EnvironmentArgumentProcessor.cs
index 07b30cb054..7e760589a5 100644
--- a/src/vstest.console/Processors/EnvironmentArgumentProcessor.cs
+++ b/src/vstest.console/Processors/EnvironmentArgumentProcessor.cs
@@ -36,35 +36,14 @@ internal class EnvironmentArgumentProcessor : IArgumentProcessor
 
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(
-                    () => new ArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, ConsoleOutput.Instance)
-                );
-            }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, ConsoleOutput.Instance));
 
-            return _executor;
-        }
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() => new ArgumentProcessorCapabilities());
 
     internal class ArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
     {
@@ -104,7 +83,7 @@ public ArgumentExecutor(CommandLineOptions commandLineOptions, IRunSettingsProvi
         /// Set the environment variables in RunSettings.xml
         /// </summary>
         /// <param name="argument">
-        /// Environment variable to set. 
+        /// Environment variable to set.
         /// </param>
         public void Initialize(string argument)
         {
diff --git a/src/vstest.console/Processors/FrameworkArgumentProcessor.cs b/src/vstest.console/Processors/FrameworkArgumentProcessor.cs
index 9fc7f9394f..2cfba59b4f 100644
--- a/src/vstest.console/Processors/FrameworkArgumentProcessor.cs
+++ b/src/vstest.console/Processors/FrameworkArgumentProcessor.cs
@@ -36,37 +36,18 @@ internal class FrameworkArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new FrameworkArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new FrameworkArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new FrameworkArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new FrameworkArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/HelpArgumentProcessor.cs b/src/vstest.console/Processors/HelpArgumentProcessor.cs
index bf3c27e94e..7f77fb5a99 100644
--- a/src/vstest.console/Processors/HelpArgumentProcessor.cs
+++ b/src/vstest.console/Processors/HelpArgumentProcessor.cs
@@ -37,37 +37,16 @@ internal class HelpArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new HelpArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() => new HelpArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new HelpArgumentExecutor());
-            }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() => new HelpArgumentExecutor());
 
-            return _executor;
-        }
-
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/InIsolationArgumentProcessor.cs b/src/vstest.console/Processors/InIsolationArgumentProcessor.cs
index 1e3afad377..bd36ea4e96 100644
--- a/src/vstest.console/Processors/InIsolationArgumentProcessor.cs
+++ b/src/vstest.console/Processors/InIsolationArgumentProcessor.cs
@@ -31,40 +31,18 @@ internal class InIsolationArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new InIsolationArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new InIsolationArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor =
-                    new Lazy<IArgumentExecutor>(
-                        () =>
-                            new InIsolationArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new InIsolationArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/ListExtensionsArgumentProcessor.cs b/src/vstest.console/Processors/ListExtensionsArgumentProcessor.cs
index fe5be232f0..f3dc55604c 100644
--- a/src/vstest.console/Processors/ListExtensionsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ListExtensionsArgumentProcessor.cs
@@ -53,34 +53,13 @@ public ListExtensionsArgumentProcessor(Func<IArgumentExecutor> getExecutor, Func
 
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(_getExecutor);
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(_getExecutor);
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(_getCapabilities);
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(_getCapabilities);
 }
 
 #region List discoverers
diff --git a/src/vstest.console/Processors/ListFullyQualifiedTestsArgumentProcessor.cs b/src/vstest.console/Processors/ListFullyQualifiedTestsArgumentProcessor.cs
index 0c70a15845..ab14170be9 100644
--- a/src/vstest.console/Processors/ListFullyQualifiedTestsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ListFullyQualifiedTestsArgumentProcessor.cs
@@ -42,43 +42,21 @@ internal class ListFullyQualifiedTestsArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ListFullyQualifiedTestsArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ListFullyQualifiedTestsArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor =
-                    new Lazy<IArgumentExecutor>(
-                        () =>
-                            new ListFullyQualifiedTestsArgumentExecutor(
-                                CommandLineOptions.Instance,
-                                RunSettingsManager.Instance,
-                                TestRequestManager.Instance));
-            }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ListFullyQualifiedTestsArgumentExecutor(
+                CommandLineOptions.Instance,
+                RunSettingsManager.Instance,
+                TestRequestManager.Instance));
 
-            return _executor;
-        }
-
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/ListTestsArgumentProcessor.cs b/src/vstest.console/Processors/ListTestsArgumentProcessor.cs
index 46b4348ea0..b6d2925d69 100644
--- a/src/vstest.console/Processors/ListTestsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ListTestsArgumentProcessor.cs
@@ -44,43 +44,21 @@ internal class ListTestsArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ListTestsArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ListTestsArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor =
-                    new Lazy<IArgumentExecutor>(
-                        () =>
-                            new ListTestsArgumentExecutor(
-                                CommandLineOptions.Instance,
-                                RunSettingsManager.Instance,
-                                TestRequestManager.Instance));
-            }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ListTestsArgumentExecutor(
+                CommandLineOptions.Instance,
+                RunSettingsManager.Instance,
+                TestRequestManager.Instance));
 
-            return _executor;
-        }
-
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/ListTestsTargetPathArgumentProcessor.cs b/src/vstest.console/Processors/ListTestsTargetPathArgumentProcessor.cs
index 30b64aa2ec..5763afe22c 100644
--- a/src/vstest.console/Processors/ListTestsTargetPathArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ListTestsTargetPathArgumentProcessor.cs
@@ -25,37 +25,18 @@ internal class ListTestsTargetPathArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ListTestsTargetPathArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ListTestsTargetPathArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new ListTestsTargetPathArgumentExecutor(CommandLineOptions.Instance));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ListTestsTargetPathArgumentExecutor(CommandLineOptions.Instance));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/ParallelArgumentProcessor.cs b/src/vstest.console/Processors/ParallelArgumentProcessor.cs
index 1b0e4bff20..ad64b00fb1 100644
--- a/src/vstest.console/Processors/ParallelArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ParallelArgumentProcessor.cs
@@ -32,37 +32,18 @@ internal class ParallelArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ParallelArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ParallelArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new ParallelArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ParallelArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/ParentProcessIdArgumentProcessor.cs b/src/vstest.console/Processors/ParentProcessIdArgumentProcessor.cs
index 46eb18613b..2f8d86aae8 100644
--- a/src/vstest.console/Processors/ParentProcessIdArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ParentProcessIdArgumentProcessor.cs
@@ -28,38 +28,18 @@ internal class ParentProcessIdArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ParentProcessIdArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ParentProcessIdArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() =>
-                    new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/PlatformArgumentProcessor.cs b/src/vstest.console/Processors/PlatformArgumentProcessor.cs
index b836e96d57..d30588fdae 100644
--- a/src/vstest.console/Processors/PlatformArgumentProcessor.cs
+++ b/src/vstest.console/Processors/PlatformArgumentProcessor.cs
@@ -37,37 +37,18 @@ internal class PlatformArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new PlatformArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new PlatformArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new PlatformArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new PlatformArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/PortArgumentProcessor.cs b/src/vstest.console/Processors/PortArgumentProcessor.cs
index 0eaadf60fa..8260da2eaf 100644
--- a/src/vstest.console/Processors/PortArgumentProcessor.cs
+++ b/src/vstest.console/Processors/PortArgumentProcessor.cs
@@ -39,38 +39,17 @@ internal class PortArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new PortArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() => new PortArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() =>
-                    new PortArgumentExecutor(CommandLineOptions.Instance, TestRequestManager.Instance));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new PortArgumentExecutor(CommandLineOptions.Instance, TestRequestManager.Instance));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/ResponseFileArgumentProcessor.cs b/src/vstest.console/Processors/ResponseFileArgumentProcessor.cs
index 598b76b2f5..a0cbcf703e 100644
--- a/src/vstest.console/Processors/ResponseFileArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ResponseFileArgumentProcessor.cs
@@ -26,17 +26,8 @@ internal class ResponseFileArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ResponseFileArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ResponseFileArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
diff --git a/src/vstest.console/Processors/ResultsDirectoryArgumentProcessor.cs b/src/vstest.console/Processors/ResultsDirectoryArgumentProcessor.cs
index 77d7ec7e3b..7aedb678ae 100644
--- a/src/vstest.console/Processors/ResultsDirectoryArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ResultsDirectoryArgumentProcessor.cs
@@ -36,37 +36,18 @@ internal class ResultsDirectoryArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ResultsDirectoryArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ResultsDirectoryArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new ResultsDirectoryArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-            }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ResultsDirectoryArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
 
-            return _executor;
-        }
-
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/RunSettingsArgumentProcessor.cs b/src/vstest.console/Processors/RunSettingsArgumentProcessor.cs
index c16738eaab..ebb3a040c1 100644
--- a/src/vstest.console/Processors/RunSettingsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/RunSettingsArgumentProcessor.cs
@@ -38,37 +38,18 @@ internal class RunSettingsArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new RunSettingsArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new RunSettingsArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new RunSettingsArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-            }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new RunSettingsArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
 
-            return _executor;
-        }
-
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/RunSpecificTestsArgumentProcessor.cs b/src/vstest.console/Processors/RunSpecificTestsArgumentProcessor.cs
index adbed0ec90..637a03b27f 100644
--- a/src/vstest.console/Processors/RunSpecificTestsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/RunSpecificTestsArgumentProcessor.cs
@@ -34,40 +34,20 @@ internal class RunSpecificTestsArgumentProcessor : IArgumentProcessor
     private Lazy<IArgumentExecutor> _executor;
 
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new RunSpecificTestsArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new RunSpecificTestsArgumentProcessorCapabilities());
 
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() =>
-                    new RunSpecificTestsArgumentExecutor(
-                        CommandLineOptions.Instance,
-                        RunSettingsManager.Instance,
-                        TestRequestManager.Instance,
-                        new ArtifactProcessingManager(CommandLineOptions.Instance.TestSessionCorrelationId),
-                        ConsoleOutput.Instance));
-            }
-
-            return _executor;
-        }
-
-        set
-        {
-            _executor = value;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new RunSpecificTestsArgumentExecutor(
+                CommandLineOptions.Instance,
+                RunSettingsManager.Instance,
+                TestRequestManager.Instance,
+                new ArtifactProcessingManager(CommandLineOptions.Instance.TestSessionCorrelationId),
+                ConsoleOutput.Instance));
+
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/RunTestsArgumentProcessor.cs b/src/vstest.console/Processors/RunTestsArgumentProcessor.cs
index 42972f46de..c0f61e57af 100644
--- a/src/vstest.console/Processors/RunTestsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/RunTestsArgumentProcessor.cs
@@ -33,38 +33,20 @@ internal class RunTestsArgumentProcessor : IArgumentProcessor
     private Lazy<IArgumentExecutor> _executor;
 
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new RunTestsArgumentProcessorCapabilities());
-            }
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new RunTestsArgumentProcessorCapabilities());
 
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() =>
-                    new RunTestsArgumentExecutor(
-                        CommandLineOptions.Instance,
-                        RunSettingsManager.Instance,
-                        TestRequestManager.Instance,
-                        new ArtifactProcessingManager(CommandLineOptions.Instance.TestSessionCorrelationId),
-                        ConsoleOutput.Instance));
-            }
-
-            return _executor;
-        }
-        set
-        {
-            _executor = value;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new RunTestsArgumentExecutor(
+                CommandLineOptions.Instance,
+                RunSettingsManager.Instance,
+                TestRequestManager.Instance,
+                new ArtifactProcessingManager(CommandLineOptions.Instance.TestSessionCorrelationId),
+                ConsoleOutput.Instance));
+
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/TestAdapterLoadingStrategyArgumentProcessor.cs b/src/vstest.console/Processors/TestAdapterLoadingStrategyArgumentProcessor.cs
index 4785cfe395..3358ef78df 100644
--- a/src/vstest.console/Processors/TestAdapterLoadingStrategyArgumentProcessor.cs
+++ b/src/vstest.console/Processors/TestAdapterLoadingStrategyArgumentProcessor.cs
@@ -37,37 +37,18 @@ internal class TestAdapterLoadingStrategyArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new TestAdapterLoadingStrategyArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new TestAdapterLoadingStrategyArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new TestAdapterLoadingStrategyArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, ConsoleOutput.Instance, new FileHelper()));
-            }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new TestAdapterLoadingStrategyArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, ConsoleOutput.Instance, new FileHelper()));
 
-            return _executor;
-        }
-
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/TestAdapterPathArgumentProcessor.cs b/src/vstest.console/Processors/TestAdapterPathArgumentProcessor.cs
index d273ec55e4..7d3dd47e2a 100644
--- a/src/vstest.console/Processors/TestAdapterPathArgumentProcessor.cs
+++ b/src/vstest.console/Processors/TestAdapterPathArgumentProcessor.cs
@@ -38,7 +38,8 @@ internal class TestAdapterPathArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() => new TestAdapterPathArgumentProcessorCapabilities());
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new TestAdapterPathArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
diff --git a/src/vstest.console/Processors/TestCaseFilterArgumentProcessor.cs b/src/vstest.console/Processors/TestCaseFilterArgumentProcessor.cs
index 17150524b1..3a7c695c26 100644
--- a/src/vstest.console/Processors/TestCaseFilterArgumentProcessor.cs
+++ b/src/vstest.console/Processors/TestCaseFilterArgumentProcessor.cs
@@ -31,37 +31,18 @@ internal class TestCaseFilterArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new TestCaseFilterArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new TestCaseFilterArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new TestCaseFilterArgumentExecutor(CommandLineOptions.Instance));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new TestCaseFilterArgumentExecutor(CommandLineOptions.Instance));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/TestSessionCorrelationIdProcessor.cs b/src/vstest.console/Processors/TestSessionCorrelationIdProcessor.cs
index 4dc20182c2..e0deae6603 100644
--- a/src/vstest.console/Processors/TestSessionCorrelationIdProcessor.cs
+++ b/src/vstest.console/Processors/TestSessionCorrelationIdProcessor.cs
@@ -27,37 +27,18 @@ internal class TestSessionCorrelationIdProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new TestSessionCorrelationIdProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new TestSessionCorrelationIdProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new TestSessionCorrelationIdProcessorModeProcessorExecutor(CommandLineOptions.Instance));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new TestSessionCorrelationIdProcessorModeProcessorExecutor(CommandLineOptions.Instance));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/TestSourceArgumentProcessor.cs b/src/vstest.console/Processors/TestSourceArgumentProcessor.cs
index 0aaeab100f..fd05023d27 100644
--- a/src/vstest.console/Processors/TestSourceArgumentProcessor.cs
+++ b/src/vstest.console/Processors/TestSourceArgumentProcessor.cs
@@ -28,35 +28,18 @@ internal class TestSourceArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new TestSourceArgumentProcessorCapabilities());
-            }
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new TestSourceArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new TestSourceArgumentExecutor(CommandLineOptions.Instance));
-            }
-
-            return _executor;
-        }
-        set
-        {
-            _executor = value;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new TestSourceArgumentExecutor(CommandLineOptions.Instance));
+
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/Processors/UseVsixExtensionsArgumentProcessor.cs b/src/vstest.console/Processors/UseVsixExtensionsArgumentProcessor.cs
index 4822e0cdca..a4c8bfdc22 100644
--- a/src/vstest.console/Processors/UseVsixExtensionsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/UseVsixExtensionsArgumentProcessor.cs
@@ -34,37 +34,18 @@ internal class UseVsixExtensionsArgumentProcessor : IArgumentProcessor
     /// Gets the metadata.
     /// </summary>
     public Lazy<IArgumentProcessorCapabilities> Metadata
-    {
-        get
-        {
-            if (_metadata == null)
-            {
-                _metadata = new Lazy<IArgumentProcessorCapabilities>(() => new UseVsixExtensionsArgumentProcessorCapabilities());
-            }
-
-            return _metadata;
-        }
-    }
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new UseVsixExtensionsArgumentProcessorCapabilities());
 
     /// <summary>
     /// Gets or sets the executor.
     /// </summary>
     public Lazy<IArgumentExecutor> Executor
     {
-        get
-        {
-            if (_executor == null)
-            {
-                _executor = new Lazy<IArgumentExecutor>(() => new UseVsixExtensionsArgumentExecutor(CommandLineOptions.Instance, TestRequestManager.Instance, new VSExtensionManager(), ConsoleOutput.Instance));
-            }
-
-            return _executor;
-        }
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new UseVsixExtensionsArgumentExecutor(CommandLineOptions.Instance, TestRequestManager.Instance, new VSExtensionManager(), ConsoleOutput.Instance));
 
-        set
-        {
-            _executor = value;
-        }
+        set => _executor = value;
     }
 }
 
diff --git a/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs b/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
index 0888ad1e9b..f08fbf603b 100644
--- a/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
+++ b/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
@@ -125,17 +125,7 @@ internal TestRequestManager(
     /// Gets the test request manager instance.
     /// </summary>
     public static ITestRequestManager Instance
-    {
-        get
-        {
-            if (s_testRequestManagerInstance == null)
-            {
-                s_testRequestManagerInstance = new TestRequestManager();
-            }
-
-            return s_testRequestManagerInstance;
-        }
-    }
+        => s_testRequestManagerInstance ??= new TestRequestManager();
 
     #region ITestRequestManager
 
diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
index cd2c70192f..c0bba0c503 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
+++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
@@ -73,17 +73,7 @@ public static string BuildConfiguration
     }
 
     public Dictionary<string, string> DependencyVersions
-    {
-        get
-        {
-            if (s_dependencyVersions == null)
-            {
-                s_dependencyVersions = GetDependencies(TestPlatformRootDirectory);
-            }
-
-            return s_dependencyVersions;
-        }
-    }
+        => s_dependencyVersions ??= GetDependencies(TestPlatformRootDirectory);
 
     /// <summary>
     /// Gets the nuget packages directory for enlistment.