diff --git a/src/MusicStore/Controllers/ShoppingCartController.cs b/src/MusicStore/Controllers/ShoppingCartController.cs
index 886b120926..54a63fcd40 100644
--- a/src/MusicStore/Controllers/ShoppingCartController.cs
+++ b/src/MusicStore/Controllers/ShoppingCartController.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Antiforgery;
 using Microsoft.AspNet.Mvc;
 using Microsoft.Data.Entity;
 using MusicStore.Models;
@@ -14,7 +15,7 @@ namespace MusicStore.Controllers
         public MusicStoreContext DbContext { get; set; }
 
         [FromServices]
-        public AntiForgery AntiForgery { get; set; }
+        public IAntiforgery Antiforgery { get; set; }
 
         //
         // GET: /ShoppingCart/
@@ -73,7 +74,7 @@ namespace MusicStore.Controllers
                 }
             }
 
-            AntiForgery.Validate(Context, new AntiForgeryTokenSet(formToken, cookieToken));
+            Antiforgery.ValidateTokens(Context, new AntiforgeryTokenSet(formToken, cookieToken));
 
             // Retrieve the current user's shopping cart
             var cart = ShoppingCart.GetCart(DbContext, Context);
diff --git a/src/MusicStore/Views/ShoppingCart/Index.cshtml b/src/MusicStore/Views/ShoppingCart/Index.cshtml
index e1a5b785d8..a18bb10cb0 100644
--- a/src/MusicStore/Views/ShoppingCart/Index.cshtml
+++ b/src/MusicStore/Views/ShoppingCart/Index.cshtml
@@ -1,5 +1,5 @@
 @model MusicStore.ViewModels.ShoppingCartViewModel
-@inject AntiForgery Xsrf
+@inject Microsoft.AspNet.Antiforgery.IAntiforgery Xsrf
 @{
     ViewBag.Title = "Shopping Cart";
 }
@@ -8,7 +8,7 @@
 {
     public string GetAntiXsrfToken()
     {
-        var tokens = Xsrf.GetTokens(Context, null);
+        var tokens = Xsrf.GetTokens(Context);
         return tokens.CookieToken + ":" + tokens.FormToken;
     }
 }
diff --git a/test/MusicStore.Test/CartSummaryComponentTest.cs b/test/MusicStore.Test/CartSummaryComponentTest.cs
index 6a465975fb..aee584bc95 100644
--- a/test/MusicStore.Test/CartSummaryComponentTest.cs
+++ b/test/MusicStore.Test/CartSummaryComponentTest.cs
@@ -5,6 +5,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Mvc;
+using Microsoft.Data.Entity;
 using Microsoft.Framework.DependencyInjection;
 using MusicStore.Controllers;
 using MusicStore.Models;
@@ -22,8 +23,7 @@ namespace MusicStore.Components
 
             services.AddEntityFramework()
                       .AddInMemoryDatabase()
-                      .AddDbContext<MusicStoreContext>(options =>
-                            options.UseInMemoryDatabase());
+                      .AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
 
             _serviceProvider = services.BuildServiceProvider();
         }
diff --git a/test/MusicStore.Test/CheckoutControllerTest.cs b/test/MusicStore.Test/CheckoutControllerTest.cs
index 562210d182..4156400ba9 100644
--- a/test/MusicStore.Test/CheckoutControllerTest.cs
+++ b/test/MusicStore.Test/CheckoutControllerTest.cs
@@ -8,6 +8,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Mvc;
+using Microsoft.Data.Entity;
 using Microsoft.Framework.DependencyInjection;
 using MusicStore.Models;
 using Xunit;
@@ -24,8 +25,7 @@ namespace MusicStore.Controllers
 
             services.AddEntityFramework()
                       .AddInMemoryDatabase()
-                      .AddDbContext<MusicStoreContext>(options =>
-                            options.UseInMemoryDatabase());
+                      .AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
 
             _serviceProvider = services.BuildServiceProvider();
         }
diff --git a/test/MusicStore.Test/GenreMenuComponentTest.cs b/test/MusicStore.Test/GenreMenuComponentTest.cs
index 7a6378a698..ce9534df6b 100644
--- a/test/MusicStore.Test/GenreMenuComponentTest.cs
+++ b/test/MusicStore.Test/GenreMenuComponentTest.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
+using Microsoft.Data.Entity;
 using Microsoft.Framework.DependencyInjection;
 using MusicStore.Models;
 using Xunit;
@@ -18,8 +19,7 @@ namespace MusicStore.Components
             var services = new ServiceCollection();
             services.AddEntityFramework()
                       .AddInMemoryDatabase()
-                      .AddDbContext<MusicStoreContext>(options =>
-                            options.UseInMemoryDatabase()););
+                      .AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
 
             _serviceProvider = services.BuildServiceProvider();
         }
diff --git a/test/MusicStore.Test/HomeControllerTest.cs b/test/MusicStore.Test/HomeControllerTest.cs
index 669dc0d55f..5bc75c35e3 100644
--- a/test/MusicStore.Test/HomeControllerTest.cs
+++ b/test/MusicStore.Test/HomeControllerTest.cs
@@ -21,8 +21,7 @@ namespace MusicStore.Controllers
 
             services.AddEntityFramework()
                       .AddInMemoryDatabase()
-                      .AddDbContext<MusicStoreContext>(options =>
-                            options.UseInMemoryDatabase()););
+                      .AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
 
             _serviceProvider = services.BuildServiceProvider();
         }
diff --git a/test/MusicStore.Test/ManageControllerTest.cs b/test/MusicStore.Test/ManageControllerTest.cs
index 077c820fcc..c8149b7a83 100644
--- a/test/MusicStore.Test/ManageControllerTest.cs
+++ b/test/MusicStore.Test/ManageControllerTest.cs
@@ -9,6 +9,7 @@ using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.AspNet.Mvc;
+using Microsoft.Data.Entity;
 using Microsoft.Framework.DependencyInjection;
 using MusicStore.Models;
 using Xunit;
@@ -24,8 +25,7 @@ namespace MusicStore.Controllers
             var services = new ServiceCollection();
             services.AddEntityFramework()
                     .AddInMemoryDatabase()
-                    .AddDbContext<MusicStoreContext>(options =>
-                            options.UseInMemoryDatabase()););
+                    .AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
 
             services.AddIdentity<ApplicationUser, IdentityRole>()
                     .AddEntityFrameworkStores<MusicStoreContext>();
diff --git a/test/MusicStore.Test/ShoppingCartControllerTest.cs b/test/MusicStore.Test/ShoppingCartControllerTest.cs
index 72a1335b0c..897352ecc5 100644
--- a/test/MusicStore.Test/ShoppingCartControllerTest.cs
+++ b/test/MusicStore.Test/ShoppingCartControllerTest.cs
@@ -3,16 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Antiforgery;
+using Microsoft.Data.Entity;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Features.Internal;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Session;
-using Microsoft.Framework.Caching.Distributed;
-using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging.Testing;
 using MusicStore.Models;
 using MusicStore.ViewModels;
 using Xunit;
@@ -29,8 +26,7 @@ namespace MusicStore.Controllers
 
             services.AddEntityFramework()
                       .AddInMemoryDatabase()
-                      .AddDbContext<MusicStoreContext>(options =>
-                            options.UseInMemoryDatabase()););
+                      .AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
 
             services.AddMvc();
 
@@ -188,8 +184,8 @@ namespace MusicStore.Controllers
 
             // AntiForgery initialization
             serviceProviderFeature.RequestServices = _serviceProvider;
-            var antiForgery = serviceProviderFeature.RequestServices.GetRequiredService<AntiForgery>();
-            var tokens = antiForgery.GetTokens(httpContext, "testToken");
+            var antiForgery = serviceProviderFeature.RequestServices.GetRequiredService<IAntiforgery>();
+            var tokens = antiForgery.GetTokens(httpContext);
 
             // Header initialization for AntiForgery
             var headers = new KeyValuePair<string, string[]>(
@@ -201,7 +197,7 @@ namespace MusicStore.Controllers
             var controller = new ShoppingCartController()
             {
                 DbContext = dbContext,
-                AntiForgery = antiForgery,
+                Antiforgery = antiForgery,
             };
             controller.ActionContext.HttpContext = httpContext;
 
diff --git a/test/MusicStore.Test/StoreControllerTest.cs b/test/MusicStore.Test/StoreControllerTest.cs
index 2ef466f77d..1f38926c42 100644
--- a/test/MusicStore.Test/StoreControllerTest.cs
+++ b/test/MusicStore.Test/StoreControllerTest.cs
@@ -21,8 +21,7 @@ namespace MusicStore.Controllers
 
             services.AddEntityFramework()
                       .AddInMemoryDatabase()
-                      .AddDbContext<MusicStoreContext>(options =>
-                            options.UseInMemoryDatabase()););
+                      .AddDbContext<MusicStoreContext>(options => options.UseInMemoryDatabase());
 
             _serviceProvider = services.BuildServiceProvider();
         }