Add TestServer.CreateBuilder overload

src/Microsoft.AspNet.TestHost/TestServer.cs

@@ -105,16 +105,22 @@ namespace Microsoft.AspNet.TestHost
                 });
         }
 
-        public static TestServerBuilder CreateBuilder(IServiceProvider fallbackServices, IConfiguration config, Action<IApplicationBuilder> configureApp, ConfigureServicesDelegate configureServices)
+        public static TestServerBuilder CreateBuilder(IServiceProvider fallbackServices, IConfiguration config)
         {
             return new TestServerBuilder
             {
                 FallbackServices = fallbackServices,
-                Startup = new StartupMethods(configureApp, configureServices),
                 Config = config
             };
         }
 
+        public static TestServerBuilder CreateBuilder(IServiceProvider fallbackServices, IConfiguration config, Action<IApplicationBuilder> configureApp, ConfigureServicesDelegate configureServices)
+        {
+            var builder = CreateBuilder(fallbackServices, config);
+            builder.Startup = new StartupMethods(configureApp, configureServices);
+            return builder;
+        }
+
         public HttpMessageHandler CreateHandler()
         {
             var pathBase = BaseAddress == null ? PathString.Empty : PathString.FromUriComponent(BaseAddress);

test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs

@@ -1,21 +1,17 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
-using Microsoft.Framework.DependencyInjection;
 using Xunit;
 
 namespace Microsoft.AspNet.TestHost
 {
     public class TestClientTests
     {
-        private readonly IServiceProvider _services;
         private readonly TestServer _server;
 
         public TestClientTests()