diff --git a/src/Liquid.Repository.Mongo/Exceptions/MongoException.cs b/src/Liquid.Repository.Mongo/Exceptions/MongoException.cs
index 38e08d0..8c4aa8d 100644
--- a/src/Liquid.Repository.Mongo/Exceptions/MongoException.cs
+++ b/src/Liquid.Repository.Mongo/Exceptions/MongoException.cs
@@ -8,7 +8,6 @@ namespace Liquid.Repository.Mongo.Exceptions
     /// Occurs when an exception has occurred in Mongo Db.
     /// </summary>
     /// <seealso cref="LiquidException" />
-    [Serializable]
     [ExcludeFromCodeCoverage]
     public class MongoException : LiquidException
     {
diff --git a/src/Liquid.Repository.Mongo/MongoClientFactory.cs b/src/Liquid.Repository.Mongo/MongoClientFactory.cs
index d997fe2..5fb1367 100644
--- a/src/Liquid.Repository.Mongo/MongoClientFactory.cs
+++ b/src/Liquid.Repository.Mongo/MongoClientFactory.cs
@@ -20,7 +20,7 @@ public class MongoClientFactory : IMongoClientFactory
         public MongoClientFactory(IOptions<MongoDbSettings> settings)
         {
             _mongoClients = new Dictionary<string, IMongoClient>();
-            _settings = settings;
+            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
         }
 
         ///<inheritdoc/>
diff --git a/test/Liquid.Repository.Mongo.Tests/IServiceCollectionExtensionsTests.cs b/test/Liquid.Repository.Mongo.Tests/IServiceCollectionExtensionsTests.cs
index ba4d15f..5f1cbb0 100644
--- a/test/Liquid.Repository.Mongo.Tests/IServiceCollectionExtensionsTests.cs
+++ b/test/Liquid.Repository.Mongo.Tests/IServiceCollectionExtensionsTests.cs
@@ -29,7 +29,7 @@ public IServiceCollectionExtensionsTests()
             var options = new MongoRunnerOptions
             {
                 UseSingleNodeReplicaSet = false,
-                AdditionalArguments = "--quiet"
+                AdditionalArguments = "--quiet",                
             };
 
             _runner = MongoRunner.Run(options);
@@ -43,7 +43,7 @@ public IServiceCollectionExtensionsTests()
             {
                 {"MyMongoEntityOptions:Settings:1:DatabaseName", _databaseName},
                 {"MyMongoEntityOptions:Settings:1:ConnectionString", _runner.ConnectionString},
-                {"MyMongoEntityOptions:Settings:1:CollectionName", "TestEntity"},
+                {"MyMongoEntityOptions:Settings:1:CollectionName", "ATestEntity"},
                 {"MyMongoEntityOptions:Settings:1:ShardKey", "id"},
                 {"MyMongoEntityOptions:Settings:2:DatabaseName", _databaseName},
                 {"MyMongoEntityOptions:Settings:2:ConnectionString", _runner.ConnectionString},
@@ -60,7 +60,7 @@ public IServiceCollectionExtensionsTests()
         [Fact]
         public void AddLiquidMongoRepository_WhenAdded_ServicesIsFilledForTestEntity()
         {
-            _services.AddLiquidMongoRepository<TestEntity, int>("MyMongoEntityOptions","TestEntity");
+            _services.AddLiquidMongoRepository<TestEntity, int>("MyMongoEntityOptions","ATestEntity");
             _services.AddLiquidMongoRepository<AnotherTestEntity, int>("MyMongoEntityOptions", "AnotherTestEntity");
             _serviceProvider = _services.BuildServiceProvider();
             Assert.NotNull(_serviceProvider.GetService<IMongoDataContext<TestEntity>>());
diff --git a/test/Liquid.Repository.Mongo.Tests/Liquid.Repository.Mongo.Tests.csproj b/test/Liquid.Repository.Mongo.Tests/Liquid.Repository.Mongo.Tests.csproj
index 1cdfdff..c3bc9ff 100644
--- a/test/Liquid.Repository.Mongo.Tests/Liquid.Repository.Mongo.Tests.csproj
+++ b/test/Liquid.Repository.Mongo.Tests/Liquid.Repository.Mongo.Tests.csproj
@@ -17,9 +17,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 	<PackageReference Include="EphemeralMongo.Core" Version="2.0.0" />
-	<PackageReference Include="EphemeralMongo6.runtime.linux-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
-	<PackageReference Include="EphemeralMongo6.runtime.osx-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
-	<PackageReference Include="EphemeralMongo6.runtime.win-x64" Version="2.0.0" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
+	<PackageReference Include="EphemeralMongo8.runtime.linux-x64" Version="2.0.0" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
+	<PackageReference Include="EphemeralMongo8.runtime.osx-x64" Version="2.0.0" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
+	<PackageReference Include="EphemeralMongo8.runtime.win-x64" Version="2.0.0" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
 	<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
 	<PackageReference Include="NSubstitute" Version="5.3.0" />
 	  <PackageReference Include="xunit" Version="2.9.3" />
diff --git a/test/Liquid.Repository.Mongo.Tests/MongoClientFactoryTests.cs b/test/Liquid.Repository.Mongo.Tests/MongoClientFactoryTests.cs
index 4707662..8ecd6dd 100644
--- a/test/Liquid.Repository.Mongo.Tests/MongoClientFactoryTests.cs
+++ b/test/Liquid.Repository.Mongo.Tests/MongoClientFactoryTests.cs
@@ -21,7 +21,7 @@ public MongoClientFactoryTests()
             var options = new MongoRunnerOptions
             {
                 UseSingleNodeReplicaSet = false,
-                AdditionalArguments = "--quiet"
+                AdditionalArguments = "--quiet",
             };
 
             _runner = MongoRunner.Run(options);
@@ -44,7 +44,7 @@ public MongoClientFactoryTests()
                     {
                         CollectionName = "TestEntities2",
                         ShardKey = "id",
-                        ConnectionString = "incorrect connection string",
+                        ConnectionString = "",
                         DatabaseName = $"{_databaseName}-2"
                     }
                 }
@@ -78,5 +78,11 @@ public void GetClient_WhenDatabaseSettingsIsWrong_ThrowException()
             MongoEntitySettings settings = null;
             Assert.Throws<MongoDB.Driver.MongoConfigurationException>(() => _sut.GetClient("TestEntities2", out settings));
         }
+
+        [Fact]
+        public void Constructor_WhenSettingsIsNull_ThrowException()
+        {
+            Assert.Throws<ArgumentNullException>(() => new MongoClientFactory(null));
+        }
     }
 }