diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs
index 05a7defbb..4f2feddda 100644
--- a/src/Services/Ordering/Ordering.API/Startup.cs
+++ b/src/Services/Ordering/Ordering.API/Startup.cs
@@ -48,11 +48,13 @@
             }).AddControllersAsServices();
 
             services.AddEntityFrameworkSqlServer()
-                .AddDbContext<OrderingContext>(options =>
-                {
-                    options.UseSqlServer(Configuration["ConnectionString"],
-                        sqlop => sqlop.MigrationsAssembly(typeof(Startup).GetTypeInfo().Assembly.GetName().Name));
-                });
+                    .AddDbContext<OrderingContext>(options =>
+                    {
+                        options.UseSqlServer(Configuration["ConnectionString"],
+                            sqlop => sqlop.MigrationsAssembly(typeof(Startup).GetTypeInfo().Assembly.GetName().Name));
+                    },
+                    ServiceLifetime.Scoped
+                    );
 
             services.AddSwaggerGen();
             services.ConfigureSwaggerGen(options =>
diff --git a/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs b/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs
index cb1fe4049..b1c9be8e8 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs
@@ -13,22 +13,22 @@
     {
         private readonly OrderingContext _context;
 
-        public BuyerRepository(OrderingContext context)
+        public IUnitOfWork UnitOfWork
         {
-            if (context == null)
+            get
             {
-                throw new ArgumentNullException(nameof(context));
+                return _context;
             }
-
-            _context = context;
         }
 
-        public IUnitOfWork UnitOfWork
+        public BuyerRepository(OrderingContext context)
         {
-            get
+            if (context == null)
             {
-                return _context;
+                throw new ArgumentNullException(nameof(context));
             }
+
+            _context = context;
         }
 
         public Buyer Add(Buyer buyer)
diff --git a/test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs b/test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs
index 47a57d578..d2a22e4a5 100644
--- a/test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs
+++ b/test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs
@@ -2,7 +2,8 @@
 {
     using Microsoft.eShopOnContainers.Services.Ordering.Api.Application.Commands;
     using Microsoft.eShopOnContainers.Services.Ordering.Domain;
-    using Microsoft.eShopOnContainers.Services.Ordering.Domain.Repositories;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate;
     using Moq;
     using System;
     using System.Threading;