diff --git a/src/Microsoft.AspNet.Identity.Entity/project.json b/src/Microsoft.AspNet.Identity.Entity/project.json
index 2eeca2ea86..2f2b90db61 100644
--- a/src/Microsoft.AspNet.Identity.Entity/project.json
+++ b/src/Microsoft.AspNet.Identity.Entity/project.json
@@ -3,7 +3,7 @@
   "dependencies": {
     "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
     "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
-    "Microsoft.AspNet.Identity": "0.1-alpha-*",
+    "Microsoft.AspNet.Identity": "",
     "Microsoft.Data.Entity": "0.1-alpha-*",
     "Microsoft.Data.Entity.Relational": "0.1-alpha-*",
     "Microsoft.Data.Entity.SqlServer": "0.1-alpha-*",
@@ -16,7 +16,7 @@
         "System.Runtime": "",
         "System.Collections": ""
       }
-	},
+    },
     "k10": {
       "dependencies": {
         "System.Collections": "4.0.0.0",
diff --git a/src/Microsoft.AspNet.Identity.InMemory/project.json b/src/Microsoft.AspNet.Identity.InMemory/project.json
index 0f7de96e9f..fc329300ae 100644
--- a/src/Microsoft.AspNet.Identity.InMemory/project.json
+++ b/src/Microsoft.AspNet.Identity.InMemory/project.json
@@ -1,7 +1,7 @@
 {
   "version": "0.1-alpha-*",
   "dependencies": {
-    "Microsoft.AspNet.Identity": "0.1-alpha-*",
+    "Microsoft.AspNet.Identity": "",
     "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*",
     "System.Security.Claims": "0.1-alpha-*"
   },
diff --git a/src/Microsoft.AspNet.Identity.Security/SignInManager.cs b/src/Microsoft.AspNet.Identity.Security/SignInManager.cs
index 9fbe478ffa..a33b696731 100644
--- a/src/Microsoft.AspNet.Identity.Security/SignInManager.cs
+++ b/src/Microsoft.AspNet.Identity.Security/SignInManager.cs
@@ -15,12 +15,12 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.AspNet.Abstractions;
-using Microsoft.AspNet.Abstractions.Security;
 using Microsoft.AspNet.DependencyInjection;
 using System;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Security;
 
 namespace Microsoft.AspNet.Identity.Security
 {
diff --git a/src/Microsoft.AspNet.Identity.Security/project.json b/src/Microsoft.AspNet.Identity.Security/project.json
index 89ff45ece3..45b9480d74 100644
--- a/src/Microsoft.AspNet.Identity.Security/project.json
+++ b/src/Microsoft.AspNet.Identity.Security/project.json
@@ -3,8 +3,8 @@
   "dependencies": {
     "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*",
     "System.Security.Claims" : "0.1-alpha-*",
-    "Microsoft.AspNet.Abstractions" : "0.1-alpha-*",
-    "Microsoft.AspNet.Identity" : "0.1-alpha-*",
+    "Microsoft.AspNet.Http" : "0.1-alpha-*",
+    "Microsoft.AspNet.Identity" : "",
     "Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*"
   },
   "configurations": {
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs
index a1a31ef4e0..5504040144 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs
@@ -19,7 +19,6 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.DependencyInjection.Fallback;
-using Microsoft.AspNet.Identity.Test;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.InMemory;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs
index 975b561dae..612dc99a7f 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs
@@ -2,12 +2,12 @@ using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.DependencyInjection.Fallback;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Identity.Entity;
-using Microsoft.AspNet.Identity.Test;
 using Microsoft.AspNet.PipelineCore;
 using System;
 using System.Threading.Tasks;
 using Microsoft.Data.Entity;
 using Xunit;
+using Microsoft.AspNet.Builder;
 
 namespace Microsoft.AspNet.Identity.Entity.Test
 {
@@ -36,7 +36,7 @@ namespace Microsoft.AspNet.Identity.Entity.Test
         [Fact]
         public void CanCustomizeIdentityOptions()
         {
-            IBuilder builder = new Builder(new ServiceCollection().BuildServiceProvider());
+            IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
             builder.UseServices(services => {
                 services.AddIdentity<IdentityUser>(identityServices => { });
                 services.AddSetup<PasswordsNegativeLengthSetup>();
@@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Identity.Entity.Test
         [Fact]
         public void CanSetupIdentityOptions()
         {
-            IBuilder app = new Builder(new ServiceCollection().BuildServiceProvider());
+            IBuilder app = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
             app.UseServices(services => services.AddIdentity<IdentityUser>(identityServices => identityServices.SetupOptions(options => options.User.RequireUniqueEmail = true)));
 
             var optionsGetter = app.ApplicationServices.GetService<IOptionsAccessor<IdentityOptions>>();
@@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Identity.Entity.Test
         [Fact]
         public async Task EnsureStartupUsageWorks()
         {
-            IBuilder builder = new Builder(new ServiceCollection().BuildServiceProvider());
+            IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
 
             //builder.UseServices(services => services.AddIdentity<ApplicationUser>(s =>
             //    s.AddEntity<ApplicationDbContext>()
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs
index ca67566f26..e195f8d78c 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs
@@ -17,7 +17,6 @@
 
 using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.DependencyInjection.Fallback;
-using Microsoft.AspNet.Identity.Test;
 using Microsoft.AspNet.Testing;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Metadata;
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/project.json b/test/Microsoft.AspNet.Identity.Entity.Test/project.json
index 6ef2aea2c7..e3d72f9ab6 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/project.json
@@ -1,10 +1,9 @@
 {
   "version": "0.1-alpha-*",
   "dependencies": {
-    "Microsoft.AspNet.Abstractions": "0.1-alpha-*",
+    "Microsoft.AspNet.Http": "0.1-alpha-*",
     "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
     "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
-    "Microsoft.AspNet.Identity": "",
     "Microsoft.AspNet.Identity.Entity": "",
     "Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
     "Microsoft.AspNet.Logging": "0.1-alpha-*",
@@ -12,12 +11,6 @@
     "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-*",
     "Microsoft.AspNet.Testing": "0.1-alpha-*",
     "Microsoft.Bcl.Immutable": "1.1.18-beta-*",
-    "Microsoft.Data.Entity": "0.1-alpha-*",
-    "Microsoft.Data.Entity.InMemory": "0.1-alpha-*",
-    "Microsoft.Data.Entity.Migrations": "0.1-alpha-*",
-    "Microsoft.Data.Entity.Relational": "0.1-alpha-*",
-    "Microsoft.Data.Entity.SqlServer": "0.1-alpha-*",
-    "Remotion.Linq": "1.15.13.0",
     "System.Security.Claims": "0.1-alpha-*",
     "Xunit.KRunner": "0.1-alpha-*",
     "xunit.abstractions": "2.0.0-aspnet-*",
@@ -25,7 +18,6 @@
     "xunit.core": "2.0.0-aspnet-*",
     "xunit.execution": "2.0.0-aspnet-*"
   },
-  "code": "**\\*.cs;..\\Shared\\*.cs",
   "configurations": {
     "net45": {
       "dependencies": {
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/Microsoft.AspNet.Identity.InMemory.Test.kproj b/test/Microsoft.AspNet.Identity.InMemory.Test/Microsoft.AspNet.Identity.InMemory.Test.kproj
index f8e992d95c..c93f7cd3e4 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/Microsoft.AspNet.Identity.InMemory.Test.kproj
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/Microsoft.AspNet.Identity.InMemory.Test.kproj
@@ -25,8 +25,5 @@
     <Compile Include="InMemoryStoreTest.cs" />
     <Compile Include="StartupTest.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
index f12bde2fce..9802b89068 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
@@ -15,13 +15,14 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.DependencyInjection.Fallback;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Identity.Test;
 using Microsoft.AspNet.PipelineCore;
-using System;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.AspNet.Identity.InMemory.Test
@@ -47,7 +48,7 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
         [Fact]
         public void CanCustomizeIdentityOptions()
         {
-            IBuilder builder = new Builder(new ServiceCollection().BuildServiceProvider());
+            IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
             builder.UseServices(services => {
                 services.AddIdentity<IdentityUser>(identityServices => { });
                 services.AddSetup<PasswordsNegativeLengthSetup>();
@@ -70,7 +71,7 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
         [Fact]
         public void CanSetupIdentityOptions()
         {
-            IBuilder app = new Builder(new ServiceCollection().BuildServiceProvider());
+            IBuilder app = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
             app.UseServices(services => services.AddIdentity<IdentityUser>(identityServices => identityServices.SetupOptions(options => options.User.RequireUniqueEmail = true)));
 
             var optionsGetter = app.ApplicationServices.GetService<IOptionsAccessor<IdentityOptions>>();
@@ -83,7 +84,7 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
         [Fact]
         public async Task EnsureStartupUsageWorks()
         {
-            IBuilder builder = new Builder(new ServiceCollection().BuildServiceProvider());
+            IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
 
             //builder.UseServices(services => services.AddIdentity<ApplicationUser>(s =>
             //    s.AddEntity<ApplicationDbContext>()
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/project.json b/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
index 4b8ccb77c0..e3339647de 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
@@ -1,7 +1,7 @@
 {
   "version": "0.1-alpha-*",
   "dependencies": {
-    "Microsoft.AspNet.Abstractions" : "0.1-alpha-*",
+    "Microsoft.AspNet.Http" : "0.1-alpha-*",
     "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
     "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*",
     "Microsoft.AspNet.Identity" : "0.1-alpha-*",
diff --git a/test/Microsoft.AspNet.Identity.Security.Test/Microsoft.AspNet.Identity.Security.Test.kproj b/test/Microsoft.AspNet.Identity.Security.Test/Microsoft.AspNet.Identity.Security.Test.kproj
index aa2be0f249..7cf8dbd775 100644
--- a/test/Microsoft.AspNet.Identity.Security.Test/Microsoft.AspNet.Identity.Security.Test.kproj
+++ b/test/Microsoft.AspNet.Identity.Security.Test/Microsoft.AspNet.Identity.Security.Test.kproj
@@ -25,8 +25,5 @@
     <Compile Include="SignInManagerTest.cs" />
     <Compile Include="TestUser.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs b/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs
index 75dd0caa77..33fa92ee82 100644
--- a/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs
+++ b/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs
@@ -31,6 +31,7 @@ using Moq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Xunit;
+using Microsoft.AspNet.Builder;
 
 namespace Microsoft.AspNet.Identity.Security.Test
 {
@@ -42,7 +43,7 @@ namespace Microsoft.AspNet.Identity.Security.Test
         [InlineData(false)]
         public async Task VerifyAccountControllerSignIn(bool isPersistent)
         {
-            IBuilder app = new Builder(new ServiceCollection().BuildServiceProvider());
+            IBuilder app = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
             app.UseCookieAuthentication(new CookieAuthenticationOptions
             {
                 AuthenticationType = DefaultAuthenticationTypes.ApplicationCookie
diff --git a/test/Microsoft.AspNet.Identity.Security.Test/project.json b/test/Microsoft.AspNet.Identity.Security.Test/project.json
index 380eacd0bb..227058967f 100644
--- a/test/Microsoft.AspNet.Identity.Security.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.Security.Test/project.json
@@ -1,7 +1,7 @@
 {
   "version": "0.1-alpha-*",
   "dependencies": {
-    "Microsoft.AspNet.Abstractions" : "0.1-alpha-*",
+    "Microsoft.AspNet.Http" : "0.1-alpha-*",
     "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
     "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*",
     "Microsoft.AspNet.Identity" : "0.1-alpha-*",
diff --git a/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs b/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
index 0861dedc97..c5f75f0eb4 100644
--- a/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
+++ b/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
@@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Identity.Test
                 {"identity:password:RequireDigit", "false"},
                 {"identity:password:RequireLowerCase", "false"}
             };
-            var config = new ConfigurationModel.Configuration { new MemoryConfigurationSource(dic) };
+            var config = new Configuration { new MemoryConfigurationSource(dic) };
             Assert.Equal(roleClaimType, config.Get("identity:claimtype:role"));
             var options = new IdentityOptions(config);
             Assert.Equal(roleClaimType, options.ClaimType.Role);
@@ -91,7 +91,7 @@ namespace Microsoft.AspNet.Identity.Test
                 {"userid", useridClaimType},
                 {"securitystamp", securityStampClaimType}
             };
-            var config = new ConfigurationModel.Configuration {new MemoryConfigurationSource(dic)};
+            var config = new Configuration {new MemoryConfigurationSource(dic)};
             Assert.Equal(roleClaimType, config.Get("role"));
             var options = new ClaimTypeOptions(config);
             Assert.Equal(roleClaimType, options.Role);
@@ -111,7 +111,7 @@ namespace Microsoft.AspNet.Identity.Test
                 {"RequireDigit", "false"},
                 {"RequireLowerCase", "false"}
             };
-            var config = new ConfigurationModel.Configuration { new MemoryConfigurationSource(dic) };
+            var config = new Configuration { new MemoryConfigurationSource(dic) };
             var options = new PasswordOptions(config);
             Assert.False(options.RequireDigit);
             Assert.False(options.RequireLowercase);
diff --git a/test/Microsoft.AspNet.Identity.Test/Microsoft.AspNet.Identity.Test.kproj b/test/Microsoft.AspNet.Identity.Test/Microsoft.AspNet.Identity.Test.kproj
index 817b6809e9..69e3ba11ef 100644
--- a/test/Microsoft.AspNet.Identity.Test/Microsoft.AspNet.Identity.Test.kproj
+++ b/test/Microsoft.AspNet.Identity.Test/Microsoft.AspNet.Identity.Test.kproj
@@ -23,20 +23,15 @@
   <ItemGroup>
     <Compile Include="ClaimsIdentityFactoryTest.cs" />
     <Compile Include="IdentityBuilderTest.cs" />
-    <Compile Include="IdentityResultAssert.cs" />
+    <Compile Include="IdentityOptionsTest.cs" />
     <Compile Include="IdentityResultTest.cs" />
     <Compile Include="NoopRoleStore.cs" />
     <Compile Include="NoopUserStore.cs" />
     <Compile Include="PasswordValidatorTest.cs" />
     <Compile Include="RoleManagerTest.cs" />
     <Compile Include="RoleValidatorTest.cs" />
-    <Compile Include="TestRole.cs" />
-    <Compile Include="TestUser.cs" />
     <Compile Include="UserManagerTest.cs" />
     <Compile Include="UserValidatorTest.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file