diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props
index 45d2efcb8b..3d5fe97b47 100644
--- a/scripts/build/TestPlatform.Dependencies.props
+++ b/scripts/build/TestPlatform.Dependencies.props
@@ -11,7 +11,7 @@
     <!-- this version also needs to be "statically" readable because the test fixture will inspect this file for the version 
     and because during the test `dotnet test` will run and re-build some of the test projects and at that time the version 
     from a build parameter would not be available, so I am writing this version from the build.ps1 script to keep it in sync -->
-    <NETTestSdkVersion>16.9.0-dev</NETTestSdkVersion>
+    <NETTestSdkVersion>16.9.1-dev</NETTestSdkVersion>
 
     <MSTestFrameworkVersion>2.1.0</MSTestFrameworkVersion>
     <MSTestAdapterVersion>2.1.0</MSTestAdapterVersion>
@@ -32,7 +32,7 @@
     <JsonNetVersion>9.0.1</JsonNetVersion>
     <MoqVersion>4.7.63</MoqVersion>
     <TestPlatformExternalsVersion>16.9.0-preview-4267359</TestPlatformExternalsVersion>
-    <CodeCoverageExternalsVersion>16.9.0-beta.21105.3</CodeCoverageExternalsVersion>
+    <CodeCoverageExternalsVersion>16.9.0-beta.21119.4</CodeCoverageExternalsVersion>
     <MicrosoftFakesVersion>16.9.0-beta.20628.1</MicrosoftFakesVersion>
 
     <MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
diff --git a/scripts/build/TestPlatform.Settings.targets b/scripts/build/TestPlatform.Settings.targets
index ffb8233c8b..0f80133468 100644
--- a/scripts/build/TestPlatform.Settings.targets
+++ b/scripts/build/TestPlatform.Settings.targets
@@ -5,7 +5,7 @@
     <!-- This version is read by vsts-prebuild.ps1 and is a base for the current version, this should be updated
     at the start of new iteration to the goal number. This is also used to version the local packages. This version needs to be statically
     readable when we read the file as xml, don't move it to a .props file, unless you change the build server process -->
-    <TPVersionPrefix>16.9.0</TPVersionPrefix>
+    <TPVersionPrefix>16.9.1</TPVersionPrefix>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Versioning is defined from the build script. Use a default dev build if it's not defined.
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSession.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSession.cs
index 206c3aa009..e8e404a061 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSession.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSession.cs
@@ -13,7 +13,7 @@ namespace Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Int
     /// Defines a test session that can be used to make calls to the vstest.console
     /// process.
     /// </summary>
-    public interface ITestSession : ITestSessionAsync
+    internal interface ITestSession : ITestSessionAsync
     {
         /// <summary>
         /// Starts test discovery.
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSessionAsync.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSessionAsync.cs
index 9c2aff1496..c992ccc569 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSessionAsync.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSessionAsync.cs
@@ -13,7 +13,7 @@ namespace Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Int
     /// Defines a test session that can be used to make async calls to the vstest.console
     /// process.
     /// </summary>
-    public interface ITestSessionAsync
+    internal interface ITestSessionAsync
     {
         /// <summary>
         /// Starts test discovery.
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs
index d3ea821e1e..fb835235a4 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs
@@ -53,21 +53,21 @@ public interface IVsTestConsoleWrapper : IVsTestConsoleWrapperAsync
             TestPlatformOptions options,
             ITestDiscoveryEventsHandler2 discoveryEventsHandler);
 
-        /// <summary>
-        /// Starts test discovery.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the discovery.</param>
-        /// <param name="discoverySettings">The run settings for the discovery.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="discoveryEventsHandler">The discovery event handler.</param>
-        void DiscoverTests(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+        // <summary>
+        // Starts test discovery.
+        // </summary>
+        // 
+        // <param name="sources">The list of source assemblies for the discovery.</param>
+        // <param name="discoverySettings">The run settings for the discovery.</param>
+        // <param name="options">The test platform options.</param>
+        // <param name="testSessionInfo">The test session info object.</param>
+        // <param name="discoveryEventsHandler">The discovery event handler.</param>
+        // void DiscoverTests(
+        //     IEnumerable<string> sources,
+        //     string discoverySettings,
+        //     TestPlatformOptions options,
+        //     TestSessionInfo testSessionInfo,
+        //     ITestDiscoveryEventsHandler2 discoveryEventsHandler);
 
         /// <summary>
         /// Cancels the last discovery request.
@@ -100,21 +100,21 @@ public interface IVsTestConsoleWrapper : IVsTestConsoleWrapperAsync
             TestPlatformOptions options,
             ITestRunEventsHandler testRunEventsHandler);
 
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        void RunTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler);
+        // <summary>
+        // Starts a test run.
+        // </summary>
+        // 
+        // <param name="sources">The list of source assemblies for the test run.</param>
+        // <param name="runSettings">The run settings for the run.</param>
+        // <param name="options">The test platform options.</param>
+        // <param name="testSessionInfo">The test session info object.</param>
+        // <param name="testRunEventsHandler">The run event handler.</param>
+        // void RunTests(
+        //     IEnumerable<string> sources,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     TestSessionInfo testSessionInfo,
+        //     ITestRunEventsHandler testRunEventsHandler);
 
         /// <summary>
         /// Starts a test run.
@@ -142,21 +142,21 @@ public interface IVsTestConsoleWrapper : IVsTestConsoleWrapperAsync
             TestPlatformOptions options,
             ITestRunEventsHandler testRunEventsHandler);
 
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        void RunTests(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler);
+        // <summary>
+        // Starts a test run.
+        // </summary>
+        // 
+        // <param name="testCases">The list of test cases for the test run.</param>
+        // <param name="runSettings">The run settings for the run.</param>
+        // <param name="options">The test platform options.</param>
+        // <param name="testSessionInfo">The test session info object.</param>
+        // <param name="testRunEventsHandler">The run event handler.</param>
+        // void RunTests(
+        //     IEnumerable<TestCase> testCases,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     TestSessionInfo testSessionInfo,
+        //     ITestRunEventsHandler testRunEventsHandler);
 
         /// <summary>
         /// Starts a test run.
@@ -188,23 +188,23 @@ public interface IVsTestConsoleWrapper : IVsTestConsoleWrapperAsync
             ITestRunEventsHandler testRunEventsHandler,
             ITestHostLauncher customTestHostLauncher);
 
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        void RunTestsWithCustomTestHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
+        // <summary>
+        // Starts a test run.
+        // </summary>
+        // 
+        // <param name="sources">The list of source assemblies for the test run.</param>
+        // <param name="runSettings">The run settings for the run.</param>
+        // <param name="options">The test platform options.</param>
+        // <param name="testSessionInfo">The test session info object.</param>
+        // <param name="testRunEventsHandler">The run event handler.</param>
+        // <param name="customTestHostLauncher">The custom host launcher.</param>
+        // void RunTestsWithCustomTestHost(
+        //     IEnumerable<string> sources,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     TestSessionInfo testSessionInfo,
+        //     ITestRunEventsHandler testRunEventsHandler,
+        //     ITestHostLauncher customTestHostLauncher);
 
         /// <summary>
         /// Starts a test run.
@@ -236,83 +236,83 @@ public interface IVsTestConsoleWrapper : IVsTestConsoleWrapperAsync
             ITestRunEventsHandler testRunEventsHandler,
             ITestHostLauncher customTestHostLauncher);
 
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        void RunTestsWithCustomTestHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
+        // <summary>
+        // Starts a test run.
+        // </summary>
+        // 
+        // <param name="testCases">The list of test cases for the test run.</param>
+        // <param name="runSettings">The run settings for the run.</param>
+        // <param name="options">The test platform options.</param>
+        // <param name="testSessionInfo">The test session info object.</param>
+        // <param name="testRunEventsHandler">The run event handler.</param>
+        // <param name="customTestHostLauncher">The custom host launcher.</param>
+        // void RunTestsWithCustomTestHost(
+        //     IEnumerable<TestCase> testCases,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     TestSessionInfo testSessionInfo,
+        //     ITestRunEventsHandler testRunEventsHandler,
+        //     ITestHostLauncher customTestHostLauncher);
 
-        /// <summary>
-        /// Starts a new test session.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="eventsHandler">The session event handler.</param>
-        /// 
-        /// <returns>A test session info object.</returns>
-        ITestSession StartTestSession(
-            IList<string> sources,
-            string runSettings,
-            ITestSessionEventsHandler eventsHandler);
+        // <summary>
+        // Starts a new test session.
+        // </summary>
+        // 
+        // <param name="sources">The list of source assemblies for the test run.</param>
+        // <param name="runSettings">The run settings for the run.</param>
+        // <param name="eventsHandler">The session event handler.</param>
+        // 
+        // <returns>A test session info object.</returns>
+        // ITestSession StartTestSession(
+        //     IList<string> sources,
+        //     string runSettings,
+        //     ITestSessionEventsHandler eventsHandler);
 
-        /// <summary>
-        /// Starts a new test session.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="eventsHandler">The session event handler.</param>
-        /// 
-        /// <returns>A test session info object.</returns>
-        ITestSession StartTestSession(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler);
+        // <summary>
+        // Starts a new test session.
+        // </summary>
+        // 
+        // <param name="sources">The list of source assemblies for the test run.</param>
+        // <param name="runSettings">The run settings for the run.</param>
+        // <param name="options">The test platform options.</param>
+        // <param name="eventsHandler">The session event handler.</param>
+        // 
+        // <returns>A test session info object.</returns>
+        // ITestSession StartTestSession(
+        //     IList<string> sources,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     ITestSessionEventsHandler eventsHandler);
 
-        /// <summary>
-        /// Starts a new test session.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="eventsHandler">The session event handler.</param>
-        /// <param name="testHostLauncher">The custom host launcher.</param>
-        /// 
-        /// <returns>A test session info object.</returns>
-        ITestSession StartTestSession(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler,
-            ITestHostLauncher testHostLauncher);
+        // <summary>
+        // Starts a new test session.
+        // </summary>
+        // 
+        // <param name="sources">The list of source assemblies for the test run.</param>
+        // <param name="runSettings">The run settings for the run.</param>
+        // <param name="options">The test platform options.</param>
+        // <param name="eventsHandler">The session event handler.</param>
+        // <param name="testHostLauncher">The custom host launcher.</param>
+        // 
+        // <returns>A test session info object.</returns>
+        // ITestSession StartTestSession(
+        //     IList<string> sources,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     ITestSessionEventsHandler eventsHandler,
+        //     ITestHostLauncher testHostLauncher);
 
-        /// <summary>
-        /// Stops the test session.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="eventsHandler">The session event handler.</param>
-        /// 
-        /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
-        bool StopTestSession(
-            TestSessionInfo testSessionInfo,
-            ITestSessionEventsHandler eventsHandler);
+        // <summary>
+        // Stops the test session.
+        // </summary>
+        // 
+        // <param name="testSessionInfo">The test session info object.</param>
+        // <param name="eventsHandler">The session event handler.</param>
+        // 
+        // <returns>True if the session was successfuly stopped, false otherwise.</returns>
+        // bool StopTestSession(
+        //     TestSessionInfo testSessionInfo,
+        //     ITestSessionEventsHandler eventsHandler);
 
         /// <summary>
         /// Cancels the last test run.
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs
index 136e6eec84..728aa0a951 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs
@@ -55,21 +55,21 @@ public interface IVsTestConsoleWrapperAsync
             TestPlatformOptions options,
             ITestDiscoveryEventsHandler2 discoveryEventsHandler);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.DiscoverTests(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestDiscoveryEventsHandler2)"/>.
-        /// </summary>
-        Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+        // <summary>
+        // Asynchronous equivalent of <see cref="
+        // IVsTestConsoleWrapper.DiscoverTests(
+        //     IEnumerable{string},
+        //     string,
+        //     TestPlatformOptions,
+        //     TestSessionInfo,
+        //     ITestDiscoveryEventsHandler2)"/>.
+        // </summary>
+        // Task DiscoverTestsAsync(
+        //     IEnumerable<string> sources,
+        //     string discoverySettings,
+        //     TestPlatformOptions options,
+        //     TestSessionInfo testSessionInfo,
+        //     ITestDiscoveryEventsHandler2 discoveryEventsHandler);
 
         /// <summary>
         /// See <see cref="IVsTestConsoleWrapper.CancelDiscovery"/>.
@@ -102,21 +102,21 @@ public interface IVsTestConsoleWrapperAsync
             TestPlatformOptions options,
             ITestRunEventsHandler testRunEventsHandler);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTests(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler)"/>.
-        /// </summary>
-        Task RunTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler);
+        // <summary>
+        // Asynchronous equivalent of <see cref="
+        // IVsTestConsoleWrapper.RunTests(
+        //     IEnumerable{string},
+        //     string,
+        //     TestPlatformOptions,
+        //     TestSessionInfo,
+        //     ITestRunEventsHandler)"/>.
+        // </summary>
+        // Task RunTestsAsync(
+        //     IEnumerable<string> sources,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     TestSessionInfo testSessionInfo,
+        //     ITestRunEventsHandler testRunEventsHandler);
 
         /// <summary>
         /// Asynchronous equivalent of <see cref="
@@ -144,21 +144,21 @@ public interface IVsTestConsoleWrapperAsync
             TestPlatformOptions options,
             ITestRunEventsHandler testRunEventsHandler);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        ///     IVsTestConsoleWrapper.RunTests(
-        ///     IEnumerable{TestCase},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler)"/>.
-        /// </summary>
-        Task RunTestsAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler);
+        // <summary>
+        // Asynchronous equivalent of <see cref="
+        //     IVsTestConsoleWrapper.RunTests(
+        //     IEnumerable{TestCase},
+        //     string,
+        //     TestPlatformOptions,
+        //     TestSessionInfo,
+        //     ITestRunEventsHandler)"/>.
+        // </summary>
+        // Task RunTestsAsync(
+        //     IEnumerable<TestCase> testCases,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     TestSessionInfo testSessionInfo,
+        //     ITestRunEventsHandler testRunEventsHandler);
 
         /// <summary>
         /// Asynchronous equivalent of <see cref="
@@ -190,23 +190,23 @@ public interface IVsTestConsoleWrapperAsync
             ITestRunEventsHandler testRunEventsHandler,
             ITestHostLauncher customTestHostLauncher);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
+        // <summary>
+        // Asynchronous equivalent of <see cref="
+        // IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
+        //     IEnumerable{string},
+        //     string,
+        //     TestPlatformOptions,
+        //     TestSessionInfo,
+        //     ITestRunEventsHandler,
+        //     ITestHostLauncher)"/>.
+        // </summary>
+        // Task RunTestsWithCustomTestHostAsync(
+        //     IEnumerable<string> sources,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     TestSessionInfo testSessionInfo,
+        //     ITestRunEventsHandler testRunEventsHandler,
+        //     ITestHostLauncher customTestHostLauncher);
 
         /// <summary>
         /// Asynchronous equivalent of <see cref="
@@ -238,75 +238,75 @@ public interface IVsTestConsoleWrapperAsync
             ITestRunEventsHandler testRunEventsHandler,
             ITestHostLauncher customTestHostLauncher);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
-        ///     IEnumerable{TestCase},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
+        // <summary>
+        // Asynchronous equivalent of <see cref="
+        // IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
+        //     IEnumerable{TestCase},
+        //     string,
+        //     TestPlatformOptions,
+        //     TestSessionInfo,
+        //     ITestRunEventsHandler,
+        //     ITestHostLauncher)"/>.
+        // </summary>
+        // Task RunTestsWithCustomTestHostAsync(
+        //     IEnumerable<TestCase> testCases,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     TestSessionInfo testSessionInfo,
+        //     ITestRunEventsHandler testRunEventsHandler,
+        //     ITestHostLauncher customTestHostLauncher);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.StartTestSession(
-        ///     IList{string},
-        ///     string,
-        ///     ITestSessionEventsHandler)"/>.
-        /// </summary>
-        Task<ITestSession> StartTestSessionAsync(
-            IList<string> sources,
-            string runSettings,
-            ITestSessionEventsHandler eventsHandler);
+        // <summary>
+        // Asynchronous equivalent of <see cref="
+        // IVsTestConsoleWrapper.StartTestSession(
+        //     IList{string},
+        //     string,
+        //     ITestSessionEventsHandler)"/>.
+        // </summary>
+        // Task<ITestSession> StartTestSessionAsync(
+        //     IList<string> sources,
+        //     string runSettings,
+        //     ITestSessionEventsHandler eventsHandler);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.StartTestSession(
-        ///     IList{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     ITestSessionEventsHandler)"/>.
-        /// </summary>
-        Task<ITestSession> StartTestSessionAsync(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler);
+        // <summary>
+        // Asynchronous equivalent of <see cref="
+        // IVsTestConsoleWrapper.StartTestSession(
+        //     IList{string},
+        //     string,
+        //     TestPlatformOptions,
+        //     ITestSessionEventsHandler)"/>.
+        // </summary>
+        // Task<ITestSession> StartTestSessionAsync(
+        //     IList<string> sources,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     ITestSessionEventsHandler eventsHandler);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.StartTestSession(
-        ///     IList{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     ITestSessionEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task<ITestSession> StartTestSessionAsync(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler,
-            ITestHostLauncher testHostLauncher);
+        // <summary>
+        // Asynchronous equivalent of <see cref="
+        // IVsTestConsoleWrapper.StartTestSession(
+        //     IList{string},
+        //     string,
+        //     TestPlatformOptions,
+        //     ITestSessionEventsHandler,
+        //     ITestHostLauncher)"/>.
+        // </summary>
+        // Task<ITestSession> StartTestSessionAsync(
+        //     IList<string> sources,
+        //     string runSettings,
+        //     TestPlatformOptions options,
+        //     ITestSessionEventsHandler eventsHandler,
+        //     ITestHostLauncher testHostLauncher);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.StopTestSession(
-        ///     TestSessionInfo,
-        ///     ITestSessionEventsHandler)"/>.
-        /// </summary>
-        Task<bool> StopTestSessionAsync(
-            TestSessionInfo testSessionInfo,
-            ITestSessionEventsHandler eventsHandler);
+        // <summary>
+        // Asynchronous equivalent of <see cref="
+        // IVsTestConsoleWrapper.StopTestSession(
+        //     TestSessionInfo,
+        //     ITestSessionEventsHandler)"/>.
+        // </summary>
+        // Task<bool> StopTestSessionAsync(
+        //     TestSessionInfo testSessionInfo,
+        //     ITestSessionEventsHandler eventsHandler);
 
         /// <summary>
         /// See <see cref="IVsTestConsoleWrapper.CancelTestRun"/>.
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TestSession.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TestSession.cs
index d97761a4c9..8635d6cfe6 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TestSession.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TestSession.cs
@@ -15,7 +15,7 @@ namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
     /// Defines a test session object that can be used to make calls to the vstest.console
     /// process.
     /// </summary>
-    public class TestSession : ITestSession
+    internal class TestSession : ITestSession
     {
         private TestSessionInfo testSessionInfo;
         private VsTestConsoleWrapper consoleWrapper;
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleWrapper.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleWrapper.cs
index 78adc5bb0c..09292008ae 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleWrapper.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleWrapper.cs
@@ -211,7 +211,7 @@ public void InitializeExtensions(IEnumerable<string> pathToAdditionalExtensions)
         }
 
         /// <inheritdoc/>
-        public void DiscoverTests(
+        internal void DiscoverTests(
             IEnumerable<string> sources,
             string discoverySettings,
             TestPlatformOptions options,
@@ -263,7 +263,7 @@ public void CancelDiscovery()
         }
 
         /// <inheritdoc/>
-        public void RunTests(
+        internal void RunTests(
             IEnumerable<string> sources,
             string runSettings,
             TestPlatformOptions options,
@@ -315,7 +315,7 @@ public void CancelDiscovery()
         }
 
         /// <inheritdoc/>
-        public void RunTests(
+        internal void RunTests(
             IEnumerable<TestCase> testCases,
             string runSettings,
             TestPlatformOptions options,
@@ -371,7 +371,7 @@ public void CancelDiscovery()
         }
 
         /// <inheritdoc/>
-        public void RunTestsWithCustomTestHost(
+        internal void RunTestsWithCustomTestHost(
             IEnumerable<string> sources,
             string runSettings,
             TestPlatformOptions options,
@@ -429,7 +429,7 @@ public void CancelDiscovery()
         }
 
         /// <inheritdoc/>
-        public void RunTestsWithCustomTestHost(
+        internal void RunTestsWithCustomTestHost(
             IEnumerable<TestCase> testCases,
             string runSettings,
             TestPlatformOptions options,
@@ -455,7 +455,7 @@ public void CancelDiscovery()
         }
 
         /// <inheritdoc/>
-        public ITestSession StartTestSession(
+        internal ITestSession StartTestSession(
             IList<string> sources,
             string runSettings,
             ITestSessionEventsHandler eventsHandler)
@@ -468,7 +468,7 @@ public void CancelDiscovery()
         }
 
         /// <inheritdoc/>
-        public ITestSession StartTestSession(
+        internal ITestSession StartTestSession(
             IList<string> sources,
             string runSettings,
             TestPlatformOptions options,
@@ -483,7 +483,7 @@ public void CancelDiscovery()
         }
 
         /// <inheritdoc/>
-        public ITestSession StartTestSession(
+        internal ITestSession StartTestSession(
             IList<string> sources,
             string runSettings,
             TestPlatformOptions options,
@@ -504,7 +504,7 @@ public void CancelDiscovery()
         }
 
         /// <inheritdoc/>
-        public bool StopTestSession(
+        internal bool StopTestSession(
             TestSessionInfo testSessionInfo,
             ITestSessionEventsHandler eventsHandler)
         {
@@ -612,7 +612,7 @@ public async Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditional
         }
 
         /// <inheritdoc/>
-        public async Task DiscoverTestsAsync(
+        internal async Task DiscoverTestsAsync(
             IEnumerable<string> sources,
             string discoverySettings,
             TestPlatformOptions options,
@@ -658,7 +658,7 @@ public async Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditional
         }
 
         /// <inheritdoc/>
-        public async Task RunTestsAsync(
+        internal async Task RunTestsAsync(
             IEnumerable<string> sources,
             string runSettings,
             TestPlatformOptions options,
@@ -710,7 +710,7 @@ public async Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditional
         }
 
         /// <inheritdoc/>
-        public async Task RunTestsAsync(
+        internal async Task RunTestsAsync(
             IEnumerable<TestCase> testCases,
             string runSettings,
             TestPlatformOptions options,
@@ -766,7 +766,7 @@ public async Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditional
         }
 
         /// <inheritdoc/>
-        public async Task RunTestsWithCustomTestHostAsync(
+        internal async Task RunTestsWithCustomTestHostAsync(
             IEnumerable<string> sources,
             string runSettings,
             TestPlatformOptions options,
@@ -824,7 +824,7 @@ public async Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditional
         }
 
         /// <inheritdoc/>
-        public async Task RunTestsWithCustomTestHostAsync(
+        internal async Task RunTestsWithCustomTestHostAsync(
             IEnumerable<TestCase> testCases,
             string runSettings,
             TestPlatformOptions options,
@@ -850,7 +850,7 @@ public async Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditional
         }
 
         /// <inheritdoc/>
-        public async Task<ITestSession> StartTestSessionAsync(
+        internal async Task<ITestSession> StartTestSessionAsync(
             IList<string> sources,
             string runSettings,
             ITestSessionEventsHandler eventsHandler)
@@ -863,7 +863,7 @@ public async Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditional
         }
 
         /// <inheritdoc/>
-        public async Task<ITestSession> StartTestSessionAsync(
+        internal async Task<ITestSession> StartTestSessionAsync(
             IList<string> sources,
             string runSettings,
             TestPlatformOptions options,
@@ -878,7 +878,7 @@ public async Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditional
         }
 
         /// <inheritdoc/>
-        public async Task<ITestSession> StartTestSessionAsync(
+        internal async Task<ITestSession> StartTestSessionAsync(
             IList<string> sources,
             string runSettings,
             TestPlatformOptions options,
@@ -899,7 +899,7 @@ public async Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditional
         }
 
         /// <inheritdoc/>
-        public async Task<bool> StopTestSessionAsync(
+        internal async Task<bool> StopTestSessionAsync(
             TestSessionInfo testSessionInfo,
             ITestSessionEventsHandler eventsHandler)
         {