Remove duplicate test helpers and put overloads right next to each other

src/EditorFeatures/TestUtilities/CallHierarchy/CallHierarchyTestState.cs

@@ -91,6 +91,13 @@ internal void WaitForCompletion()
             }
         }
 
+        public static CallHierarchyTestState Create(string markup, params Type[] additionalTypes)
+        {
+            var exportProvider = CreateExportProvider(additionalTypes);
+            var workspace = TestWorkspace.CreateCSharp(markup, exportProvider: exportProvider);
+            return new CallHierarchyTestState(workspace);
+        }
+
         public static CallHierarchyTestState Create(XElement markup, params Type[] additionalTypes)
         {
             var exportProvider = CreateExportProvider(additionalTypes);
@@ -128,31 +135,6 @@ private static VisualStudio.Composition.ExportProvider CreateExportProvider(Type
             return MinimalTestExportProvider.CreateExportProvider(catalog);
         }
 
-        public static CallHierarchyTestState Create(string markup, params Type[] additionalTypes)
-        {
-            var exportProvider = CreateExportProvider(additionalTypes);
-            var workspace = TestWorkspace.CreateCSharp(markup, exportProvider: exportProvider);
-            return new CallHierarchyTestState(markup, workspace);
-        }
-
-        private CallHierarchyTestState(string markup, TestWorkspace workspace)
-        {
-            this.Workspace = workspace;
-            var testDocument = Workspace.Documents.Single(d => d.CursorPosition.HasValue);
-
-            _textView = testDocument.GetTextView();
-            _subjectBuffer = testDocument.GetTextBuffer();
-
-            var provider = Workspace.GetService<CallHierarchyProvider>();
-
-            var notificationService = Workspace.Services.GetService<INotificationService>() as INotificationServiceCallback;
-            var callback = new Action<string, string, NotificationSeverity>((message, title, severity) => NotificationMessage = message);
-            notificationService.NotificationCallback = callback;
-
-            _presenter = new MockCallHierarchyPresenter();
-            _commandHandler = new CallHierarchyCommandHandler(new[] { _presenter }, provider, TestWaitIndicator.Default);
-        }
-
         internal string NotificationMessage
         {
             get;