diff --git a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/DiscoveryEventHandler.cs b/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/DiscoveryEventHandler.cs
index 4505ffb9e0..bc609dc574 100644
--- a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/DiscoveryEventHandler.cs
+++ b/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/DiscoveryEventHandler.cs
@@ -15,17 +15,12 @@ public class DiscoveryEventHandler2 : ITestDiscoveryEventsHandler2
///
/// Gets the discovered test cases.
///
- public List DiscoveredTestCases { get; }
+ public List DiscoveredTestCases { get; } = new List();
///
/// Gets the metrics.
///
- public IDictionary? Metrics { get; private set; }
-
- public DiscoveryEventHandler2()
- {
- DiscoveredTestCases = new List();
- }
+ public IDictionary Metrics { get; private set; } = new Dictionary();
public void HandleRawMessage(string rawMessage)
{
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/RunEventHandler.cs b/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/RunEventHandler.cs
index b21d945c73..eea50855d0 100644
--- a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/RunEventHandler.cs
+++ b/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/RunEventHandler.cs
@@ -20,7 +20,7 @@ public class RunEventHandler : ITestRunEventsHandler2
///
/// Gets the metrics.
///
- public IDictionary? Metrics { get; private set; }
+ public IDictionary Metrics { get; private set; } = new Dictionary();
///
/// Gets the log message.
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/TelemetryPerfTestBase.cs b/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/TelemetryPerfTestBase.cs
index 6283bfb0e8..90a3be7182 100644
--- a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/TelemetryPerfTestBase.cs
+++ b/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/TelemetryPerfTestBase.cs
@@ -34,9 +34,9 @@ public TelemetryPerfTestBase()
///
///
///
- public void PostTelemetry(IDictionary handlerMetrics, PerfAnalyzer perfAnalyzer, string projectName, [CallerMemberName] string scenario = null)
+ public void PostTelemetry(IDictionary handlerMetrics, PerfAnalyzer perfAnalyzer, string projectName, [CallerMemberName] string? scenario = null)
{
- var properties = new Dictionary
+ var properties = new Dictionary
{
["Version"] = "1.0.1",
["Project"] = projectName,