diff --git a/test/MusicStore.Test/CheckoutControllerTest.cs b/test/MusicStore.Test/CheckoutControllerTest.cs
index 2e6007d1b3..a706518c88 100644
--- a/test/MusicStore.Test/CheckoutControllerTest.cs
+++ b/test/MusicStore.Test/CheckoutControllerTest.cs
@@ -82,14 +82,11 @@ namespace MusicStore.Controllers
             dbContext.AddRange(cartItems);
             dbContext.SaveChanges();
 
-            var controller = new CheckoutController()
-            {
-                DbContext = dbContext,
-            };
+            var controller = new CheckoutController();
             controller.ActionContext.HttpContext = httpContext;
 
             // Act
-            var result = await controller.AddressAndPayment(order, CancellationToken.None);
+            var result = await controller.AddressAndPayment(dbContext, order, CancellationToken.None);
 
             // Assert
             var redirectResult = Assert.IsType<RedirectToActionResult>(result);
@@ -105,6 +102,7 @@ namespace MusicStore.Controllers
         {
             // Arrange
             var context = new DefaultHttpContext();
+            var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
 
             // AddressAndPayment action reads the Promo code from FormCollection.
             context.Request.Form =
@@ -117,7 +115,7 @@ namespace MusicStore.Controllers
             var order = new Order();
 
             // Act
-            var result = await controller.AddressAndPayment(order, CancellationToken.None);
+            var result = await controller.AddressAndPayment(dbContext, order, CancellationToken.None);
 
             // Assert
             var viewResult = Assert.IsType<ViewResult>(result);
@@ -134,6 +132,7 @@ namespace MusicStore.Controllers
             var context = new DefaultHttpContext();
             context.Request.Form =
                 new FormCollection(new Dictionary<string, StringValues>());
+            var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
 
             var controller = new CheckoutController();
             controller.ActionContext.HttpContext = context;
@@ -141,7 +140,7 @@ namespace MusicStore.Controllers
             var order = new Order();
 
             // Act
-            var result = await controller.AddressAndPayment(order, new CancellationToken(true));
+            var result = await controller.AddressAndPayment(dbContext, order, new CancellationToken(true));
 
             // Assert
             var viewResult = Assert.IsType<ViewResult>(result);
@@ -157,11 +156,12 @@ namespace MusicStore.Controllers
             // Arrange
             var controller = new CheckoutController();
             controller.ModelState.AddModelError("a", "ModelErrorA");
+            var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
 
             var order = new Order();
 
             // Act
-            var result = await controller.AddressAndPayment(order, CancellationToken.None);
+            var result = await controller.AddressAndPayment(dbContext, order, CancellationToken.None);
 
             // Assert
             var viewResult = Assert.IsType<ViewResult>(result);
@@ -193,14 +193,11 @@ namespace MusicStore.Controllers
             });
             dbContext.SaveChanges();
 
-            var controller = new CheckoutController()
-            {
-                DbContext = dbContext,
-            };
+            var controller = new CheckoutController();
             controller.ActionContext.HttpContext = httpContext;
 
             // Act
-            var result = await controller.Complete(orderId);
+            var result = await controller.Complete(dbContext, orderId);
 
             // Assert
             var viewResult = Assert.IsType<ViewResult>(result);
@@ -218,14 +215,11 @@ namespace MusicStore.Controllers
             var dbContext =
                 _serviceProvider.GetRequiredService<MusicStoreContext>();
 
-            var controller = new CheckoutController()
-            {
-                DbContext = dbContext,
-            };
+            var controller = new CheckoutController();
             controller.ActionContext.HttpContext = new DefaultHttpContext();
 
             // Act
-            var result = await controller.Complete(invalidOrderId);
+            var result = await controller.Complete(dbContext, invalidOrderId);
 
             // Assert
             var viewResult = Assert.IsType<ViewResult>(result);
diff --git a/test/MusicStore.Test/HomeControllerTest.cs b/test/MusicStore.Test/HomeControllerTest.cs
index 83d9e56d05..dd2b92cab7 100644
--- a/test/MusicStore.Test/HomeControllerTest.cs
+++ b/test/MusicStore.Test/HomeControllerTest.cs
@@ -46,16 +46,13 @@ namespace MusicStore.Controllers
         public async Task Index_GetsSixTopAlbums()
         {
             // Arrange
-            var controller = new HomeController()
-            {
-                DbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(),
-                Cache = _serviceProvider.GetRequiredService<IMemoryCache>(),
-            };
-
-            PopulateData(controller.DbContext);
+            var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
+            var cache = _serviceProvider.GetRequiredService<IMemoryCache>();
+            var controller = new HomeController();
+            PopulateData(dbContext);
 
             // Action
-            var result = await controller.Index();
+            var result = await controller.Index(dbContext, cache);
 
             // Assert
             var viewResult = Assert.IsType<ViewResult>(result);
diff --git a/test/MusicStore.Test/ManageControllerTest.cs b/test/MusicStore.Test/ManageControllerTest.cs
index 1723aa607a..c22f95b645 100644
--- a/test/MusicStore.Test/ManageControllerTest.cs
+++ b/test/MusicStore.Test/ManageControllerTest.cs
@@ -64,11 +64,7 @@ namespace MusicStore.Controllers
             var httpContext = _serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
             httpContext.User = new ClaimsPrincipal(new ClaimsIdentity(claims));
 
-            var controller = new ManageController()
-            {
-                UserManager = userManager,
-                SignInManager = signInManager,
-            };
+            var controller = new ManageController(userManager, signInManager);
             controller.ActionContext.HttpContext = httpContext;
 
             // Act
diff --git a/test/MusicStore.Test/ShoppingCartControllerTest.cs b/test/MusicStore.Test/ShoppingCartControllerTest.cs
index 2b8a67e231..b6761f4cba 100644
--- a/test/MusicStore.Test/ShoppingCartControllerTest.cs
+++ b/test/MusicStore.Test/ShoppingCartControllerTest.cs
@@ -42,10 +42,7 @@ namespace MusicStore.Controllers
             var httpContext = new DefaultHttpContext();
             httpContext.Session = new TestSession();
 
-            var controller = new ShoppingCartController()
-            {
-                DbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(),
-            };
+            var controller = new ShoppingCartController(_serviceProvider.GetRequiredService<MusicStoreContext>());
             controller.ActionContext.HttpContext = httpContext;
 
             // Act
@@ -69,10 +66,7 @@ namespace MusicStore.Controllers
             httpContext.Session = new TestSession();
             httpContext.Session.SetString("Session", "CartId_A");
 
-            var controller = new ShoppingCartController()
-            {
-                DbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(),
-            };
+            var controller = new ShoppingCartController(_serviceProvider.GetRequiredService<MusicStoreContext>());
             controller.ActionContext.HttpContext = httpContext;
 
             // Act
@@ -106,10 +100,7 @@ namespace MusicStore.Controllers
             dbContext.AddRange(cartItems);
             dbContext.SaveChanges();
 
-            var controller = new ShoppingCartController()
-            {
-                DbContext = dbContext,
-            };
+            var controller = new ShoppingCartController(dbContext);
             controller.ActionContext.HttpContext = httpContext;
 
             // Act
@@ -140,10 +131,7 @@ namespace MusicStore.Controllers
             dbContext.AddRange(albums);
             dbContext.SaveChanges();
 
-            var controller = new ShoppingCartController()
-            {
-                DbContext = dbContext
-            };
+            var controller = new ShoppingCartController(dbContext);
             controller.ActionContext.HttpContext = httpContext;
 
             // Act
@@ -196,15 +184,11 @@ namespace MusicStore.Controllers
             httpContext.Request.Headers.Add(headers);
 
             // Cotroller initialization
-            var controller = new ShoppingCartController()
-            {
-                DbContext = dbContext,
-                Antiforgery = antiForgery,
-            };
+            var controller = new ShoppingCartController(dbContext);
             controller.ActionContext.HttpContext = httpContext;
 
             // Act
-            var result = await controller.RemoveFromCart(cartItemId, CancellationToken.None);
+            var result = await controller.RemoveFromCart(antiForgery, cartItemId, CancellationToken.None);
 
             // Assert
             var jsonResult = Assert.IsType<JsonResult>(result);
diff --git a/test/MusicStore.Test/StoreControllerTest.cs b/test/MusicStore.Test/StoreControllerTest.cs
index c258788fe2..4d16070fe2 100644
--- a/test/MusicStore.Test/StoreControllerTest.cs
+++ b/test/MusicStore.Test/StoreControllerTest.cs
@@ -33,10 +33,7 @@ namespace MusicStore.Controllers
             var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
             CreateTestGenres(numberOfGenres: 10, numberOfAlbums: 1, dbContext: dbContext);
 
-            var controller = new StoreController()
-            {
-                DbContext = dbContext,
-            };
+            var controller = new StoreController(dbContext);
 
             // Act
             var result = await controller.Index();
@@ -54,10 +51,7 @@ namespace MusicStore.Controllers
         public async Task Browse_ReturnsHttpNotFoundWhenNoGenreData()
         {
             // Arrange
-            var controller = new StoreController()
-            {
-                DbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(),
-            };
+            var controller = new StoreController(_serviceProvider.GetRequiredService<MusicStoreContext>());
 
             // Act
             var result = await controller.Browse(string.Empty);
@@ -75,10 +69,7 @@ namespace MusicStore.Controllers
             var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
             CreateTestGenres(numberOfGenres: 3, numberOfAlbums: 3, dbContext: dbContext);
 
-            var controller = new StoreController()
-            {
-                DbContext = dbContext,
-            };
+            var controller = new StoreController(dbContext);
 
             // Act
             var result = await controller.Browse(genreName);
@@ -99,14 +90,10 @@ namespace MusicStore.Controllers
         {
             // Arrange
             var albumId = int.MinValue;
-            var controller = new StoreController()
-            {
-                DbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(),
-                Cache = _serviceProvider.GetRequiredService<IMemoryCache>(),
-            };
+            var controller = new StoreController(_serviceProvider.GetRequiredService<MusicStoreContext>());
 
             // Act
-            var result = await controller.Details(albumId);
+            var result = await controller.Details(_serviceProvider.GetRequiredService<IMemoryCache>(), albumId);
 
             // Assert
             Assert.IsType<HttpNotFoundResult>(result);
@@ -123,14 +110,10 @@ namespace MusicStore.Controllers
 
             var cache = _serviceProvider.GetRequiredService<IMemoryCache>();
 
-            var controller = new StoreController()
-            {
-                DbContext = dbContext,
-                Cache = cache,
-            };
+            var controller = new StoreController(dbContext);
 
             // Act
-            var result = await controller.Details(albumId);
+            var result = await controller.Details(cache, albumId);
 
             // Assert
             var viewResult = Assert.IsType<ViewResult>(result);