diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a0d641e9..2af3a2f3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -210,7 +210,7 @@ jobs:
   publish-nuget:
     runs-on: ubuntu-latest
     needs: build
-    if: needs.build.outputs.publishNuget == 'true' && (github.event.inputs.runPublish == 'true' || github.ref_name == github.event.repository.default_branch)
+    if: github.event.inputs.runPublish == 'true' || github.ref_name == github.event.repository.default_branch
     environment: 
       name: Publish
       url: https://www.nuget.org/packages/TestStack.BDDfy/
diff --git a/.gitignore b/.gitignore
index ad4aa3cb..ecb096af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,8 @@ obj/
 packages/*
 PackageBuild/*
 Build/*
-TestResult.xml
+TestResult*
+CoverageReport
 TestStack.BDDfy.sln.ide/graph
 _NCrunch_TestStack.BDDfy/
 TestStack.BDDfy.sln.ide/
diff --git a/GitVersion.yml b/GitVersion.yml
index 29e4741b..07063aa5 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,9 +1,16 @@
-mode: ContinuousDelivery
-next-version: 8.0.0
+assembly-versioning-scheme: MajorMinorPatch
+strategies:
+- Mainline
 branches:
   main:
-    increment: Patch
+    mode: ContinuousDeployment
     regex: ^main$
     is-release-branch: true
+    increment: Patch
+
+  other:
+    mode: ContinuousDelivery
+    regex: .*
+    increment: Patch
 ignore:
-  sha: []
+  sha: []
\ No newline at end of file
diff --git a/coverage-by-samples.ps1 b/coverage-by-samples.ps1
new file mode 100644
index 00000000..86c72c87
--- /dev/null
+++ b/coverage-by-samples.ps1
@@ -0,0 +1,10 @@
+dotnet test ./src/Samples/TestStack.BDDfy.Samples/TestStack.BDDfy.Samples.csproj `
+    --collect:"XPlat Code Coverage" `
+    --results-directory ./TestResults
+
+reportgenerator `
+    -reports:./TestResults/**/coverage.cobertura.xml `
+    -targetdir:./CoverageReport `
+    -reporttypes:Html
+
+Remove-Item -Recurse -Force ./TestResults
\ No newline at end of file
diff --git a/coverage-by-tests.ps1 b/coverage-by-tests.ps1
new file mode 100644
index 00000000..f77d4f9f
--- /dev/null
+++ b/coverage-by-tests.ps1
@@ -0,0 +1,10 @@
+dotnet test ./src/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj `
+    --collect:"XPlat Code Coverage" `
+    --results-directory ./TestResults
+
+reportgenerator `
+    -reports:./TestResults/**/coverage.cobertura.xml `
+    -targetdir:./CoverageReport `
+    -reporttypes:Html
+
+Remove-Item -Recurse -Force ./TestResults
\ No newline at end of file
diff --git a/coverage.ps1 b/coverage.ps1
new file mode 100644
index 00000000..9c7b651c
--- /dev/null
+++ b/coverage.ps1
@@ -0,0 +1,10 @@
+dotnet test ./src `
+    --collect:"XPlat Code Coverage" `
+    --results-directory ./TestResults
+
+reportgenerator `
+    -reports:./TestResults/**/coverage.cobertura.xml `
+    -targetdir:./CoverageReport `
+    -reporttypes:Html
+
+Remove-Item -Recurse -Force ./TestResults
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 10ad5c22..8bfe45ed 100644
--- a/readme.md
+++ b/readme.md
@@ -1,3 +1,5 @@
+![Build Status](https://github.com/TestStack/TestStack.BDDfy/actions/workflows/build.yml/badge.svg)
+
 BDDfy is the simplest BDD framework to use, customize and extend! 
 
 A few quick facts about BDDfy:
diff --git a/src/.editorconfig b/src/.editorconfig
index dd2b5504..e3d80304 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -1,4 +1,5 @@
 [*.cs]
 
-# Default severity for analyzer diagnostics with category 'Style'
-dotnet_analyzer_diagnostic.category-Style.severity = none
+
+# SYSLIB1045: Convert to 'GeneratedRegexAttribute'.
+dotnet_diagnostic.SYSLIB1045.severity = none
diff --git a/src/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs b/src/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs
index e9e2a205..ae90dcb9 100644
--- a/src/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs
+++ b/src/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs
@@ -10,43 +10,43 @@ public class AccountHasInsufficientFund
 
         // You can override step text using executable attributes
         [Given("Given the Account Balance is $10")]
-        void GivenTheAccountBalanceIs10()
+        internal void GivenTheAccountBalanceIs10()
         {
             _card = new Card(true, 10);
         }
 
-        void And_given_the_Card_is_valid()
+        internal void And_given_the_Card_is_valid()
         {
         }
 
-        void AndGivenTheMachineContainsEnoughMoney()
+        internal void AndGivenTheMachineContainsEnoughMoney()
         {
             _atm = new Atm(100);
         }
 
         [When("When the Account Holder requests $20")]
-        void WhenTheAccountHolderRequests20()
+        internal void WhenTheAccountHolderRequests20()
         {
             _atm.RequestMoney(_card, 20);
         }
 
-        void Then_the_ATM_should_not_dispense_any_Money()
+        internal void Then_the_ATM_should_not_dispense_any_Money()
         {
             _atm.DispenseValue.ShouldBe(0);
         }
 
-        void And_the_ATM_should_say_there_are_Insufficient_Funds()
+        internal void And_the_ATM_should_say_there_are_Insufficient_Funds()
         {
             _atm.Message.ShouldBe(DisplayMessage.InsufficientFunds);
         }
 
         [AndThen("And the Account Balance should be $20")]
-        void AndTheAccountBalanceShouldBe20()
+        internal void AndTheAccountBalanceShouldBe20()
         {
             _card.AccountBalance.ShouldBe(10);
         }
 
-        void And_the_Card_should_be_returned()
+        internal void And_the_Card_should_be_returned()
         {
             _atm.CardIsRetained.ShouldBe(false);
         }
@@ -56,5 +56,12 @@ public void Verify()
         {
             this.BDDfy<AccountHolderWithdrawsCash>();
         }
+
+        [Fact]
+        public void VerifyLazy()
+        {
+            var engine = this.LazyBDDfy<AccountHolderWithdrawsCash>();
+            engine.Run();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Samples/TestStack.BDDfy.Samples/CanRunAsyncVoidSteps.cs b/src/Samples/TestStack.BDDfy.Samples/CanRunAsyncVoidSteps.cs
new file mode 100644
index 00000000..36afc1e5
--- /dev/null
+++ b/src/Samples/TestStack.BDDfy.Samples/CanRunAsyncVoidSteps.cs
@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+using TestStack.BDDfy.Configuration;
+using Xunit;
+
+namespace TestStack.BDDfy.Samples
+{
+    public class CanRunAsyncVoidSteps
+    {
+        [Fact]
+        internal void Run() => this.BDDfy();
+        internal void SetUp() => Configurator.AsyncVoidSupportEnabled = false;
+        internal void TearDown() => Configurator.AsyncVoidSupportEnabled = true;
+
+        internal async void GivenNonAsyncStep() => await Task.CompletedTask;
+        internal async void WhenSomethingHappens() => await Task.CompletedTask;
+        internal async void ThenAssertSomething()  => await Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs b/src/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs
index 726295a3..056ce792 100644
--- a/src/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs
+++ b/src/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs
@@ -1,6 +1,5 @@
 using Shouldly;
 using Xunit;
-using Xunit.Extensions;
 
 namespace TestStack.BDDfy.Samples.TicTacToe
 {
diff --git a/src/Samples/TestStack.BDDfy.Samples/TicTacToe/WinnerGame.cs b/src/Samples/TestStack.BDDfy.Samples/TicTacToe/WinnerGame.cs
index 43e363eb..ce50e23e 100644
--- a/src/Samples/TestStack.BDDfy.Samples/TicTacToe/WinnerGame.cs
+++ b/src/Samples/TestStack.BDDfy.Samples/TicTacToe/WinnerGame.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using NUnit.Framework;
 using Shouldly;
 
 namespace TestStack.BDDfy.Samples.TicTacToe
diff --git a/src/TestStack.BDDfy.Tests/Concurrency/TestCollectionName.cs b/src/TestStack.BDDfy.Tests/Concurrency/TestCollectionName.cs
new file mode 100644
index 00000000..aaf5a2ea
--- /dev/null
+++ b/src/TestStack.BDDfy.Tests/Concurrency/TestCollectionName.cs
@@ -0,0 +1,7 @@
+namespace TestStack.BDDfy.Tests.Concurrency
+{
+    internal static class TestCollectionName { 
+        public const string ModifiesConfigurator = "ModifiesConfigurator";
+        public const string Approvals = nameof(Approvals);
+    }
+}
diff --git a/src/TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs b/src/TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs
index b6ac86f7..b253c45c 100644
--- a/src/TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs
+++ b/src/TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs
@@ -1,17 +1,21 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using Shouldly;
 using TestStack.BDDfy.Configuration;
+using TestStack.BDDfy.Reporters.Diagnostics;
 using TestStack.BDDfy.Reporters.Html;
 using TestStack.BDDfy.Reporters.MarkDown;
+using TestStack.BDDfy.Tests.Concurrency;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests.Configuration
 {
+    [Collection(TestCollectionName.ModifiesConfigurator)]
     public class BatchProcessorsTests
     {
         static bool MetroReportProcessorIsActive(IBatchProcessor batchProcessor)
         {
-            return batchProcessor is HtmlReporter && ((HtmlReporter)batchProcessor).ReportBuilder is MetroReportBuilder;
+            return batchProcessor is HtmlReporter reporter && reporter.ReportBuilder is MetroReportBuilder;
         }
 
         [Fact]
@@ -67,5 +71,35 @@ public void ReturnsHtmlMetroReporterWhenItIsActivated()
 
             Configurator.BatchProcessors.HtmlMetroReport.Disable();
         }
+
+        [Fact]
+        public void ReturnsDianosticsReporterWhenItIsActivated()
+        {
+            Configurator.BatchProcessors.DiagnosticsReport.Enable();
+
+            var processors = Configurator.BatchProcessors.GetProcessors().ToList();
+
+            processors.ShouldContain(p=> p is DiagnosticsReporter, 1);
+
+            Configurator.BatchProcessors.DiagnosticsReport.Disable();
+        }
+
+        [Fact]
+        public void ReturnsAdditionalBatchProcessorsWhenAdded()
+        {
+            Configurator.BatchProcessors.Add(new FooBatchProcessor());
+
+            var processors = Configurator.BatchProcessors.GetProcessors().ToList();
+
+            processors.ShouldContain(p => p is FooBatchProcessor, 1);
+        }
+
+        private class FooBatchProcessor : IBatchProcessor
+        {
+            public void Process(IEnumerable<Story> stories)
+            {
+                throw new System.NotImplementedException();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Configuration/ExceptionResolverTests.cs b/src/TestStack.BDDfy.Tests/Configuration/ExceptionResolverTests.cs
new file mode 100644
index 00000000..9f1f8988
--- /dev/null
+++ b/src/TestStack.BDDfy.Tests/Configuration/ExceptionResolverTests.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Reflection;
+using Shouldly;
+using TestStack.BDDfy.Processors;
+using Xunit;
+
+namespace TestStack.BDDfy.Tests.Configuration;
+
+public class ExceptionResolverTests
+{
+    [Fact]
+    public void WhenTargetInvocationException_ResolveRoot_WhenInnerNotAvailable()
+    {
+        var ex = new TargetInvocationException(null);
+        var resolved = ExceptionResolver.Resolve(ex);
+        resolved.ShouldBeOfType<TargetInvocationException>();
+    }
+
+    [Fact]
+    public void WhenNotTargetInvocationException_ResolveRoot_EvenWhenInnerIsAvailable()
+    {
+        var ex = new System.InvalidCastException("error", new AmbiguousMatchException());
+        var resolved = ExceptionResolver.Resolve(ex);
+        resolved.ShouldBeOfType<InvalidCastException>();
+    }
+}
diff --git a/src/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs b/src/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs
index 3ca8a1ab..1c042227 100644
--- a/src/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs
+++ b/src/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs
@@ -3,11 +3,12 @@
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Processors;
 using TestStack.BDDfy.Reporters;
+using TestStack.BDDfy.Tests.Concurrency;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests.Configuration
 {
-    [Collection("ExclusiveAccessToConfigurator")]
+    [Collection(TestCollectionName.ModifiesConfigurator)]
     public class ProcessorPipelineTests
     {
         [Fact]
diff --git a/src/TestStack.BDDfy.Tests/Configuration/StepExecutorTests.cs b/src/TestStack.BDDfy.Tests/Configuration/StepExecutorTests.cs
index 8d9e1916..8e78f3b2 100644
--- a/src/TestStack.BDDfy.Tests/Configuration/StepExecutorTests.cs
+++ b/src/TestStack.BDDfy.Tests/Configuration/StepExecutorTests.cs
@@ -1,11 +1,12 @@
 using System.Text;
 using Shouldly;
 using TestStack.BDDfy.Configuration;
+using TestStack.BDDfy.Tests.Concurrency;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests.Configuration
 {
-    [Collection("ExclusiveAccessToConfigurator")]
+    [Collection(TestCollectionName.ModifiesConfigurator)]
     public class StepExecutorTests
     {
         private class TestStepExecutor : StepExecutor
diff --git a/src/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs b/src/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs
index f89aece7..1213e381 100644
--- a/src/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs
+++ b/src/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs
@@ -2,11 +2,11 @@
 using System.Linq;
 using Shouldly;
 using TestStack.BDDfy.Configuration;
+using TestStack.BDDfy.Tests.Concurrency;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests.Configuration
 {
-    [Collection("ExclusiveAccessToConfigurator")]
     public class TestRunnerTests
     {
         public class ScenarioWithFailingThen
@@ -33,6 +33,9 @@ public void PassingAndThen()
             }
         }
 
+
+        [Collection(TestCollectionName.ModifiesConfigurator)]
+
         public class When_StopExecutionOnFailingThen_IsSetToTrue
         {
             [Fact]
diff --git a/src/TestStack.BDDfy.Tests/Disposer/DisposingScenarios.cs b/src/TestStack.BDDfy.Tests/Disposer/DisposingScenarios.cs
index a47ad897..86b41b84 100644
--- a/src/TestStack.BDDfy.Tests/Disposer/DisposingScenarios.cs
+++ b/src/TestStack.BDDfy.Tests/Disposer/DisposingScenarios.cs
@@ -3,7 +3,6 @@
 using Shouldly;
 using TestStack.BDDfy.Tests.Exceptions;
 using Xunit;
-using Xunit.Extensions;
 
 namespace TestStack.BDDfy.Tests.Disposer
 {
diff --git a/src/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenWhenThrowsException.cs b/src/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenWhenThrowsException.cs
index 11741e33..1ea549b7 100644
--- a/src/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenWhenThrowsException.cs
+++ b/src/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenWhenThrowsException.cs
@@ -1,9 +1,11 @@
 using System;
 using Shouldly;
+using TestStack.BDDfy.Tests.Concurrency;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests.Exceptions.OtherExceptions
 {
+    [Collection(TestCollectionName.ModifiesConfigurator)]
     public class WhenWhenThrowsException : OtherExceptionBase
     {
         private void ExecuteUsingFluentScanner()
diff --git a/src/TestStack.BDDfy.Tests/ExclusiveAccessToConfiguratorFixture.cs b/src/TestStack.BDDfy.Tests/ExclusiveAccessToConfiguratorFixture.cs
deleted file mode 100644
index 2c9f5f33..00000000
--- a/src/TestStack.BDDfy.Tests/ExclusiveAccessToConfiguratorFixture.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Xunit;
-
-namespace TestStack.BDDfy.Tests
-{
-    [CollectionDefinition("ExclusiveAccessToConfigurator", DisableParallelization = true)]
-    public class ExclusiveAccessToConfiguratorFixture
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/DefaultHumanizerTests.cs b/src/TestStack.BDDfy.Tests/HumanizerTests.cs
similarity index 83%
rename from src/TestStack.BDDfy.Tests/DefaultHumanizerTests.cs
rename to src/TestStack.BDDfy.Tests/HumanizerTests.cs
index 7a5d7baf..079666a9 100644
--- a/src/TestStack.BDDfy.Tests/DefaultHumanizerTests.cs
+++ b/src/TestStack.BDDfy.Tests/HumanizerTests.cs
@@ -1,13 +1,12 @@
 using System;
 using Shouldly;
-using TestStack.BDDfy.Configuration;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests
 {
-    public class DefaultHumanizerTests
+    public sealed class HumanizerTests
     {
-        private static DefaultHumanizer Humanizer => new();
+        private static readonly DefaultHumanizer Humanizer = new();
 
         [Fact]
         public void PascalCaseInputStringIsTurnedIntoSentence()
@@ -34,6 +33,13 @@ public void WhenInputStringEndWithANumber_ThenNumberIsDealtWithLikeAWord()
             Humanizer.Humanize("NumberIsAtTheEnd100").ShouldBe("Number is at the end 100");
         }
 
+        [Fact]
+        public void WhenInputStringHasANumberInTheMiddleAndEnd_ThenNumberIsDealtWithLikeAWord()
+        {
+            Humanizer.Humanize("Number15InTheMiddleAndEndingWith100")
+                .ShouldBe("Number 15 in the middle and ending with 100");
+        }
+
         [Fact]
         public void UnderscoredInputStringIsTurnedIntoSentence()
         {
@@ -57,7 +63,7 @@ public void OneLetterWordInTheBeginningOfStringIsTurnedIntoAWord()
         [Theory]
         [InlineData("GivenThereAre__start__Cucumbers", "Given there are <start> cucumbers")]
         [InlineData("Given_there_are__start__cucumbers", "Given there are <start> cucumbers")]
-        [InlineData("GivenThereAre__count1__Cucumbers", "Given there are <count 1> cucumbers")]
+        [InlineData("GivenThereAre__count1__Cucumbers", "Given there are <count1> cucumbers")]
         [InlineData("Given_there_are__count2__cucumbers", "Given there are <count2> cucumbers")] // The spacing rules for numbers are not consequential
         [InlineData("GivenMethodTaking__ExampleInt__", "Given method taking <example int>")]
         [InlineData("Given_method_taking__ExampleInt__", "Given method taking <ExampleInt>")]
@@ -82,5 +88,14 @@ public void ReportsIllegalExampleStepNames(string stepName, string expectedStepT
             exception.ShouldNotBeNull();
             exception.ShouldBeOfType<ArgumentException>();
         }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(" ")]
+        [InlineData(null)]
+        internal void HumanizeWithNullOrEmptyInput_ReturnsTheSame(string providedInput)
+        {
+            Humanizer.Humanize(providedInput).ShouldBe(providedInput);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/ModifiesConfiguratorFixture.cs b/src/TestStack.BDDfy.Tests/ModifiesConfiguratorFixture.cs
new file mode 100644
index 00000000..c5fae0dc
--- /dev/null
+++ b/src/TestStack.BDDfy.Tests/ModifiesConfiguratorFixture.cs
@@ -0,0 +1,10 @@
+using TestStack.BDDfy.Tests.Concurrency;
+using Xunit;
+
+namespace TestStack.BDDfy.Tests
+{
+    [CollectionDefinition(TestCollectionName.ModifiesConfigurator, DisableParallelization = true)]
+    public class ModifiesConfiguratorFixture
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.ShouldProduceExpectedHtml.approved.txt b/src/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.ShouldProduceExpectedHtml.approved.txt
index 436429e4..02482b18 100644
--- a/src/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.ShouldProduceExpectedHtml.approved.txt
+++ b/src/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.ShouldProduceExpectedHtml.approved.txt
@@ -159,7 +159,7 @@ body{margin:0;padding:0;padding-bottom:40px;max-width:100%;background-color:#fff
       </div>
     </div>
     <div class='footer'>Powered by <a href='https://github.com/TestStack/TestStack.BDDfy'>BDDfy</a> framework</div>
-    <script type='text/javascript' src='http://code.jquery.com/jquery-2.1.0.min.js'></script>
+    <script type='text/javascript' src='https://code.jquery.com/jquery-2.1.0.min.js'></script>
     <script>
 $(function(){$(".canToggle").each(function(){var n=$("#"+$(this).data("toggle-target"));n.hide();$(this).click(function(){n.toggle(200)})});$(".expandAll").click(function(){$(".steps").css("display","")});$(".collapseAll").click(function(){$(".steps").css("display","none")});$("ul.resultSummary li:not('.storySummary'):not('.scenarioSummary')").append("<input type='checkbox' class='cbx_toggle' checked/>");$(".cbx_toggle").click(function(){var n=$(this),t=n.closest("li").attr("class");$("#testResult div.scenario ."+t).parent().toggle(n.is(":checked"))})});
 /*
diff --git a/src/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.cs b/src/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.cs
index 6ea5dd5d..aefce73b 100644
--- a/src/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.cs
+++ b/src/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.cs
@@ -1,4 +1,3 @@
-#if Approvals
 using System;
 using System.Runtime.CompilerServices;
 using TestStack.BDDfy.Reporters;
@@ -13,9 +12,11 @@ public class ClassicReportBuilderTests
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ShouldProduceExpectedHtml()
         {
-            var model = 
-                new HtmlReportModel(new ReportTestData().CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMilliseconds()
-                    .ToReportModel())
+            var reportModel = new ReportTestData()
+                .CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMilliseconds()
+                .ToReportModel();
+
+            var model = new HtmlReportModel(reportModel)
                     {
                         RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
                     };
@@ -28,8 +29,11 @@ public void ShouldProduceExpectedHtml()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ShouldProduceExpectedHtmlWithExamples()
         {
-            var reportData = new ReportTestData().CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMillisecondsAndEachHasTwoExamples().ToReportModel();
-            var model = new HtmlReportModel(reportData)
+            var reportModel = new ReportTestData()
+                .CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMillisecondsAndEachHasTwoExamples()
+                .ToReportModel();
+
+            var model = new HtmlReportModel(reportModel)
             {
                 RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
             };
@@ -38,5 +42,4 @@ public void ShouldProduceExpectedHtmlWithExamples()
             ReportApprover.Approve(model, sut);
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Reporters/Html/MetroReportBuilderTests.cs b/src/TestStack.BDDfy.Tests/Reporters/Html/MetroReportBuilderTests.cs
index c135aaa1..1e71ab22 100644
--- a/src/TestStack.BDDfy.Tests/Reporters/Html/MetroReportBuilderTests.cs
+++ b/src/TestStack.BDDfy.Tests/Reporters/Html/MetroReportBuilderTests.cs
@@ -1,4 +1,3 @@
-#if Approvals
 using System;
 using System.Runtime.CompilerServices;
 using TestStack.BDDfy.Reporters;
@@ -38,5 +37,4 @@ public void ShouldProduceExpectedHtmlWithExamples()
             ReportApprover.Approve(model, sut);
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Reporters/Html/TemporaryCulture.cs b/src/TestStack.BDDfy.Tests/Reporters/Html/TemporaryCulture.cs
index 5ffed717..5ba8698b 100644
--- a/src/TestStack.BDDfy.Tests/Reporters/Html/TemporaryCulture.cs
+++ b/src/TestStack.BDDfy.Tests/Reporters/Html/TemporaryCulture.cs
@@ -1,4 +1,3 @@
-#if Culture
 using System;
 using System.Globalization;
 using System.Threading;
@@ -17,7 +16,7 @@ public TemporaryCulture(string newCulture)
         public void Dispose()
         {
             Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(_originalCulture);
+            GC.SuppressFinalize(this);
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReportBuilderTests.cs b/src/TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReportBuilderTests.cs
index 2924d3ba..be33c004 100644
--- a/src/TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReportBuilderTests.cs
+++ b/src/TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReportBuilderTests.cs
@@ -1,5 +1,4 @@
-#if Approvals
-using System;
+using System;
 using System.Runtime.CompilerServices;
 using TestStack.BDDfy.Reporters;
 using TestStack.BDDfy.Reporters.MarkDown;
@@ -13,7 +12,8 @@ public class MarkDownReportBuilderTests
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ShouldProduceExpectedMarkdown()
         {
-            var model = new FileReportModel(new ReportTestData().CreateMixContainingEachTypeOfOutcome().ToReportModel());
+            var reportModel = new ReportTestData().CreateMixContainingEachTypeOfOutcome().ToReportModel();
+            var model = new FileReportModel(reportModel);
             var sut = new MarkDownReportBuilder();
             ReportApprover.Approve(model, sut);
         }
@@ -22,16 +22,17 @@ public void ShouldProduceExpectedMarkdown()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ShouldProduceExpectedMarkdownWithExamples()
         {
-            var model = 
-                new FileReportModel(new ReportTestData().CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMillisecondsAndEachHasTwoExamples()
-                    .ToReportModel())
-                {
-                    RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
-                };
+            var reportModel = new ReportTestData()
+                .CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMillisecondsAndEachHasTwoExamples()
+                .ToReportModel();
+
+            var model =  new FileReportModel(reportModel)
+            {
+                RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
+            };
 
             var sut = new MarkDownReportBuilder();
             ReportApprover.Approve(model, sut);
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Reporters/ReportApprover.cs b/src/TestStack.BDDfy.Tests/Reporters/ReportApprover.cs
index b89b6d2b..07c65f92 100644
--- a/src/TestStack.BDDfy.Tests/Reporters/ReportApprover.cs
+++ b/src/TestStack.BDDfy.Tests/Reporters/ReportApprover.cs
@@ -1,12 +1,11 @@
-#if Approvals
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using Shouldly;
 using TestStack.BDDfy.Reporters;
 using TestStack.BDDfy.Tests.Reporters.Html;
 
 namespace TestStack.BDDfy.Tests.Reporters
 {
-    class ReportApprover
+    internal class ReportApprover
     {
         public static void Approve(FileReportModel model, IReportBuilder reportBuilder)
         {
@@ -36,10 +35,8 @@ static string ScrubLineNumbers(string source)
 
         static string ScrubPaths(string source)
         {
-            var result = new Regex(@"\b\w:[\\\w.\s-]+\\").Replace(source, "...\\");
+            var result = Regex.Replace(source, @"(at .* in) .*[\\/](.*.cs)", "$1 ...\\$2", RegexOptions.Multiline);
             return result;
         }
     }
-}
-
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Reporters/TextReporter/TextReporterTests.cs b/src/TestStack.BDDfy.Tests/Reporters/TextReporter/TextReporterTests.cs
index d0ea304f..6e10e115 100644
--- a/src/TestStack.BDDfy.Tests/Reporters/TextReporter/TextReporterTests.cs
+++ b/src/TestStack.BDDfy.Tests/Reporters/TextReporter/TextReporterTests.cs
@@ -1,12 +1,10 @@
-#if Approvals
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Text;
 using Shouldly;
-using TestStack.BDDfy.Reporters;
+using TextReporterClass = TestStack.BDDfy.Reporters.TextReporter;
 using Xunit;
 
-namespace TestStack.BDDfy.Tests.Reporters.MarkDown
+namespace TestStack.BDDfy.Tests.Reporters.TextReporter
 {
     public class TextReporterTests
     {
@@ -19,7 +17,7 @@ public void ShouldProduceExpectedReport()
 
             foreach (var story in stories)
             {
-                var textReporter = new TextReporter();
+                var textReporter = new TextReporterClass();
                 textReporter.Process(story);
                 actual.AppendLine(textReporter.ToString());
             }
@@ -36,7 +34,7 @@ public void ShouldProduceExpectedTextWithExamples()
 
             foreach (var story in stories)
             {
-                var textReporter = new TextReporter();
+                var textReporter = new TextReporterClass();
                 textReporter.Process(story);
                 actual.AppendLine(textReporter.ToString());
             }
@@ -48,21 +46,20 @@ public void ShouldProduceExpectedTextWithExamples()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void LongStepName()
         {
-            var textReporter = new TextReporter();
-            var scenario = new Scenario(typeof(TextReporterTests), new List<Step>
-            {
-                new Step(o => null, new StepTitle("Given a normal length title"), false, ExecutionOrder.SetupState, true, new List<StepArgument>()),
-                new Step(o => null, new StepTitle("When something of normal length happens"), false, ExecutionOrder.Transition, true, new List<StepArgument>()),
+            var textReporter = new TextReporterClass();
+            var scenario = new Scenario(typeof(TextReporterTests),
+            [
+                new Step(o => null, new StepTitle("Given a normal length title"), false, ExecutionOrder.SetupState, true, []),
+                new Step(o => null, new StepTitle("When something of normal length happens"), false, ExecutionOrder.Transition, true, []),
                 new Step(o => null, new StepTitle("Then some long state should be: #Title\r\n\r\nSome more stuff which is quite long on the second line\r\n\r\nAnd finally another really long line"),
-                    true, ExecutionOrder.Assertion, true, new List<StepArgument>()),
-                new Step(o => null, new StepTitle("And a normal length assertion"), true, ExecutionOrder.ConsecutiveAssertion, true, new List<StepArgument>())
-            }, "Scenario Text", new List<string>());
-            textReporter.Process(new Story(new StoryMetadata(typeof(TextReporterTests), new StoryNarrativeAttribute()),
-                scenario));
+                    true, ExecutionOrder.Assertion, true, []),
+                new Step(o => null, new StepTitle("And a normal length assertion"), true, ExecutionOrder.ConsecutiveAssertion, true, [])
+            ], "Scenario Text", []);
+
+            textReporter.Process(new Story(new StoryMetadata(typeof(TextReporterTests), new StoryNarrativeAttribute()), scenario));
             var actual = new StringBuilder();
             actual.AppendLine(textReporter.ToString());
             actual.ToString().ShouldMatchApproved(c => c.WithScrubber(ReportApprover.Scrub));
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Scanner/Examples/ExampleActionTests.cs b/src/TestStack.BDDfy.Tests/Scanner/Examples/ExampleActionTests.cs
index 2f24641b..4e88cbf5 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/Examples/ExampleActionTests.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/Examples/ExampleActionTests.cs
@@ -1,5 +1,4 @@
-#if Approvals
-using Shouldly;
+using Shouldly;
 using TestStack.BDDfy.Reporters;
 using Xunit;
 
@@ -40,5 +39,4 @@ private void SomeSetup()
             
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Scanner/Examples/ExampleTableTests.cs b/src/TestStack.BDDfy.Tests/Scanner/Examples/ExampleTableTests.cs
index 47c98247..90777fb8 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/Examples/ExampleTableTests.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/Examples/ExampleTableTests.cs
@@ -1,5 +1,4 @@
-#if Approvals
-using System;
+using System;
 using System.Linq;
 using Shouldly;
 using Xunit;
@@ -51,9 +50,8 @@ public void TableToStringWithAdditionalColumn()
                 {3, 4}
             };
 
-            table.ToString(new[] {"Additional"}, new[] {new[] {"SomeAdditional Value"}})
+            table.ToString(new[] { "Additional" }, new[] { new[] { "SomeAdditional Value" } })
                 .ShouldMatchApproved();
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamples.cs b/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamples.cs
index 7e52f9d1..2b7efd13 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamples.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamples.cs
@@ -1,5 +1,4 @@
-#if Approvals
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using Shouldly;
 using TestStack.BDDfy.Reporters;
 using Xunit;
@@ -106,5 +105,4 @@ private void MethodTaking__ExampleInt__(int exampleInt)
         private string multiWordHeading = null;
         public ExecutionOrder Prop_3 { get; set; }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamplesAtEnd.FluentCanBeUsedWithExamplesEndingInANumber.approved.txt b/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamplesAtEnd.FluentCanBeUsedWithExamplesEndingInANumber.approved.txt
index 049f6ef0..15b4167f 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamplesAtEnd.FluentCanBeUsedWithExamplesEndingInANumber.approved.txt
+++ b/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamplesAtEnd.FluentCanBeUsedWithExamplesEndingInANumber.approved.txt
@@ -1,6 +1,6 @@
 
 Scenario: Fluent can be used with examples ending in a number
-	Given method taking <example int 1>
+	Given method taking <example int1>
 	When empty method
 	Then all is good
 
diff --git a/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamplesAtEnd.cs b/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamplesAtEnd.cs
index 8019f583..80ed5fec 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamplesAtEnd.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamplesAtEnd.cs
@@ -1,5 +1,4 @@
-#if Approvals
-using Shouldly;
+using Shouldly;
 using TestStack.BDDfy.Reporters;
 using Xunit;
 
@@ -53,5 +52,4 @@ private void MethodTaking__ExampleIntA__(int exampleInt) {
             exampleInt.ShouldBeInRange(1, 2);
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Scanner/Examples/ReflectiveWithExamples.cs b/src/TestStack.BDDfy.Tests/Scanner/Examples/ReflectiveWithExamples.cs
index 79440bda..8ea33941 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/Examples/ReflectiveWithExamples.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/Examples/ReflectiveWithExamples.cs
@@ -1,5 +1,4 @@
-#if Approvals
-using Shouldly;
+using Shouldly;
 using TestStack.BDDfy.Reporters;
 using Xunit;
 
@@ -7,8 +6,19 @@ namespace TestStack.BDDfy.Tests.Scanner.Examples
 {
     public class ReflectiveWithExamples
     {
-        public string SecondExample { get; set; }
+        private readonly Story _story;
 
+        public string SecondExample { get; set; }
+        public ReflectiveWithExamples()
+        {
+            _story = this
+                .WithExamples(new ExampleTable("First Example", "Second Example")
+                {
+                    {1, "foo"},
+                    {2, "bar"}
+                })
+                .BDDfy();
+        }
         public void GivenStepWith__FirstExample__PassedAsParameter(int firstExample)
         {
             firstExample.ShouldBeOneOf(1, 2);
@@ -22,18 +32,9 @@ public void AndGivenStepWith__SecondExample__AccessedViaProperty()
         [Fact]
         public void Run()
         {
-            var story = this
-                .WithExamples(new ExampleTable("First Example", "Second Example")
-                {
-                    {1, "foo"},
-                    {2, "bar"}
-                })
-                .BDDfy();
-
             var reporter = new TextReporter();
-            reporter.Process(story);
+            reporter.Process(_story);
             reporter.ToString().ShouldMatchApproved();
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/BDDfyUsingFluentApi.cs b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/BDDfyUsingFluentApi.cs
index 08e10ab2..cbca64c6 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/BDDfyUsingFluentApi.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/BDDfyUsingFluentApi.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using NUnit.Framework;
 using Shouldly;
 using TestStack.BDDfy.Configuration;
 using Xunit;
diff --git a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/ComplexStepsTests.cs b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/ComplexStepsTests.cs
index e97b5c23..b23776b3 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/ComplexStepsTests.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/ComplexStepsTests.cs
@@ -1,12 +1,13 @@
 using System;
 using System.Linq;
 using Shouldly;
+using TestStack.BDDfy.Tests.Concurrency;
 using TestStack.BDDfy.Tests.Configuration;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests.Scanner.FluentScanner
 {
-    [Collection("ExclusiveAccessToConfigurator")]
+    [Collection(TestCollectionName.ModifiesConfigurator)]
     public class ComplexStepsTests
     {
         private int count;
diff --git a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/ExpressionExtensionsTests.cs b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/ExpressionExtensionsTests.cs
index 988d7966..f58b2a25 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/ExpressionExtensionsTests.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/ExpressionExtensionsTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using NUnit.Framework;
 using Shouldly;
 using Xunit;
 
diff --git a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/PrependStepTypeTests.cs b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/PrependStepTypeTests.cs
index 2b640dde..389d6110 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/PrependStepTypeTests.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/PrependStepTypeTests.cs
@@ -1,5 +1,4 @@
-#if Approvals
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using Shouldly;
 using TestStack.BDDfy.Reporters;
 using Xunit;
@@ -74,5 +73,4 @@ private void WeAreWinning()
             
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/StepTitleTests.cs b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/StepTitleTests.cs
index cd637327..e405fc62 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/StepTitleTests.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/StepTitleTests.cs
@@ -1,9 +1,11 @@
 using System.Linq;
 using Shouldly;
+using TestStack.BDDfy.Tests.Concurrency;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests.Scanner.FluentScanner
 {
+    [Collection(TestCollectionName.ModifiesConfigurator)]
     public class StepTitleTests
     {
         private string _mutatedState;
diff --git a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/UsingCustomStepTitleFactory.cs b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/UsingCustomStepTitleFactory.cs
new file mode 100644
index 00000000..0a303360
--- /dev/null
+++ b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/UsingCustomStepTitleFactory.cs
@@ -0,0 +1,90 @@
+using Shouldly;
+using System.Linq;
+using System.Reflection;
+using TestStack.BDDfy.Abstractions;
+using TestStack.BDDfy.Configuration;
+using TestStack.BDDfy.Tests.Concurrency;
+using Xunit;
+
+namespace TestStack.BDDfy.Tests.Scanner.FluentScanner
+{
+    [Collection(TestCollectionName.ModifiesConfigurator)]
+    public class UsingCustomStepTitleFactory
+    {
+        private class CustomStepTitleFactory : IStepTitleFactory
+        {
+            public StepTitle Create(
+                string stepTextTemplate,
+                bool includeInputsInStepTitle,
+                MethodInfo methodInfo,
+                StepArgument[] inputArguments,
+                ITestContext testContext,
+                string stepPrefix) => new StepTitle("Custom Step Title");
+
+            public StepTitle Create(string title, string stepPrefix, ITestContext testContext) => new StepTitle(title);
+        }
+
+        [Fact]
+        public void ShouldUseCustomStepTitleFactoryWhenSet()
+        {
+            Configurator.StepTitleFactory = new CustomStepTitleFactory();
+
+            try
+            {
+                var story = new UsingCustomStepTitleFactory()
+                .Given(_ => SomeState())
+                .When(_ => SomethingHappens())
+                .Then(_ => SomeResult())
+                .BDDfy();
+
+                story.Scenarios.Single().Steps.ElementAt(0).Title.ShouldBe("Custom Step Title");
+                story.Scenarios.Single().Steps.ElementAt(1).Title.ShouldBe("Custom Step Title");
+                story.Scenarios.Single().Steps.ElementAt(2).Title.ShouldBe("Custom Step Title");
+            }
+            finally
+            {
+                Configurator.StepTitleFactory = new DefaultStepTitleFactory();
+            }
+
+        }
+
+        [Fact]
+        public void ShouldUseCustomStepTitleFactoryWhenSetWithStepTitles()
+        {
+            Configurator.StepTitleFactory = new CustomStepTitleFactory();
+
+            try
+            {
+                var story = new UsingCustomStepTitleFactory()
+                .Given(_ => SomeState(), "Not this")
+                .When(_ => SomethingHappens(), "Or this")
+                .Then(_ => SomeResult(), "should not appear")
+                .BDDfy();
+
+                story.Scenarios.Single().Steps.ElementAt(0).Title.ShouldBe("Custom Step Title");
+                story.Scenarios.Single().Steps.ElementAt(1).Title.ShouldBe("Custom Step Title");
+                story.Scenarios.Single().Steps.ElementAt(2).Title.ShouldBe("Custom Step Title");
+            }
+            finally
+            {
+              Configurator.StepTitleFactory = new DefaultStepTitleFactory();
+
+            }
+        }
+
+        [StepTitle("given from attribute")]
+        private void SomeState()
+        {
+        }
+
+        [StepTitle("when from attribute")]
+        private void SomethingHappens()
+        {
+        }
+
+        [StepTitle("then from attribute")]
+        private void SomeResult()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/WhenStepsAreScannedUsingFluentScanner.cs b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/WhenStepsAreScannedUsingFluentScanner.cs
index 1123d70e..032dda2a 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/WhenStepsAreScannedUsingFluentScanner.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/WhenStepsAreScannedUsingFluentScanner.cs
@@ -1,10 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using Shouldly;
+using TestStack.BDDfy.Tests.Concurrency;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests.Scanner.FluentScanner
 {
+    [Collection(TestCollectionName.ModifiesConfigurator)]
     public class WhenStepsAreScannedUsingFluentScanner
     {
         private IEnumerable<Step> _steps;
diff --git a/src/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/AnyExecutableAttributeWhichIsEmptyOrWhitespaceWillResultInMethodName.cs b/src/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/AnyExecutableAttributeWhichIsEmptyOrWhitespaceWillResultInMethodName.cs
new file mode 100644
index 00000000..c9e26a34
--- /dev/null
+++ b/src/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/AnyExecutableAttributeWhichIsEmptyOrWhitespaceWillResultInMethodName.cs
@@ -0,0 +1,48 @@
+using Shouldly;
+using System.Linq;
+using TestStack.BDDfy.Configuration;
+using Xunit;
+
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
+{
+    public class AnyExecutableAttributeWhichIsEmptyOrWhitespaceWillResultInMethodName
+    {
+        private class TypeWithDecoratedMethods
+        {
+            public TypeWithDecoratedMethods()
+            {
+                this.WithExamples(new ExampleTable("Example")
+                {
+                    {1},
+                    {2}
+                });
+            }
+
+            [Given("")]
+            public void GivenWithEmptyString() { }
+            [When("   ")]
+            public void WhenWithWhitespace() { }
+            [Then(null)]
+            public void ThenWithNull() { }
+
+            [AndThen("Then with title should work too")]
+            public void AndThenWithTitle() { }
+        }
+
+        [Fact]
+        public void WhenUsingReflectiveScanner_MethodNamesAreUsedAsStepTitles_When_StepTitlesAreWhiteSpace()
+        {
+            var testObject = new TypeWithDecoratedMethods();
+
+            var stepScanners = Configurator.Scanners.GetStepScanners(testObject).ToArray();
+            var scanner = new ReflectiveScenarioScanner(stepScanners);
+            var scenario = scanner.Scan(TestContext.GetContext(testObject)).First();
+            var steps = scenario.Steps;
+
+            steps[0].Title.ShouldBe("Given with empty string");
+            steps[1].Title.ShouldBe("When with whitespace");
+            steps[2].Title.ShouldBe("Then with null");
+            steps[3].Title.ShouldBe("Then with title should work too");
+        }
+    }
+}
diff --git a/src/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/DefaultScanForStepsByMethodNameTests.cs b/src/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/DefaultScanForStepsByMethodNameTests.cs
index 02579cad..390eb199 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/DefaultScanForStepsByMethodNameTests.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/DefaultScanForStepsByMethodNameTests.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using NUnit.Framework;
 using Shouldly;
 using Xunit;
 
diff --git a/src/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/ExecutableAttributeScannerTests.cs b/src/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/ExecutableAttributeScannerTests.cs
index 2d5b6481..c8a49be2 100644
--- a/src/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/ExecutableAttributeScannerTests.cs
+++ b/src/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/ExecutableAttributeScannerTests.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using NUnit.Framework;
 using Shouldly;
 using Xunit;
 
diff --git a/src/TestStack.BDDfy.Tests/Stories/CanUseACustomStoryAttribute.cs b/src/TestStack.BDDfy.Tests/Stories/CanUseACustomStoryAttribute.cs
index 5df7282a..fc2e003b 100644
--- a/src/TestStack.BDDfy.Tests/Stories/CanUseACustomStoryAttribute.cs
+++ b/src/TestStack.BDDfy.Tests/Stories/CanUseACustomStoryAttribute.cs
@@ -1,5 +1,4 @@
-using NUnit.Framework;
-using Shouldly;
+using Shouldly;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests.Stories
diff --git a/src/TestStack.BDDfy.Tests/Stories/WhenAStoryHasUriAndImageMetadata.cs b/src/TestStack.BDDfy.Tests/Stories/WhenAStoryHasUriAndImageMetadata.cs
index d585ab83..39b6d75f 100644
--- a/src/TestStack.BDDfy.Tests/Stories/WhenAStoryHasUriAndImageMetadata.cs
+++ b/src/TestStack.BDDfy.Tests/Stories/WhenAStoryHasUriAndImageMetadata.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xunit;
+using Xunit;
 using Shouldly;
 
 namespace TestStack.BDDfy.Tests.Stories
diff --git a/src/TestStack.BDDfy.Tests/TagsTests.cs b/src/TestStack.BDDfy.Tests/TagsTests.cs
index 26128025..14a359ce 100644
--- a/src/TestStack.BDDfy.Tests/TagsTests.cs
+++ b/src/TestStack.BDDfy.Tests/TagsTests.cs
@@ -1,5 +1,4 @@
-#if Approvals
-using System;
+using System;
 using Shouldly;
 using System.Runtime.CompilerServices;
 using TestStack.BDDfy.Reporters;
@@ -30,7 +29,7 @@ public void TagsAreReportedInTextReport()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void TagsAreReportedInHtmlReport()
         {
-            var model = new HtmlReportModel(this.CreateReportModel()) {
+            var model = new HtmlReportModel(CreateReportModel(x=>x.BDDfy())) {
                 RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
             };
 
@@ -42,7 +41,7 @@ public void TagsAreReportedInHtmlReport()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void TagsAreReportedInMetroHtmlReport()
         {
-            var reportModel = this.CreateReportModel();
+            var reportModel = CreateReportModel(x=>x.BDDfy());
             var model = new HtmlReportModel(reportModel)
             {
                 RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
@@ -56,7 +55,7 @@ public void TagsAreReportedInMetroHtmlReport()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void TagsAreReportedInMarkdownReport()
         {
-            var reportModel = this.CreateReportModel();
+            var reportModel = CreateReportModel(x=>x.BDDfy());
             var model = new FileReportModel(reportModel);
             var sut = new MarkDownReportBuilder();
             ReportApprover.Approve(model, sut);
@@ -67,14 +66,14 @@ private void GivenAStep()
 
         }
 
-        private ReportModel CreateReportModel()
+        private ReportModel CreateReportModel(Func<IFluentStepBuilder<TagsTests>, Story> bddfy)
         {
-            var story = this.Given(_ => GivenAStep())
-                .WithTags("Tag1", "Tag 2")
-                .BDDfy();
+            var stepBuilder = this.Given(_ => GivenAStep())
+                .WithTags("Tag1", "Tag 2");
+            var story = bddfy(stepBuilder);
+
             var reportModel = new[] { story }.ToReportModel();
             return reportModel;
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Abstractions/DefaultStepTitleFactory.cs b/src/TestStack.BDDfy/Abstractions/DefaultStepTitleFactory.cs
new file mode 100644
index 00000000..51c7c433
--- /dev/null
+++ b/src/TestStack.BDDfy/Abstractions/DefaultStepTitleFactory.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using TestStack.BDDfy.Configuration;
+
+namespace TestStack.BDDfy.Abstractions;
+
+internal class DefaultStepTitleFactory : IStepTitleFactory
+{
+    public StepTitle Create(
+        string stepTextTemplate,
+        bool includeInputsInStepTitle,
+        MethodInfo methodInfo,
+        StepArgument[] inputArguments,
+        ITestContext testContext,
+        string stepPrefix)
+    {
+        Func<string> createTitle = () =>
+        {
+            var flatInputArray = inputArguments.Select(o => o.Value).FlattenArrays();
+            var name = methodInfo.Name;
+            var stepTitleAttribute = methodInfo.GetCustomAttributes(typeof(StepTitleAttribute), true).SingleOrDefault();
+            if (stepTitleAttribute != null)
+            {
+                var titleAttribute = ((StepTitleAttribute)stepTitleAttribute);
+                name = string.Format(titleAttribute.StepTitle, flatInputArray);
+                if (titleAttribute.IncludeInputsInStepTitle != null)
+                    includeInputsInStepTitle = titleAttribute.IncludeInputsInStepTitle.Value;
+            }
+
+            var stepTitle = AppendPrefix(Configurator.Humanizer.Humanize(name), stepPrefix);
+
+            if (!string.IsNullOrEmpty(stepTextTemplate)) stepTitle = string.Format(stepTextTemplate, flatInputArray);
+            else if (includeInputsInStepTitle)
+            {
+                var parameters = methodInfo.GetParameters();
+                var stringFlatInputs =
+                    inputArguments
+                        .Select((a, i) => new { ParameterName = parameters[i].Name, Value = a })
+                        .Select(i =>
+                        {
+                            if (testContext.Examples != null)
+                            {
+                                var matchingHeaders = testContext.Examples.Headers
+                                    .Where(header => ExampleTable.HeaderMatches(header, i.ParameterName) ||
+                                                    ExampleTable.HeaderMatches(header, i.Value.Name))
+                                    .ToList();
+
+                                if (matchingHeaders.Count > 1)
+                                    throw new AmbiguousMatchException($"More than one headers for examples, match the parameter '{i.ParameterName}' provided for '{methodInfo.Name}'");
+
+                                var matchingHeader = matchingHeaders.SingleOrDefault();
+                                if (matchingHeader != null)
+                                    return string.Format("<{0}>", matchingHeader);
+                            }
+                            return i.Value.Value.FlattenArray();
+                        })
+                        .ToArray();
+                stepTitle = stepTitle + " " + string.Join(", ", stringFlatInputs);
+            }
+
+            return stepTitle.Trim();
+        };
+
+        return new StepTitle(createTitle);
+    }
+
+    public StepTitle Create(string title, string stepPrefix, ITestContext testContext) => new StepTitle(AppendPrefix(title, stepPrefix));
+
+    private static string AppendPrefix(string title, string stepPrefix)
+    {
+        if (!title.StartsWith(stepPrefix, StringComparison.CurrentCultureIgnoreCase))
+        {
+            if (title.Length == 0) return string.Format("{0} ", stepPrefix);
+            return string.Format("{0} {1}{2}", stepPrefix, title.Substring(0, 1).ToLower(), title.Substring(1));
+        }
+
+        return title;
+    }
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Abstractions/IStepTitleFactory.cs b/src/TestStack.BDDfy/Abstractions/IStepTitleFactory.cs
new file mode 100644
index 00000000..55365c19
--- /dev/null
+++ b/src/TestStack.BDDfy/Abstractions/IStepTitleFactory.cs
@@ -0,0 +1,16 @@
+using System.Reflection;
+
+namespace TestStack.BDDfy.Abstractions;
+
+public interface IStepTitleFactory
+{
+    public StepTitle Create(
+        string stepTextTemplate,
+        bool includeInputsInStepTitle,
+        MethodInfo methodInfo,
+        StepArgument[] inputArguments,
+        ITestContext testContext,
+        string stepPrefix);
+
+    StepTitle Create(string title, string stepPrefix, ITestContext testContext);
+}
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/BDDfyExtensions.cs b/src/TestStack.BDDfy/BDDfyExtensions.cs
index 3340f3fa..f75c5ee7 100644
--- a/src/TestStack.BDDfy/BDDfyExtensions.cs
+++ b/src/TestStack.BDDfy/BDDfyExtensions.cs
@@ -6,58 +6,31 @@ namespace TestStack.BDDfy
 {
     public static class BDDfyExtensions
     {
-#if STACKTRACE
         /// <summary>
         /// Extension method to BDDfy an object instance.
         /// </summary>
         /// <param name="testObject">The test object representing a scenario.</param>
         /// <param name="scenarioTitle">Overrides the default scenario title and is displayed in the reports.</param>
-        /// <returns></returns>
-        public static Story BDDfy(this object testObject, string scenarioTitle = null)
-        {
-            return testObject.LazyBDDfy(scenarioTitle).Run();
-        }
-
-        public static Engine LazyBDDfy(this object testObject, string scenarioTitle = null)
-        {
-            return InternalLazyBDDfy(testObject, scenarioTitle);
-        }
-
-        /// <summary>
-        /// Extension method to BDDfy an object instance.
-        /// </summary>
-        /// <typeparam name="TStory">The type representing the story.</typeparam>
-        /// <param name="testObject">The test object representing a scenario.</param>
-        /// <param name="scenarioTitle">Overrides the default scenario title and is displayed in the reports.</param>
         /// <param name="caller">Caller (populated by [CallerMemberName])</param>
         /// <returns></returns>
-        public static Story BDDfy<TStory>(this object testObject, string scenarioTitle = null)
-            where TStory : class
+        public static Story BDDfy(
+            this object testObject, 
+            string scenarioTitle = null, 
+            [System.Runtime.CompilerServices.CallerMemberName] 
+            string caller = null)
         {
-            return InternalLazyBDDfy(testObject, scenarioTitle, typeof(TStory)).Run();
+            var callerName = testObject.GetActualCallerName(caller);
+            return InternalLazyBDDfy(testObject, scenarioTitle ?? Configurator.Humanizer.Humanize(callerName)).Run();
         }
 
-        public static Engine LazyBDDfy<TStory>(this object testObject, string scenarioTitle = null)
-            where TStory : class
+        public static Engine LazyBDDfy(
+            this object testObject, 
+            string scenarioTitle = null, 
+            [System.Runtime.CompilerServices.CallerMemberName] 
+            string caller = null)
         {
-            return InternalLazyBDDfy(testObject, scenarioTitle, typeof(TStory));
-        }
-#else
-        /// <summary>
-        /// Extension method to BDDfy an object instance.
-        /// </summary>
-        /// <param name="testObject">The test object representing a scenario.</param>
-        /// <param name="scenarioTitle">Overrides the default scenario title and is displayed in the reports.</param>
-        /// <param name="caller">Caller (populated by [CallerMemberName])</param>
-        /// <returns></returns>
-        public static Story BDDfy(this object testObject, string scenarioTitle = null, [System.Runtime.CompilerServices.CallerMemberName] string caller = null)
-        {
-            return InternalLazyBDDfy(testObject, scenarioTitle ?? Configurator.Humanizer.Humanize(caller)).Run();
-        }
-
-        public static Engine LazyBDDfy(this object testObject, string scenarioTitle = null, [System.Runtime.CompilerServices.CallerMemberName] string caller = null)
-        {
-            return InternalLazyBDDfy(testObject, scenarioTitle ?? Configurator.Humanizer.Humanize(caller));
+            var callerName = testObject.GetActualCallerName(caller);
+            return InternalLazyBDDfy(testObject, scenarioTitle ?? Configurator.Humanizer.Humanize(callerName));
         }
 
         /// <summary>
@@ -68,22 +41,31 @@ public static Engine LazyBDDfy(this object testObject, string scenarioTitle = nu
         /// <param name="scenarioTitle">Overrides the default scenario title and is displayed in the reports.</param>
         /// <param name="caller">Caller (populated by [CallerMemberName])</param>
         /// <returns></returns>
-        public static Story BDDfy<TStory>(this object testObject, string scenarioTitle = null, [System.Runtime.CompilerServices.CallerMemberName] string caller = null)
-            where TStory : class
+        public static Story BDDfy<TStory>(
+            this object testObject,
+            string scenarioTitle = null,
+            [System.Runtime.CompilerServices.CallerMemberName]
+            string caller = null)
+        where TStory : class
         {
-            return InternalLazyBDDfy(testObject, scenarioTitle ?? Configurator.Humanizer.Humanize(caller), typeof(TStory)).Run();
+            var callerName = testObject.GetActualCallerName(caller);
+            return InternalLazyBDDfy(testObject, scenarioTitle ?? Configurator.Humanizer.Humanize(callerName), typeof(TStory)).Run();
         }
 
-        public static Engine LazyBDDfy<TStory>(this object testObject, string scenarioTitle = null, [System.Runtime.CompilerServices.CallerMemberName] string caller = null)
-            where TStory : class
+        public static Engine LazyBDDfy<TStory>(
+            this object testObject,
+            string scenarioTitle = null,
+            [System.Runtime.CompilerServices.CallerMemberName]
+            string caller = null)
+        where TStory : class
         {
-            return InternalLazyBDDfy(testObject, scenarioTitle ?? Configurator.Humanizer.Humanize(caller), typeof(TStory));
+            var callerName = testObject.GetActualCallerName(caller);
+            return InternalLazyBDDfy(testObject, scenarioTitle ?? Configurator.Humanizer.Humanize(callerName), typeof(TStory));
         }
-#endif
 
         static Engine InternalLazyBDDfy(
-            object testObject, 
-            string scenarioTitle, 
+            object testObject,
+            string scenarioTitle,
             Type explicitStoryType = null)
         {
             var testContext = TestContext.GetContext(testObject);
@@ -92,15 +74,18 @@ static Engine InternalLazyBDDfy(
                 testContext.FluentScanner.GetScanner(scenarioTitle, explicitStoryType) :
                 GetReflectiveScanner(testContext, scenarioTitle, explicitStoryType);
 
-            return new Engine(storyScanner);
+            return new (storyScanner);
         }
 
-        static IScanner GetReflectiveScanner(ITestContext testContext, string scenarioTitle = null, Type explicitStoryType = null)
+        static DefaultScanner GetReflectiveScanner(ITestContext testContext, string scenarioTitle = null, Type explicitStoryType = null)
         {
             var stepScanners = Configurator.Scanners.GetStepScanners(testContext).ToArray();
             var reflectiveScenarioScanner = new ReflectiveScenarioScanner(scenarioTitle, stepScanners);
 
-            return new DefaultScanner(testContext, reflectiveScenarioScanner, explicitStoryType);
+            return new (testContext, reflectiveScenarioScanner, explicitStoryType);
         }
+
+        static string GetActualCallerName(this object testObject, string inferedCallerName)
+            => inferedCallerName == ".ctor" ? testObject.GetType().Name : inferedCallerName;
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Configuration/BatchProcessors.cs b/src/TestStack.BDDfy/Configuration/BatchProcessors.cs
index b90000cf..c17a52dd 100644
--- a/src/TestStack.BDDfy/Configuration/BatchProcessors.cs
+++ b/src/TestStack.BDDfy/Configuration/BatchProcessors.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using TestStack.BDDfy.Processors;
 using TestStack.BDDfy.Reporters.Diagnostics;
 using TestStack.BDDfy.Reporters.Html;
@@ -9,7 +8,9 @@ namespace TestStack.BDDfy.Configuration
 {
     public class BatchProcessors
     {
-        IEnumerable<IBatchProcessor> _GetProcessors()
+        readonly List<IBatchProcessor> _addedProcessors = [];
+
+        private IEnumerable<IBatchProcessor> YieldProcessors()
         {
             var htmlReporter = HtmlReport.ConstructFor(StoryCache.Stories);
             if (htmlReporter != null)
@@ -33,19 +34,14 @@ IEnumerable<IBatchProcessor> _GetProcessors()
             }
         }
 
-        private readonly BatchProcessorFactory _htmlReportFactory = new(() => new HtmlReporter(new DefaultHtmlReportConfiguration()));
-        public BatchProcessorFactory HtmlReport { get { return _htmlReportFactory; } }
-
-        private readonly BatchProcessorFactory _htmlMetroReportFactory = new(() => new HtmlReporter(new DefaultHtmlReportConfiguration(), new MetroReportBuilder()), false);
-        public BatchProcessorFactory HtmlMetroReport { get { return _htmlMetroReportFactory; } }
+        public BatchProcessorFactory HtmlReport { get; } = new(() => new HtmlReporter(new DefaultHtmlReportConfiguration()));
 
-        private readonly BatchProcessorFactory _markDownFactory = new(() => new MarkDownReporter(), false);
-        public BatchProcessorFactory MarkDownReport { get { return _markDownFactory; } }
+        public BatchProcessorFactory HtmlMetroReport { get; } = new(() 
+            => new HtmlReporter(new DefaultHtmlReportConfiguration(), new MetroReportBuilder()), false);
 
-        private readonly BatchProcessorFactory _diagnosticsFactory = new(() => new DiagnosticsReporter(), false);
-        public BatchProcessorFactory DiagnosticsReport { get { return _diagnosticsFactory; } }
+        public BatchProcessorFactory MarkDownReport { get; } = new(() => new MarkDownReporter(), false);
 
-        readonly List<IBatchProcessor> _addedProcessors = new();
+        public BatchProcessorFactory DiagnosticsReport { get; } = new(() => new DiagnosticsReporter(), false);
 
         public BatchProcessors Add(IBatchProcessor processor)
         {
@@ -55,7 +51,7 @@ public BatchProcessors Add(IBatchProcessor processor)
 
         public IEnumerable<IBatchProcessor> GetProcessors()
         {
-            return _GetProcessors().ToList();
+            return [.. YieldProcessors()];
         }
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Configuration/ComponentFactory.cs b/src/TestStack.BDDfy/Configuration/ComponentFactory.cs
index 8f5ed7ca..6f99ca68 100644
--- a/src/TestStack.BDDfy/Configuration/ComponentFactory.cs
+++ b/src/TestStack.BDDfy/Configuration/ComponentFactory.cs
@@ -2,15 +2,13 @@
 
 namespace TestStack.BDDfy.Configuration
 {
-    public class ComponentFactory<TComponent, TMaterial> where TComponent : class 
+    public abstract class ComponentFactory<TComponent, TMaterial> where TComponent : class 
     {
-        private bool _active = true;
+        private const bool DefaultState = true;
+        private bool _active = DefaultState;
         private Predicate<TMaterial> _runsOn = o => true;
         readonly Func<TComponent> _factory;
-        internal ComponentFactory(Func<TComponent> factory)
-        {
-            _factory = factory;
-        }
+        internal ComponentFactory(Func<TComponent> factory):this(factory, DefaultState) { }
 
         internal ComponentFactory(Func<TComponent> factory, bool active)
         {
@@ -30,10 +28,10 @@ public void Enable()
 
         public TComponent ConstructFor(TMaterial material)
         {
-            if (!_active || !_runsOn(material))
-                return null;
+            if (_active && _runsOn(material))
+                return _factory();
 
-            return _factory();
+            return null;
         }
 
         public void RunsOn(Predicate<TMaterial> runOn)
diff --git a/src/TestStack.BDDfy/Configuration/Configurator.cs b/src/TestStack.BDDfy/Configuration/Configurator.cs
index 7ff99aef..b31d876c 100644
--- a/src/TestStack.BDDfy/Configuration/Configurator.cs
+++ b/src/TestStack.BDDfy/Configuration/Configurator.cs
@@ -1,3 +1,6 @@
+using TestStack.BDDfy.Abstractions;
+using TestStack.BDDfy.Factories;
+
 namespace TestStack.BDDfy.Configuration
 {
     public static class Configurator
@@ -15,5 +18,9 @@ public static class Configurator
         public static IStepExecutor StepExecutor { get; set; } = new StepExecutor();
 
         public static IHumanizer Humanizer { get; set; } = new DefaultHumanizer();
+
+        public static IFluentScannerFactory FluentScannerFactory { get; set; } = new DefaultFluentScannerFactory();
+
+        public static IStepTitleFactory StepTitleFactory { get; set; } = new DefaultStepTitleFactory();
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Configuration/HtmlReportFactory.cs b/src/TestStack.BDDfy/Configuration/HtmlReportFactory.cs
index e9df6fc2..980f46ea 100644
--- a/src/TestStack.BDDfy/Configuration/HtmlReportFactory.cs
+++ b/src/TestStack.BDDfy/Configuration/HtmlReportFactory.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using TestStack.BDDfy.Processors;
 using TestStack.BDDfy.Reporters.Html;
 
 namespace TestStack.BDDfy.Configuration
diff --git a/src/TestStack.BDDfy/Configuration/Scanners.cs b/src/TestStack.BDDfy/Configuration/Scanners.cs
index 22c2c845..a0b0775f 100644
--- a/src/TestStack.BDDfy/Configuration/Scanners.cs
+++ b/src/TestStack.BDDfy/Configuration/Scanners.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using TestStack.BDDfy.Scanners;
 
 namespace TestStack.BDDfy.Configuration
 {
@@ -11,7 +12,7 @@ public class Scanners
         private readonly StepScannerFactory _methodNameStepScanner = new(() => new DefaultMethodNameStepScanner());
         public StepScannerFactory DefaultMethodNameStepScanner { get { return _methodNameStepScanner; } }
 
-        private readonly List<Func<IStepScanner>> _addedStepScanners = new();
+        private readonly List<Func<IStepScanner>> _addedStepScanners = [];
         public Scanners Add(Func<IStepScanner> stepScannerFactory)
         {
             _addedStepScanners.Add(stepScannerFactory);
@@ -35,5 +36,8 @@ public IEnumerable<IStepScanner> GetStepScanners(object objectUnderTest)
         }
 
         public Func<IStoryMetadataScanner> StoryMetadataScanner = () => new StoryAttributeMetadataScanner();
+
+        [Obsolete("This will be removed soon. Use Configurator.Humanizer.Humanize")]
+        public static Func<string, string> Humanize = Configurator.Humanizer.Humanize;
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/DefaultHumanizer.cs b/src/TestStack.BDDfy/DefaultHumanizer.cs
index 576ea423..e88d2908 100644
--- a/src/TestStack.BDDfy/DefaultHumanizer.cs
+++ b/src/TestStack.BDDfy/DefaultHumanizer.cs
@@ -1,81 +1,55 @@
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Xml.Linq;
 using TestStack.BDDfy.Configuration;
 
 namespace TestStack.BDDfy
 {
-    public partial class DefaultHumanizer: IHumanizer
+    internal partial class DefaultHumanizer: IHumanizer
     {
-        static readonly Func<string, string> FromUnderscoreSeparatedWords = methodName => string.Join(" ", methodName.Split(new[] { '_' }));
-        static string FromPascalCase(string name)
+        private static readonly Regex ConsecutiveCapitalLetters = new("([A-Z]+)([A-Z][a-z])");
+        private static readonly Regex TokensPattern = new("__([a-zA-Z0-9]+)__");
+        private static readonly Regex PascalCaseRegex = new(@"(?<!^)([A-Z])");
+        private static readonly Regex TokenReplacePattern = new("#(\\S+)#");
+        private static readonly Regex SentenceWithNumerals = new(@"(?<=[a-zA-Z])(?=\d)(?![^<>]*>)");
+        private static readonly Regex UnicodeMatchPattern = new(@"[^\u0000-\u007F]");
+        private static readonly Regex LoneIReplacePattern = new(@"(?<=^|\s)i(?=\s|$)");
+
+        public string Humanize(string input)
         {
-            var chars = name.Aggregate(
-                new List<char>(), 
-                (list, currentChar) =>
-                    {
-                        if (currentChar == ' ' || list.Count == 0)
-                            list.Add(currentChar);
-                        else
-                        {
-                            if(ShouldAddSpace(list[list.Count - 1], currentChar))
-                                list.Add(' ');
-                            list.Add(char.ToLower(currentChar));
-                        }
+            if (string.IsNullOrWhiteSpace(input)) return input;
 
-                        return list;
-                    });
+            var shouldPreserveCasing = input.Replace("__", "-").Contains('_');
 
-            var result = new string(chars.ToArray());
-            return result.Replace(" i ", " I "); // I is an exception
-        }
+            input = TokensPattern.Replace(input, "-#$1#-");
 
-        private static bool ShouldAddSpace(char lastChar, char currentChar)
-        {
-            if (lastChar == ' ') 
-                return false;
+            var words = input.Split(['_','-']);
 
-            if (char.IsDigit(lastChar))
-            {
-                if (char.IsLetter(currentChar))
-                    return true;
+            var finalWords = words.Select(x => TokenReplacePattern.Replace(x, "<$1>"));
 
-                return false;
-            }
+            var sentence = string.Join(" ", finalWords);
 
-            if (!char.IsLower(currentChar) && currentChar != '>' && lastChar != '<')
-                return true;
-
-            return false;
+            if (!shouldPreserveCasing)
+            {
+                sentence = ConsecutiveCapitalLetters.Replace(sentence, "$1 $2");
+                sentence = PascalToSentence(sentence);
+                sentence = SentenceWithNumerals.Replace(sentence, " ");
+                if (UnicodeMatchPattern.IsMatch(input)) 
+                    throw new ArgumentException("Non ascii characters detected");
+            }
+            
+            
+            sentence = sentence.Trim().Replace("  "," ");
+            sentence = LoneIReplacePattern.Replace(sentence, "I");
+            return sentence;
         }
 
-        private static readonly Func<string, string> ConvertNonExample = name => {
-            if (name.Contains('_'))
-                return FromUnderscoreSeparatedWords(name);
-
-            return FromPascalCase(name);
-        };
-
-        private string ExampleTitle(string name)
+        private static string PascalToSentence(string input)
         {
-            // Compare contains("__") with a regex match
-            string newName = TitleCleanerRegex().Replace(name, " <$1> ");
-
-            if (newName == name) {
-                throw new ArgumentException("Illegal example title in name '" + name + "'!");
-            }
-
-            // for when there are two consequetive example placeholders in the word; e.g. Given__one____two__parameters
-            newName = newName.Replace("  ", " ");
-            return Humanize(newName).Trim();
+            var sentence = PascalCaseRegex.Replace(input, " $1");
+            sentence = sentence.Replace("< ", "<").Replace(" >",">");
+            var final = char.ToUpper(sentence[0]) + sentence[1..].ToLower();
+            return final;
         }
-
-        public string Humanize(string input) 
-            => input.Contains("__") ? ExampleTitle(input) : ConvertNonExample(input);
-
-        [GeneratedRegex("__([a-zA-Z][a-zA-Z0-9]*)__")]
-        private static partial Regex TitleCleanerRegex();
     }
 }
diff --git a/src/TestStack.BDDfy/Engine.cs b/src/TestStack.BDDfy/Engine.cs
index d29d4cf8..4c1083a1 100644
--- a/src/TestStack.BDDfy/Engine.cs
+++ b/src/TestStack.BDDfy/Engine.cs
@@ -10,13 +10,7 @@ public class Engine(IScanner scanner)
 
         static Engine()
         {
-#if APPDOMAIN
-            System.AppDomain.CurrentDomain.DomainUnload += (sender, e) => {
-                InvokeBatchProcessors();
-            };
-#else
             System.Runtime.Loader.AssemblyLoadContext.Default.Unloading += context => InvokeBatchProcessors();
-#endif
         }
 
         static void InvokeBatchProcessors()
diff --git a/src/TestStack.BDDfy/Factories/DefaultFluentScannerFactory.cs b/src/TestStack.BDDfy/Factories/DefaultFluentScannerFactory.cs
new file mode 100644
index 00000000..e6ef0643
--- /dev/null
+++ b/src/TestStack.BDDfy/Factories/DefaultFluentScannerFactory.cs
@@ -0,0 +1,6 @@
+namespace TestStack.BDDfy.Factories;
+
+internal class DefaultFluentScannerFactory : IFluentScannerFactory
+{
+    public IFluentScanner Create<TScenario>(TScenario testObject) where TScenario : class => new FluentScanner<TScenario>(testObject);
+}
diff --git a/src/TestStack.BDDfy/Factories/IFluentScannerFactory.cs b/src/TestStack.BDDfy/Factories/IFluentScannerFactory.cs
new file mode 100644
index 00000000..2196a3e7
--- /dev/null
+++ b/src/TestStack.BDDfy/Factories/IFluentScannerFactory.cs
@@ -0,0 +1,6 @@
+namespace TestStack.BDDfy.Factories;
+
+public interface IFluentScannerFactory
+{
+    IFluentScanner Create<TScenario>(TScenario testObject) where TScenario : class;
+}
diff --git a/src/TestStack.BDDfy/Processors/AsyncTestRunner.cs b/src/TestStack.BDDfy/Processors/AsyncTestRunner.cs
index 6d4b99e2..9b525329 100644
--- a/src/TestStack.BDDfy/Processors/AsyncTestRunner.cs
+++ b/src/TestStack.BDDfy/Processors/AsyncTestRunner.cs
@@ -15,8 +15,7 @@ public static void Run(Func<object> performStep)
                 var asyncSyncContext = new AsyncTestSyncContext();
                 SetSynchronizationContext(asyncSyncContext);
                 var result = performStep();
-                var task = result as Task;
-                if (task != null)
+                if (result is Task task)
                 {
                     try
                     {
diff --git a/src/TestStack.BDDfy/Processors/ExceptionProcessor.cs b/src/TestStack.BDDfy/Processors/ExceptionProcessor.cs
index 1df3d22a..f9e04ca2 100644
--- a/src/TestStack.BDDfy/Processors/ExceptionProcessor.cs
+++ b/src/TestStack.BDDfy/Processors/ExceptionProcessor.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
@@ -10,58 +9,11 @@ public class ExceptionProcessor(Action assertInconclusive): IProcessor
         private readonly Action _assertInconclusive = assertInconclusive;
         private static readonly Action BestGuessInconclusiveAssertion;
 
-        static readonly List<string> ExcludedAssemblies =
-            new(new[] { "System", "mscorlib", "TestStack.BDDfy", "TestDriven", "JetBrains.ReSharper" });
-    
         static ExceptionProcessor()
         {
-            var exceptionType = typeof(Exception);
-// No best guess for CORE Clr
-#if APPDOMAIN
-            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-            {
-                if(ExcludedAssemblies.Any(ex => assembly.GetName().FullName.StartsWith(ex)))
-                    continue;
-
-                foreach (var inconclusiveExceptionType in GetTypesSafely(assembly))
-                {
-                    if (inconclusiveExceptionType.Name.Contains("Inconclusive") &&
-                        inconclusiveExceptionType.Name.Contains("Exception") &&
-                        exceptionType.IsAssignableFrom(inconclusiveExceptionType))
-                    {
-                        var constructors = inconclusiveExceptionType.GetConstructors();
-                        var shortestCtor = constructors.Min(c => c.GetParameters().Length);
-                        var ctor = constructors.First(c => c.GetParameters().Length == shortestCtor);
-                        var argList = new List<object>();
-                        argList.AddRange(ctor.GetParameters().Select(p => DefaultValue(p.ParameterType)));
-                        BestGuessInconclusiveAssertion = () => { throw (Exception)ctor.Invoke(argList.ToArray()); };
-                        return;
-                    }
-                }
-            }
-#endif
-
             BestGuessInconclusiveAssertion = () => { throw new InconclusiveException(); };
         }
 
-        private static IEnumerable<Type> GetTypesSafely(Assembly assembly)
-        {
-            try
-            {
-                return assembly.GetTypes();
-            }
-            catch (ReflectionTypeLoadException ex)
-            {
-                return ex.Types.Where(x => x != null);
-            }
-        }
-
-        //http://stackoverflow.com/questions/520290/how-can-i-get-the-default-value-of-a-type-in-a-non-generic-way
-        static object DefaultValue(Type myType)
-        {
-            return !myType.IsValueType() ? null : Activator.CreateInstance(myType);
-        }
-
         public ExceptionProcessor() : this(BestGuessInconclusiveAssertion)
         {
         }
diff --git a/src/TestStack.BDDfy/Processors/ExceptionResolver.cs b/src/TestStack.BDDfy/Processors/ExceptionResolver.cs
new file mode 100644
index 00000000..def3379b
--- /dev/null
+++ b/src/TestStack.BDDfy/Processors/ExceptionResolver.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Reflection;
+
+namespace TestStack.BDDfy.Processors
+{
+    internal class ExceptionResolver
+    {
+        public static Exception Resolve(Exception ex)
+            => ex is not TargetInvocationException ? ex : ex.InnerException ?? ex;
+    }
+}
diff --git a/src/TestStack.BDDfy/Processors/InconclusiveException.cs b/src/TestStack.BDDfy/Processors/InconclusiveException.cs
index a0ee8841..2d948e24 100644
--- a/src/TestStack.BDDfy/Processors/InconclusiveException.cs
+++ b/src/TestStack.BDDfy/Processors/InconclusiveException.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.Serialization;
 
 namespace TestStack.BDDfy.Processors
 {
@@ -16,11 +15,5 @@ public InconclusiveException(string message) : base(message)
         public InconclusiveException(string message, Exception innerException) : base(message, innerException)
         {
         }
-#if NET40
-
-        protected InconclusiveException(SerializationInfo info, StreamingContext context) : base(info, context)
-        {
-        }
-#endif
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Processors/ScenarioExecutor.cs b/src/TestStack.BDDfy/Processors/ScenarioExecutor.cs
index d69fb4f5..01157c43 100644
--- a/src/TestStack.BDDfy/Processors/ScenarioExecutor.cs
+++ b/src/TestStack.BDDfy/Processors/ScenarioExecutor.cs
@@ -34,7 +34,7 @@ public void InitializeScenario()
                     .Where(n => cell.MatchesName(n.Name))
                     .ToArray();
 
-                if (!matchingMembers.Any())
+                if (matchingMembers.Length == 0)
                     continue;
 
                 foreach (var matchingMember in matchingMembers)
@@ -57,11 +57,7 @@ public Result ExecuteStep(Step step)
             catch (Exception ex)
             {
                 // ToDo: more thought should be put into this. Is it safe to get the exception?
-                var exception = ex;
-                if (exception is TargetInvocationException)
-                {
-                    exception = ex.InnerException ?? ex;
-                }
+                var exception = ExceptionResolver.Resolve(ex);
 
                 if (exception is NotImplementedException)
                 {
diff --git a/src/TestStack.BDDfy/Processors/UnusedExampleException.cs b/src/TestStack.BDDfy/Processors/UnusedExampleException.cs
index 4661af29..27471b6e 100644
--- a/src/TestStack.BDDfy/Processors/UnusedExampleException.cs
+++ b/src/TestStack.BDDfy/Processors/UnusedExampleException.cs
@@ -2,22 +2,13 @@
 
 namespace TestStack.BDDfy.Processors
 {
-#if NET40
-    [System.Serializable]
-#else
-    [System.Runtime.Serialization.Serializable]
-#endif
-    public class UnusedExampleException(ExampleValue unusedValue): Exception(string.Format("Example Column '{0}' is unused, all examples should be consumed by the test (have you misspelt a field or property?)\r\n\r\n"
-            + "If this is not the case, raise an issue at https://github.com/TestStack/TestStack.BDDfy/issues.", unusedValue.Header))
+    [Serializable]
+    public class UnusedExampleException : Exception
     {
-#if NET40
-
-        protected UnusedExampleException(
-            System.Runtime.Serialization.SerializationInfo info,
-            System.Runtime.Serialization.StreamingContext context)
-            : base(info, context)
+        public UnusedExampleException(ExampleValue unusedValue) 
+            : base(string.Format("Example Column '{0}' is unused, all examples should be consumed by the test (have you misspelt a field or property?)\r\n\r\n"
+        + "If this is not the case, raise an issue at https://github.com/TestStack/TestStack.BDDfy/issues.", unusedValue.Header))
         {
         }
-#endif
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Properties/Annotations.cs b/src/TestStack.BDDfy/Properties/Annotations.cs
index 027dcdcf..27f81204 100644
--- a/src/TestStack.BDDfy/Properties/Annotations.cs
+++ b/src/TestStack.BDDfy/Properties/Annotations.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 
-#pragma warning disable 1591
+#pragma warning disable CS1591 //Missing XML comment for publicly visible type or member
+#pragma warning disable CS9113 // Parameter is unread.
 // ReSharper disable UnusedMember.Global
 // ReSharper disable UnusedParameter.Local
 // ReSharper disable MemberCanBePrivate.Global
@@ -11,36 +13,38 @@
 
 namespace TestStack.BDDfy.Annotations
 {
-  /// <summary>
-  /// Indicates that the value of the marked element could be <c>null</c> sometimes,
-  /// so the check for <c>null</c> is necessary before its usage
-  /// </summary>
-  /// <example><code>
-  /// [CanBeNull] public object Test() { return null; }
-  /// public void UseTest() {
-  ///   var p = Test();
-  ///   var s = p.ToString(); // Warning: Possible 'System.NullReferenceException'
-  /// }
-  /// </code></example>
-  [AttributeUsage(
-    AttributeTargets.Method | AttributeTargets.Parameter |
-    AttributeTargets.Property | AttributeTargets.Delegate |
-    AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-  public sealed class CanBeNullAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that the value of the marked element could never be <c>null</c>
-  /// </summary>
-  /// <example><code>
-  /// [NotNull] public object Foo() {
-  ///   return null; // Warning: Possible 'null' assignment
-  /// }
-  /// </code></example>
-  [AttributeUsage(
-    AttributeTargets.Method | AttributeTargets.Parameter |
-    AttributeTargets.Property | AttributeTargets.Delegate |
-    AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-  public sealed class NotNullAttribute : Attribute { }
+    /// <summary>
+    /// Indicates that the value of the marked element could be <c>null</c> sometimes,
+    /// so the check for <c>null</c> is necessary before its usage
+    /// </summary>
+    /// <example><code>
+    /// [CanBeNull] public object Test() { return null; }
+    /// public void UseTest() {
+    ///   var p = Test();
+    ///   var s = p.ToString(); // Warning: Possible 'System.NullReferenceException'
+    /// }
+    /// </code></example>
+    [AttributeUsage(
+      AttributeTargets.Method | AttributeTargets.Parameter |
+      AttributeTargets.Property | AttributeTargets.Delegate |
+      AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class CanBeNullAttribute : Attribute { }
+
+    /// <summary>
+    /// Indicates that the value of the marked element could never be <c>null</c>
+    /// </summary>
+    /// <example><code>
+    /// [NotNull] public object Foo() {
+    ///   return null; // Warning: Possible 'null' assignment
+    /// }
+    /// </code></example>
+    [AttributeUsage(
+      AttributeTargets.Method | AttributeTargets.Parameter |
+      AttributeTargets.Property | AttributeTargets.Delegate |
+      AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class NotNullAttribute : Attribute { }
 
     /// <summary>
     /// Indicates that the marked method builds string by format pattern and (optional) arguments.
@@ -58,318 +62,367 @@ public sealed class NotNullAttribute : Attribute { }
     /// Specifies which parameter of an annotated method should be treated as format-string
     /// </param>
     [AttributeUsage(
-    AttributeTargets.Constructor | AttributeTargets.Method,
-    AllowMultiple = false, Inherited = true)]
-  public sealed class StringFormatMethodAttribute(string formatParameterName): Attribute
-  {
+      AttributeTargets.Constructor | AttributeTargets.Method,
+      AllowMultiple = false, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class StringFormatMethodAttribute(string formatParameterName) : Attribute
+    {
         public string FormatParameterName { get; private set; } = formatParameterName;
     }
 
-  /// <summary>
-  /// Indicates that the function argument should be string literal and match one
-  /// of the parameters of the caller function. For example, ReSharper annotates
-  /// the parameter of <see cref="System.ArgumentNullException"/>
-  /// </summary>
-  /// <example><code>
-  /// public void Foo(string param) {
-  ///   if (param == null)
-  ///     throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
-  /// }
-  /// </code></example>
-  [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
-  public sealed class InvokerParameterNameAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that the method is contained in a type that implements
-  /// <see cref="System.ComponentModel.INotifyPropertyChanged"/> interface
-  /// and this method is used to notify that some property value changed
-  /// </summary>
-  /// <remarks>
-  /// The method should be non-static and conform to one of the supported signatures:
-  /// <list>
-  /// <item><c>NotifyChanged(string)</c></item>
-  /// <item><c>NotifyChanged(params string[])</c></item>
-  /// <item><c>NotifyChanged{T}(Expression{Func{T}})</c></item>
-  /// <item><c>NotifyChanged{T,U}(Expression{Func{T,U}})</c></item>
-  /// <item><c>SetProperty{T}(ref T, T, string)</c></item>
-  /// </list>
-  /// </remarks>
-  /// <example><code>
-  /// public class Foo : INotifyPropertyChanged {
-  ///   public event PropertyChangedEventHandler PropertyChanged;
-  ///   [NotifyPropertyChangedInvocator]
-  ///   protected virtual void NotifyChanged(string propertyName) { ... }
-  ///
-  ///   private string _name;
-  ///   public string Name {
-  ///     get { return _name; }
-  ///     set { _name = value; NotifyChanged("LastName"); /* Warning */ }
-  ///   }
-  /// }
-  /// </code>
-  /// Examples of generated notifications:
-  /// <list>
-  /// <item><c>NotifyChanged("Property")</c></item>
-  /// <item><c>NotifyChanged(() =&gt; Property)</c></item>
-  /// <item><c>NotifyChanged((VM x) =&gt; x.Property)</c></item>
-  /// <item><c>SetProperty(ref myField, value, "Property")</c></item>
-  /// </list>
-  /// </example>
-  [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
-  public sealed class NotifyPropertyChangedInvocatorAttribute : Attribute
-  {
-    public NotifyPropertyChangedInvocatorAttribute() { }
-    public NotifyPropertyChangedInvocatorAttribute(string parameterName)
+    /// <summary>
+    /// Indicates that the function argument should be string literal and match one
+    /// of the parameters of the caller function. For example, ReSharper annotates
+    /// the parameter of <see cref="System.ArgumentNullException"/>
+    /// </summary>
+    /// <example><code>
+    /// public void Foo(string param) {
+    ///   if (param == null)
+    ///     throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
+    /// }
+    /// </code></example>
+    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class InvokerParameterNameAttribute : Attribute { }
+
+    /// <summary>
+    /// Indicates that the method is contained in a type that implements
+    /// <see cref="System.ComponentModel.INotifyPropertyChanged"/> interface
+    /// and this method is used to notify that some property value changed
+    /// </summary>
+    /// <remarks>
+    /// The method should be non-static and conform to one of the supported signatures:
+    /// <list>
+    /// <item><c>NotifyChanged(string)</c></item>
+    /// <item><c>NotifyChanged(params string[])</c></item>
+    /// <item><c>NotifyChanged{T}(Expression{Func{T}})</c></item>
+    /// <item><c>NotifyChanged{T,U}(Expression{Func{T,U}})</c></item>
+    /// <item><c>SetProperty{T}(ref T, T, string)</c></item>
+    /// </list>
+    /// </remarks>
+    /// <example><code>
+    /// public class Foo : INotifyPropertyChanged {
+    ///   public event PropertyChangedEventHandler PropertyChanged;
+    ///   [NotifyPropertyChangedInvocator]
+    ///   protected virtual void NotifyChanged(string propertyName) { ... }
+    ///
+    ///   private string _name;
+    ///   public string Name {
+    ///     get { return _name; }
+    ///     set { _name = value; NotifyChanged("LastName"); /* Warning */ }
+    ///   }
+    /// }
+    /// </code>
+    /// Examples of generated notifications:
+    /// <list>
+    /// <item><c>NotifyChanged("Property")</c></item>
+    /// <item><c>NotifyChanged(() =&gt; Property)</c></item>
+    /// <item><c>NotifyChanged((VM x) =&gt; x.Property)</c></item>
+    /// <item><c>SetProperty(ref myField, value, "Property")</c></item>
+    /// </list>
+    /// </example>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class NotifyPropertyChangedInvocatorAttribute : Attribute
     {
-      ParameterName = parameterName;
+        public NotifyPropertyChangedInvocatorAttribute() { }
+        public NotifyPropertyChangedInvocatorAttribute(string parameterName)
+        {
+            ParameterName = parameterName;
+        }
+
+        public string ParameterName { get; private set; }
     }
 
-    public string ParameterName { get; private set; }
-  }
-
-  /// <summary>
-  /// Describes dependency between method input and output
-  /// </summary>
-  /// <syntax>
-  /// <p>Function Definition Table syntax:</p>
-  /// <list>
-  /// <item>FDT      ::= FDTRow [;FDTRow]*</item>
-  /// <item>FDTRow   ::= Input =&gt; Output | Output &lt;= Input</item>
-  /// <item>Input    ::= ParameterName: Value [, Input]*</item>
-  /// <item>Output   ::= [ParameterName: Value]* {halt|stop|void|nothing|Value}</item>
-  /// <item>Value    ::= true | false | null | notnull | canbenull</item>
-  /// </list>
-  /// If method has single input parameter, it's name could be omitted.<br/>
-  /// Using <c>halt</c> (or <c>void</c>/<c>nothing</c>, which is the same)
-  /// for method output means that the methos doesn't return normally.<br/>
-  /// <c>canbenull</c> annotation is only applicable for output parameters.<br/>
-  /// You can use multiple <c>[ContractAnnotation]</c> for each FDT row,
-  /// or use single attribute with rows separated by semicolon.<br/>
-  /// </syntax>
-  /// <examples><list>
-  /// <item><code>
-  /// [ContractAnnotation("=> halt")]
-  /// public void TerminationMethod()
-  /// </code></item>
-  /// <item><code>
-  /// [ContractAnnotation("halt &lt;= condition: false")]
-  /// public void Assert(bool condition, string text) // regular assertion method
-  /// </code></item>
-  /// <item><code>
-  /// [ContractAnnotation("s:null => true")]
-  /// public bool IsNullOrEmpty(string s) // string.IsNullOrEmpty()
-  /// </code></item>
-  /// <item><code>
-  /// // A method that returns null if the parameter is null, and not null if the parameter is not null
-  /// [ContractAnnotation("null => null; notnull => notnull")]
-  /// public object Transform(object data) 
-  /// </code></item>
-  /// <item><code>
-  /// [ContractAnnotation("s:null=>false; =>true,result:notnull; =>false, result:null")]
-  /// public bool TryParse(string s, out Person result)
-  /// </code></item>
-  /// </list></examples>
-  [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
-  public sealed class ContractAnnotationAttribute([NotNull] string contract, bool forceFullStates): Attribute
-  {
-    public ContractAnnotationAttribute([NotNull] string contract)
-      : this(contract, false) { }
+    /// <summary>
+    /// Describes dependency between method input and output
+    /// </summary>
+    /// <syntax>
+    /// <p>Function Definition Table syntax:</p>
+    /// <list>
+    /// <item>FDT      ::= FDTRow [;FDTRow]*</item>
+    /// <item>FDTRow   ::= Input =&gt; Output | Output &lt;= Input</item>
+    /// <item>Input    ::= ParameterName: Value [, Input]*</item>
+    /// <item>Output   ::= [ParameterName: Value]* {halt|stop|void|nothing|Value}</item>
+    /// <item>Value    ::= true | false | null | notnull | canbenull</item>
+    /// </list>
+    /// If method has single input parameter, it's name could be omitted.<br/>
+    /// Using <c>halt</c> (or <c>void</c>/<c>nothing</c>, which is the same)
+    /// for method output means that the methos doesn't return normally.<br/>
+    /// <c>canbenull</c> annotation is only applicable for output parameters.<br/>
+    /// You can use multiple <c>[ContractAnnotation]</c> for each FDT row,
+    /// or use single attribute with rows separated by semicolon.<br/>
+    /// </syntax>
+    /// <examples><list>
+    /// <item><code>
+    /// [ContractAnnotation("=> halt")]
+    /// public void TerminationMethod()
+    /// </code></item>
+    /// <item><code>
+    /// [ContractAnnotation("halt &lt;= condition: false")]
+    /// public void Assert(bool condition, string text) // regular assertion method
+    /// </code></item>
+    /// <item><code>
+    /// [ContractAnnotation("s:null => true")]
+    /// public bool IsNullOrEmpty(string s) // string.IsNullOrEmpty()
+    /// </code></item>
+    /// <item><code>
+    /// // A method that returns null if the parameter is null, and not null if the parameter is not null
+    /// [ContractAnnotation("null => null; notnull => notnull")]
+    /// public object Transform(object data) 
+    /// </code></item>
+    /// <item><code>
+    /// [ContractAnnotation("s:null=>false; =>true,result:notnull; =>false, result:null")]
+    /// public bool TryParse(string s, out Person result)
+    /// </code></item>
+    /// </list></examples>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class ContractAnnotationAttribute([NotNull] string contract, bool forceFullStates) : Attribute
+    {
+        public ContractAnnotationAttribute([NotNull] string contract)
+          : this(contract, false) { }
 
         public string Contract { get; private set; } = contract;
         public bool ForceFullStates { get; private set; } = forceFullStates;
     }
 
-  /// <summary>
-  /// Indicates that marked element should be localized or not
-  /// </summary>
-  /// <example><code>
-  /// [LocalizationRequiredAttribute(true)]
-  /// public class Foo {
-  ///   private string str = "my string"; // Warning: Localizable string
-  /// }
-  /// </code></example>
-  [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = true)]
-  public sealed class LocalizationRequiredAttribute(bool required): Attribute
-  {
-    public LocalizationRequiredAttribute() : this(true) { }
+    /// <summary>
+    /// Indicates that marked element should be localized or not
+    /// </summary>
+    /// <example><code>
+    /// [LocalizationRequiredAttribute(true)]
+    /// public class Foo {
+    ///   private string str = "my string"; // Warning: Localizable string
+    /// }
+    /// </code></example>
+    [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class LocalizationRequiredAttribute(bool required) : Attribute
+    {
+        public LocalizationRequiredAttribute() : this(true) { }
 
         public bool Required { get; private set; } = required;
     }
 
-  /// <summary>
-  /// Indicates that the value of the marked type (or its derivatives)
-  /// cannot be compared using '==' or '!=' operators and <c>Equals()</c>
-  /// should be used instead. However, using '==' or '!=' for comparison
-  /// with <c>null</c> is always permitted.
-  /// </summary>
-  /// <example><code>
-  /// [CannotApplyEqualityOperator]
-  /// class NoEquality { }
-  /// class UsesNoEquality {
-  ///   public void Test() {
-  ///     var ca1 = new NoEquality();
-  ///     var ca2 = new NoEquality();
-  ///     if (ca1 != null) { // OK
-  ///       bool condition = ca1 == ca2; // Warning
-  ///     }
-  ///   }
-  /// }
-  /// </code></example>
-  [AttributeUsage(
-    AttributeTargets.Interface | AttributeTargets.Class |
-    AttributeTargets.Struct, AllowMultiple = false, Inherited = true)]
-  public sealed class CannotApplyEqualityOperatorAttribute : Attribute { }
-
-  /// <summary>
-  /// When applied to a target attribute, specifies a requirement for any type marked
-  /// with the target attribute to implement or inherit specific type or types.
-  /// </summary>
-  /// <example><code>
-  /// [BaseTypeRequired(typeof(IComponent)] // Specify requirement
-  /// public class ComponentAttribute : Attribute { }
-  /// [Component] // ComponentAttribute requires implementing IComponent interface
-  /// public class MyComponent : IComponent { }
-  /// </code></example>
-  [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
-  [BaseTypeRequired(typeof(Attribute))]
-  public sealed class BaseTypeRequiredAttribute([NotNull] Type baseType): Attribute
-  {
+    /// <summary>
+    /// Indicates that the value of the marked type (or its derivatives)
+    /// cannot be compared using '==' or '!=' operators and <c>Equals()</c>
+    /// should be used instead. However, using '==' or '!=' for comparison
+    /// with <c>null</c> is always permitted.
+    /// </summary>
+    /// <example><code>
+    /// [CannotApplyEqualityOperator]
+    /// class NoEquality { }
+    /// class UsesNoEquality {
+    ///   public void Test() {
+    ///     var ca1 = new NoEquality();
+    ///     var ca2 = new NoEquality();
+    ///     if (ca1 != null) { // OK
+    ///       bool condition = ca1 == ca2; // Warning
+    ///     }
+    ///   }
+    /// }
+    /// </code></example>
+    [AttributeUsage(
+      AttributeTargets.Interface | AttributeTargets.Class |
+      AttributeTargets.Struct, AllowMultiple = false, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class CannotApplyEqualityOperatorAttribute : Attribute { }
+
+    /// <summary>
+    /// When applied to a target attribute, specifies a requirement for any type marked
+    /// with the target attribute to implement or inherit specific type or types.
+    /// </summary>
+    /// <example><code>
+    /// [BaseTypeRequired(typeof(IComponent)] // Specify requirement
+    /// public class ComponentAttribute : Attribute { }
+    /// [Component] // ComponentAttribute requires implementing IComponent interface
+    /// public class MyComponent : IComponent { }
+    /// </code></example>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    [BaseTypeRequired(typeof(Attribute))]
+    [ExcludeFromCodeCoverage]
+    public sealed class BaseTypeRequiredAttribute([NotNull] Type baseType) : Attribute
+    {
         [NotNull] public Type BaseType { get; private set; } = baseType;
     }
 
-  /// <summary>
-  /// Indicates that the marked symbol is used implicitly
-  /// (e.g. via reflection, in external library), so this symbol
-  /// will not be marked as unused (as well as by other usage inspections)
-  /// </summary>
-  [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = true)]
-  public sealed class UsedImplicitlyAttribute(
-    ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags): Attribute
-  {
-    public UsedImplicitlyAttribute()
-      : this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) { }
+    /// <summary>
+    /// Indicates that the marked symbol is used implicitly
+    /// (e.g. via reflection, in external library), so this symbol
+    /// will not be marked as unused (as well as by other usage inspections)
+    /// </summary>
+    [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class UsedImplicitlyAttribute(
+      ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags) : Attribute
+    {
+        public UsedImplicitlyAttribute()
+          : this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) { }
 
-    public UsedImplicitlyAttribute(ImplicitUseKindFlags useKindFlags)
-      : this(useKindFlags, ImplicitUseTargetFlags.Default) { }
+        public UsedImplicitlyAttribute(ImplicitUseKindFlags useKindFlags)
+          : this(useKindFlags, ImplicitUseTargetFlags.Default) { }
 
-    public UsedImplicitlyAttribute(ImplicitUseTargetFlags targetFlags)
-      : this(ImplicitUseKindFlags.Default, targetFlags) { }
+        public UsedImplicitlyAttribute(ImplicitUseTargetFlags targetFlags)
+          : this(ImplicitUseKindFlags.Default, targetFlags) { }
 
         public ImplicitUseKindFlags UseKindFlags { get; private set; } = useKindFlags;
         public ImplicitUseTargetFlags TargetFlags { get; private set; } = targetFlags;
     }
 
-  /// <summary>
-  /// Should be used on attributes and causes ReSharper
-  /// to not mark symbols marked with such attributes as unused
-  /// (as well as by other usage inspections)
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
-  public sealed class MeansImplicitUseAttribute(
-    ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags): Attribute
-  {
-    public MeansImplicitUseAttribute() 
-      : this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) { }
+    /// <summary>
+    /// Should be used on attributes and causes ReSharper
+    /// to not mark symbols marked with such attributes as unused
+    /// (as well as by other usage inspections)
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public class MeansImplicitUseAttribute(
+      ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags) : Attribute
+    {
+        public MeansImplicitUseAttribute()
+          : this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) { }
 
-    public MeansImplicitUseAttribute(ImplicitUseKindFlags useKindFlags)
-      : this(useKindFlags, ImplicitUseTargetFlags.Default) { }
+        public MeansImplicitUseAttribute(ImplicitUseKindFlags useKindFlags)
+          : this(useKindFlags, ImplicitUseTargetFlags.Default) { }
 
-    public MeansImplicitUseAttribute(ImplicitUseTargetFlags targetFlags)
-      : this(ImplicitUseKindFlags.Default, targetFlags) { }
+        public MeansImplicitUseAttribute(ImplicitUseTargetFlags targetFlags)
+          : this(ImplicitUseKindFlags.Default, targetFlags) { }
 
         [UsedImplicitly] public ImplicitUseKindFlags UseKindFlags { get; private set; } = useKindFlags;
         [UsedImplicitly] public ImplicitUseTargetFlags TargetFlags { get; private set; } = targetFlags;
     }
-  
-  [Flags]
-  public enum ImplicitUseKindFlags
-  {
-    Default = Access | Assign | InstantiatedWithFixedConstructorSignature,
-    /// <summary>Only entity marked with attribute considered used</summary>
-    Access = 1,
-    /// <summary>Indicates implicit assignment to a member</summary>
-    Assign = 2,
+
+    [Flags]
+    public enum ImplicitUseKindFlags
+    {
+        Default = Access | Assign | InstantiatedWithFixedConstructorSignature,
+        /// <summary>Only entity marked with attribute considered used</summary>
+        Access = 1,
+        /// <summary>Indicates implicit assignment to a member</summary>
+        Assign = 2,
+        /// <summary>
+        /// Indicates implicit instantiation of a type with fixed constructor signature.
+        /// That means any unused constructor parameters won't be reported as such.
+        /// </summary>
+        InstantiatedWithFixedConstructorSignature = 4,
+        /// <summary>Indicates implicit instantiation of a type</summary>
+        InstantiatedNoFixedConstructorSignature = 8,
+    }
+
+    /// <summary>
+    /// Specify what is considered used implicitly
+    /// when marked with <see cref="MeansImplicitUseAttribute"/>
+    /// or <see cref="UsedImplicitlyAttribute"/>
+    /// </summary>
+    [Flags]
+    public enum ImplicitUseTargetFlags
+    {
+        Default = Itself,
+        Itself = 1,
+        /// <summary>Members of entity marked with attribute are considered used</summary>
+        Members = 2,
+        /// <summary>Entity marked with attribute and all its members considered used</summary>
+        WithMembers = Itself | Members
+    }
+
+    /// <summary>
+    /// This attribute is intended to mark publicly available API
+    /// which should not be removed and so is treated as used
+    /// </summary>
+    [ExcludeFromCodeCoverage]
+    public sealed class PublicAPIAttribute : MeansImplicitUseAttribute
+    {
+        public PublicAPIAttribute() { }
+        public PublicAPIAttribute([NotNull] string comment)
+        {
+            Comment = comment;
+        }
+
+        [NotNull] public string Comment { get; private set; }
+    }
+
+    /// <summary>
+    /// Tells code analysis engine if the parameter is completely handled
+    /// when the invoked method is on stack. If the parameter is a delegate,
+    /// indicates that delegate is executed while the method is executed.
+    /// If the parameter is an enumerable, indicates that it is enumerated
+    /// while the method is executed
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class InstantHandleAttribute : Attribute { }
+
+    /// <summary>
+    /// Indicates that a method does not make any observable state changes.
+    /// The same as <c>System.Diagnostics.Contracts.PureAttribute</c>
+    /// </summary>
+    /// <example><code>
+    /// [Pure] private int Multiply(int x, int y) { return x * y; }
+    /// public void Foo() {
+    ///   const int a = 2, b = 2;
+    ///   Multiply(a, b); // Waring: Return value of pure method is not used
+    /// }
+    /// </code></example>
+    [AttributeUsage(AttributeTargets.Method, Inherited = true)]
+    public sealed class PureAttribute : Attribute { }
+
     /// <summary>
-    /// Indicates implicit instantiation of a type with fixed constructor signature.
-    /// That means any unused constructor parameters won't be reported as such.
+    /// Indicates that a parameter is a path to a file or a folder
+    /// within a web project. Path can be relative or absolute,
+    /// starting from web root (~)
     /// </summary>
-    InstantiatedWithFixedConstructorSignature = 4,
-    /// <summary>Indicates implicit instantiation of a type</summary>
-    InstantiatedNoFixedConstructorSignature = 8,
-  }
-
-  /// <summary>
-  /// Specify what is considered used implicitly
-  /// when marked with <see cref="MeansImplicitUseAttribute"/>
-  /// or <see cref="UsedImplicitlyAttribute"/>
-  /// </summary>
-  [Flags]
-  public enum ImplicitUseTargetFlags
-  {
-    Default = Itself,
-    Itself = 1,
-    /// <summary>Members of entity marked with attribute are considered used</summary>
-    Members = 2,
-    /// <summary>Entity marked with attribute and all its members considered used</summary>
-    WithMembers = Itself | Members
-  }
-
-  /// <summary>
-  /// This attribute is intended to mark publicly available API
-  /// which should not be removed and so is treated as used
-  /// </summary>
-  [MeansImplicitUse]
-  public sealed class PublicAPIAttribute : Attribute
-  {
-    public PublicAPIAttribute() { }
-    public PublicAPIAttribute([NotNull] string comment)
+    [AttributeUsage(AttributeTargets.Parameter)]
+    [ExcludeFromCodeCoverage]
+    public class PathReferenceAttribute : Attribute
+    {
+        public PathReferenceAttribute() { }
+        public PathReferenceAttribute([PathReference] string basePath)
+        {
+            BasePath = basePath;
+        }
+
+        [NotNull] public string BasePath { get; private set; }
+    }
+
+    // ASP.NET MVC attributes
+
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcAreaMasterLocationFormatAttribute(string format) : Attribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcAreaPartialViewLocationFormatAttribute(string format) : Attribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcAreaViewLocationFormatAttribute(string format) : Attribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcMasterLocationFormatAttribute(string format) : Attribute
     {
-      Comment = comment;
     }
 
-    [NotNull] public string Comment { get; private set; }
-  }
-
-  /// <summary>
-  /// Tells code analysis engine if the parameter is completely handled
-  /// when the invoked method is on stack. If the parameter is a delegate,
-  /// indicates that delegate is executed while the method is executed.
-  /// If the parameter is an enumerable, indicates that it is enumerated
-  /// while the method is executed
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter, Inherited = true)]
-  public sealed class InstantHandleAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that a method does not make any observable state changes.
-  /// The same as <c>System.Diagnostics.Contracts.PureAttribute</c>
-  /// </summary>
-  /// <example><code>
-  /// [Pure] private int Multiply(int x, int y) { return x * y; }
-  /// public void Foo() {
-  ///   const int a = 2, b = 2;
-  ///   Multiply(a, b); // Waring: Return value of pure method is not used
-  /// }
-  /// </code></example>
-  [AttributeUsage(AttributeTargets.Method, Inherited = true)]
-  public sealed class PureAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that a parameter is a path to a file or a folder
-  /// within a web project. Path can be relative or absolute,
-  /// starting from web root (~)
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-  public class PathReferenceAttribute : Attribute
-  {
-    public PathReferenceAttribute() { }
-    public PathReferenceAttribute([PathReference] string basePath)
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcPartialViewLocationFormatAttribute(string format) : Attribute
     {
-      BasePath = basePath;
     }
 
-    [NotNull] public string BasePath { get; private set; }
-  }
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcViewLocationFormatAttribute(string format) : Attribute
+    {
+    }
 
     /// <summary>
     /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
@@ -378,162 +431,177 @@ public PathReferenceAttribute([PathReference] string basePath)
     /// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>
     /// </summary>
     [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-  public sealed class AspMvcActionAttribute : Attribute
-  {
-    public AspMvcActionAttribute() { }
-    public AspMvcActionAttribute([NotNull] string anonymousProperty)
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcActionAttribute : Attribute
     {
-      AnonymousProperty = anonymousProperty;
+        public AspMvcActionAttribute() { }
+        public AspMvcActionAttribute([NotNull] string anonymousProperty)
+        {
+            AnonymousProperty = anonymousProperty;
+        }
+
+        [NotNull] public string AnonymousProperty { get; private set; }
     }
 
-    [NotNull] public string AnonymousProperty { get; private set; }
-  }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC area.
-  /// Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-  public sealed class AspMvcAreaAttribute : PathReferenceAttribute
-  {
-    public AspMvcAreaAttribute() { }
-    public AspMvcAreaAttribute([NotNull] string anonymousProperty)
+    /// <summary>
+    /// ASP.NET MVC attribute. Indicates that a parameter is an MVC area.
+    /// Use this attribute for custom wrappers similar to
+    /// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcAreaAttribute : PathReferenceAttribute
     {
-      AnonymousProperty = anonymousProperty;
+        public AspMvcAreaAttribute() { }
+        public AspMvcAreaAttribute([NotNull] string anonymousProperty)
+        {
+            AnonymousProperty = anonymousProperty;
+        }
+
+        [NotNull] public string AnonymousProperty { get; private set; }
     }
 
-    [NotNull] public string AnonymousProperty { get; private set; }
-  }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. If applied to a parameter, indicates that
-  /// the parameter is an MVC controller. If applied to a method,
-  /// the MVC controller name is calculated implicitly from the context.
-  /// Use this attribute for custom wrappers similar to 
-  /// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String, String)</c>
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-  public sealed class AspMvcControllerAttribute : Attribute
-  {
-    public AspMvcControllerAttribute() { }
-    public AspMvcControllerAttribute([NotNull] string anonymousProperty)
+    /// <summary>
+    /// ASP.NET MVC attribute. If applied to a parameter, indicates that
+    /// the parameter is an MVC controller. If applied to a method,
+    /// the MVC controller name is calculated implicitly from the context.
+    /// Use this attribute for custom wrappers similar to 
+    /// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String, String)</c>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcControllerAttribute : Attribute
     {
-      AnonymousProperty = anonymousProperty;
+        public AspMvcControllerAttribute() { }
+        public AspMvcControllerAttribute([NotNull] string anonymousProperty)
+        {
+            AnonymousProperty = anonymousProperty;
+        }
+
+        [NotNull] public string AnonymousProperty { get; private set; }
     }
 
-    [NotNull] public string AnonymousProperty { get; private set; }
-  }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC Master.
-  /// Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Controller.View(String, String)</c>
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-  public sealed class AspMvcMasterAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC model type.
-  /// Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Controller.View(String, Object)</c>
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-  public sealed class AspMvcModelTypeAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. If applied to a parameter, indicates that
-  /// the parameter is an MVC partial view. If applied to a method,
-  /// the MVC partial view name is calculated implicitly from the context.
-  /// Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Html.RenderPartialExtensions.RenderPartial(HtmlHelper, String)</c>
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-  public sealed class AspMvcPartialViewAttribute : PathReferenceAttribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Allows disabling all inspections
-  /// for MVC views within a class or a method.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
-  public sealed class AspMvcSupressViewErrorAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC display template.
-  /// Use this attribute for custom wrappers similar to 
-  /// <c>System.Web.Mvc.Html.DisplayExtensions.DisplayForModel(HtmlHelper, String)</c>
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-  public sealed class AspMvcDisplayTemplateAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC editor template.
-  /// Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Html.EditorExtensions.EditorForModel(HtmlHelper, String)</c>
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-  public sealed class AspMvcEditorTemplateAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC template.
-  /// Use this attribute for custom wrappers similar to
-  /// <c>System.ComponentModel.DataAnnotations.UIHintAttribute(System.String)</c>
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-  public sealed class AspMvcTemplateAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
-  /// is an MVC view. If applied to a method, the MVC view name is calculated implicitly
-  /// from the context. Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Controller.View(Object)</c>
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-  public sealed class AspMvcViewAttribute : PathReferenceAttribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. When applied to a parameter of an attribute,
-  /// indicates that this parameter is an MVC action name
-  /// </summary>
-  /// <example><code>
-  /// [ActionName("Foo")]
-  /// public ActionResult Login(string returnUrl) {
-  ///   ViewBag.ReturnUrl = Url.Action("Foo"); // OK
-  ///   return RedirectToAction("Bar"); // Error: Cannot resolve action
-  /// }
-  /// </code></example>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
-  public sealed class AspMvcActionSelectorAttribute : Attribute { }
-
-  [AttributeUsage(
-    AttributeTargets.Parameter | AttributeTargets.Property |
-    AttributeTargets.Field, Inherited = true)]
-  public sealed class HtmlElementAttributesAttribute : Attribute
-  {
-    public HtmlElementAttributesAttribute() { }
-    public HtmlElementAttributesAttribute([NotNull] string name)
+    /// <summary>
+    /// ASP.NET MVC attribute. Indicates that a parameter is an MVC Master.
+    /// Use this attribute for custom wrappers similar to
+    /// <c>System.Web.Mvc.Controller.View(String, String)</c>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcMasterAttribute : Attribute { }
+
+    /// <summary>
+    /// ASP.NET MVC attribute. Indicates that a parameter is an MVC model type.
+    /// Use this attribute for custom wrappers similar to
+    /// <c>System.Web.Mvc.Controller.View(String, Object)</c>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcModelTypeAttribute : Attribute { }
+
+    /// <summary>
+    /// ASP.NET MVC attribute. If applied to a parameter, indicates that
+    /// the parameter is an MVC partial view. If applied to a method,
+    /// the MVC partial view name is calculated implicitly from the context.
+    /// Use this attribute for custom wrappers similar to
+    /// <c>System.Web.Mvc.Html.RenderPartialExtensions.RenderPartial(HtmlHelper, String)</c>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcPartialViewAttribute : PathReferenceAttribute { }
+
+    /// <summary>
+    /// ASP.NET MVC attribute. Allows disabling all inspections
+    /// for MVC views within a class or a method.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcSupressViewErrorAttribute : Attribute { }
+
+    /// <summary>
+    /// ASP.NET MVC attribute. Indicates that a parameter is an MVC display template.
+    /// Use this attribute for custom wrappers similar to 
+    /// <c>System.Web.Mvc.Html.DisplayExtensions.DisplayForModel(HtmlHelper, String)</c>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcDisplayTemplateAttribute : Attribute { }
+
+    /// <summary>
+    /// ASP.NET MVC attribute. Indicates that a parameter is an MVC editor template.
+    /// Use this attribute for custom wrappers similar to
+    /// <c>System.Web.Mvc.Html.EditorExtensions.EditorForModel(HtmlHelper, String)</c>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcEditorTemplateAttribute : Attribute { }
+
+    /// <summary>
+    /// ASP.NET MVC attribute. Indicates that a parameter is an MVC template.
+    /// Use this attribute for custom wrappers similar to
+    /// <c>System.ComponentModel.DataAnnotations.UIHintAttribute(System.String)</c>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcTemplateAttribute : Attribute { }
+
+    /// <summary>
+    /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
+    /// is an MVC view. If applied to a method, the MVC view name is calculated implicitly
+    /// from the context. Use this attribute for custom wrappers similar to
+    /// <c>System.Web.Mvc.Controller.View(Object)</c>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcViewAttribute : PathReferenceAttribute { }
+
+    /// <summary>
+    /// ASP.NET MVC attribute. When applied to a parameter of an attribute,
+    /// indicates that this parameter is an MVC action name
+    /// </summary>
+    /// <example><code>
+    /// [ActionName("Foo")]
+    /// public ActionResult Login(string returnUrl) {
+    ///   ViewBag.ReturnUrl = Url.Action("Foo"); // OK
+    ///   return RedirectToAction("Bar"); // Error: Cannot resolve action
+    /// }
+    /// </code></example>
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
+    [ExcludeFromCodeCoverage]
+    public sealed class AspMvcActionSelectorAttribute : Attribute { }
+
+    [AttributeUsage(
+      AttributeTargets.Parameter | AttributeTargets.Property |
+      AttributeTargets.Field, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class HtmlElementAttributesAttribute : Attribute
     {
-      Name = name;
-    }
+        public HtmlElementAttributesAttribute() { }
+        public HtmlElementAttributesAttribute([NotNull] string name)
+        {
+            Name = name;
+        }
 
-    [NotNull] public string Name { get; private set; }
-  }
+        [NotNull] public string Name { get; private set; }
+    }
 
-  [AttributeUsage(
-    AttributeTargets.Parameter | AttributeTargets.Field |
-    AttributeTargets.Property, Inherited = true)]
-  public sealed class HtmlAttributeValueAttribute([NotNull] string name): Attribute
-  {
+    [AttributeUsage(
+      AttributeTargets.Parameter | AttributeTargets.Field |
+      AttributeTargets.Property, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class HtmlAttributeValueAttribute([NotNull] string name) : Attribute
+    {
         [NotNull] public string Name { get; private set; } = name;
     }
 
-  // Razor attributes
+    // Razor attributes
 
-  /// <summary>
-  /// Razor attribute. Indicates that a parameter or a method is a Razor section.
-  /// Use this attribute for custom wrappers similar to 
-  /// <c>System.Web.WebPages.WebPageBase.RenderSection(String)</c>
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method, Inherited = true)]
-  public sealed class RazorSectionAttribute : Attribute { }
+    /// <summary>
+    /// Razor attribute. Indicates that a parameter or a method is a Razor section.
+    /// Use this attribute for custom wrappers similar to 
+    /// <c>System.Web.WebPages.WebPageBase.RenderSection(String)</c>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method, Inherited = true)]
+    [ExcludeFromCodeCoverage]
+    public sealed class RazorSectionAttribute : Attribute { }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Properties/AssemblyInfo.cs b/src/TestStack.BDDfy/Properties/AssemblyInfo.cs
deleted file mode 100644
index 46b351b7..00000000
--- a/src/TestStack.BDDfy/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("TestStack.BDDfy - http://teststack.github.com/TestStack.BDDfy/")]
-[assembly: AssemblyProduct("TestStack.BDDfy")]
-[assembly: AssemblyCopyright("Copyright © 2011-2017 TestStack.BDDfy contributors")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("20482e5c-b996-4cc8-b30b-fc7b16268b29")]
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Reporters/FileHelpers.cs b/src/TestStack.BDDfy/Reporters/FileHelpers.cs
index 58c55259..60803d9e 100644
--- a/src/TestStack.BDDfy/Reporters/FileHelpers.cs
+++ b/src/TestStack.BDDfy/Reporters/FileHelpers.cs
@@ -8,15 +8,8 @@ public class FileHelpers
         // http://stackoverflow.com/questions/52797/c-how-do-i-get-the-path-of-the-assembly-the-code-is-in#answer-283917
         internal static string AssemblyDirectory()
         {
-#if NET40
-            string codeBase = typeof(Engine).Assembly().CodeBase;
-            var uri = new UriBuilder(codeBase);
-            string path = Uri.UnescapeDataString(uri.Path);
-            return Path.GetDirectoryName(path);
-#else
             var basePath = AppContext.BaseDirectory;
             return Path.GetFullPath(basePath);
-#endif
         }
 
     }
diff --git a/src/TestStack.BDDfy/Reporters/Html/DefaultHtmlReportConfiguration.cs b/src/TestStack.BDDfy/Reporters/Html/DefaultHtmlReportConfiguration.cs
index 1bb87d82..b1617c32 100644
--- a/src/TestStack.BDDfy/Reporters/Html/DefaultHtmlReportConfiguration.cs
+++ b/src/TestStack.BDDfy/Reporters/Html/DefaultHtmlReportConfiguration.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Reflection;
-
 namespace TestStack.BDDfy.Reporters.Html
 {
     public class DefaultHtmlReportConfiguration : IHtmlReportConfiguration
diff --git a/src/TestStack.BDDfy/Reporters/Html/HtmlReportModel.cs b/src/TestStack.BDDfy/Reporters/Html/HtmlReportModel.cs
index 3efc1375..07321a80 100644
--- a/src/TestStack.BDDfy/Reporters/Html/HtmlReportModel.cs
+++ b/src/TestStack.BDDfy/Reporters/Html/HtmlReportModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace TestStack.BDDfy.Reporters.Html
+namespace TestStack.BDDfy.Reporters.Html
 {
     public class HtmlReportModel(IHtmlReportConfiguration configuration, ReportModel reportModel): FileReportModel(reportModel)
     {
diff --git a/src/TestStack.BDDfy/Reporters/MarkDown/MarkDownReportBuilder.cs b/src/TestStack.BDDfy/Reporters/MarkDown/MarkDownReportBuilder.cs
index e8433c5d..effdf5b6 100644
--- a/src/TestStack.BDDfy/Reporters/MarkDown/MarkDownReportBuilder.cs
+++ b/src/TestStack.BDDfy/Reporters/MarkDown/MarkDownReportBuilder.cs
@@ -8,7 +8,7 @@ namespace TestStack.BDDfy.Reporters.MarkDown
 {
     public class MarkDownReportBuilder : IReportBuilder
     {
-        private readonly List<Exception> _exceptions = new();
+        private readonly List<Exception> _exceptions = [];
 
         public string CreateReport(FileReportModel model)
         {
@@ -38,7 +38,7 @@ public string CreateReport(FileReportModel model)
                         var exampleScenario = story.Scenarios.First();
                         report.AppendLine(string.Format("### {0}", exampleScenario.Title));
 
-                        if (exampleScenario.Steps.Any())
+                        if (exampleScenario.Steps.Count != 0)
                         {
                             foreach (var step in exampleScenario.Steps.Where(s => s.ShouldReport))
                                 report.AppendLine("  " + WebUtility.HtmlEncode(step.Title) + "  ");
@@ -72,9 +72,9 @@ public string CreateReport(FileReportModel model)
             return report.ToString();
         }
 
-        private void ReportTags(StringBuilder report, List<string> tags)
+        private static void ReportTags(StringBuilder report, List<string> tags)
         {
-            if (!tags.Any())
+            if (tags.Count == 0)
                 return;
 
             report.AppendLine(string.Format("Tags: {0}", string.Join(", ", tags.Select(t => string.Format("`{0}`", t)))));
@@ -91,7 +91,7 @@ private void WriteExamples(StringBuilder report, ReportModel.Scenario exampleSce
             var maxWidth = new int[numberColumns];
             var rows = new List<string[]>();
 
-            Action<IEnumerable<string>, string, string> addRow = (cells, result, error) =>
+            void addRow(IEnumerable<string> cells, string result, string error)
             {
                 var row = new string[numberColumns];
                 var index = 0;
@@ -113,7 +113,7 @@ private void WriteExamples(StringBuilder report, ReportModel.Scenario exampleSce
                 }
 
                 rows.Add(row);
-            };
+            }
 
             addRow(exampleScenario.Example.Headers, "Result", "Errors");
             foreach (var scenario in scenarios)
@@ -130,7 +130,7 @@ private void WriteExamples(StringBuilder report, ReportModel.Scenario exampleSce
                 WriteExampleRow(report, row, maxWidth);
         }
 
-        private void WriteExampleRow(StringBuilder report, string[] row, int[] maxWidth)
+        private static void WriteExampleRow(StringBuilder report, string[] row, int[] maxWidth)
         {
             report.Append("    ");
             for (int index = 0; index < row.Length; index++)
@@ -173,7 +173,7 @@ void ReportExceptions(StringBuilder report)
                 else
                     report.AppendLine();
 
-                var stackTrace = string.Join(Environment.NewLine, exception.StackTrace.Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                var stackTrace = string.Join(Environment.NewLine, exception.StackTrace.Split([Environment.NewLine], StringSplitOptions.None)
                     .Select(s => "    " + s));
                 report.AppendLine(stackTrace);
             }
@@ -185,7 +185,7 @@ static string FlattenExceptionMessage(string message)
         {
             return string.Join(" ", message
                 .Replace("\t", " ") // replace tab with one space
-                .Split(new[] { "\r\n", "\n" }, StringSplitOptions.None)
+                .Split(["\r\n", "\n"], StringSplitOptions.None)
                 .Select(s => s.Trim()))
                 .TrimEnd(','); // chop any , from the end
         }
diff --git a/src/TestStack.BDDfy/Reporters/TextReporter.cs b/src/TestStack.BDDfy/Reporters/TextReporter.cs
index 69bf89c1..a931579f 100644
--- a/src/TestStack.BDDfy/Reporters/TextReporter.cs
+++ b/src/TestStack.BDDfy/Reporters/TextReporter.cs
@@ -19,7 +19,7 @@ public void Process(Story story)
             var allSteps = story.Scenarios.SelectMany(s => s.Steps)
                 .Select(GetStepWithLines)
                 .ToList();
-            if (allSteps.Any())
+            if (allSteps.Count != 0)
                 _longestStepSentence = allSteps.SelectMany(s => s.Item2.Select(l => l.Length)).Max();
 
             foreach (var scenarioGroup in story.Scenarios.GroupBy(s => s.Id))
@@ -30,7 +30,7 @@ public void Process(Story story)
                     var exampleScenario = story.Scenarios.First();
                     Report(exampleScenario);
 
-                    if (exampleScenario.Steps.Any())
+                    if (exampleScenario.Steps.Count != 0)
                     {
                         foreach (var step in exampleScenario.Steps.Where(s => s.ShouldReport))
                             ReportOnStep(exampleScenario, GetStepWithLines(step), false);
@@ -46,7 +46,7 @@ public void Process(Story story)
                     {
                         Report(scenario);
 
-                        if (scenario.Steps.Any())
+                        if (scenario.Steps.Count != 0)
                         {
                             foreach (var step in scenario.Steps.Where(s => s.ShouldReport))
                                 ReportOnStep(scenario, GetStepWithLines(step), true);
@@ -68,7 +68,7 @@ private static Tuple<Step, string[]> GetStepWithLines(Step s)
 
         private void ReportTags(List<string> tags)
         {
-            if (!tags.Any())
+            if (tags.Count == 0)
                 return;
 
             WriteLine();
diff --git a/src/TestStack.BDDfy/Reporters/Writers/FileWriter.cs b/src/TestStack.BDDfy/Reporters/Writers/FileWriter.cs
index 0919e338..4012b659 100644
--- a/src/TestStack.BDDfy/Reporters/Writers/FileWriter.cs
+++ b/src/TestStack.BDDfy/Reporters/Writers/FileWriter.cs
@@ -1,6 +1,4 @@
-using System;
 using System.IO;
-using TestStack.BDDfy.Reporters.Diagnostics;
 
 namespace TestStack.BDDfy.Reporters.Writers
 {
diff --git a/src/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs b/src/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs
index 826dd55b..23ba87d0 100644
--- a/src/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs
+++ b/src/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs
@@ -2,46 +2,25 @@
 using System.Linq;
 using TestStack.BDDfy.Configuration;
 
-namespace TestStack.BDDfy
-{
-    public class FluentScenarioScanner(List<Step> steps, string title): IScenarioScanner
-    {
-        private readonly string _title = title;
-        private readonly List<Step> _steps = steps;
-
-        public IEnumerable<Scenario> Scan(ITestContext testContext)
-        {
-            var scenarioText = _title ?? GetTitleFromMethodNameInStackTrace(testContext.TestObject);
-            if (testContext.Examples != null)
-            {
-                var scenarioId = Configurator.IdGenerator.GetScenarioId();
-                return testContext.Examples.Select(example =>
-                    new Scenario(scenarioId, testContext.TestObject, CloneSteps(_steps), scenarioText, example, testContext.Tags));
-            }
+namespace TestStack.BDDfy.Scanners.ScenarioScanners;
 
-            return new[] { new Scenario(testContext.TestObject, _steps, scenarioText, testContext.Tags) };
-        }
+internal class FluentScenarioScanner(List<Step> steps, string title): IScenarioScanner
+{
+    private readonly string _title = title;
+    private readonly List<Step> _steps = steps;
 
-        private List<Step> CloneSteps(IEnumerable<Step> steps)
+    public IEnumerable<Scenario> Scan(ITestContext testContext)
+    {
+        var scenarioText = _title ?? testContext.TestObject.GetType().Name;
+        if (testContext.Examples != null)
         {
-            return steps.Select(step => new Step(step)).ToList();
+            var scenarioId = Configurator.IdGenerator.GetScenarioId();
+            return testContext.Examples.Select(example =>
+                new Scenario(scenarioId, testContext.TestObject, CloneSteps(_steps), scenarioText, example, testContext.Tags));
         }
 
-        private static string GetTitleFromMethodNameInStackTrace(object testObject)
-        {
-            // ReSharper disable once JoinDeclarationAndInitializer
-#if STACKTRACE
-            var trace = new System.Diagnostics.StackTrace();
-            var frames = trace.GetFrames();
-
-            var initiatingFrame = frames?.LastOrDefault(s => s.GetMethod().DeclaringType == testObject.GetType());
-            if (initiatingFrame == null)
-                return null;
-
-            return Configurator.Humanizer.Humanize(initiatingFrame.GetMethod().Name);
-#else
-            return null;
-#endif
-        }
+        return [new Scenario(testContext.TestObject, _steps, scenarioText, testContext.Tags)];
     }
+
+    private static List<Step> CloneSteps(IEnumerable<Step> steps) => [.. steps.Select(static step => new Step(step))];
 }
diff --git a/src/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs b/src/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs
index 21ca2330..adcca8a5 100644
--- a/src/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs
+++ b/src/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs
@@ -103,11 +103,10 @@ public virtual IEnumerable<MethodInfo> GetMethodsOfInterest(Type scenarioType)
             var setMethods = properties.Select(p => p.GetSetMethod(true));
             var allPropertyMethods = getMethods.Union(setMethods);
 
-            return scenarioType
+            return [.. scenarioType
                 .GetMethods(bindingFlags)
-                .Where(m => !m.GetCustomAttributes(typeof(IgnoreStepAttribute), false).Any()) // it is not decorated with IgnoreStep
-                .Except(allPropertyMethods) // properties cannot be steps; only methods
-                .ToList();
+                .Where(m => m.GetCustomAttribute<IgnoreStepAttribute>() is null)
+                .Except(allPropertyMethods)];
         }
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Scanners/StepScanners/Examples/UnassignableExampleException.cs b/src/TestStack.BDDfy/Scanners/StepScanners/Examples/UnassignableExampleException.cs
index e1909791..c58d7a29 100644
--- a/src/TestStack.BDDfy/Scanners/StepScanners/Examples/UnassignableExampleException.cs
+++ b/src/TestStack.BDDfy/Scanners/StepScanners/Examples/UnassignableExampleException.cs
@@ -2,22 +2,9 @@
 
 namespace TestStack.BDDfy
 {
-#if NET40
-    [System.Serializable]
-#else
-    [System.Runtime.Serialization.Serializable]
-#endif
+    [Serializable]
     public class UnassignableExampleException(string message, Exception inner, ExampleValue exampleValue): Exception(message, inner)
     {
-#if NET40
-
-        protected UnassignableExampleException(
-            System.Runtime.Serialization.SerializationInfo info,
-            System.Runtime.Serialization.StreamingContext context) : base(info, context)
-        {
-        }
-
-#endif
         public ExampleValue ExampleValue { get; private set; } = exampleValue;
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs b/src/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs
index 7b64b30f..dcc4c58d 100644
--- a/src/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs
+++ b/src/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using TestStack.BDDfy.Annotations;
 
 namespace TestStack.BDDfy
diff --git a/src/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs b/src/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs
index 748fe08f..3c4fc75d 100644
--- a/src/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs
+++ b/src/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -28,25 +29,30 @@ public class ExecutableAttributeStepScanner : IStepScanner
     {
         public IEnumerable<Step> Scan(ITestContext testContext, MethodInfo candidateMethod)
         {
-            var executableAttribute = (ExecutableAttribute)candidateMethod.GetCustomAttributes(typeof(ExecutableAttribute), true).FirstOrDefault();
-            if(executableAttribute == null)
+            var executableAttribute = candidateMethod.GetCustomAttribute<ExecutableAttribute>(true);
+            if (executableAttribute == null)
                 yield break;
 
             var stepTitle = new StepTitle(executableAttribute.StepTitle);
-            if(string.IsNullOrEmpty(stepTitle))
+            if (string.IsNullOrWhiteSpace(stepTitle))
                 stepTitle = new StepTitle(Configurator.Humanizer.Humanize(candidateMethod.Name));
 
-            var stepAsserts = IsAssertingByAttribute(candidateMethod);
             var shouldReport = executableAttribute.ShouldReport;
 
             var runStepWithArgsAttributes = (RunStepWithArgsAttribute[])candidateMethod.GetCustomAttributes(typeof(RunStepWithArgsAttribute), true);
             if (runStepWithArgsAttributes.Length == 0)
             {
-                var stepAction = StepActionFactory.GetStepAction(candidateMethod, new object[0]);
-                yield return new Step(stepAction, stepTitle, stepAsserts, executableAttribute.ExecutionOrder, shouldReport, new List<StepArgument>())
-                        {
-                            ExecutionSubOrder = executableAttribute.Order
-                        };
+                var stepAction = StepActionFactory.GetStepAction(candidateMethod, []);
+                yield return new Step(
+                    stepAction,
+                    stepTitle,
+                    executableAttribute.Asserts,
+                    executableAttribute.ExecutionOrder,
+                    shouldReport,
+                    [])
+                {
+                    ExecutionSubOrder = executableAttribute.Order
+                };
             }
 
             foreach (var runStepWithArgsAttribute in runStepWithArgsAttributes)
@@ -62,25 +68,29 @@ public IEnumerable<Step> Scan(ITestContext testContext, MethodInfo candidateMeth
                     methodName = string.Format(executableAttribute.StepTitle, flatInput);
 
                 var stepAction = StepActionFactory.GetStepAction(candidateMethod, inputArguments);
-                yield return new Step(stepAction, new StepTitle(methodName), stepAsserts,
-                                      executableAttribute.ExecutionOrder, shouldReport, new List<StepArgument>())
-                        {
-                            ExecutionSubOrder = executableAttribute.Order
-                        };
+                yield return new Step(
+                    stepAction,
+                    new StepTitle(methodName),
+                    executableAttribute.Asserts,
+                    executableAttribute.ExecutionOrder,
+                    shouldReport,
+                    [])
+                {
+                    ExecutionSubOrder = executableAttribute.Order
+                };
             }
         }
 
         public IEnumerable<Step> Scan(ITestContext testContext, MethodInfo method, Example example)
         {
-            var executableAttribute = (ExecutableAttribute)method.GetCustomAttributes(typeof(ExecutableAttribute), true).FirstOrDefault();
+            var executableAttribute = method.GetCustomAttribute<ExecutableAttribute>(true);
             if (executableAttribute == null)
                 yield break;
 
             string stepTitle = executableAttribute.StepTitle;
-            if (string.IsNullOrEmpty(stepTitle))
+            if (string.IsNullOrWhiteSpace(stepTitle))
                 stepTitle = Configurator.Humanizer.Humanize(method.Name);
 
-            var stepAsserts = IsAssertingByAttribute(method);
             var shouldReport = executableAttribute.ShouldReport;
             var methodParameters = method.GetParameters();
 
@@ -101,20 +111,14 @@ public IEnumerable<Step> Scan(ITestContext testContext, MethodInfo method, Examp
                 }
             }
 
-            var stepAction = StepActionFactory.GetStepAction(method, inputs.ToArray());
-            yield return new Step(stepAction, new StepTitle(stepTitle), stepAsserts, executableAttribute.ExecutionOrder, shouldReport, new List<StepArgument>());
-        }
-
-
-        private static bool IsAssertingByAttribute(MethodInfo method)
-        {
-            var attribute = GetExecutableAttribute(method);
-            return attribute.Asserts;
-        }
-
-        private static ExecutableAttribute GetExecutableAttribute(MethodInfo method)
-        {
-            return (ExecutableAttribute)method.GetCustomAttributes(typeof(ExecutableAttribute), true).First();
+            var stepAction = StepActionFactory.GetStepAction(method, [.. inputs]);
+            yield return new Step(
+                stepAction,
+                new StepTitle(stepTitle),
+                executableAttribute.Asserts,
+                executableAttribute.ExecutionOrder,
+                shouldReport,
+                []);
         }
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentApi.cs b/src/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentApi.cs
index 4beb5884..c1fb10f1 100644
--- a/src/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentApi.cs
+++ b/src/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentApi.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
- 
+using TestStack.BDDfy.Configuration;
+
 // ReSharper disable CheckNamespace
 // This is in BDDfy namespace to make its usage simpler
 namespace TestStack.BDDfy
@@ -308,8 +309,9 @@ interface IFluentStepBuilder
         object TestObject { get; }
     }
 
-    public class FluentStepBuilder<TScenario> : IFluentStepBuilder<TScenario>, IFluentStepBuilder 
-                                                where TScenario : class
+    public class FluentStepBuilder<TScenario> 
+        : IFluentStepBuilder<TScenario>, IFluentStepBuilder
+        where TScenario : class
     {
         readonly FluentScanner<TScenario> scanner;
 
@@ -318,7 +320,7 @@ public FluentStepBuilder(TScenario testObject)
             TestObject = testObject;
             var existingContext = TestContext.GetContext(TestObject);
             if (existingContext.FluentScanner == null)
-                existingContext.FluentScanner = new FluentScanner<TScenario>(testObject);
+                existingContext.FluentScanner = Configurator.FluentScannerFactory.Create(testObject);
  
             scanner = (FluentScanner<TScenario>) existingContext.FluentScanner;
         }
diff --git a/src/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs b/src/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs
index 50510085..6ac42e08 100644
--- a/src/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs
+++ b/src/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs
@@ -1,41 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Linq;
 using System.Threading.Tasks;
-using TestStack.BDDfy.Annotations;
 using TestStack.BDDfy.Configuration;
+using TestStack.BDDfy.Scanners.ScenarioScanners;
 
 namespace TestStack.BDDfy
 {
-    /// <summary>
-    /// Provides an alternative method of implementing stories and scenarios.
-    /// </summary>
-    /// <remarks>
-    /// Reflecting scanners run in a pipeline which means you can mix and match their
-    /// usage in your scenario; however, when you use FluentStepScanner, BDDfy does not
-    /// use other scanners which means method names and attributes are ignored for
-    /// scanning methods. You are in full control of what steps you want
-    /// run and in what order.
-    /// </remarks>
-    /// <typeparam name="TScenario"></typeparam>
-    /// <example>
-    /// <code>
-    /// [Fact]
-    /// public void AccountHasSufficientFund()
-    /// {
-    ///     this.Given(s => s.GivenTheAccountBalanceIs(100), GivenTheAccountBalanceIsTitleTemplate)
-    ///             .And(s => s.AndTheCardIsValid())
-    ///             .And(s => s.AndTheMachineContains(100), AndTheMachineContainsEnoughMoneyTitleTemplate)
-    ///         .When(s => s.WhenTheAccountHolderRequests(20), WhenTheAccountHolderRequestsTitleTemplate)
-    ///         .Then(s => s.TheAtmShouldDispense(20), "Then the ATM should dispense $20")
-    ///             .And(s => s.AndTheAccountBalanceShouldBe(80), "And the account balance should be $80")
-    ///             .And(s => s.ThenCardIsRetained(false), AndTheCardShouldBeReturnedTitleTemplate)
-    ///         .BDDfy(storyCategory: "ATM");
-    /// }
-    /// </code>
-    /// </example>
     internal class FluentScanner<TScenario> : IFluentScanner
         where TScenario : class
     {
@@ -48,7 +21,7 @@ internal FluentScanner(TScenario testObject)
         {
             _testObject = testObject;
             _testContext = TestContext.GetContext(_testObject);
-            _fakeExecuteActionMethod = typeof(FluentScanner<TScenario>).GetMethod("ExecuteAction", BindingFlags.Instance | BindingFlags.NonPublic);
+            _fakeExecuteActionMethod = typeof(FluentScanner<TScenario>).GetMethod(nameof(ExecuteAction), BindingFlags.Instance | BindingFlags.NonPublic);
         }
 
         IScanner IFluentScanner.GetScanner(string scenarioTitle, Type explicitStoryType)
@@ -59,58 +32,74 @@ IScanner IFluentScanner.GetScanner(string scenarioTitle, Type explicitStoryType)
         public void AddStep(Action stepAction, string title, bool reports, ExecutionOrder executionOrder, bool asserts, string stepPrefix)
         {
             var action = StepActionFactory.GetStepAction<object>(o => stepAction());
-            _steps.Add(new Step(action, new StepTitle(AppendPrefix(title, stepPrefix)), FixAsserts(asserts, executionOrder), FixConsecutiveStep(executionOrder), reports, new List<StepArgument>()));
-        }
-
-        private string AppendPrefix(string title, string stepPrefix)
-        {
-            if (!title.ToLower().StartsWith(stepPrefix.ToLower()))
-            {
-                if (title.Length == 0)
-                    return string.Format("{0} ", stepPrefix);
-                return string.Format("{0} {1}{2}", stepPrefix, title.Substring(0, 1).ToLower(), title.Substring(1));
-            }
-
-            return title;
+            var stepTitle = CreateTitle(title, stepPrefix);
+            _steps.Add(new Step(action, stepTitle, FixAsserts(asserts, executionOrder), FixConsecutiveStep(executionOrder), reports, new List<StepArgument>()));
         }
 
         public void AddStep(Func<Task> stepAction, string title, bool reports, ExecutionOrder executionOrder, bool asserts, string stepPrefix)
         {
             var action = StepActionFactory.GetStepAction<object>(o => stepAction());
-            _steps.Add(new Step(action, new StepTitle(AppendPrefix(title, stepPrefix)), FixAsserts(asserts, executionOrder), FixConsecutiveStep(executionOrder), reports, new List<StepArgument>()));
+            var stepTitle = CreateTitle(title, stepPrefix);
+            _steps.Add(new Step(action, stepTitle, FixAsserts(asserts, executionOrder), FixConsecutiveStep(executionOrder), reports, new List<StepArgument>()));
         }
 
+        private StepTitle CreateTitle(string title, string stepPrefix) => Configurator.StepTitleFactory.Create(title, stepPrefix, _testContext);
+
         public void AddStep(Expression<Func<ExampleAction>> stepAction, bool reports, ExecutionOrder executionOrder, bool asserts, string stepPrefix)
         {
             var compiledAction = stepAction.Compile();
-            var call = Expression.Call(Expression.Constant(this),
-                _fakeExecuteActionMethod, stepAction.Body);
+            var call = Expression.Call(Expression.Constant(this), _fakeExecuteActionMethod, stepAction.Body);
             var expression = Expression.Lambda<Action<TScenario>>(call, Expression.Parameter(typeof(TScenario)));
             AddStep(_ => compiledAction().Action(), expression, null, true, reports, executionOrder, asserts, stepPrefix);
         }
 
-        [UsedImplicitly]
         [StepTitle("")]
-        private void ExecuteAction(ExampleAction action)
+#pragma warning disable CA1822 // Mark members as static
+        private void ExecuteAction(ExampleAction _)
+#pragma warning restore CA1822 // Mark members as static
         {
             
         }
 
-        public void AddStep(Expression<Func<TScenario, Task>> stepAction, string stepTextTemplate, bool includeInputsInStepTitle, bool reports, ExecutionOrder executionOrder, bool asserts, string stepPrefix)
+        public void AddStep(
+            Expression<Func<TScenario, Task>> stepAction, 
+            string stepTextTemplate, 
+            bool includeInputsInStepTitle, 
+            bool reports, 
+            ExecutionOrder executionOrder, 
+            bool asserts, 
+            string stepPrefix)
         {
             var action = stepAction.Compile();
-            var inputArguments = new StepArgument[0];
+            var inputArguments = Array.Empty<StepArgument>();
             if (includeInputsInStepTitle)
             {
                 inputArguments = stepAction.ExtractArguments(_testObject).ToArray();
             }
 
-            var title = CreateTitle(stepTextTemplate, includeInputsInStepTitle, GetMethodInfo(stepAction), inputArguments, stepPrefix);
+            var title = CreateTitle(
+                stepTextTemplate, 
+                includeInputsInStepTitle, 
+                GetMethodInfo(stepAction), 
+                inputArguments,
+                stepPrefix);
+
             var args = inputArguments.Where(s => !string.IsNullOrEmpty(s.Name)).ToList();
-            _steps.Add(new Step(StepActionFactory.GetStepAction(action), title, FixAsserts(asserts, executionOrder), FixConsecutiveStep(executionOrder), reports, args));
+            var stepDelegate = StepActionFactory.GetStepAction(action);
+            var shouldFixAsserts = FixAsserts(asserts, executionOrder);
+            var shouldFixConsecutiveStep = FixConsecutiveStep(executionOrder);
+
+            _steps.Add(new Step(stepDelegate, title, shouldFixAsserts, shouldFixConsecutiveStep, reports, args));
         }
 
-        public void AddStep(Expression<Action<TScenario>> stepAction, string stepTextTemplate, bool includeInputsInStepTitle, bool reports, ExecutionOrder executionOrder, bool asserts, string stepPrefix)
+        public void AddStep(
+            Expression<Action<TScenario>> stepAction, 
+            string stepTextTemplate, 
+            bool includeInputsInStepTitle, 
+            bool reports, 
+            ExecutionOrder executionOrder, 
+            bool asserts, 
+            string stepPrefix)
         {
             var action = stepAction.Compile();
 
@@ -120,19 +109,33 @@ public void AddStep(Expression<Action<TScenario>> stepAction, string stepTextTem
         private void AddStep(Action<TScenario> action, LambdaExpression stepAction, string stepTextTemplate, bool includeInputsInStepTitle,
             bool reports, ExecutionOrder executionOrder, bool asserts, string stepPrefix)
         {
-            var inputArguments = new StepArgument[0];
+            var inputArguments = Array.Empty<StepArgument>();
             if (includeInputsInStepTitle)
             {
                 inputArguments = stepAction.ExtractArguments(_testObject).ToArray();
             }
 
-            var title = CreateTitle(stepTextTemplate, includeInputsInStepTitle, GetMethodInfo(stepAction), inputArguments,
-                stepPrefix);
+            var title = CreateTitle(stepTextTemplate, includeInputsInStepTitle, GetMethodInfo(stepAction), inputArguments, stepPrefix);
+
             var args = inputArguments.Where(s => !string.IsNullOrEmpty(s.Name)).ToList();
             _steps.Add(new Step(StepActionFactory.GetStepAction(action), title, FixAsserts(asserts, executionOrder),
                 FixConsecutiveStep(executionOrder), reports, args));
         }
 
+        private StepTitle CreateTitle(
+            string stepTextTemplate,
+            bool includeInputsInStepTitle,
+            MethodInfo methodInfo,
+            StepArgument[] inputArguments,
+            string stepPrefix) 
+            => Configurator.StepTitleFactory.Create(
+                stepTextTemplate, 
+                includeInputsInStepTitle, 
+                methodInfo, 
+                inputArguments, 
+                _testContext, 
+                stepPrefix);
+
         private bool FixAsserts(bool asserts, ExecutionOrder executionOrder)
         {
             if (executionOrder == ExecutionOrder.ConsecutiveStep)
@@ -174,59 +177,6 @@ private ExecutionOrder FixConsecutiveStep(ExecutionOrder executionOrder)
             return executionOrder;
         }
 
-        private StepTitle CreateTitle(string stepTextTemplate, bool includeInputsInStepTitle, MethodInfo methodInfo, StepArgument[] inputArguments, string stepPrefix)
-        {
-            Func<string> createTitle = () =>
-                {
-
-                    var flatInputArray = inputArguments.Select(o => o.Value).FlattenArrays();
-                    var name = methodInfo.Name;
-                    var stepTitleAttribute = methodInfo.GetCustomAttributes(typeof(StepTitleAttribute), true).SingleOrDefault();
-                    if (stepTitleAttribute != null)
-                    {
-                        var titleAttribute = ((StepTitleAttribute)stepTitleAttribute);
-                        name = string.Format(titleAttribute.StepTitle, flatInputArray);
-                        if (titleAttribute.IncludeInputsInStepTitle != null)
-                            includeInputsInStepTitle = titleAttribute.IncludeInputsInStepTitle.Value;
-                    }
-
-                    var stepTitle = AppendPrefix(Configurator.Humanizer.Humanize(name), stepPrefix);
-
-                    if (!string.IsNullOrEmpty(stepTextTemplate)) stepTitle = string.Format(stepTextTemplate, flatInputArray);
-                    else if (includeInputsInStepTitle)
-                    {
-                        var parameters = methodInfo.GetParameters();
-                        var stringFlatInputs =
-                            inputArguments
-                                .Select((a, i) => new { ParameterName = parameters[i].Name, Value = a })
-                                .Select(i =>
-                                {
-                                    if (_testContext.Examples != null)
-                                    {
-                                        var matchingHeaders = _testContext.Examples.Headers
-                                            .Where(header => ExampleTable.HeaderMatches(header, i.ParameterName) ||
-                                                            ExampleTable.HeaderMatches(header, i.Value.Name))
-                                            .ToList();
-
-                                        if (matchingHeaders.Count > 1)
-                                            throw new AmbiguousMatchException ($"More than one headers for examples, match the parameter '{i.ParameterName}' provided for '{methodInfo.Name}'");
-
-                                        var matchingHeader = matchingHeaders.SingleOrDefault();
-                                        if (matchingHeader != null)
-                                            return string.Format("<{0}>", matchingHeader);
-                                    }
-                                    return i.Value.Value.FlattenArray();
-                                })
-                                .ToArray();
-                        stepTitle = stepTitle + " " + string.Join(", ", stringFlatInputs);
-                    }
-
-                    return stepTitle.Trim();
-                };
-
-            return new StepTitle(createTitle);
-        }
-
         private static MethodInfo GetMethodInfo(LambdaExpression stepAction)
         {
             var methodCall = (MethodCallExpression)stepAction.Body;
diff --git a/src/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs b/src/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs
index 1e68d310..6dc145a0 100644
--- a/src/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs
+++ b/src/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.Serialization;
 
 namespace TestStack.BDDfy
 {
@@ -16,12 +15,5 @@ public StepTitleException(string message) : base(message)
         public StepTitleException(string message, Exception innerException) : base(message, innerException)
         {
         }
- #if NET40
-
-       protected StepTitleException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-#endif
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Scanners/StoryAttributeMetaDataScanner.cs b/src/TestStack.BDDfy/Scanners/StoryAttributeMetaDataScanner.cs
index 0d4f3d5e..c0219adf 100644
--- a/src/TestStack.BDDfy/Scanners/StoryAttributeMetaDataScanner.cs
+++ b/src/TestStack.BDDfy/Scanners/StoryAttributeMetaDataScanner.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Diagnostics;
 using System.Linq;
 
-namespace TestStack.BDDfy
+namespace TestStack.BDDfy.Scanners
 {
-    public class StoryAttributeMetadataScanner : IStoryMetadataScanner
+    internal class StoryAttributeMetadataScanner : IStoryMetadataScanner
     {
         public virtual StoryMetadata Scan(object testObject, Type explicitStoryType = null)
         {
@@ -39,22 +38,9 @@ protected virtual Type GetCandidateStory(object testObject, Type explicitStoryTy
             if (explicitStoryType != null)
                 return explicitStoryType;
 
-#if STACKTRACE
-            StackTrace stackTrace = new StackTrace();
-
-            var frames = stackTrace.GetFrames();
-            if (frames == null)
-                return null;
-            var scenarioType = testObject.GetType();
-            // This is assuming scenario and story live in the same assembly
-            var firstFrame = frames.LastOrDefault(f => f.GetMethod().DeclaringType.Assembly() == scenarioType.Assembly());
-            if (firstFrame == null)
-                return null;
-
-            return firstFrame.GetMethod().DeclaringType;
-#else
-            return null;
-#endif
+            var testObjectType = testObject.GetType();
+            var declaringType = testObjectType.DeclaringType;
+            return declaringType ?? testObjectType;
         }
 
         static StoryNarrativeAttribute GetStoryAttribute(Type candidateStoryType)
diff --git a/src/TestStack.BDDfy/SerializableAttribute.cs b/src/TestStack.BDDfy/SerializableAttribute.cs
deleted file mode 100644
index 85100866..00000000
--- a/src/TestStack.BDDfy/SerializableAttribute.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-#if NET40
-
-#else
-namespace System.Runtime.Serialization
-{
-    public class SerializableAttribute : Attribute
-    {
-    }
-}
-#endif
\ No newline at end of file
diff --git a/src/TestStack.BDDfy/Story.cs b/src/TestStack.BDDfy/Story.cs
index 0765350b..6c37a2b6 100644
--- a/src/TestStack.BDDfy/Story.cs
+++ b/src/TestStack.BDDfy/Story.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/src/TestStack.BDDfy/TestContext.cs b/src/TestStack.BDDfy/TestContext.cs
index 35a4613a..4c9c6e37 100644
--- a/src/TestStack.BDDfy/TestContext.cs
+++ b/src/TestStack.BDDfy/TestContext.cs
@@ -20,9 +20,8 @@ public static void SetContext(object testObject, ITestContext context)
 
             lock (_dictionaryLock)
             {
-                if (ContextLookup.ContainsKey(testObject))
+                if (ContextLookup.TryGetValue(testObject, out ITestContext oldContext))
                 {
-                    var oldContext = ContextLookup[testObject];
                     context.Examples = oldContext.Examples;
                     ContextLookup[testObject] = new TestContext(testObject);
                 }
@@ -51,8 +50,7 @@ public static void ClearContextFor(object testObject)
         {
             lock (_dictionaryLock)
             {
-                if (ContextLookup.ContainsKey(testObject))
-                    ContextLookup.Remove(testObject);
+                ContextLookup.Remove(testObject);
             }
         }
 
diff --git a/src/TestStack.BDDfy/TestStack.BDDfy.csproj b/src/TestStack.BDDfy/TestStack.BDDfy.csproj
index 2ffbe71c..17367de9 100644
--- a/src/TestStack.BDDfy/TestStack.BDDfy.csproj
+++ b/src/TestStack.BDDfy/TestStack.BDDfy.csproj
@@ -1,8 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Company>TestStack.BDDfy - http://teststack.github.com/TestStack.BDDfy/</Company>
+    <Product>TestStack.BDDfy</Product>
+    <Copyright>Copyright © 2011-2017 TestStack.BDDfy contributors</Copyright>
+  </PropertyGroup>
   <PropertyGroup>
 	  <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>TestStack.BDDfy</AssemblyName>
     <PackageId>TestStack.BDDfy</PackageId>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
@@ -12,8 +18,19 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
   </PropertyGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="**\Scripts\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+    <InternalsVisibleTo Include="$(AssemblyName).Tests" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/src/TestStack.BDDfy/TypeExtensions.cs b/src/TestStack.BDDfy/TypeExtensions.cs
index d20d7329..1e599c02 100644
--- a/src/TestStack.BDDfy/TypeExtensions.cs
+++ b/src/TestStack.BDDfy/TypeExtensions.cs
@@ -1,44 +1,9 @@
 using System;
 using System.Reflection;
+using System.Linq;
 
 namespace TestStack.BDDfy
 {
-#if NET40
-    public static class TypeExtensions
-    {
-        public static Assembly Assembly(this Type type)
-        {
-            return type.Assembly;
-        }
-
-        public static object[] GetCustomAttributes(this Type type, Type attributeType, bool inherit)
-        {
-            return type.GetCustomAttributes(attributeType, inherit);
-        }
-
-        public static bool IsEnum(this Type type)
-        {
-            return type.IsEnum;
-        }
-
-        public static bool IsGenericType(this Type type)
-        {
-            return type.IsGenericType;
-        }
-
-        public static bool IsInstanceOfType(this Type type, object obj)
-        {
-            return type.IsInstanceOfType(obj);
-        }
-
-        public static bool IsValueType(this Type type)
-        {
-            return type.IsValueType;
-        }
-    }
-
-#else
-using System.Linq;
     public static class TypeExtensions
     {
         public static Assembly Assembly(this Type type)
@@ -76,6 +41,4 @@ public static bool IsValueType(this Type type)
         }
     }
 
-#endif
-
 }