diff --git a/src/Microsoft.TestPlatform.Client/MultiTestRunFinalization/MultiTestRunFinalizationEventsHandler.cs b/src/Microsoft.TestPlatform.Client/MultiTestRunFinalization/MultiTestRunFinalizationEventsHandler.cs
index 78cc89e1be..cc9c7cbcab 100644
--- a/src/Microsoft.TestPlatform.Client/MultiTestRunFinalization/MultiTestRunFinalizationEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.Client/MultiTestRunFinalization/MultiTestRunFinalizationEventsHandler.cs
@@ -11,7 +11,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Client.MultiTestRunFinalization
     using System.Collections.Generic;
 
     /// <summary>
-    /// The multi test finalization event handler.
+    /// The multi test finalization events handler.
     /// </summary>
     public class MultiTestRunFinalizationEventsHandler : IMultiTestRunFinalizationEventsHandler
     {
@@ -20,23 +20,20 @@ public class MultiTestRunFinalizationEventsHandler : IMultiTestRunFinalizationEv
         /// <summary>
         /// Initializes a new instance of the <see cref="MultiTestRunFinalizationEventsHandler"/> class.
         /// </summary>
-        /// <param name="requestHandler"> The Request Handler. </param>
+        /// <param name="communicationManager"> The communication manager. </param>
         public MultiTestRunFinalizationEventsHandler(ICommunicationManager communicationManager)
         {
             this.communicationManager = communicationManager;
         }
 
-        /// <summary>
-        /// The handle discovery message.
-        /// </summary>
-        /// <param name="level"> Logging level. </param>
-        /// <param name="message"> Logging message. </param>
+        /// <inheritdoc/>
         public void HandleLogMessage(TestMessageLevel level, string message)
         {
             var testMessagePayload = new TestMessagePayload { MessageLevel = level, Message = message };
             this.communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
         }
 
+        /// <inheritdoc/>
         public void HandleMultiTestRunFinalizationComplete(ICollection<AttachmentSet> attachments)
         {
             if (EqtTrace.IsInfoEnabled)
@@ -53,6 +50,7 @@ public void HandleMultiTestRunFinalizationComplete(ICollection<AttachmentSet> at
             this.communicationManager.SendMessage(MessageType.MultiTestRunFinalizationComplete, payload);
         }
 
+        /// <inheritdoc/>
         public void HandleRawMessage(string rawMessage)
         {
             // No-Op
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IMultiTestRunFinalizationManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IMultiTestRunFinalizationManager.cs
index e91b1da0d3..078bc1349f 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IMultiTestRunFinalizationManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IMultiTestRunFinalizationManager.cs
@@ -17,16 +17,17 @@ internal interface IMultiTestRunFinalizationManager
         /// <summary>
         /// Finalizes multi test run and provides results through handler
         /// </summary>
-        /// <param name="attachments">Attachments</param>
-        /// <param name="eventHandler">EventHandler for handling multi test run finalization events from Engine</param>
+        /// <param name="attachments">Collection of attachments</param>
+        /// <param name="eventHandler">EventHandler for handling multi test run finalization event</param>
         /// <param name="cancellationToken">Cancellation token</param>
         Task FinalizeMultiTestRunAsync(ICollection<AttachmentSet> attachments, IMultiTestRunFinalizationEventsHandler eventHandler, CancellationToken cancellationToken);
 
         /// <summary>
-        /// Finalizes multi test
+        /// Finalizes multi test run
         /// </summary>
-        /// <param name="attachments">Attachments</param>
+        /// <param name="attachments">Collection of attachments</param>
         /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>Collection of attachments.</returns>
         Task<Collection<AttachmentSet>> FinalizeMultiTestRunAsync(ICollection<AttachmentSet> attachments, CancellationToken cancellationToken);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/Interfaces/ITestPlatformEventSource.cs b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/Interfaces/ITestPlatformEventSource.cs
index a287b0cf6d..262803cf48 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/Interfaces/ITestPlatformEventSource.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/Interfaces/ITestPlatformEventSource.cs
@@ -196,18 +196,18 @@ public interface ITestPlatformEventSource
         /// <summary>
         /// The multi test run finalization start.
         /// </summary>
-        /// <param name="numberOfAttachements">
-        /// The number of attachements.
+        /// <param name="numberOfAttachments">
+        /// The number of attachments.
         /// </param>
-        void MultiTestRunFinalizationStart(long numberOfAttachements);
+        void MultiTestRunFinalizationStart(long numberOfAttachments);
 
         /// <summary>
         /// The multi test run finalization stop.
         /// </summary>
-        /// <param name="numberOfAttachements">
-        /// The number of attachements.
+        /// <param name="numberOfAttachments">
+        /// The number of attachments.
         /// </param>
-        void MultiTestRunFinalizationStop(long numberOfAttachements);
+        void MultiTestRunFinalizationStop(long numberOfAttachments);
 
         /// <summary>
         /// Mark the start of translation layer multi test run finalization request.
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformEventSource.cs b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformEventSource.cs
index 7cda495578..cf7a4f5845 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformEventSource.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformEventSource.cs
@@ -254,16 +254,16 @@ public void MultiTestRunFinalizationRequestStop()
 
         /// <inheritdoc/>
         [Event(TestPlatformInstrumentationEvents.MultiTestRunFinalizationStartEventId)]
-        public void MultiTestRunFinalizationStart(long numberOfAttachements)
+        public void MultiTestRunFinalizationStart(long numberOfAttachments)
         {
-            this.WriteEvent(TestPlatformInstrumentationEvents.MultiTestRunFinalizationStartEventId, numberOfAttachements);
+            this.WriteEvent(TestPlatformInstrumentationEvents.MultiTestRunFinalizationStartEventId, numberOfAttachments);
         }
 
         /// <inheritdoc/>
         [Event(TestPlatformInstrumentationEvents.MultiTestRunFinalizationStopEventId)]
-        public void MultiTestRunFinalizationStop(long numberOfAttachements)
+        public void MultiTestRunFinalizationStop(long numberOfAttachments)
         {
-            this.WriteEvent(TestPlatformInstrumentationEvents.MultiTestRunFinalizationStopEventId, numberOfAttachements);
+            this.WriteEvent(TestPlatformInstrumentationEvents.MultiTestRunFinalizationStopEventId, numberOfAttachments);
         }
 
         /// <inheritdoc/>
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/MultiTestRunFinalization/MultiTestRunFinalizationManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/MultiTestRunFinalization/MultiTestRunFinalizationManager.cs
index 2eb388eeeb..23bb2d463b 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/MultiTestRunFinalization/MultiTestRunFinalizationManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/MultiTestRunFinalization/MultiTestRunFinalizationManager.cs
@@ -16,7 +16,7 @@
 namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.MultiTestRunFinalization
 {
     /// <summary>
-    /// Orchestrates multi test run finalization operations for the engine communicating with the test host process.
+    /// Orchestrates multi test run finalization operations.
     /// </summary>
     public class MultiTestRunFinalizationManager : IMultiTestRunFinalizationManager
     {
@@ -60,7 +60,7 @@ private async Task<Collection<AttachmentSet>> InternalFinalizeMultiTestRunAsync(
 
                 Task task = Task.Run(() =>
                 {
-                    HandleAttachements(attachments, cancellationToken);
+                    HandleAttachments(attachments, cancellationToken);
                 });
 
                 var completedTask = await Task.WhenAny(task, taskCompletionSource.Task);
@@ -92,7 +92,7 @@ private async Task<Collection<AttachmentSet>> InternalFinalizeMultiTestRunAsync(
             }
         }
 
-        private void HandleAttachements(ICollection<AttachmentSet> attachments, CancellationToken cancellationToken)
+        private void HandleAttachments(ICollection<AttachmentSet> attachments, CancellationToken cancellationToken)
         {
             foreach (var dataCollectorAttachmentsHandler in dataCollectorAttachmentsHandlers)
             {
@@ -107,8 +107,8 @@ private void HandleAttachements(ICollection<AttachmentSet> attachments, Cancella
                             attachments.Remove(attachment);
                         }
 
-                        ICollection<AttachmentSet> processedAttachements = dataCollectorAttachmentsHandler.HandleDataCollectionAttachmentSets(new Collection<AttachmentSet>(attachmentsToBeProcessed), cancellationToken);
-                        foreach (var attachment in processedAttachements)
+                        ICollection<AttachmentSet> processedAttachments = dataCollectorAttachmentsHandler.HandleDataCollectionAttachmentSets(new Collection<AttachmentSet>(attachmentsToBeProcessed), cancellationToken);
+                        foreach (var attachment in processedAttachments)
                         {
                             attachments.Add(attachment);
                         }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/MultiTestRunFinalizationPayload.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/MultiTestRunFinalizationPayload.cs
index 5066f0e3a9..13f7cfc229 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/MultiTestRunFinalizationPayload.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/MultiTestRunFinalizationPayload.cs
@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
     public class MultiTestRunFinalizationPayload
     {
         /// <summary>
-        /// Settings used for the discovery request.
+        /// Collection of attachments.
         /// </summary>
         [DataMember]
         public ICollection<AttachmentSet> Attachments { get; set; }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSender.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSender.cs
index 224edbe0aa..45519affa7 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSender.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSender.cs
@@ -113,9 +113,9 @@ internal interface ITranslationLayerRequestSender : IDisposable
         void CancelDiscovery();
 
         /// <summary>
-        /// Provides back all attachements to TestPlatform for additional processing (for example merging)
+        /// Provides back all attachments to TestPlatform for additional processing (for example merging)
         /// </summary>
-        /// <param name="attachments">List of attachements</param>
+        /// <param name="attachments">Collection of attachments</param>
         /// <param name="multiTestRunFinalizationCompleteEventsHandler">Events handler</param>
         /// <param name="cancellationToken">Cancellation token</param>
         Task FinalizeMultiTestRunAsync(ICollection<AttachmentSet> attachments, IMultiTestRunFinalizationEventsHandler multiTestRunFinalizationCompleteEventsHandler, CancellationToken cancellationToken);
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSenderAsync.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSenderAsync.cs
index babfee4518..0bf4ce0a82 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSenderAsync.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSenderAsync.cs
@@ -79,9 +79,9 @@ internal interface ITranslationLayerRequestSenderAsync : IDisposable
         void OnProcessExited();
 
         /// <summary>
-        /// Provides back all attachements to TestPlatform for additional processing (for example merging)
+        /// Provides back all attachments to TestPlatform for additional processing (for example merging)
         /// </summary>
-        /// <param name="attachments">List of attachements</param>
+        /// <param name="attachments">Collection of attachments</param>
         /// <param name="multiTestRunFinalizationCompleteEventsHandler">Events handler</param>
         /// <param name="cancellationToken">Cancellation token</param>
         Task FinalizeMultiTestRunAsync(ICollection<AttachmentSet> attachments, IMultiTestRunFinalizationEventsHandler multiTestRunFinalizationCompleteEventsHandler, CancellationToken cancellationToken);
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs
index acc2ab836b..d9b86dac3a 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs
@@ -121,9 +121,9 @@ public interface IVsTestConsoleWrapper
         void RunTestsWithCustomTestHost(IEnumerable<TestCase> testCases, string runSettings, TestPlatformOptions options, ITestRunEventsHandler testRunEventsHandler, ITestHostLauncher customTestHostLauncher);
 
         /// <summary>
-        /// Provides back all attachements to TestPlatform for additional processing (for example merging)
+        /// Provides back all attachments to TestPlatform for additional processing (for example merging)
         /// </summary>
-        /// <param name="attachments">List of attachements</param>
+        /// <param name="attachments">Collection of attachments</param>
         /// <param name="multiTestRunFinalizationCompleteEventsHandler">EventHandler to receive session complete event</param>
         /// <param name="cancellationToken">Cancellation token</param>
         Task FinalizeMultiTestRunAsync(ICollection<AttachmentSet> attachments, IMultiTestRunFinalizationEventsHandler multiTestRunFinalizationCompleteEventsHandler, CancellationToken cancellationToken);
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs
index d3b705150b..3e6cabe3b8 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs
@@ -83,9 +83,9 @@ public interface IVsTestConsoleWrapperAsync
         Task RunTestsWithCustomTestHostAsync(IEnumerable<TestCase> testCases, string runSettings, TestPlatformOptions options, ITestRunEventsHandler testRunEventsHandler, ITestHostLauncher customTestHostLauncher);
 
         /// <summary>
-        /// Provides back all attachements to TestPlatform for additional processing (for example merging)
+        /// Provides back all attachments to TestPlatform for additional processing (for example merging)
         /// </summary>
-        /// <param name="attachments">List of attachements</param>
+        /// <param name="attachments">Collection of attachments</param>
         /// <param name="multiTestRunFinalizationCompleteEventsHandler">EventHandler to receive session complete event</param>
         /// <param name="cancellationToken">Cancellation token</param>
         Task FinalizeMultiTestRunAsync(ICollection<AttachmentSet> attachments, IMultiTestRunFinalizationEventsHandler multiTestRunFinalizationCompleteEventsHandler, CancellationToken cancellationToken);
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs
index b263203063..c32e28bfa5 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs
@@ -755,7 +755,7 @@ private async Task SendMessageAndListenAndReportFinalizationResultAsync(ICollect
                     {
                         if (EqtTrace.IsInfoEnabled)
                         {
-                            EqtTrace.Info("VsTestConsoleRequestSender.SendMessageAndListenAndReportAttachements: Process complete.");
+                            EqtTrace.Info("VsTestConsoleRequestSender.SendMessageAndListenAndReportAttachments: Process complete.");
                         }
 
                         var multiTestRunFinalizationCompletePayload = this.dataSerializer.DeserializePayload<MultiTestRunFinalizationCompletePayload>(message);
diff --git a/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs b/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
index 5ef58e6190..d38cc6cd0e 100644
--- a/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
+++ b/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
@@ -312,13 +312,7 @@ public void RunTests(TestRunRequestPayload testRunRequestPayload, ITestHostLaunc
             }
         }
 
-        /// <summary>
-        /// Discover Tests given a list of sources, run settings.
-        /// </summary>
-        /// <param name="discoveryPayload">Discovery payload</param>
-        /// <param name="discoveryEventsRegistrar">EventHandler for discovered tests</param>
-        /// <param name="protocolConfig">Protocol related information</param>
-        /// <returns>True, if successful</returns>
+        /// <inheritdoc/>
         public void FinalizeMultiTestRun(MultiTestRunFinalizationPayload finalizationPayload, IMultiTestRunFinalizationEventsHandler finalizationEventsHandler)
         {
             EqtTrace.Info("TestRequestManager.FinalizeMultiTestRun: Multi test run finalization started.");
@@ -392,9 +386,7 @@ public void AbortTestRun()
             this.currentTestRunRequest?.Abort();
         }
 
-        /// <summary>
-        /// Cancel the multi test run finalization.
-        /// </summary>
+        /// <inheritdoc/>
         public void CancelMultiTestRunFinalization()
         {
             EqtTrace.Info("TestRequestManager.CancelMultiTestRunFinalization: Sending cancel request.");
diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/ConverterTests.cs b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/ConverterTests.cs
index 8d1e341c9e..1734b9c15d 100644
--- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/ConverterTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/ConverterTests.cs
@@ -145,7 +145,7 @@ public void ToTestElementShouldContainExpectedTestMethodPropertiesIfFqnDoesNotEn
         }
 
         [TestMethod]
-        public void ToResultFilesShouldAddAttachementsWithRelativeURI()
+        public void ToResultFilesShouldAddAttachmentsWithRelativeURI()
         {
             UriDataAttachment uriDataAttachment1 =
                 new UriDataAttachment(new Uri($"/mnt/c/abc.txt", UriKind.Relative), "Description 1");