diff --git a/documentation/diagnostics-client-library-instructions.md b/documentation/diagnostics-client-library-instructions.md
index 09fcfdd711..1ebddb12b4 100644
--- a/documentation/diagnostics-client-library-instructions.md
+++ b/documentation/diagnostics-client-library-instructions.md
@@ -224,14 +224,36 @@ public static void PrintEventsLive(int processId)
 
 This sample shows how to attach an ICorProfiler to a process (profiler attach).
 ```cs
-public static int AttachProfiler(int processId, Guid profilerGuid, string profilerPath)
+public static void AttachProfiler(int processId, Guid profilerGuid, string profilerPath)
 {
     var client = new DiagnosticsClient(processId);
-    return client.AttachProfiler(TimeSpan.FromSeconds(10), profilerGuid, profilerPath);
+    client.AttachProfiler(TimeSpan.FromSeconds(10), profilerGuid, profilerPath);
 }
 ```
 
+#### 8. Set an ICorProfiler to be used as the startup profiler
 
+This sample shows how to request that the runtime use an ICorProfiler as the startup profiler (not as an attaching profiler). It is only valid to issue this command while the runtime is paused in "reverse server" mode.
+
+```cs
+public static void SetStartupProfilerProfiler(Guid profilerGuid, string profilerPath)
+{
+    var client = new DiagnosticsClient(processId);
+    client.SetStartupProfiler(profilerGuid, profilerPath);
+}
+```
+
+#### 9. Resume the runtime when it is paused in reverse server mode
+
+This sample shows how a client can instruct the runtime to resume loading after it has been paused in "reverse server" mode.
+
+```cs
+public static void ResumeRuntime(Guid profilerGuid, string profilerPath)
+{
+    var client = new DiagnosticsClient(processId);
+    client.ResumeRuntime();
+}
+```
 
 ## API Description
 
diff --git a/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClient/DiagnosticsClient.cs b/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClient/DiagnosticsClient.cs
index 46a382119c..fb0fadab22 100644
--- a/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClient/DiagnosticsClient.cs
+++ b/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClient/DiagnosticsClient.cs
@@ -162,7 +162,7 @@ public void AttachProfiler(TimeSpan attachTimeout, Guid profilerGuid, string pro
         /// </summary>
         /// <param name="profilerGuid">Guid for the profiler to be attached</param>
         /// <param name="profilerPath">Path to the profiler to be attached</param>
-        public void StartupProfiler(Guid profilerGuid, string profilerPath)
+        public void SetStartupProfiler(Guid profilerGuid, string profilerPath)
         {
             if (profilerGuid == null || profilerGuid == Guid.Empty)
             {
diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/EnvironmentVariableUnitTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/EnvironmentVariableUnitTests.cs
deleted file mode 100644
index 5cca5ca5b2..0000000000
--- a/src/tests/Microsoft.Diagnostics.NETCore.Client/EnvironmentVariableUnitTests.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Microsoft.Diagnostics.NETCore.Client.UnitTests
-{
-    internal static class DiagnosticClientExtensions
-    {
-        public static string GetEnvironmentVariable(this DiagnosticsClient client, string name)
-        {
-            Dictionary<string, string> allEnvs = client.GetProcessEnvironment();
-            return allEnvs[name];
-        }
-    }
-
-    public class EnvironmentVariableUnitTests
-    {
-        private readonly ITestOutputHelper output;
-
-        public EnvironmentVariableUnitTests(ITestOutputHelper outputHelper)
-        {
-            output = outputHelper;
-        }
-
-        [Fact]
-        public void SetEnvironmentVariable()
-        {
-            Dictionary<string, string> envVars = new Dictionary<string, string>
-            {
-                { "TestOverwrite", "Original" },
-                { "TestClear", "Hi!" }
-            };
-            using TestRunner runner = new TestRunner(testExePath: CommonHelper.GetTraceePathWithArgs(),
-                                                     _outputHelper: output,
-                                                     envVars: envVars);
-            runner.Start(timeoutInMSPipeCreation: 15_000, testProcessTimeout: 60_000);
-            DiagnosticsClient client = new DiagnosticsClient(runner.Pid);
-
-            Assert.Equal(envVars["TestClear"], client.GetEnvironmentVariable("TestClear"));
-            client.SetEnvironmentVariable("TestClear", null);
-            Assert.Null(client.GetEnvironmentVariable("TestClear"));
-
-            Assert.Equal(envVars["TestOverwrite"], client.GetEnvironmentVariable("TestOverwrite"));
-            client.SetEnvironmentVariable("TestOverwrite", "NewValue");
-            Assert.Equal("NewValue", client.GetEnvironmentVariable("TestOverwrite"));
-        }
-    }
-}