diff --git a/test/Services/IntegrationTests/IntegrationTests.csproj b/test/Services/IntegrationTests/IntegrationTests.csproj
index fbe703649..3054fe98d 100644
--- a/test/Services/IntegrationTests/IntegrationTests.csproj
+++ b/test/Services/IntegrationTests/IntegrationTests.csproj
@@ -20,12 +20,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Services\Basket\Basket.API\Basket.API.csproj" />
     <ProjectReference Include="..\..\..\src\Services\Catalog\Catalog.API\Catalog.API.csproj" />
     <ProjectReference Include="..\..\..\src\Services\Ordering\Ordering.API\Ordering.API.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
+    <PackageReference Include="Moq" Version="4.6.38-alpha" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.1.0" />
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
diff --git a/test/Services/IntegrationTests/Services/Basket/RedisBasketRepositoryTests.cs b/test/Services/IntegrationTests/Services/Basket/RedisBasketRepositoryTests.cs
index e2037c4ee..931dcee61 100644
--- a/test/Services/IntegrationTests/Services/Basket/RedisBasketRepositoryTests.cs
+++ b/test/Services/IntegrationTests/Services/Basket/RedisBasketRepositoryTests.cs
@@ -1,63 +1,68 @@
 
-//namespace IntegrationTests.Services.Basket
-//{
-//    using Microsoft.eShopOnContainers.Services.Basket.API;
-//    using Microsoft.eShopOnContainers.Services.Basket.API.Model;
-//    using Microsoft.Extensions.Logging;
-//    using Microsoft.Extensions.Options;
-//    using System.Collections.Generic;
-//    using System.Threading.Tasks;
-//    using Xunit;
-
-
-//    public class RedisBasketRepositoryTests
-//    {
-//        [Fact]
-//        public async Task UpdateBasket_return_and_add_basket()
-//        {
-//            var redisBasketRepository = BuildBasketRepository();
-
-//            var basket = await redisBasketRepository.UpdateBasket(new CustomerBasket("customerId")
-//            {
-//                BuyerId = "buyerId",
-//                Items = BuildBasketItems()
-//            });
-
-//            Assert.NotNull(basket);
-//            Assert.Equal(1, basket.Items.Count);
-//        }
-
-//        [Fact]
-//        public async Task GetBasket_return_existing_basket()
-//        {
-//        }
-
-//        RedisBasketRepository BuildBasketRepository()
-//        {
-//            var loggerFactory = new LoggerFactory();
-
-//            var options = Options.Create<BasketSettings>(new BasketSettings()
-//            {
-//                ConnectionString = "127.0.0.1"
-//            });
-
-//            return new RedisBasketRepository(options, loggerFactory);
-//        }
-
-//        List<BasketItem> BuildBasketItems()
-//        {
-//            return new List<BasketItem>()
-//            {
-//                new BasketItem()
-//                {
-//                    Id = "basketId",
-//                    PictureUrl = "pictureurl",
-//                    ProductId = "productId",
-//                    ProductName = "productName",
-//                    Quantity = 1,
-//                    UnitPrice = 1
-//                }
-//            };
-//        }
-//    }
-//}
+namespace IntegrationTests.Services.Basket
+{
+    using Microsoft.eShopOnContainers.Services.Basket.API;
+    using Microsoft.eShopOnContainers.Services.Basket.API.Model;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Options;
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
+    using Xunit;
+    using Moq;
+
+
+    public class RedisBasketRepositoryTests
+    {
+        private Mock<IOptionsSnapshot<BasketSettings>> _optionsMock;
+
+        public RedisBasketRepositoryTests()
+        {
+            _optionsMock = new Mock<IOptionsSnapshot<BasketSettings>>();
+        }
+
+        [Fact]
+        public async Task UpdateBasket_return_and_add_basket()
+        {
+            var redisBasketRepository = BuildBasketRepository();
+
+            var basket = await redisBasketRepository.UpdateBasket(new CustomerBasket("customerId")
+            {
+                BuyerId = "buyerId",
+                Items = BuildBasketItems()
+            });
+
+            Assert.NotNull(basket);
+            Assert.Equal(1, basket.Items.Count);
+        }
+
+        //[Fact]
+        //public async Task GetBasket_return_existing_basket()
+        //{
+        //}
+
+        RedisBasketRepository BuildBasketRepository()
+        {
+            var loggerFactory = new LoggerFactory();            
+            var basketSettings = new BasketSettings() { ConnectionString = "127.0.0.1" };
+            _optionsMock.Setup(x => x.Value).Returns(basketSettings);
+            
+            return new RedisBasketRepository(_optionsMock.Object, loggerFactory);
+        }
+
+        List<BasketItem> BuildBasketItems()
+        {
+            return new List<BasketItem>()
+            {
+                new BasketItem()
+                {
+                    Id = "basketId",
+                    PictureUrl = "pictureurl",
+                    ProductId = "productId",
+                    ProductName = "productName",
+                    Quantity = 1,
+                    UnitPrice = 1
+                }
+            };
+        }
+    }
+}
diff --git a/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs b/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs
index 5a5c47d3b..5fe9d29db 100644
--- a/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs
+++ b/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs
@@ -24,18 +24,6 @@
             }
         }
 
-        [Fact]
-        public async Task Get_get_order_and_response_ok_status_code()
-        {
-            using (var server = CreateServer())
-            {
-                var response = await server.CreateClient()
-                    .GetAsync(Get.OrderBy(31));
-
-                response.EnsureSuccessStatusCode();
-            }
-        }
-
         [Fact]
         public async Task AddNewOrder_add_new_order_and_response_ok_status_code()
         {