diff --git a/src/Tests/Services/Application.FunctionalTests/Services/Catalog/CatalogScenariosBase.cs b/src/Tests/Services/Application.FunctionalTests/Services/Catalog/CatalogScenariosBase.cs
index 3ce419230..ffaef64a3 100644
--- a/src/Tests/Services/Application.FunctionalTests/Services/Catalog/CatalogScenariosBase.cs
+++ b/src/Tests/Services/Application.FunctionalTests/Services/Catalog/CatalogScenariosBase.cs
@@ -33,7 +33,7 @@ namespace FunctionalTests.Services.Catalog
             testServer.Host
                 .MigrateDbContext<CatalogContext>((context, services) =>
                 {
-                    var env = services.GetService<IHostingEnvironment>();
+                    var env = services.GetService<IWebHostEnvironment>();
                     var settings = services.GetService<IOptions<CatalogSettings>>();
                     var logger = services.GetService<ILogger<CatalogContextSeed>>();
 
diff --git a/src/Tests/Services/Application.FunctionalTests/Services/IntegrationEventsScenarios.cs b/src/Tests/Services/Application.FunctionalTests/Services/IntegrationEventsScenarios.cs
index fd270d159..dd6eef99a 100644
--- a/src/Tests/Services/Application.FunctionalTests/Services/IntegrationEventsScenarios.cs
+++ b/src/Tests/Services/Application.FunctionalTests/Services/IntegrationEventsScenarios.cs
@@ -56,7 +56,7 @@ namespace FunctionalTests.Services
                 else
                 {
                     //THEN the product price changes in the catalog 
-                    Assert.Equal(newPrice, modifiedCatalogProducts.Data.Single(it => it.Id == int.Parse(itemToModify.ProductId)).Price);
+                    Assert.Equal(newPrice, modifiedCatalogProducts.Data.Single(it => it.Id == itemToModify.ProductId).Price);
 
                     // AND the products in the basket reflects the changed priced and the original price
                     Assert.Equal(newPrice, itemUpdated.UnitPrice);
@@ -65,7 +65,7 @@ namespace FunctionalTests.Services
             }
         }
 
-        private async Task<BasketItem> GetUpdatedBasketItem(decimal newPrice, string productId, string userId, HttpClient basketClient)
+        private async Task<BasketItem> GetUpdatedBasketItem(decimal newPrice, int productId, string userId, HttpClient basketClient)
         {
             bool continueLoop = true;
             var counter = 0;
@@ -102,7 +102,7 @@ namespace FunctionalTests.Services
 
         private string ChangePrice(BasketItem itemToModify, decimal newPrice, PaginatedItemsViewModel<CatalogItem> catalogProducts)
         {
-            var catalogProduct = catalogProducts.Data.Single(pr => pr.Id == int.Parse(itemToModify.ProductId));
+            var catalogProduct = catalogProducts.Data.Single(pr => pr.Id == itemToModify.ProductId);
             catalogProduct.Price = newPrice;
             return JsonConvert.SerializeObject(catalogProduct);
         }
@@ -117,7 +117,7 @@ namespace FunctionalTests.Services
                     Id = Guid.NewGuid().ToString(),
                     UnitPrice = item.Price,
                     PictureUrl = item.PictureUri,
-                    ProductId = item.Id.ToString(),
+                    ProductId = item.Id,
                     OldUnitPrice = 0,
                     ProductName = item.Name,
                     Quantity = 1
diff --git a/src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs b/src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs
index 179717583..cb1fc2526 100644
--- a/src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs
+++ b/src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs
@@ -104,7 +104,7 @@ namespace FunctionalTests.Services.Ordering
                 {
                     Id = "1",
                     ProductName = "ProductName",
-                    ProductId = "1",
+                    ProductId = 1,
                     UnitPrice = 10,
                     Quantity = 1
                 }
diff --git a/src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingScenariosBase.cs b/src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
index ad5230fcd..487e435d2 100644
--- a/src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
+++ b/src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
@@ -33,7 +33,7 @@ namespace FunctionalTests.Services.Ordering
             testServer.Host
                 .MigrateDbContext<OrderingContext>((context, services) =>
                 {
-                    var env = services.GetService<IHostingEnvironment>();
+                    var env = services.GetService<IWebHostEnvironment>();
                     var settings = services.GetService<IOptions<OrderingSettings>>();
                     var logger = services.GetService<ILogger<OrderingContextSeed>>();