diff --git a/src/Services/Ordering/Ordering.API/Application/Queries/IOrderQueries.cs b/src/Services/Ordering/Ordering.API/Application/Queries/IOrderQueries.cs
index 253b01e9c..8d78524ea 100644
--- a/src/Services/Ordering/Ordering.API/Application/Queries/IOrderQueries.cs
+++ b/src/Services/Ordering/Ordering.API/Application/Queries/IOrderQueries.cs
@@ -1,14 +1,13 @@
 namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Queries
 {
-    using System.Collections.Generic;
     using System.Threading.Tasks;
 
     public interface IOrderQueries
     {
         Task<dynamic> GetOrderAsync(int id);
 
-        Task<IEnumerable<dynamic>> GetOrdersAsync();
+        Task<dynamic> GetOrdersAsync();
 
-        Task<IEnumerable<dynamic>> GetCardTypesAsync();
+        Task<dynamic> GetCardTypesAsync();
     }
 }
diff --git a/src/Services/Ordering/Ordering.API/Application/Queries/OrderQueries.cs b/src/Services/Ordering/Ordering.API/Application/Queries/OrderQueries.cs
index afcfc71b5..9d909e254 100644
--- a/src/Services/Ordering/Ordering.API/Application/Queries/OrderQueries.cs
+++ b/src/Services/Ordering/Ordering.API/Application/Queries/OrderQueries.cs
@@ -44,13 +44,13 @@
             }
         }
 
-        public Task<IEnumerable<dynamic>> GetOrdersAsync()
+        public async Task<dynamic> GetOrdersAsync()
         {
             using (var connection = new SqlConnection(_connectionString))
             {
                 connection.Open();
 
-                return connection.QueryAsync<dynamic>(@"SELECT o.[Id] as ordernumber,o.[OrderDate] as [date],os.[Name] as [status],SUM(oi.units*oi.unitprice) as total
+                return await connection.QueryAsync<dynamic>(@"SELECT o.[Id] as ordernumber,o.[OrderDate] as [date],os.[Name] as [status],SUM(oi.units*oi.unitprice) as total
                      FROM [ordering].[Orders] o
                      LEFT JOIN[ordering].[orderitems] oi ON  o.Id = oi.orderid 
                      LEFT JOIN[ordering].[orderstatus] os on o.OrderStatusId = os.Id
@@ -58,13 +58,13 @@
             }
         }
 
-        public Task<IEnumerable<dynamic>> GetCardTypesAsync()
+        public async Task<dynamic> GetCardTypesAsync()
         {
             using (var connection = new SqlConnection(_connectionString))
             {
                 connection.Open();
 
-                return connection.QueryAsync<dynamic>("SELECT * FROM ordering.cardtypes");
+                return await connection.QueryAsync<dynamic>("SELECT * FROM ordering.cardtypes");
             }
         }
 
diff --git a/test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs b/test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs
index c0656f050..8c7659862 100644
--- a/test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs
+++ b/test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs
@@ -6,7 +6,6 @@ using Microsoft.eShopOnContainers.Services.Ordering.API.Controllers;
 using Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.Services;
 using Moq;
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -60,7 +59,7 @@ namespace UnitTest.Ordering.Application
         public async Task Get_orders_success()
         {
             //Arrange
-            var fakeDynamicResult = Enumerable.Empty<object>();
+            var fakeDynamicResult = new Object();
             _orderQueriesMock.Setup(x => x.GetOrdersAsync())
                 .Returns(Task.FromResult(fakeDynamicResult));
 
@@ -93,7 +92,7 @@ namespace UnitTest.Ordering.Application
         public async Task Get_cardTypes_success()
         {
             //Arrange
-            var fakeDynamicResult = Enumerable.Empty<object>();
+            var fakeDynamicResult = new Object();
             _orderQueriesMock.Setup(x => x.GetCardTypesAsync())
                 .Returns(Task.FromResult(fakeDynamicResult));