diff --git a/src/BBT.StrategyPattern.Tests/BBT.StrategyPattern.Tests.csproj b/src/BBT.StrategyPattern.Tests/BBT.StrategyPattern.Tests.csproj
index 3a1c246..205ec36 100644
--- a/src/BBT.StrategyPattern.Tests/BBT.StrategyPattern.Tests.csproj
+++ b/src/BBT.StrategyPattern.Tests/BBT.StrategyPattern.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyTitle>BBT.StrategyPattern.Tests</AssemblyTitle>
     <Company>BBT Software AG</Company>
@@ -25,7 +25,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="FluentAssertions" Version="8.8.0" />
+    <PackageReference Include="Shouldly" Version="4.3.0" />
     <PackageReference Include="Ninject" Version="3.3.6" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
diff --git a/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/AdditionStrategy.cs b/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/AdditionStrategy.cs
index 62176b8..cee6c8a 100644
--- a/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/AdditionStrategy.cs
+++ b/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/AdditionStrategy.cs
@@ -1,10 +1,10 @@
 // Copyright © BBT Software AG. All rights reserved.
 
+using BBT.StrategyPattern.Tests.Data;
+using Shouldly;
+
 namespace BBT.StrategyPattern.Tests.ExampleStrategyImpl
 {
-    using BBT.StrategyPattern.Tests.Data;
-    using FluentAssertions;
-
     public class AdditionStrategy : IOperatorStrategy
     {
         public double DoCalculate(CalculationInput calc)
@@ -14,7 +14,7 @@ public double DoCalculate(CalculationInput calc)
 
         public bool IsResponsible(Operator criterion)
         {
-            criterion.Should().NotBeNull();
+            criterion.ShouldNotBeNull();
 
             return criterion.Operation == OperatorEnum.Addition;
         }
diff --git a/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/IOperatorStrategy.cs b/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/IOperatorStrategy.cs
index 5707b8d..fa43e10 100644
--- a/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/IOperatorStrategy.cs
+++ b/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/IOperatorStrategy.cs
@@ -1,9 +1,9 @@
 // Copyright © BBT Software AG. All rights reserved.
 
+using BBT.StrategyPattern.Tests.Data;
+
 namespace BBT.StrategyPattern.Tests.ExampleStrategyImpl
 {
-    using BBT.StrategyPattern.Tests.Data;
-
     public interface IOperatorStrategy : IGenericStrategy<Operator>
     {
         double DoCalculate(CalculationInput calc);
diff --git a/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/SubstractionStrategy.cs b/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/SubstractionStrategy.cs
index e4103ed..4625eca 100644
--- a/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/SubstractionStrategy.cs
+++ b/src/BBT.StrategyPattern.Tests/ExampleStrategyImpl/SubstractionStrategy.cs
@@ -1,10 +1,10 @@
 // Copyright © BBT Software AG. All rights reserved.
 
+using BBT.StrategyPattern.Tests.Data;
+using Shouldly;
+
 namespace BBT.StrategyPattern.Tests.ExampleStrategyImpl
 {
-    using BBT.StrategyPattern.Tests.Data;
-    using FluentAssertions;
-
     public class SubstractionStrategy : IOperatorStrategy
     {
         public double DoCalculate(CalculationInput calc)
@@ -14,7 +14,7 @@ public double DoCalculate(CalculationInput calc)
 
         public bool IsResponsible(Operator criterion)
         {
-            criterion.Should().NotBeNull();
+            criterion.ShouldNotBeNull();
 
             return criterion.Operation == OperatorEnum.Subtraktion;
         }
diff --git a/src/BBT.StrategyPattern.Tests/WithIoc/NinjectStrategyLocator.cs b/src/BBT.StrategyPattern.Tests/WithIoc/NinjectStrategyLocator.cs
index e221e48..f82de73 100644
--- a/src/BBT.StrategyPattern.Tests/WithIoc/NinjectStrategyLocator.cs
+++ b/src/BBT.StrategyPattern.Tests/WithIoc/NinjectStrategyLocator.cs
@@ -1,11 +1,11 @@
 // Copyright © BBT Software AG. All rights reserved.
 
+using System;
+using System.Collections.Generic;
+using Ninject;
+
 namespace BBT.StrategyPattern.Tests.WithIoc
 {
-    using System;
-    using System.Collections.Generic;
-    using Ninject;
-
     public class NinjectStrategyLocator<T> : IStrategyLocator<T>
     {
         public NinjectStrategyLocator(IKernel kernel)
diff --git a/src/BBT.StrategyPattern.Tests/WithIocTest.cs b/src/BBT.StrategyPattern.Tests/WithIocTest.cs
index 4212502..e6fcfae 100644
--- a/src/BBT.StrategyPattern.Tests/WithIocTest.cs
+++ b/src/BBT.StrategyPattern.Tests/WithIocTest.cs
@@ -1,15 +1,15 @@
 // Copyright © BBT Software AG. All rights reserved.
 
+using BBT.StrategyPattern.Tests.Data;
+using BBT.StrategyPattern.Tests.ExampleStrategyImpl;
+using BBT.StrategyPattern.Tests.WithIoc;
+using Ninject;
+using Shouldly;
+using System;
+using Xunit;
+
 namespace BBT.StrategyPattern.Tests
 {
-    using System;
-    using BBT.StrategyPattern.Tests.Data;
-    using BBT.StrategyPattern.Tests.ExampleStrategyImpl;
-    using BBT.StrategyPattern.Tests.WithIoc;
-    using FluentAssertions;
-    using Ninject;
-    using Xunit;
-
     public class WithIocTest
     {
         [Fact]
@@ -34,10 +34,10 @@ public void WorksWithIocNinject()
             IOperatorStrategy strategy;
 
             strategy = kernel.Get<IGenericStrategyProvider<IOperatorStrategy, Operator>>().GetStrategy(op1);
-            strategy.DoCalculate(calc1).Should().Be(8);
+            strategy.DoCalculate(calc1).ShouldBe(8);
 
             strategy = kernel.Get<IGenericStrategyProvider<IOperatorStrategy, Operator>>().GetStrategy(op2);
-            strategy.DoCalculate(calc1).Should().Be(2);
+            strategy.DoCalculate(calc1).ShouldBe(2);
         }
 
         [Fact]
@@ -58,10 +58,8 @@ public void MissingStrategies_ThrowsExpectedException()
             var act = () => kernel.Get<IGenericStrategyProvider<IOperatorStrategy, Operator>>().GetStrategy(op2);
 
             // Assert
-            act.Should()
-                .Throw<InvalidOperationException>()
-                .WithMessage("No strategies of type IOperatorStrategy are available from the locator.");
-
+            var ex = Should.Throw<InvalidOperationException>(act);
+            ex.Message.ShouldBe("No strategies of type IOperatorStrategy are available from the locator.");
         }
 
         [Fact]
@@ -85,9 +83,8 @@ public void MissingStrategyForCriteria_ThrowsExpectedException()
             var act = () => kernel.Get<IGenericStrategyProvider<IOperatorStrategy, Operator>>().GetStrategy(op2);
 
             // Assert
-            act.Should()
-                .Throw<InvalidOperationException>()
-                .WithMessage("No strategy of type IOperatorStrategy available from the locator being responsible for criterion of type Operator.");
+            var ex = Should.Throw<InvalidOperationException>(act);
+            ex.Message.ShouldBe("No strategy of type IOperatorStrategy available from the locator being responsible for criterion of type Operator.");
         }
     }
 }
\ No newline at end of file
diff --git a/src/BBT.StrategyPattern.Tests/WithoutIoc/MemoryOperatorStrategyLocator.cs b/src/BBT.StrategyPattern.Tests/WithoutIoc/MemoryOperatorStrategyLocator.cs
index d224c3e..1458b6b 100644
--- a/src/BBT.StrategyPattern.Tests/WithoutIoc/MemoryOperatorStrategyLocator.cs
+++ b/src/BBT.StrategyPattern.Tests/WithoutIoc/MemoryOperatorStrategyLocator.cs
@@ -1,10 +1,10 @@
 // Copyright © BBT Software AG. All rights reserved.
 
+using System.Collections.Generic;
+using BBT.StrategyPattern.Tests.ExampleStrategyImpl;
+
 namespace BBT.StrategyPattern.Tests.WithoutIoc
 {
-    using System.Collections.Generic;
-    using BBT.StrategyPattern.Tests.ExampleStrategyImpl;
-
     public class MemoryOperatorStrategyLocator : IStrategyLocator<IOperatorStrategy>
     {
         public IEnumerable<IOperatorStrategy> GetAllStrategies()
diff --git a/src/BBT.StrategyPattern.Tests/WithoutIocTest.cs b/src/BBT.StrategyPattern.Tests/WithoutIocTest.cs
index cdf3ef9..b45dcab 100644
--- a/src/BBT.StrategyPattern.Tests/WithoutIocTest.cs
+++ b/src/BBT.StrategyPattern.Tests/WithoutIocTest.cs
@@ -1,13 +1,13 @@
 // Copyright © BBT Software AG. All rights reserved.
 
+using BBT.StrategyPattern.Tests.Data;
+using BBT.StrategyPattern.Tests.ExampleStrategyImpl;
+using BBT.StrategyPattern.Tests.WithoutIoc;
+using Shouldly;
+using Xunit;
+
 namespace BBT.StrategyPattern.Tests
 {
-    using BBT.StrategyPattern.Tests.Data;
-    using BBT.StrategyPattern.Tests.ExampleStrategyImpl;
-    using BBT.StrategyPattern.Tests.WithoutIoc;
-    using FluentAssertions;
-    using Xunit;
-
     public class WithoutIocTest
     {
         [Fact]
@@ -23,10 +23,10 @@ public void GenericStrategyWorksInMemory()
             IOperatorStrategy strategy;
 
             strategy = strategyProvider.GetStrategy(op1);
-            strategy.DoCalculate(calc1).Should().Be(8);
+            strategy.DoCalculate(calc1).ShouldBe(8);
 
             strategy = strategyProvider.GetStrategy(op2);
-            strategy.DoCalculate(calc1).Should().Be(2);
+            strategy.DoCalculate(calc1).ShouldBe(2);
         }
     }
 }
diff --git a/src/BBT.StrategyPattern.sln b/src/BBT.StrategyPattern.sln
deleted file mode 100644
index 6f9c470..0000000
--- a/src/BBT.StrategyPattern.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.271
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BBT.StrategyPattern", "BBT.StrategyPattern\BBT.StrategyPattern.csproj", "{2F38B821-95F8-4560-B08E-9796C44D0C86}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BBT.StrategyPattern.Tests", "BBT.StrategyPattern.Tests\BBT.StrategyPattern.Tests.csproj", "{86D8402D-88CF-4887-A9BC-5662FC23BAFE}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2F38B821-95F8-4560-B08E-9796C44D0C86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F38B821-95F8-4560-B08E-9796C44D0C86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F38B821-95F8-4560-B08E-9796C44D0C86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F38B821-95F8-4560-B08E-9796C44D0C86}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86D8402D-88CF-4887-A9BC-5662FC23BAFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86D8402D-88CF-4887-A9BC-5662FC23BAFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86D8402D-88CF-4887-A9BC-5662FC23BAFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86D8402D-88CF-4887-A9BC-5662FC23BAFE}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9E9EFC94-8A6D-473C-BA4C-2C793E565BA6}
-	EndGlobalSection
-EndGlobal
diff --git a/src/BBT.StrategyPattern.slnx b/src/BBT.StrategyPattern.slnx
new file mode 100644
index 0000000..74c42ac
--- /dev/null
+++ b/src/BBT.StrategyPattern.slnx
@@ -0,0 +1,4 @@
+<Solution>
+  <Project Path="BBT.StrategyPattern.Tests/BBT.StrategyPattern.Tests.csproj" />
+  <Project Path="BBT.StrategyPattern/BBT.StrategyPattern.csproj" />
+</Solution>
diff --git a/src/BBT.StrategyPattern/BBT.StrategyPattern.csproj b/src/BBT.StrategyPattern/BBT.StrategyPattern.csproj
index 16fc1ce..c7cd0d2 100644
--- a/src/BBT.StrategyPattern/BBT.StrategyPattern.csproj
+++ b/src/BBT.StrategyPattern/BBT.StrategyPattern.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net10.0</TargetFrameworks>
     <AssemblyTitle>BBT.StrategyPattern</AssemblyTitle>
     <CodeAnalysisRuleSet>..\BBT.StrategyPattern.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\$(Configuration)\BBT.StrategyPattern.xml</DocumentationFile>
diff --git a/src/BBT.StrategyPattern/GenericStrategyProvider.cs b/src/BBT.StrategyPattern/GenericStrategyProvider.cs
index dbc8993..a14e565 100644
--- a/src/BBT.StrategyPattern/GenericStrategyProvider.cs
+++ b/src/BBT.StrategyPattern/GenericStrategyProvider.cs
@@ -1,10 +1,10 @@
 // Copyright © BBT Software AG. All rights reserved.
 
+using System;
+using System.Linq;
+
 namespace BBT.StrategyPattern
 {
-    using System;
-    using System.Linq;
-
     /// <summary>
     /// Generic implementation of <see cref="IGenericStrategyProvider{TStrategy,TCriterion}"/>.
     /// </summary>
diff --git a/src/BBT.StrategyPattern/IStrategyLocator.cs b/src/BBT.StrategyPattern/IStrategyLocator.cs
index 15cb831..53b9996 100644
--- a/src/BBT.StrategyPattern/IStrategyLocator.cs
+++ b/src/BBT.StrategyPattern/IStrategyLocator.cs
@@ -1,9 +1,9 @@
 // Copyright © BBT Software AG. All rights reserved.
 
+using System.Collections.Generic;
+
 namespace BBT.StrategyPattern
 {
-    using System.Collections.Generic;
-
     /// <summary>
     /// Defines how strategies are located.
     /// </summary>