diff --git a/AutoMapper.OData.EF6.Tests/GetQuerySelectTests.cs b/AutoMapper.OData.EF6.Tests/GetQuerySelectTests.cs
index 495274a..071b418 100644
--- a/AutoMapper.OData.EF6.Tests/GetQuerySelectTests.cs
+++ b/AutoMapper.OData.EF6.Tests/GetQuerySelectTests.cs
@@ -71,7 +71,7 @@ public async void OpsTenantExpandBuildingsFilterEqAndOrderBy_FirstBuildingHasVal
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(2, collection.First().Buildings.Count);
                 Assert.NotNull(collection.First().Buildings.First().Name);
                 Assert.NotEqual(default, collection.First().Buildings.First().Identity);
@@ -90,7 +90,7 @@ public async void BuildingSelectNameExpandBuilder_BuilderNameShouldBeSam()
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("Sam", collection.First().Builder.Name);
                 Assert.Equal(default, collection.First().Builder.Id);
                 Assert.Null(collection.First().Builder.City);
@@ -109,7 +109,7 @@ public async void BuildingExpandBuilderSelectNamefilterEqAndOrderBy()
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("Sam", collection.First().Builder.Name);
                 Assert.Equal(default, collection.First().Builder.Id);
                 Assert.Null(collection.First().Builder.City);
@@ -128,7 +128,7 @@ public async void BuildingExpandBuilderSelectNameExpandCityFilterEqAndOrderBy_Ci
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("Sam", collection.First().Builder.Name);
                 Assert.Equal(default, collection.First().Builder.Id);
                 Assert.Equal("London", collection.First().Builder.City.Name);
diff --git a/AutoMapper.OData.EF6.Tests/GetQueryTests.cs b/AutoMapper.OData.EF6.Tests/GetQueryTests.cs
index e2f7f93..80b3574 100644
--- a/AutoMapper.OData.EF6.Tests/GetQueryTests.cs
+++ b/AutoMapper.OData.EF6.Tests/GetQueryTests.cs
@@ -63,7 +63,7 @@ public async void OpsTenantSearch()
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("One", collection.First().Name);
             }
         }
@@ -78,7 +78,7 @@ public async void OpsTenantSearchAndFilter()
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(0, collection.Count);
+                Assert.Empty(collection);
             }
         }
         
@@ -92,7 +92,7 @@ public async void OpsTenantExpandBuildingsFilterEqAndOrderBy()
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(2, collection.First().Buildings.Count);
                 Assert.Equal("One", collection.First().Name);
             }
@@ -141,7 +141,7 @@ public async void OpsTenantExpandBuildingsFilterNeAndOrderBy()
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(3, collection.First().Buildings.Count);
                 Assert.Equal("Two", collection.First().Name);
             }
@@ -157,7 +157,7 @@ public async void OpsTenantFilterEqNoExpand()
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Null(collection.First().Buildings);
                 Assert.Equal("One", collection.First().Name);
             }
@@ -189,7 +189,7 @@ public async void OpsTenantFilterLtDateNoExpand()
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(0, collection.Count);
+                Assert.Empty(collection);
             }
         }
 
@@ -235,7 +235,7 @@ public async void OpsTenantNoExpandFilterEqAndOrderBy()
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Null(collection.First().Buildings);
                 Assert.Equal("One", collection.First().Name);
             }
@@ -251,7 +251,7 @@ public async void OpsTenantExpandBuildingsSelectNameAndBuilderExpandBuilderExpan
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(3, collection.First().Buildings.Count);
                 Assert.NotNull(collection.First().Buildings.First().Builder);
                 Assert.NotNull(collection.First().Buildings.First().Builder.City);
@@ -270,7 +270,7 @@ public async void OpsTenantExpandBuildingsExpandBuilderExpandCityFilterNeAndOrde
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(3, collection.First().Buildings.Count);
                 Assert.NotNull(collection.First().Buildings.First().Builder);
                 Assert.NotNull(collection.First().Buildings.First().Builder.City);
@@ -334,7 +334,7 @@ await GetUsingCustomNameSpace<CoreBuilding, TBuilding>
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("One L1", collection.First().Name);
                 Assert.Equal(buildingParameterValue, collection.First().Parameter);
                 Assert.Equal("Sam", collection.First().Builder.Name);
@@ -352,7 +352,7 @@ public async void BuildingExpandBuilderTenantFilterEqAndOrderBy()
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("Sam", collection.First().Builder.Name);
                 Assert.Equal("One", collection.First().Tenant.Name);
                 Assert.Equal("One L1", collection.First().Name);
@@ -369,7 +369,7 @@ public async void BuildingExpandBuilderSelectNameExpandTenantFilterEqAndOrderBy(
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("Sam", collection.First().Builder.Name);
                 Assert.Equal("One", collection.First().Tenant.Name);
                 Assert.Equal("One L1", collection.First().Name);
@@ -504,7 +504,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
             void Test(ICollection<CoreBuilding> collection)
             {
                 Assert.Equal(5, options.Request.ODataFeature().TotalCount);
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("London", collection.First().Builder.City.Name);
                 Assert.Equal("One L1", collection.First().Name);
             }
@@ -527,7 +527,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
             void Test(ICollection<CoreBuilding> collection)
             {
                 Assert.Null(options.Request.ODataFeature().TotalCount);
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("London", collection.First().Builder.City.Name);
                 Assert.Equal("One L1", collection.First().Name);
             }
@@ -1090,7 +1090,7 @@ await GetUsingCustomNameSpace<CategoryModel, Category>
             static void Test(ICollection<CategoryModel> collection)
             {
                 Assert.Equal(2, collection.Count);
-                Assert.Equal(1, collection.First().Products.Count);
+                Assert.Single(collection.First().Products);
                 Assert.Equal(2, collection.First().Products.First().AlternateAddresses.Count());
             }
         }
@@ -1142,9 +1142,9 @@ public async void SkipOnRootNoOrderByThenExpandAndSkipOnChildCollectionNoOrderBy
 
             static void Test(ICollection<CategoryModel> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(2, collection.First().CategoryID);
-                Assert.Equal(1, collection.First().Products.Count);
+                Assert.Single(collection.First().Products);
                 Assert.Equal(5, collection.First().Products.First().ProductID);
                 Assert.Equal(2, collection.First().Products.First().AlternateAddresses.Length);
                 Assert.Equal(4, collection.First().Products.First().AlternateAddresses.First().AddressID);
@@ -1162,9 +1162,9 @@ public async void SkipOnRootNoOrderByThenExpandAndSkipOnChildCollectionNoOrderBy
 
             static void Test(ICollection<CategoryModel> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(2, collection.First().CategoryID);
-                Assert.Equal(1, collection.First().Products.Count);
+                Assert.Single(collection.First().Products);
                 Assert.Equal(5, collection.First().Products.First().ProductID);
                 Assert.Equal(2, collection.First().Products.First().AlternateAddresses.Length);
                 Assert.Equal(4, collection.First().Products.First().AlternateAddresses.First().AddressID);
@@ -1184,7 +1184,7 @@ static void Test(ICollection<CategoryModel> collection)
             {
                 Assert.Equal(2, collection.First().Products.First().ProductID);
                 Assert.Equal(3, collection.First().Products.Last().ProductID);
-                Assert.Equal(1, collection.Last().Products.Count);
+                Assert.Single(collection.Last().Products);
                 Assert.Equal(5, collection.Last().Products.First().ProductID);
             }
         }
@@ -1262,7 +1262,7 @@ public async void SkipOnRootNoOrderBy()
 
             static void Test(ICollection<CategoryModel> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(2, collection.First().CategoryID);
             }
         }
diff --git a/AutoMapper.OData.EF6.Tests/GetTests.cs b/AutoMapper.OData.EF6.Tests/GetTests.cs
index d9849fd..94350f2 100644
--- a/AutoMapper.OData.EF6.Tests/GetTests.cs
+++ b/AutoMapper.OData.EF6.Tests/GetTests.cs
@@ -63,7 +63,7 @@ public async void OpsTenantExpandBuildingsFilterEqAndOrderBy()
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(2, collection.First().Buildings.Count);
                 Assert.Equal("One", collection.First().Name);
             }
@@ -79,7 +79,7 @@ public async void OpsTenantExpandBuildingsFilterNeAndOrderBy()
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(3, collection.First().Buildings.Count);
                 Assert.Equal("Two", collection.First().Name);
             }
@@ -95,8 +95,8 @@ public async void OpsTenantFilterEqNoExpand()
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
-                Assert.Equal(0, collection.First().Buildings.Count);
+                Assert.Single(collection);
+                Assert.Empty(collection.First().Buildings);
                 Assert.Equal("One", collection.First().Name);
             }
         }
@@ -128,7 +128,7 @@ public async void OpsTenantNoExpandNoFilterAndOrderBy()
             void Test(ICollection<OpsTenant> collection)
             {
                 Assert.Equal(2, collection.Count);
-                Assert.Equal(0, collection.First().Buildings.Count);
+                Assert.Empty(collection.First().Buildings);
                 Assert.Equal("Two", collection.First().Name);
             }
         }
@@ -143,8 +143,8 @@ public async void OpsTenantNoExpandFilterEqAndOrderBy()
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
-                Assert.Equal(0, collection.First().Buildings.Count);
+                Assert.Single(collection);
+                Assert.Empty(collection.First().Buildings);
                 Assert.Equal("One", collection.First().Name);
             }
         }
@@ -159,7 +159,7 @@ public async void OpsTenantExpandBuildingsExpandBuilderExpandCityFilterNeAndOrde
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(3, collection.First().Buildings.Count);
                 Assert.NotNull(collection.First().Buildings.First().Builder);
                 Assert.NotNull(collection.First().Buildings.First().Builder.City);
@@ -177,7 +177,7 @@ public async void BuildingExpandBuilderTenantFilterEqAndOrderBy()
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("Sam", collection.First().Builder.Name);
                 Assert.Equal("One", collection.First().Tenant.Name);
                 Assert.Equal("One L1", collection.First().Name);
@@ -312,7 +312,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
             void Test(ICollection<CoreBuilding> collection)
             {
                 Assert.Equal(5, options.Request.ODataFeature().TotalCount);
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("London", collection.First().Builder.City.Name);
                 Assert.Equal("One L1", collection.First().Name);
             }
@@ -335,7 +335,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
             void Test(ICollection<CoreBuilding> collection)
             {
                 Assert.Null(options.Request.ODataFeature().TotalCount);
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("London", collection.First().Builder.City.Name);
                 Assert.Equal("One L1", collection.First().Name);
             }
diff --git a/Web.Tests/GetTests.cs b/Web.Tests/GetTests.cs
index 0514ea4..2c60ef3 100644
--- a/Web.Tests/GetTests.cs
+++ b/Web.Tests/GetTests.cs
@@ -40,7 +40,7 @@ public async void OpsTenantSearchAndFilterNoResult(string port)
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(0, collection.Count);
+                Assert.Empty(collection);
             }
         }
         
@@ -53,7 +53,7 @@ public async void OpsTenantSearchAndFilterExpand(string port)
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(2, collection.First().Buildings.Count);
                 Assert.Equal("One", collection.First().Name);
             }
@@ -68,7 +68,7 @@ public async void OpsTenantSearchExpand(string port)
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(2, collection.First().Buildings.Count);
                 Assert.Equal("One", collection.First().Name);
             }
@@ -83,7 +83,7 @@ public async void OpsTenantSearchNoExpand(string port)
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.False(collection.First()?.Buildings?.Any() == true);
                 Assert.Equal("One", collection.First().Name);
             }
@@ -98,7 +98,7 @@ public async void OpsTenantExpandBuildingsFilterEqAndOrderBy(string port)
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(2, collection.First().Buildings.Count);
                 Assert.Equal("One", collection.First().Name);
             }
@@ -113,7 +113,7 @@ public async void OpsTenantExpandBuildingsFilterNeAndOrderBy(string port)
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(3, collection.First().Buildings.Count);
                 Assert.Equal("Two", collection.First().Name);
             }
@@ -128,7 +128,7 @@ public async void OpsTenantFilterEqNoExpand(string port)
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.False(collection.First()?.Buildings?.Any() == true);
                 Assert.Equal("One", collection.First().Name);
             }
@@ -158,7 +158,7 @@ public async void OpsTenantFilterLtDateNoExpand(string port)
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(0, collection.Count);
+                Assert.Empty(collection);
             }
         }
 
@@ -201,7 +201,7 @@ public async void OpsTenantNoExpandFilterEqAndOrderBy(string port)
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.False(collection.First()?.Buildings?.Any() == true);
                 Assert.Equal("One", collection.First().Name);
             }
@@ -216,7 +216,7 @@ public async void OpsTenantExpandBuildingsSelectNameAndBuilderExpandBuilderExpan
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(3, collection.First().Buildings.Count);
                 Assert.NotNull(collection.First().Buildings.First().Builder);
                 Assert.NotNull(collection.First().Buildings.First().Builder.City);
@@ -234,7 +234,7 @@ public async void OpsTenantExpandBuildingsExpandBuilderExpandCityFilterNeAndOrde
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(3, collection.First().Buildings.Count);
                 Assert.NotNull(collection.First().Buildings.First().Builder);
                 Assert.NotNull(collection.First().Buildings.First().Builder.City);
@@ -251,7 +251,7 @@ public async void BuildingExpandBuilderTenantFilterEqAndOrderBy(string port)
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("Sam", collection.First().Builder.Name);
                 Assert.Equal("One", collection.First().Tenant.Name);
                 Assert.Equal("One L1", collection.First().Name);
@@ -371,7 +371,7 @@ await Get<CoreBuilding>
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("London", collection.First().Builder.City.Name);
                 Assert.Equal("One L1", collection.First().Name);
             }
@@ -394,7 +394,7 @@ await Get<CoreBuilding>
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("London", collection.First().Builder.City.Name);
                 Assert.Equal("One L1", collection.First().Name);
             }
@@ -503,7 +503,7 @@ public async void OpsTenantExpandBuildingsFilterEqAndOrderBy_FirstBuildingHasVal
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(2, collection.First().Buildings.Count);
                 Assert.NotNull(collection.First().Buildings.First().Name);
                 Assert.NotEqual(default, collection.First().Buildings.First().Identity);
@@ -521,7 +521,7 @@ public async void BuildingSelectNameExpandBuilder_BuilderNameShouldBeSam(string
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("Sam", collection.First().Builder.Name);
                 Assert.Equal(default, collection.First().Builder.Id);
                 Assert.Null(collection.First().Builder.City);
@@ -539,7 +539,7 @@ public async void BuildingExpandBuilderSelectNamefilterEqAndOrderBy(string port)
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("Sam", collection.First().Builder.Name);
                 Assert.Equal(default, collection.First().Builder.Id);
                 Assert.Null(collection.First().Builder.City);
@@ -557,7 +557,7 @@ public async void BuildingExpandBuilderSelectNameExpandCityFilterEqAndOrderBy_Ci
 
             void Test(ICollection<CoreBuilding> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal("Sam", collection.First().Builder.Name);
                 Assert.Equal(default, collection.First().Builder.Id);
                 Assert.Equal("London", collection.First().Builder.City.Name);
@@ -576,7 +576,7 @@ public async void OpsTenantExpandBuildingsSelectNameAndBuilderExpandBuilderExpan
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(2, collection.First().Buildings.Count);
                 Assert.Equal("Two L2", collection.First().Buildings.First().Name);
                 Assert.NotNull(collection.First().Buildings.First().Builder);
@@ -595,7 +595,7 @@ public async void OpsTenantExpandBuildingsExpandBuilderExpandCityFilterNeAndOrde
 
             void Test(ICollection<OpsTenant> collection)
             {
-                Assert.Equal(1, collection.Count);
+                Assert.Single(collection);
                 Assert.Equal(3, collection.First().Buildings.Count);
                 Assert.Equal("Two L3", collection.First().Buildings.First().Name);
                 Assert.NotNull(collection.First().Buildings.First().Builder);