1.4.11

Fix match logic (#604 )
1.4.10
2026-01-14 07:33:33 +01:00 · 2021-04-18 21:32:42 +02:00 · 2021-04-18 21:30:03 +02:00 · 2021-04-15 19:46:41 +02:00 · 2021-04-15 19:41:45 +02:00 · 2021-03-31 18:23:49 +02:00
40 changed files with 1597 additions and 1555 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 1.4.11 (18 April 2021)
+- [#604](https://github.com/WireMock-Net/WireMock.Net/pull/604) - Fix match logic for exact bytearray contributed by [StefH](https://github.com/StefH)
+- [#601](https://github.com/WireMock-Net/WireMock.Net/issues/601) - Exact byte array request matching fails on specific byte arrays [bug]
+
+# 1.4.10 (15 April 2021)
+- [#603](https://github.com/WireMock-Net/WireMock.Net/pull/603) - Fix callback with Headers [bug] contributed by [StefH](https://github.com/StefH)
+- [#602](https://github.com/WireMock-Net/WireMock.Net/issues/602) - Header not being returned when set in WithCallback [bug]
+
+# 1.4.9 (31 March 2021)
+- [#600](https://github.com/WireMock-Net/WireMock.Net/pull/600) - WithProxy() should save the new mapping [bug] contributed by [StefH](https://github.com/StefH)
+
 # 1.4.8 (24 March 2021)
 - [#591](https://github.com/WireMock-Net/WireMock.Net/pull/591) - Webhook [feature] contributed by [StefH](https://github.com/StefH)
 - [#589](https://github.com/WireMock-Net/WireMock.Net/issues/589) - How to send a request to a specific URL after sending response [feature]
@@ -52,6 +63,7 @@
 - [#549](https://github.com/WireMock-Net/WireMock.Net/issues/549) - WithProxy(...) does not save the mappings to file [bug]

 # 1.3.8 (03 December 2020)
+- [#539](https://github.com/WireMock-Net/WireMock.Net/pull/539) - Support for partial JSON matching contributed by [gleb-osokin](https://github.com/gleb-osokin)
 - [#542](https://github.com/WireMock-Net/WireMock.Net/pull/542) - Create dotnet-wiremock tool [feature] contributed by [StefH](https://github.com/StefH)
 - [#543](https://github.com/WireMock-Net/WireMock.Net/pull/543) - Add support for .NET 5 [feature] contributed by [StefH](https://github.com/StefH)
 - [#544](https://github.com/WireMock-Net/WireMock.Net/pull/544) - Use Java 11 in Azure Pipelines (needed for SonarCloud) [feature] contributed by [StefH](https://github.com/StefH)
@@ -59,9 +71,6 @@
 - [#547](https://github.com/WireMock-Net/WireMock.Net/pull/547) - Fix Proxying with SSL and NetCoreApp3.1 [bug] contributed by [StefH](https://github.com/StefH)
 - [#524](https://github.com/WireMock-Net/WireMock.Net/issues/524) - Proxying with SSL Not Working in .NET Core 3.1 [bug]

-# 1.3.7 (17 November 2020)
- [#539](https://github.com/WireMock-Net/WireMock.Net/pull/539) - Support for partial JSON matching contributed by [gleb-osokin](https://github.com/gleb-osokin)
-
 # 1.3.6 (10 November 2020)
 - [#529](https://github.com/WireMock-Net/WireMock.Net/pull/529) - Add assertions for ClientIP, Url and ProxyUrl [feature] contributed by [akamud](https://github.com/akamud)
 - [#535](https://github.com/WireMock-Net/WireMock.Net/pull/535) - WithCallback should use also use enum HttpStatusCode [bug] contributed by [StefH](https://github.com/StefH)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <VersionPrefix>1.4.8</VersionPrefix>
+    <VersionPrefix>1.4.11</VersionPrefix>
    <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
    <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
    <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
--- a/GitHubReleaseNotes.txt
+++ b/GitHubReleaseNotes.txt
@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes

-GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.4.8
+GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.4.11
--- a/Solution.sln
+++ b/Solution.sln
@@ -82,8 +82,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Matchers.CShar
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net472.Classic", "examples\WireMock.Net.Console.Net472.Classic\WireMock.Net.Console.Net472.Classic.csproj", "{6580580B-1EFD-4922-B0EC-FF290DB279EE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.XamarinUI.Tests", "test\WireMock.Net.XamarinUI.Tests\WireMock.Net.XamarinUI.Tests.csproj", "{0DE14F1B-A51E-4B59-A87C-C6012DCD2844}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -206,14 +204,6 @@ Global
 		{6580580B-1EFD-4922-B0EC-FF290DB279EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6580580B-1EFD-4922-B0EC-FF290DB279EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6580580B-1EFD-4922-B0EC-FF290DB279EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0DE14F1B-A51E-4B59-A87C-C6012DCD2844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DE14F1B-A51E-4B59-A87C-C6012DCD2844}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DE14F1B-A51E-4B59-A87C-C6012DCD2844}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DE14F1B-A51E-4B59-A87C-C6012DCD2844}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -247,9 +237,7 @@ Global
 		{40BF24B5-12E6-4610-9489-138798632E28} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{3F8CF0AE-5F24-4A54-89E7-A3EE829DB5F8} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{B6269AAC-170A-4346-8B9A-444DED3D9A44} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
-		{B6269AAC-170A-4346-8B9A-444DED3D9A44} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{6580580B-1EFD-4922-B0EC-FF290DB279EE} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{0DE14F1B-A51E-4B59-A87C-C6012DCD2844} = {0BB8B634-407A-4610-A91F-11586990767A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
+++ b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
@@ -32,11 +32,8 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -57,6 +54,7 @@
      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Configuration.Install" />
    <Reference Include="System.Core" />
    <Reference Include="System.Management" />
--- a/examples/WireMock.Net.Service/packages.config
+++ b/examples/WireMock.Net.Service/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Handlebars.Net" version="1.9.5" targetFramework="net452" />
-  <package id="log4net" version="2.0.10" targetFramework="net452" />
+  <package id="log4net" version="2.0.12" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
--- a/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
+++ b/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
@@ -39,8 +39,8 @@
    <StartupObject>WireMock.Net.StandAlone.Net452.Program</StartupObject>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
@@ -49,12 +49,14 @@
      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
    <Reference Include="System.Numerics" />
+    <Reference Include="System.Web" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Xml.Linq" />
  </ItemGroup>
--- a/examples/WireMock.Net.StandAlone.Net452/packages.config
+++ b/examples/WireMock.Net.StandAlone.Net452/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.10" targetFramework="net452" />
+  <package id="log4net" version="2.0.12" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net452" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
--- a/src/WireMock.Net/IMapping.cs
+++ b/src/WireMock.Net/IMapping.cs
@@ -103,8 +103,8 @@ namespace WireMock
        /// ProvideResponseAsync
        /// </summary>
        /// <param name="requestMessage">The request message.</param>
-        /// <returns>The <see cref="ResponseMessage"/>.</returns>
-        Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage);
+        /// <returns>The <see cref="ResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
+        Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage);

        /// <summary>
        /// Gets the RequestMatchResult based on the RequestMessage.
--- a/src/WireMock.Net/Mapping.cs
+++ b/src/WireMock.Net/Mapping.cs
@@ -103,7 +103,7 @@ namespace WireMock
        }

        /// <inheritdoc cref="IMapping.ProvideResponseAsync" />
-        public async Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
+        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage)
        {
            return await Provider.ProvideResponseAsync(requestMessage, Settings);
        }
--- a/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
@@ -1,185 +1,195 @@
-using JetBrains.Annotations;
-using System;
-using System.Linq;
-using WireMock.Types;
+using JetBrains.Annotations;
+using System;
+using System.Linq;
+using WireMock.Types;
 using WireMock.Util;
-using WireMock.Validation;
-
-namespace WireMock.Matchers.Request
-{
-    /// <summary>
-    /// The request body matcher.
-    /// </summary>
-    public class RequestMessageBodyMatcher : IRequestMatcher
-    {
-        /// <summary>
-        /// The body function
-        /// </summary>
-        public Func<string, bool> Func { get; }
-
-        /// <summary>
-        /// The body data function for byte[]
-        /// </summary>
-        public Func<byte[], bool> DataFunc { get; }
-
-        /// <summary>
-        /// The body data function for json
-        /// </summary>
-        public Func<object, bool> JsonFunc { get; }
-
-        /// <summary>
-        /// The body data function for BodyData
-        /// </summary>
-        public Func<IBodyData, bool> BodyDataFunc { get; }
-
-        /// <summary>
-        /// The matchers.
-        /// </summary>
-        public IMatcher[] Matchers { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] string body) : this(new[] { new WildcardMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] byte[] body) : this(new[] { new ExactObjectMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] object body) : this(new[] { new ExactObjectMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="func">The function.</param>
-        public RequestMessageBodyMatcher([NotNull] Func<string, bool> func)
-        {
-            Check.NotNull(func, nameof(func));
-            Func = func;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="func">The function.</param>
-        public RequestMessageBodyMatcher([NotNull] Func<byte[], bool> func)
-        {
-            Check.NotNull(func, nameof(func));
-            DataFunc = func;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="func">The function.</param>
-        public RequestMessageBodyMatcher([NotNull] Func<object, bool> func)
-        {
-            Check.NotNull(func, nameof(func));
-            JsonFunc = func;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="func">The function.</param>
-        public RequestMessageBodyMatcher([NotNull] Func<IBodyData, bool> func)
-        {
-            Check.NotNull(func, nameof(func));
-            BodyDataFunc = func;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        public RequestMessageBodyMatcher([NotNull] params IMatcher[] matchers)
-        {
-            Check.NotNull(matchers, nameof(matchers));
-            Matchers = matchers;
-        }
-
-        /// <see cref="IRequestMatcher.GetMatchingScore"/>
-        public double GetMatchingScore(IRequestMessage requestMessage, RequestMatchResult requestMatchResult)
-        {
-            double score = CalculateMatchScore(requestMessage);
-            return requestMatchResult.AddScore(GetType(), score);
-        }
-
-        private double CalculateMatchScore(IRequestMessage requestMessage, IMatcher matcher)
-        {
-            // Check if the matcher is a IObjectMatcher
-            if (matcher is IObjectMatcher objectMatcher)
-            {
-                // If the body is a JSON object, try to match.
-                if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json)
-                {
-                    return objectMatcher.IsMatch(requestMessage.BodyData.BodyAsJson);
-                }
-
-                // If the body is a byte array, try to match.
-                if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Bytes)
-                {
-                    return objectMatcher.IsMatch(requestMessage.BodyData.BodyAsBytes);
-                }
-            }
-
-            // Check if the matcher is a IStringMatcher
-            if (matcher is IStringMatcher stringMatcher)
-            {
-                // If the body is a Json or a String, use the BodyAsString to match on.
-                if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json || requestMessage?.BodyData?.DetectedBodyType == BodyType.String)
-                {
-                    return stringMatcher.IsMatch(requestMessage.BodyData.BodyAsString);
-                }
-            }
-
-            return MatchScores.Mismatch;
-        }
-
-        private double CalculateMatchScore(IRequestMessage requestMessage)
-        {
-            if (Matchers != null && Matchers.Any())
-            {
-                return Matchers.Max(matcher => CalculateMatchScore(requestMessage, matcher));
-            }
-
-            if (Func != null)
-            {
-                return MatchScores.ToScore(Func(requestMessage?.BodyData?.BodyAsString));
-            }
-
-            if (JsonFunc != null)
-            {
-                return MatchScores.ToScore(JsonFunc(requestMessage?.BodyData?.BodyAsJson));
-            }
-
-            if (DataFunc != null)
-            {
-                return MatchScores.ToScore(DataFunc(requestMessage?.BodyData?.BodyAsBytes));
-            }
-
-            if (BodyDataFunc != null)
-            {
-                return MatchScores.ToScore(BodyDataFunc(requestMessage?.BodyData));
-            }
-
-            return MatchScores.Mismatch;
-        }
-    }
+using WireMock.Validation;
+
+namespace WireMock.Matchers.Request
+{
+    /// <summary>
+    /// The request body matcher.
+    /// </summary>
+    public class RequestMessageBodyMatcher : IRequestMatcher
+    {
+        /// <summary>
+        /// The body function
+        /// </summary>
+        public Func<string, bool> Func { get; }
+
+        /// <summary>
+        /// The body data function for byte[]
+        /// </summary>
+        public Func<byte[], bool> DataFunc { get; }
+
+        /// <summary>
+        /// The body data function for json
+        /// </summary>
+        public Func<object, bool> JsonFunc { get; }
+
+        /// <summary>
+        /// The body data function for BodyData
+        /// </summary>
+        public Func<IBodyData, bool> BodyDataFunc { get; }
+
+        /// <summary>
+        /// The matchers.
+        /// </summary>
+        public IMatcher[] Matchers { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="body">The body.</param>
+        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] string body) : this(new[] { new WildcardMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="body">The body.</param>
+        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] byte[] body) : this(new[] { new ExactObjectMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="body">The body.</param>
+        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] object body) : this(new[] { new ExactObjectMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="func">The function.</param>
+        public RequestMessageBodyMatcher([NotNull] Func<string, bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+            Func = func;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="func">The function.</param>
+        public RequestMessageBodyMatcher([NotNull] Func<byte[], bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+            DataFunc = func;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="func">The function.</param>
+        public RequestMessageBodyMatcher([NotNull] Func<object, bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+            JsonFunc = func;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="func">The function.</param>
+        public RequestMessageBodyMatcher([NotNull] Func<IBodyData, bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+            BodyDataFunc = func;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="matchers">The matchers.</param>
+        public RequestMessageBodyMatcher([NotNull] params IMatcher[] matchers)
+        {
+            Check.NotNull(matchers, nameof(matchers));
+            Matchers = matchers;
+        }
+
+        /// <see cref="IRequestMatcher.GetMatchingScore"/>
+        public double GetMatchingScore(IRequestMessage requestMessage, RequestMatchResult requestMatchResult)
+        {
+            double score = CalculateMatchScore(requestMessage);
+            return requestMatchResult.AddScore(GetType(), score);
+        }
+
+        private double CalculateMatchScore(IRequestMessage requestMessage, IMatcher matcher)
+        {
+            if (matcher is ExactObjectMatcher exactObjectMatcher)
+            {
+                // If the body is a byte array, try to match.
+                var detectedBodyType = requestMessage?.BodyData?.DetectedBodyType;
+                if (detectedBodyType == BodyType.Bytes || detectedBodyType == BodyType.String)
+                {
+                    return exactObjectMatcher.IsMatch(requestMessage.BodyData.BodyAsBytes);
+                }
+            }
+
+            // Check if the matcher is a IObjectMatcher
+            if (matcher is IObjectMatcher objectMatcher)
+            {
+                // If the body is a JSON object, try to match.
+                if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json)
+                {
+                    return objectMatcher.IsMatch(requestMessage.BodyData.BodyAsJson);
+                }
+
+                // If the body is a byte array, try to match.
+                if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Bytes)
+                {
+                    return objectMatcher.IsMatch(requestMessage.BodyData.BodyAsBytes);
+                }
+            }
+
+            // Check if the matcher is a IStringMatcher
+            if (matcher is IStringMatcher stringMatcher)
+            {
+                // If the body is a Json or a String, use the BodyAsString to match on.
+                if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json || requestMessage?.BodyData?.DetectedBodyType == BodyType.String)
+                {
+                    return stringMatcher.IsMatch(requestMessage.BodyData.BodyAsString);
+                }
+            }
+
+            return MatchScores.Mismatch;
+        }
+
+        private double CalculateMatchScore(IRequestMessage requestMessage)
+        {
+            if (Matchers != null && Matchers.Any())
+            {
+                return Matchers.Max(matcher => CalculateMatchScore(requestMessage, matcher));
+            }
+
+            if (Func != null)
+            {
+                return MatchScores.ToScore(Func(requestMessage?.BodyData?.BodyAsString));
+            }
+
+            if (JsonFunc != null)
+            {
+                return MatchScores.ToScore(JsonFunc(requestMessage?.BodyData?.BodyAsJson));
+            }
+
+            if (DataFunc != null)
+            {
+                return MatchScores.ToScore(DataFunc(requestMessage?.BodyData?.BodyAsBytes));
+            }
+
+            if (BodyDataFunc != null)
+            {
+                return MatchScores.ToScore(BodyDataFunc(requestMessage?.BodyData));
+            }
+
+            return MatchScores.Mismatch;
+        }
+    }
 }
--- a/src/WireMock.Net/Models/BodyData.cs
+++ b/src/WireMock.Net/Models/BodyData.cs
@@ -6,7 +6,7 @@ namespace WireMock.Util
    /// <summary>
    /// BodyData
    /// </summary>
-    internal class BodyData : IBodyData
+    public class BodyData : IBodyData
    {
        /// <inheritdoc cref="IBodyData.Encoding" />
        public Encoding Encoding { get; set; }
--- a/src/WireMock.Net/Owin/WireMockMiddleware.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddleware.cs
@@ -129,15 +129,16 @@ namespace WireMock.Owin
                    await Task.Delay(_options.RequestProcessingDelay.Value);
                }

-                response = await targetMapping.ProvideResponseAsync(request);
+                var (theResponse, theOptionalNewMapping) = await targetMapping.ProvideResponseAsync(request);
+                response = theResponse;

                var responseBuilder = targetMapping.Provider as Response;

-                if (!targetMapping.IsAdminInterface)
+                if (!targetMapping.IsAdminInterface && theOptionalNewMapping != null)
                {
                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMapping == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMapping == true)
                    {
-                        _options.Mappings.TryAdd(targetMapping.Guid, targetMapping);
+                        _options.Mappings.TryAdd(theOptionalNewMapping.Guid, theOptionalNewMapping);
                    }

                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMappingToFile == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMappingToFile == true)
@@ -146,7 +147,7 @@ namespace WireMock.Owin
                        var mappingConverter = new MappingConverter(matcherMapper);
                        var mappingToFileSaver = new MappingToFileSaver(targetMapping.Settings, mappingConverter);

-                        mappingToFileSaver.SaveMappingToFile(targetMapping);
+                        mappingToFileSaver.SaveMappingToFile(theOptionalNewMapping);
                    }
                }

--- a/src/WireMock.Net/Proxy/ProxyHelper.cs
+++ b/src/WireMock.Net/Proxy/ProxyHelper.cs
@@ -1,111 +1,111 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
-using WireMock.Http;
-using WireMock.Matchers;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
-using WireMock.Settings;
-using WireMock.Types;
-using WireMock.Util;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using WireMock.Http;
+using WireMock.Matchers;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Settings;
+using WireMock.Types;
+using WireMock.Util;
 using WireMock.Validation;

-namespace WireMock.Proxy
-{
-    internal class ProxyHelper
-    {
-        private readonly IWireMockServerSettings _settings;
-
-        public ProxyHelper([NotNull] IWireMockServerSettings settings)
-        {
-            Check.NotNull(settings, nameof(settings));
-            _settings = settings;
-        }
-
-        public async Task<(ResponseMessage ResponseMessage, IMapping Mapping)> SendAsync(
-            [NotNull] IProxyAndRecordSettings proxyAndRecordSettings,
-            [NotNull] HttpClient client,
-            [NotNull] RequestMessage requestMessage,
-            [NotNull] string url)
-        {
-            Check.NotNull(client, nameof(client));
-            Check.NotNull(requestMessage, nameof(requestMessage));
-            Check.NotNull(url, nameof(url));
-
-            var originalUri = new Uri(requestMessage.Url);
-            var requiredUri = new Uri(url);
-
-            // Create HttpRequestMessage
-            var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url);
-
-            // Call the URL
-            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);
-
-            // Create ResponseMessage
-            bool deserializeJson = !_settings.DisableJsonBodyParsing.GetValueOrDefault(false);
-            bool decompressGzipAndDeflate = !_settings.DisableRequestBodyDecompressing.GetValueOrDefault(false);
-
-            var responseMessage = await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson, decompressGzipAndDeflate);
-
-            IMapping mapping = null;
-            if (HttpStatusRangeParser.IsMatch(proxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) &&
-                (proxyAndRecordSettings.SaveMapping || proxyAndRecordSettings.SaveMappingToFile))
-            {
-                mapping = ToMapping(proxyAndRecordSettings, requestMessage, responseMessage);
-            }
-
-            return (responseMessage, mapping);
-        }
-
-        private IMapping ToMapping(IProxyAndRecordSettings proxyAndRecordSettings, RequestMessage requestMessage, ResponseMessage responseMessage)
-        {
-            string[] excludedHeaders = proxyAndRecordSettings.ExcludedHeaders ?? new string[] { };
-            string[] excludedCookies = proxyAndRecordSettings.ExcludedCookies ?? new string[] { };
-
-            var request = Request.Create();
-            request.WithPath(requestMessage.Path);
-            request.UsingMethod(requestMessage.Method);
-
-            requestMessage.Query.Loop((key, value) => request.WithParam(key, false, value.ToArray()));
-            requestMessage.Cookies.Loop((key, value) =>
-            {
-                if (!excludedCookies.Contains(key, StringComparer.OrdinalIgnoreCase))
-                {
-                    request.WithCookie(key, value);
-                }
-            });
-
-            var allExcludedHeaders = new List<string>(excludedHeaders) { "Cookie" };
-            requestMessage.Headers.Loop((key, value) =>
-            {
-                if (!allExcludedHeaders.Contains(key, StringComparer.OrdinalIgnoreCase))
-                {
-                    request.WithHeader(key, value.ToArray());
-                }
-            });
-
-            bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
-            switch (requestMessage.BodyData?.DetectedBodyType)
-            {
-                case BodyType.Json:
-                    request.WithBody(new JsonMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsJson, true, throwExceptionWhenMatcherFails));
-                    break;
-
-                case BodyType.String:
-                    request.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, throwExceptionWhenMatcherFails, requestMessage.BodyData.BodyAsString));
-                    break;
-
-                case BodyType.Bytes:
-                    request.WithBody(new ExactObjectMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsBytes, throwExceptionWhenMatcherFails));
-                    break;
-            }
-
-            var response = Response.Create(responseMessage);
-
-            return new Mapping(Guid.NewGuid(), string.Empty, null, _settings, request, response, 0, null, null, null, null, null);
-        }
-    }
+namespace WireMock.Proxy
+{
+    internal class ProxyHelper
+    {
+        private readonly IWireMockServerSettings _settings;
+
+        public ProxyHelper([NotNull] IWireMockServerSettings settings)
+        {
+            Check.NotNull(settings, nameof(settings));
+            _settings = settings;
+        }
+
+        public async Task<(ResponseMessage Message, IMapping Mapping)> SendAsync(
+            [NotNull] IProxyAndRecordSettings proxyAndRecordSettings,
+            [NotNull] HttpClient client,
+            [NotNull] RequestMessage requestMessage,
+            [NotNull] string url)
+        {
+            Check.NotNull(client, nameof(client));
+            Check.NotNull(requestMessage, nameof(requestMessage));
+            Check.NotNull(url, nameof(url));
+
+            var originalUri = new Uri(requestMessage.Url);
+            var requiredUri = new Uri(url);
+
+            // Create HttpRequestMessage
+            var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url);
+
+            // Call the URL
+            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);
+
+            // Create ResponseMessage
+            bool deserializeJson = !_settings.DisableJsonBodyParsing.GetValueOrDefault(false);
+            bool decompressGzipAndDeflate = !_settings.DisableRequestBodyDecompressing.GetValueOrDefault(false);
+
+            var responseMessage = await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson, decompressGzipAndDeflate);
+
+            IMapping mapping = null;
+            if (HttpStatusRangeParser.IsMatch(proxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) &&
+                (proxyAndRecordSettings.SaveMapping || proxyAndRecordSettings.SaveMappingToFile))
+            {
+                mapping = ToMapping(proxyAndRecordSettings, requestMessage, responseMessage);
+            }
+
+            return (responseMessage, mapping);
+        }
+
+        private IMapping ToMapping(IProxyAndRecordSettings proxyAndRecordSettings, RequestMessage requestMessage, ResponseMessage responseMessage)
+        {
+            string[] excludedHeaders = proxyAndRecordSettings.ExcludedHeaders ?? new string[] { };
+            string[] excludedCookies = proxyAndRecordSettings.ExcludedCookies ?? new string[] { };
+
+            var request = Request.Create();
+            request.WithPath(requestMessage.Path);
+            request.UsingMethod(requestMessage.Method);
+
+            requestMessage.Query.Loop((key, value) => request.WithParam(key, false, value.ToArray()));
+            requestMessage.Cookies.Loop((key, value) =>
+            {
+                if (!excludedCookies.Contains(key, StringComparer.OrdinalIgnoreCase))
+                {
+                    request.WithCookie(key, value);
+                }
+            });
+
+            var allExcludedHeaders = new List<string>(excludedHeaders) { "Cookie" };
+            requestMessage.Headers.Loop((key, value) =>
+            {
+                if (!allExcludedHeaders.Contains(key, StringComparer.OrdinalIgnoreCase))
+                {
+                    request.WithHeader(key, value.ToArray());
+                }
+            });
+
+            bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
+            switch (requestMessage.BodyData?.DetectedBodyType)
+            {
+                case BodyType.Json:
+                    request.WithBody(new JsonMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsJson, true, throwExceptionWhenMatcherFails));
+                    break;
+
+                case BodyType.String:
+                    request.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, throwExceptionWhenMatcherFails, requestMessage.BodyData.BodyAsString));
+                    break;
+
+                case BodyType.Bytes:
+                    request.WithBody(new ExactObjectMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsBytes, throwExceptionWhenMatcherFails));
+                    break;
+            }
+
+            var response = Response.Create(responseMessage);
+
+            return new Mapping(Guid.NewGuid(), string.Empty, null, _settings, request, response, 0, null, null, null, null, null);
+        }
+    }
 }
--- a/src/WireMock.Net/ResponseBuilders/Response.cs
+++ b/src/WireMock.Net/ResponseBuilders/Response.cs
@@ -335,7 +335,7 @@ namespace WireMock.ResponseBuilders
        }

        /// <inheritdoc cref="IResponseProvider.ProvideResponseAsync(RequestMessage, IWireMockServerSettings)"/>
-        public async Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
            Check.NotNull(requestMessage, nameof(requestMessage));
            Check.NotNull(settings, nameof(settings));
@@ -361,14 +361,12 @@ namespace WireMock.ResponseBuilders

                var proxyHelper = new ProxyHelper(settings);

-                var (proxyResponseMessage, _) = await proxyHelper.SendAsync(
+                return await proxyHelper.SendAsync(
                    ProxyAndRecordSettings,
                    _httpClientForProxy,
                    requestMessage,
                    requestMessage.ProxyUrl
                );
-
-                return proxyResponseMessage;
            }

            ResponseMessage responseMessage;
@@ -394,7 +392,7 @@ namespace WireMock.ResponseBuilders
                }

                // Copy Headers from ResponseMessage (if defined)
-                if (ResponseMessage.Headers != null)
+                if (ResponseMessage.Headers?.Count > 0)
                {
                    responseMessage.Headers = ResponseMessage.Headers;
                }
@@ -420,7 +418,7 @@ namespace WireMock.ResponseBuilders
                        throw new NotImplementedException($"TransformerType '{TransformerType}' is not supported.");
                }

-                return responseMessageTransformer.Transform(requestMessage, responseMessage, UseTransformerForBodyAsFile);
+                return (responseMessageTransformer.Transform(requestMessage, responseMessage, UseTransformerForBodyAsFile), null);
            }

            if (!UseTransformer && ResponseMessage.BodyData?.BodyAsFileIsCached == true)
@@ -428,7 +426,7 @@ namespace WireMock.ResponseBuilders
                ResponseMessage.BodyData.BodyAsBytes = settings.FileSystemHandler.ReadResponseBodyAsFile(responseMessage.BodyData.BodyAsFile);
            }

-            return responseMessage;
+            return (responseMessage, null);
        }
    }
 }
--- a/src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs
@@ -13,9 +13,9 @@ namespace WireMock.ResponseProviders
            _responseMessageFunc = responseMessageFunc;
        }

-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
-            return _responseMessageFunc(requestMessage);
+            return (await _responseMessageFunc(requestMessage), null);
        }
    }
 }
--- a/src/WireMock.Net/ResponseProviders/DynamicResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/DynamicResponseProvider.cs
@@ -13,9 +13,10 @@ namespace WireMock.ResponseProviders
            _responseMessageFunc = responseMessageFunc;
        }

-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        public Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
-            return Task.FromResult(_responseMessageFunc(requestMessage));
+            (ResponseMessage responseMessage, IMapping mapping) result = (_responseMessageFunc(requestMessage), null);
+            return Task.FromResult(result);
        }
    }
 }
--- a/src/WireMock.Net/ResponseProviders/IResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/IResponseProvider.cs
@@ -16,7 +16,7 @@ namespace WireMock.ResponseProviders
        /// </summary>
        /// <param name="requestMessage">The request.</param>
        /// <param name="settings">The WireMockServerSettings.</param>
-        /// <returns>The <see cref="ResponseMessage"/>.</returns>
-        Task<ResponseMessage> ProvideResponseAsync([NotNull] RequestMessage requestMessage, [NotNull] IWireMockServerSettings settings);
+        /// <returns>The <see cref="ResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
+        Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync([NotNull] RequestMessage requestMessage, [NotNull] IWireMockServerSettings settings);
    }
 }
--- a/src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs
@@ -15,9 +15,9 @@ namespace WireMock.ResponseProviders
            _settings = settings;
        }

-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
-            return _responseMessageFunc(requestMessage, _settings);
+            return (await _responseMessageFunc(requestMessage, _settings), null);
        }
    }
 }
--- a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs
+++ b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs
@@ -13,7 +13,6 @@ using WireMock.Matchers;
 using System.Collections.Generic;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
-using WireMock.ResponseProviders;
 using WireMock.Settings;
 using FluentAssertions;
 using WireMock.Handlers;
@@ -177,7 +176,8 @@ namespace WireMock.Net.Tests.Owin
            _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
            _mappingMock.SetupGet(m => m.Settings).Returns(settings);

-            _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync(new ResponseMessage());
+            var newMappingFromProxy = new Mapping(Guid.NewGuid(), "", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null);
+            _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));

            var requestBuilder = Request.Create().UsingAnyMethod();
            _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder);
@@ -230,7 +230,8 @@ namespace WireMock.Net.Tests.Owin
            _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
            _mappingMock.SetupGet(m => m.Settings).Returns(settings);

-            _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync(new ResponseMessage());
+            var newMappingFromProxy = new Mapping(Guid.NewGuid(), "", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null);
+            _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));

            var requestBuilder = Request.Create().UsingAnyMethod();
            _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder);
--- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs
+++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs
@@ -209,13 +209,15 @@ namespace WireMock.Net.Tests.RequestMatchers
            Check.That(score).IsEqualTo(1.0d);
        }

-        [Fact]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsBytes_IObjectMatcher()
+        [Theory]
+        [InlineData(new byte[] { 1 })]
+        [InlineData(new byte[] { 48 })]
+        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsBytes_IObjectMatcher(byte[] bytes)
        {
            // Assign
            var body = new BodyData
            {
-                BodyAsBytes = new byte[] { 1 },
+                BodyAsBytes = bytes,
                DetectedBodyType = BodyType.Bytes
            };
            var objectMatcherMock = new Mock<IObjectMatcher>();
--- a/test/WireMock.Net.Tests/RequestWithBodyTests.cs
+++ b/test/WireMock.Net.Tests/RequestWithBodyTests.cs
@@ -2,6 +2,7 @@
 using NFluent;
 using System;
 using System.Text;
+using FluentAssertions;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Models;
@@ -307,17 +308,20 @@ namespace WireMock.Net.Tests
            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Fact]
-        public void Request_WithBodyAsBytes_ExactObjectMatcher_true()
+        [Theory]
+        [InlineData(new byte[] { 1 }, BodyType.Bytes)]
+        [InlineData(new byte[] { 48, 49, 50 }, BodyType.Bytes)]
+        [InlineData(new byte[] { 48, 49, 50 }, BodyType.String)]
+        public void Request_WithBodyAsBytes_ExactObjectMatcher_true(byte[] bytes, BodyType detectedBodyType)
        {
            // Assign
-            byte[] body = { 123 };
+            byte[] body = bytes;
            var requestBuilder = Request.Create().UsingAnyMethod().WithBody(body);

            var bodyData = new BodyData
            {
-                BodyAsBytes = new byte[] { 123 },
-                DetectedBodyType = BodyType.Bytes
+                BodyAsBytes = bytes,
+                DetectedBodyType = detectedBodyType
            };

            // Act
@@ -325,7 +329,7 @@ namespace WireMock.Net.Tests

            // Assert
            var requestMatchResult = new RequestMatchResult();
-            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+            requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0);
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs
@@ -18,13 +18,13 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var responseMessage = new ResponseMessage { StatusCode = 500 };
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", "::1");

-            var response = Response.Create(() => responseMessage);
+            var responseBuilder = Response.Create(() => responseMessage);

            // Act
-            var providedResponse = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(providedResponse).Equals(responseMessage);
+            Check.That(response.Message).Equals(responseMessage);
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs
@@ -40,15 +40,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);

-            var response = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII);

            // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // then
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("01");
-            Check.That(responseMessage.BodyData.BodyAsBytes).IsNull();
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsString).Equals("01");
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -62,15 +62,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);

-            var response = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII);

            // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // then
-            Check.That(responseMessage.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 });
-            Check.That(responseMessage.BodyData.BodyAsString).IsNull();
-            Check.That(responseMessage.BodyData.Encoding).IsNull();
+            Check.That(response.Message.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 });
+            Check.That(response.Message.BodyData.BodyAsString).IsNull();
+            Check.That(response.Message.BodyData.Encoding).IsNull();
        }

        [Fact]
@@ -84,14 +84,14 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);

-            var response = Response.Create().WithBody("test", null, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody("test", null, Encoding.ASCII);

            // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // then
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -106,14 +106,14 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);

            object x = new { value = "test" };
-            var response = Response.Create().WithBodyAsJson(x, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBodyAsJson(x, Encoding.ASCII);

            // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // then
-            Check.That(responseMessage.BodyData.BodyAsJson).Equals(x);
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsJson).Equals(x);
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -128,14 +128,14 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);

            object x = new { message = "Hello" };
-            var response = Response.Create().WithBodyAsJson(x, true);
+            var responseBuilder = Response.Create().WithBodyAsJson(x, true);

            // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // then
-            Check.That(responseMessage.BodyData.BodyAsJson).Equals(x);
-            Check.That(responseMessage.BodyData.BodyAsJsonIndented).IsEqualTo(true);
+            Check.That(response.Message.BodyData.BodyAsJson).Equals(x);
+            Check.That(response.Message.BodyData.BodyAsJsonIndented).IsEqualTo(true);
        }

        [Fact]
@@ -144,16 +144,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", ClientIp);

-            var response = Response.Create().WithBody("r", BodyDestinationFormat.SameAsSource, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.SameAsSource, Encoding.ASCII);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsBytes).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsJson).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("r");
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response.Message.BodyData.BodyAsJson).IsNull();
+            Check.That(response.Message.BodyData.BodyAsString).Equals("r");
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -162,16 +162,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", ClientIp);

-            var response = Response.Create().WithBody("r", BodyDestinationFormat.Bytes, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.Bytes, Encoding.ASCII);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsJson).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsBytes).IsNotNull();
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsString).IsNull();
+            Check.That(response.Message.BodyData.BodyAsJson).IsNull();
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNotNull();
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -180,16 +180,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", ClientIp);

-            var response = Response.Create().WithBody("{ \"value\": 42 }", BodyDestinationFormat.Json, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody("{ \"value\": 42 }", BodyDestinationFormat.Json, Encoding.ASCII);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsBytes).IsNull();
-            Check.That(((dynamic)responseMessage.BodyData.BodyAsJson).value).Equals(42);
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsString).IsNull();
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(((dynamic)response.Message.BodyData.BodyAsJson).value).Equals(42);
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -198,23 +198,23 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost/test"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithStatusCode(500)
                .WithHeader("H1", "X1")
                .WithHeader("H2", "X2")
                .WithBody(req => $"path: {req.Path}");

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo("path: /test");
-            Check.That(responseMessage.BodyData.BodyAsBytes).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsJson).IsNull();
-            Check.That(responseMessage.BodyData.Encoding.CodePage).Equals(Encoding.UTF8.CodePage);
-            Check.That(responseMessage.StatusCode).IsEqualTo(500);
-            Check.That(responseMessage.Headers["H1"].ToString()).IsEqualTo("X1");
-            Check.That(responseMessage.Headers["H2"].ToString()).IsEqualTo("X2");
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test");
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response.Message.BodyData.BodyAsJson).IsNull();
+            Check.That(response.Message.BodyData.Encoding.CodePage).Equals(Encoding.UTF8.CodePage);
+            Check.That(response.Message.StatusCode).IsEqualTo(500);
+            Check.That(response.Message.Headers["H1"].ToString()).IsEqualTo("X1");
+            Check.That(response.Message.Headers["H2"].ToString()).IsEqualTo("X2");
        }

        [Fact]
@@ -223,7 +223,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost/test"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithStatusCode(500)
                .WithHeader("H1", "X1")
                .WithHeader("H2", "X2")
@@ -234,16 +234,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
                });

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo("path: /test");
-            Check.That(responseMessage.BodyData.BodyAsBytes).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsJson).IsNull();
-            Check.That(responseMessage.BodyData.Encoding.CodePage).Equals(Encoding.UTF8.CodePage);
-            Check.That(responseMessage.StatusCode).IsEqualTo(500);
-            Check.That(responseMessage.Headers["H1"].ToString()).IsEqualTo("X1");
-            Check.That(responseMessage.Headers["H2"].ToString()).IsEqualTo("X2");
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test");
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response.Message.BodyData.BodyAsJson).IsNull();
+            Check.That(response.Message.BodyData.Encoding.CodePage).Equals(Encoding.UTF8.CodePage);
+            Check.That(response.Message.StatusCode).IsEqualTo(500);
+            Check.That(response.Message.Headers["H1"].ToString()).IsEqualTo("X1");
+            Check.That(response.Message.Headers["H2"].ToString()).IsEqualTo("X2");
        }

        [Fact]
@@ -256,25 +256,25 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request1 = new RequestMessage(new UrlDetails($"http://localhost/test?id={request1Id}"), "GET", ClientIp);
            var request2 = new RequestMessage(new UrlDetails($"http://localhost/test?id={request2Id}"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithStatusCode(200)
                .WithBodyAsJson(JObject.Parse("{ \"id\": \"{{request.query.id}}\" }"))
                .WithTransformer();

            // Act
-            var response1Message = await response.ProvideResponseAsync(request1, _settings);
-            var response2Message = await response.ProvideResponseAsync(request2, _settings);
+            var response1 = await responseBuilder.ProvideResponseAsync(request1, _settings);
+            var response2 = await responseBuilder.ProvideResponseAsync(request2, _settings);

            // Assert
-            Check.That(((JToken)response1Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request1Id);
-            Check.That(response1Message.BodyData.BodyAsBytes).IsNull();
-            Check.That(response1Message.BodyData.BodyAsString).IsNull();
-            Check.That(response1Message.StatusCode).IsEqualTo(200);
+            Check.That(((JToken)response1.Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request1Id);
+            Check.That(response1.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response1.Message.BodyData.BodyAsString).IsNull();
+            Check.That(response1.Message.StatusCode).IsEqualTo(200);

-            Check.That(((JToken)response2Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request2Id);
-            Check.That(response2Message.BodyData.BodyAsBytes).IsNull();
-            Check.That(response2Message.BodyData.BodyAsString).IsNull();
-            Check.That(response2Message.StatusCode).IsEqualTo(200);
+            Check.That(((JToken)response2.Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request2Id);
+            Check.That(response2.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response2.Message.BodyData.BodyAsString).IsNull();
+            Check.That(response2.Message.StatusCode).IsEqualTo(200);
        }

        [Fact]
@@ -285,12 +285,12 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request1 = new RequestMessage(new UrlDetails("http://localhost/__admin/files/filename.txt"), "PUT", ClientIp, bodyDataAsFile);

-            var response = Response.Create().WithStatusCode(200).WithBody(fileContents);
+            var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents);

-            var provideResponseAsync = await response.ProvideResponseAsync(request1, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request1, _settings);

-            Check.That(provideResponseAsync.StatusCode).IsEqualTo(200);
-            Check.That(provideResponseAsync.BodyData.BodyAsString).Contains(fileContents);
+            Check.That(response.Message.StatusCode).IsEqualTo(200);
+            Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents);
        }

        [Fact]
@@ -301,12 +301,12 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request1 = new RequestMessage(new UrlDetails("http://localhost/__admin/files/filename.txt"), "GET", ClientIp, bodyDataAsFile);

-            var response = Response.Create().WithStatusCode(200).WithBody(fileContents);
+            var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents);

-            var provideResponseAsync = await response.ProvideResponseAsync(request1, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request1, _settings);

-            Check.That(provideResponseAsync.StatusCode).IsEqualTo(200);
-            Check.That(provideResponseAsync.BodyData.BodyAsString).Contains(fileContents);
+            Check.That(response.Message.StatusCode).IsEqualTo(200);
+            Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents);
        }

        [Fact]
@@ -317,12 +317,12 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request1 = new RequestMessage(new UrlDetails("http://localhost/__admin/files/filename.txt"), "DELETE", ClientIp, bodyDataAsFile);

-            var response = Response.Create().WithStatusCode(200).WithBody("File deleted.");
+            var responseBuilder = Response.Create().WithStatusCode(200).WithBody("File deleted.");

-            var provideResponseAsync = await response.ProvideResponseAsync(request1, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request1, _settings);

-            Check.That(provideResponseAsync.StatusCode).IsEqualTo(200);
-            Check.That(provideResponseAsync.BodyData.BodyAsString).Contains("File deleted.");
+            Check.That(response.Message.StatusCode).IsEqualTo(200);
+            Check.That(response.Message.BodyData.BodyAsString).Contains("File deleted.");
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs
@@ -33,7 +33,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
        {
            // Assign
            var requestMessage = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithCallback(async request =>
                {
                    await Task.Delay(1);
@@ -50,11 +50,11 @@ namespace WireMock.Net.Tests.ResponseBuilders
                });

            // Act
-            var responseMessage = await response.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);

            // Assert
-            responseMessage.BodyData.BodyAsString.Should().Be("/fooBar");
-            responseMessage.StatusCode.Should().Be(302);
+            response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
+            response.Message.StatusCode.Should().Be(302);
        }

        [Fact]
@@ -62,7 +62,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
        {
            // Assign
            var requestMessage = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithCallback(request => new ResponseMessage
                {
                    BodyData = new BodyData
@@ -74,20 +74,50 @@ namespace WireMock.Net.Tests.ResponseBuilders
                });

            // Act
-            var responseMessage = await response.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);

            // Assert
-            responseMessage.BodyData.BodyAsString.Should().Be("/fooBar");
-            responseMessage.StatusCode.Should().Be(302);
+            response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
+            response.Message.StatusCode.Should().Be(302);
        }

        [Fact]
-        public async Task Response_WithCallback_And_WithStatusCode_And_WithHeader()
+        public async Task Response_WithCallback_ShouldUseStatusCodeAndHeaderInTheCallback()
        {
            // Assign
            var header = "X-UserId";
            var requestMessage = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
-            var response = Response.Create()
+            var responseBuilder = Response.Create()
+                .WithCallback(request => new ResponseMessage
+                {
+                    BodyData = new BodyData
+                    {
+                        DetectedBodyType = BodyType.String,
+                        BodyAsString = request.Path + "Bar"
+                    },
+                    StatusCode = HttpStatusCode.Accepted,
+                    Headers = new Dictionary<string, WireMockList<string>>
+                    {
+                        { header, new WireMockList<string>("Stef") }
+                    }
+                });
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);
+
+            // Assert
+            response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
+            response.Message.StatusCode.Should().Be(HttpStatusCode.Accepted);
+            response.Message.Headers[header].Should().ContainSingle("Stef");
+        }
+
+        [Fact]
+        public async Task Response_WithCallback_And_Additional_WithStatusCode_And_WithHeader_ShouldUseAdditional()
+        {
+            // Assign
+            var header = "X-UserId";
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
+            var responseBuilder = Response.Create()
                .WithCallback(request => new ResponseMessage
                {
                    BodyData = new BodyData
@@ -105,12 +135,12 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithHeader(header, "Stef");

            // Act
-            var responseMessage = await response.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);

            // Assert
-            responseMessage.BodyData.BodyAsString.Should().Be("/fooBar");
-            responseMessage.StatusCode.Should().Be(HttpStatusCode.Accepted);
-            responseMessage.Headers[header].Should().ContainSingle("Stef");
+            response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
+            response.Message.StatusCode.Should().Be(HttpStatusCode.Accepted);
+            response.Message.Headers[header].Should().ContainSingle("Stef");
        }

        [Fact]
@@ -118,7 +148,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
        {
            // Assign
            var requestMessage = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithCallback(request => new ResponseMessage
                {
                    BodyData = new BodyData
@@ -131,11 +161,11 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);

            // Assert
-            responseMessage.BodyData.BodyAsString.Should().Be("/fooBar");
-            responseMessage.StatusCode.Should().Be(302);
+            response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
+            response.Message.StatusCode.Should().Be(302);
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs
@@ -21,12 +21,12 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request = new RequestMessage(new UrlDetails("http://localhost/fault"), "GET", ClientIp);

            // Act
-            var response = Response.Create().WithFault(faultType);
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseBuilder = Response.Create().WithFault(faultType);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            responseMessage.FaultType.Should().Be(faultType);
-            responseMessage.FaultPercentage.Should().BeNull();
+            response.Message.FaultType.Should().Be(faultType);
+            response.Message.FaultPercentage.Should().BeNull();
        }

        [Theory]
@@ -37,12 +37,12 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request = new RequestMessage(new UrlDetails("http://localhost/fault"), "GET", ClientIp);

            // Act
-            var response = Response.Create().WithFault(faultType, percentage);
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseBuilder = Response.Create().WithFault(faultType, percentage);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            responseMessage.FaultType.Should().Be(faultType);
-            responseMessage.FaultPercentage.Should().Be(percentage);
+            response.Message.FaultType.Should().Be(faultType);
+            response.Message.FaultPercentage.Should().Be(percentage);
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs
@@ -1,100 +1,99 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using HandlebarsDotNet;
-using Moq;
-using Newtonsoft.Json.Linq;
-using NFluent;
-using WireMock.Handlers;
-using WireMock.Models;
-using WireMock.ResponseBuilders;
-using WireMock.Settings;
-using Xunit;
-
-namespace WireMock.Net.Tests.ResponseBuilders
-{
-    public class ResponseWithHandlebarsFileTests
-    {
-        private readonly Mock<IFileSystemHandler> _filesystemHandlerMock;
-        private readonly WireMockServerSettings _settings = new WireMockServerSettings();
-        private const string ClientIp = "::1";
-
-        public ResponseWithHandlebarsFileTests()
-        {
-            _filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-            _filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("abc");
-
-            _settings.FileSystemHandler = _filesystemHandlerMock.Object;
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponseAsync_Handlebars_File()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Data = "{{File \"x.json\"}}"
-                })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["Data"].Value<string>()).Equals("abc");
-
-            // Verify
-            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once);
-            _filesystemHandlerMock.VerifyNoOtherCalls();
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponseAsync_Handlebars_File_Replace()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234?id=x"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Data = "{{File \"{{request.query.id}}.json\"}}"
-                })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["Data"].Value<string>()).Equals("abc");
-
-            // Verify
-            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once);
-            _filesystemHandlerMock.VerifyNoOtherCalls();
-        }
-
-        [Fact]
-        public void Response_ProvideResponseAsync_Handlebars_File_WithMissingArgument_Throws_HandlebarsException()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Data = "{{File}}"
-                })
-                .WithTransformer();
-
-            // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<HandlebarsException>();
-
-            // Verify
-            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString(It.IsAny<string>()), Times.Never);
-            _filesystemHandlerMock.VerifyNoOtherCalls();
-        }
-    }
+using Moq;
+using Newtonsoft.Json.Linq;
+using NFluent;
+using WireMock.Handlers;
+using WireMock.Models;
+using WireMock.ResponseBuilders;
+using WireMock.Settings;
+using Xunit;
+
+namespace WireMock.Net.Tests.ResponseBuilders
+{
+    public class ResponseWithHandlebarsFileTests
+    {
+        private readonly Mock<IFileSystemHandler> _filesystemHandlerMock;
+        private readonly WireMockServerSettings _settings = new WireMockServerSettings();
+        private const string ClientIp = "::1";
+
+        public ResponseWithHandlebarsFileTests()
+        {
+            _filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+            _filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("abc");
+
+            _settings.FileSystemHandler = _filesystemHandlerMock.Object;
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponseAsync_Handlebars_File()
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new
+                {
+                    Data = "{{File \"x.json\"}}"
+                })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["Data"].Value<string>()).Equals("abc");
+
+            // Verify
+            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once);
+            _filesystemHandlerMock.VerifyNoOtherCalls();
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponseAsync_Handlebars_File_Replace()
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234?id=x"), "GET", ClientIp);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new
+                {
+                    Data = "{{File \"{{request.query.id}}.json\"}}"
+                })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["Data"].Value<string>()).Equals("abc");
+
+            // Verify
+            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once);
+            _filesystemHandlerMock.VerifyNoOtherCalls();
+        }
+
+        [Fact]
+        public void Response_ProvideResponseAsync_Handlebars_File_WithMissingArgument_Throws_HandlebarsException()
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new
+                {
+                    Data = "{{File}}"
+                })
+                .WithTransformer();
+
+            // Act
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<HandlebarsException>();
+
+            // Verify
+            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString(It.IsAny<string>()), Times.Never);
+            _filesystemHandlerMock.VerifyNoOtherCalls();
+        }
+    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs
@@ -34,15 +34,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{String.Uppercase request.body}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("ABC");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("ABC");
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs
@@ -71,16 +71,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBodyAsJson(new { x = "{{JsonPath.SelectToken request.body \"$.Manufacturers[?(@.Name == 'Acme Co')]\"}}" })
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["x"]).IsNotNull();
            Check.That(j["x"]["Name"].ToString()).Equals("Acme Co");
        }
@@ -97,16 +97,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBodyAsJson(new { x = "{{JsonPath.SelectToken request.body \"..Price\"}}" })
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["x"].Value<long>()).Equals(99);
        }

@@ -151,16 +151,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBody("{{JsonPath.SelectToken request.body \"$.Manufacturers[?(@.Name == 'Acme Co')]\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
+            Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
        }

        [Fact]
@@ -204,16 +204,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBody("{{JsonPath.SelectToken request.bodyAsJson \"$.Manufacturers[?(@.Name == 'Acme Co')]\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
+            Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
        }

        [Fact]
@@ -257,16 +257,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBody("{{#JsonPath.SelectTokens request.body \"$..Products[?(@.Price >= 50)].Name\"}}{{#each this}}%{{@index}}:{{this}}%{{/each}}{{/JsonPath.SelectTokens}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
        }

        [Fact]
@@ -310,16 +310,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBody("{{#JsonPath.SelectTokens request.bodyAsJson \"$..Products[?(@.Price >= 50)].Name\"}}{{#each this}}%{{@index}}:{{this}}%{{/each}}{{/JsonPath.SelectTokens}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
        }

        [Fact]
@@ -339,13 +339,13 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBody("{{#JsonPath.SelectTokens request.body \"$..Products[?(@.Price >= 50)].Name\"}}{{id}} {{value}},{{/JsonPath.SelectTokens}}")
                .WithTransformer();

            // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<ArgumentNullException>();
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<ArgumentNullException>();
        }

        [Fact]
@@ -364,15 +364,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, bodyData);

            string jsonPath = "\"$.MyUniqueNumber\"";
-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithTransformer()
                .WithBodyFromFile(@"c:\\{{JsonPath.SelectToken request.body " + jsonPath + "}}\\test.json"); // why use a \\ here ?

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.json");
+            Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.json");
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs
@@ -1,249 +1,249 @@
-using System;
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using FluentAssertions;
 using HandlebarsDotNet;
-using Moq;
-using Newtonsoft.Json.Linq;
-using NFluent;
-using WireMock.Handlers;
-using WireMock.Models;
-using WireMock.ResponseBuilders;
-using WireMock.Settings;
-using WireMock.Types;
-using WireMock.Util;
-using Xunit;
-
-namespace WireMock.Net.Tests.ResponseBuilders
-{
-    public class ResponseWithHandlebarsLinqTests
-    {
-        private readonly Mock<IFileSystemHandler> _filesystemHandlerMock;
-        private readonly WireMockServerSettings _settings = new WireMockServerSettings();
-
-        public ResponseWithHandlebarsLinqTests()
-        {
-            _filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-            _filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("abc");
-
-            _settings.FileSystemHandler = _filesystemHandlerMock.Object;
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Linq1_String0()
-        {
-            // Assign
-            var body = new BodyData();
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234/pathtest"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithHeader("Content-Type", "application/json")
-                .WithBodyAsJson(new { x = "{{Linq request.Path 'it'}}" })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["x"]).IsNotNull();
-            Check.That(j["x"].ToString()).Equals("/pathtest");
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Linq1_String1()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new JObject
-                {
-                    { "Id", new JValue(9) },
-                    { "Name", new JValue("Test") }
-                },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithHeader("Content-Type", "application/json")
-                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 'it.Name + \"_123\"' }}" })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["x"]).IsNotNull();
-            Check.That(j["x"].ToString()).Equals("Test_123");
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Linq1_String2()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new JObject
-                {
-                    { "Id", new JValue(9) },
-                    { "Name", new JValue("Test") }
-                },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithHeader("Content-Type", "application/json")
-                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 'new(it.Name + \"_123\" as N, it.Id as I)' }}" })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["x"]).IsNotNull();
-            Check.That(j["x"].ToString()).Equals("{ N = Test_123, I = 9 }");
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Linq2_Object()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new JObject
-                {
-                    { "Id", new JValue(9) },
-                    { "Name", new JValue("Test") }
-                },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithHeader("Content-Type", "application/json")
-                .WithBodyAsJson(new { x = "{{#Linq request.bodyAsJson 'new(it.Name + \"_123\" as N, it.Id as I)' }}{{this}}{{/Linq}}" })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["x"]).IsNotNull();
-            Check.That(j["x"].ToString()).Equals("{ N = Test_123, I = 9 }");
-        }
-
-        [Fact]
-        public void Response_ProvideResponse_Handlebars_Linq_Throws_ArgumentException()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new { x = "x" },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 1}}" })
-                .WithTransformer();
-
-            // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<ArgumentException>();
-        }
-
-        [Fact]
-        public void Response_ProvideResponse_Handlebars_Linq1_Throws_ArgumentNullException()
-        {
-            // Assign
-            var body = new BodyData();
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new { x = "{{Linq request.body 'Name'}}" })
-                .WithTransformer();
-
-            // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<ArgumentNullException>();
-        }
-
-        [Fact]
-        public void Response_ProvideResponse_Handlebars_Linq1_Throws_HandlebarsException()
-        {
-            // Assign
-            var body = new BodyData();
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson}} ''" })
-                .WithTransformer();
-
-            // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<HandlebarsException>();
-        }
-
-        [Fact]
-        public void Response_ProvideResponse_Handlebars_Linq1_ParseError_Throws_ExceptionMessage()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new JObject
-                {
-                    { "Id", new JValue(9) },
-                    { "Name", new JValue("Test") }
-                },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson '---' }}" })
-                .WithTransformer();
-
-            // Act
-            Func<Task> a = async () => await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            a.Should().Throw<HandlebarsException>();
-        }
-
-        [Fact]
-        public void Response_ProvideResponse_Handlebars_Linq2_ParseError_Throws_ExceptionMessage()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new JObject
-                {
-                    { "Id", new JValue(9) },
-                    { "Name", new JValue("Test") }
-                },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new { x = "{{#Linq request.bodyAsJson '---' }}{{this}}{{/Linq}}" })
-                .WithTransformer();
-
-            // Act
-            Func<Task> a = async () => await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            a.Should().Throw<HandlebarsException>();
-        }
-    }
+using Moq;
+using Newtonsoft.Json.Linq;
+using NFluent;
+using WireMock.Handlers;
+using WireMock.Models;
+using WireMock.ResponseBuilders;
+using WireMock.Settings;
+using WireMock.Types;
+using WireMock.Util;
+using Xunit;
+
+namespace WireMock.Net.Tests.ResponseBuilders
+{
+    public class ResponseWithHandlebarsLinqTests
+    {
+        private readonly Mock<IFileSystemHandler> _filesystemHandlerMock;
+        private readonly WireMockServerSettings _settings = new WireMockServerSettings();
+
+        public ResponseWithHandlebarsLinqTests()
+        {
+            _filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+            _filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("abc");
+
+            _settings.FileSystemHandler = _filesystemHandlerMock.Object;
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Linq1_String0()
+        {
+            // Assign
+            var body = new BodyData();
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234/pathtest"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithHeader("Content-Type", "application/json")
+                .WithBodyAsJson(new { x = "{{Linq request.Path 'it'}}" })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["x"]).IsNotNull();
+            Check.That(j["x"].ToString()).Equals("/pathtest");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Linq1_String1()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new JObject
+                {
+                    { "Id", new JValue(9) },
+                    { "Name", new JValue("Test") }
+                },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithHeader("Content-Type", "application/json")
+                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 'it.Name + \"_123\"' }}" })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["x"]).IsNotNull();
+            Check.That(j["x"].ToString()).Equals("Test_123");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Linq1_String2()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new JObject
+                {
+                    { "Id", new JValue(9) },
+                    { "Name", new JValue("Test") }
+                },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithHeader("Content-Type", "application/json")
+                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 'new(it.Name + \"_123\" as N, it.Id as I)' }}" })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["x"]).IsNotNull();
+            Check.That(j["x"].ToString()).Equals("{ N = Test_123, I = 9 }");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Linq2_Object()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new JObject
+                {
+                    { "Id", new JValue(9) },
+                    { "Name", new JValue("Test") }
+                },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithHeader("Content-Type", "application/json")
+                .WithBodyAsJson(new { x = "{{#Linq request.bodyAsJson 'new(it.Name + \"_123\" as N, it.Id as I)' }}{{this}}{{/Linq}}" })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["x"]).IsNotNull();
+            Check.That(j["x"].ToString()).Equals("{ N = Test_123, I = 9 }");
+        }
+
+        [Fact]
+        public void Response_ProvideResponse_Handlebars_Linq_Throws_ArgumentException()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new { x = "x" },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 1}}" })
+                .WithTransformer();
+
+            // Act
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<ArgumentException>();
+        }
+
+        [Fact]
+        public void Response_ProvideResponse_Handlebars_Linq1_Throws_ArgumentNullException()
+        {
+            // Assign
+            var body = new BodyData();
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new { x = "{{Linq request.body 'Name'}}" })
+                .WithTransformer();
+
+            // Act
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<ArgumentNullException>();
+        }
+
+        [Fact]
+        public void Response_ProvideResponse_Handlebars_Linq1_Throws_HandlebarsException()
+        {
+            // Assign
+            var body = new BodyData();
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson}} ''" })
+                .WithTransformer();
+
+            // Act
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<HandlebarsException>();
+        }
+
+        [Fact]
+        public void Response_ProvideResponse_Handlebars_Linq1_ParseError_Throws_ExceptionMessage()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new JObject
+                {
+                    { "Id", new JValue(9) },
+                    { "Name", new JValue("Test") }
+                },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson '---' }}" })
+                .WithTransformer();
+
+            // Act
+            Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            a.Should().Throw<HandlebarsException>();
+        }
+
+        [Fact]
+        public void Response_ProvideResponse_Handlebars_Linq2_ParseError_Throws_ExceptionMessage()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new JObject
+                {
+                    { "Id", new JValue(9) },
+                    { "Name", new JValue("Test") }
+                },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new { x = "{{#Linq request.bodyAsJson '---' }}{{this}}{{/Linq}}" })
+                .WithTransformer();
+
+            // Act
+            Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            a.Should().Throw<HandlebarsException>();
+        }
+    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs
@@ -32,7 +32,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    Text = "{{Random Type=\"Text\" Min=8 Max=20}}",
@@ -43,10 +43,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["Text"].Value<string>()).IsNotEmpty();
            Check.That(j["Integer"].Value<int>()).IsEqualTo(1000);
            Check.That(j["Long"].Value<long>()).IsStrictlyGreaterThan(77777777).And.IsStrictlyLessThan(99999999);
@@ -58,7 +58,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    Value = "{{Random Type=\"Boolean\"}}"
@@ -66,10 +66,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["Value"].Type).IsEqualTo(JTokenType.Boolean);
        }

@@ -79,7 +79,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    Guid1 = "{{Random Type=\"Guid\" Uppercase=false}}",
@@ -88,10 +88,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            string guid1 = j["Guid1"].Value<string>();
            Check.That(guid1.ToUpper()).IsNotEqualTo(guid1);
            string guid2 = j["Guid2"].Value<string>();
@@ -104,7 +104,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    StringValue = "{{Random Type=\"StringList\" Values=[\"a\", \"b\", \"c\"]}}"
@@ -112,10 +112,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            string value = j["StringValue"].Value<string>();
            Check.That(new[] { "a", "b", "c" }.Contains(value)).IsTrue();
        }
@@ -126,7 +126,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    Integer = "{{#Random Type=\"Integer\" Min=10000000 Max=99999999}}{{this}}{{/Random}}",
@@ -134,10 +134,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["Integer"].Value<int>()).IsStrictlyGreaterThan(10000000).And.IsStrictlyLessThan(99999999);
        }
    }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs
@@ -35,15 +35,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{Regex.Match request.body \"^(\\w+)$\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("abc");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("abc");
        }

        [Fact]
@@ -54,15 +54,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{Regex.Match request.body \"^?0$\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("");
        }

        [Fact]
@@ -73,15 +73,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{Regex.Match request.body \"^?0$\" \"d\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("d");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("d");
        }

        [Fact]
@@ -92,15 +92,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{#Regex.Match request.body \"^(?<proto>\\w+)://[^/]+?(?<port>\\d+)/?\"}}{{this.port}}-{{this.proto}}{{/Regex.Match}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("5000-https");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("5000-https");
        }

        [Fact]
@@ -111,15 +111,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{#Regex.Match request.body \"^(?<proto>\\w+)://[^/]+?(?<port>\\d+)/?\"}}{{this}}{{/Regex.Match}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("");
        }

        [Fact]
@@ -130,15 +130,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{#Regex.Match request.body \"^(?<proto>\\w+)://[^/]+?(?<port>\\d+)/?\" \"x\"}}{{this}}{{/Regex.Match}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("x");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("x");
        }

        [Fact]
@@ -149,12 +149,12 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{#Regex.Match request.bodyAsJson \"^(?<proto>\\w+)://[^/]+?(?<port>\\d+)/?\"}}{{/Regex.Match}}")
                .WithTransformer();

            // Act and Assert
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<ArgumentNullException>();
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<ArgumentNullException>();
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs
@@ -46,16 +46,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/xml")
                .WithBody("<response>{{XPath.SelectSingleNode request.body \"/todo-list/todo-item[1]\"}}</response>")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            var nav = new XmlDocument { InnerXml = responseMessage.BodyData.BodyAsString }.CreateNavigator();
+            var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator();
            var node = nav.XPath2SelectSingleNode("/response/todo-item");
            Check.That(node.Value).Equals("abc");
            Check.That(node.GetAttribute("id", "")).Equals("a1");
@@ -77,16 +77,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/xml")
                .WithBody("{{XPath.SelectSingleNode request.body \"/todo-list/todo-item[1]/text()\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo("abc");
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("abc");
        }

        [Fact]
@@ -105,16 +105,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/xml")
                .WithBody("<response>{{XPath.SelectNodes request.body \"/todo-list/todo-item\"}}</response>")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            var nav = new XmlDocument { InnerXml = responseMessage.BodyData.BodyAsString }.CreateNavigator();
+            var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator();
            var nodes = nav.XPath2SelectNodes("/response/todo-item");
            Check.That(nodes.Count + 1).IsEqualTo(3);
        }
@@ -135,16 +135,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/xml")
                .WithBody("{{XPath.Evaluate request.body \"boolean(/todo-list[count(todo-item) = 3])\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualIgnoringCase("True");
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualIgnoringCase("True");
        }

        [Fact]
@@ -163,16 +163,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/xml")
                .WithBody("{{XPath.Evaluate request.body \"string(/todo-list/todo-item[1]/@id)\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo("a1");
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("a1");
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs
@@ -31,7 +31,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    Number = "{{Xeger.Generate \"[1-9]{1}\\d{3}\"}}",
@@ -40,10 +40,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["Number"].Value<int>()).IsStrictlyGreaterThan(1000).And.IsStrictlyLessThan(9999);
            Check.That(j["Postcode"].Value<string>()).IsNotEmpty();
        }
@@ -54,7 +54,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    Number = "{{#Xeger.Generate \"[1-9]{1}\\d{3}\"}}{{this}}{{/Xeger.Generate}}",
@@ -63,10 +63,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["Number"].Value<int>()).IsStrictlyGreaterThan(1000).And.IsStrictlyLessThan(9999);
            Check.That(j["Postcode"].Value<string>()).IsNotEmpty();
        }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs
@@ -28,7 +28,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var response = await builder.ProvideResponseAsync(requestMock, _settings);

            // Assert
-            Check.That(response.Headers[headerName].ToString()).Equals(headerValue);
+            Check.That(response.Message.Headers[headerName].ToString()).Equals(headerValue);
        }

        [Theory]
@@ -44,7 +44,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var response = await builder.ProvideResponseAsync(requestMock, _settings);

            // Assert
-            Check.That(response.Headers[headerName].ToArray()).Equals(headerValues);
+            Check.That(response.Message.Headers[headerName].ToArray()).Equals(headerValues);
        }

        [Fact]
@@ -59,7 +59,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var responseMessage = await response.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.Headers["h"]).ContainsExactly("x");
+            Check.That(responseMessage.Message.Headers["h"]).ContainsExactly("x");
        }

        [Fact]
@@ -68,13 +68,13 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", ClientIp);
            var headers = new Dictionary<string, string[]> { { "h", new[] { "x" } } };
-            var response = Response.Create().WithHeaders(headers);
+            var responseBuilder = Response.Create().WithHeaders(headers);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.Headers["h"]).ContainsExactly("x");
+            Check.That(response.Message.Headers["h"]).ContainsExactly("x");
        }

        [Fact]
@@ -83,13 +83,13 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", ClientIp);
            var headers = new Dictionary<string, WireMockList<string>> { { "h", new WireMockList<string>("x") } };
-            var response = Response.Create().WithHeaders(headers);
+            var builder = Response.Create().WithHeaders(headers);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await builder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.Headers["h"]).ContainsExactly("x");
+            Check.That(response.Message.Headers["h"]).ContainsExactly("x");
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs
@@ -46,16 +46,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml" } } };
            var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}{prepend}/{_guid}{append}"), "POST", ClientIp, new BodyData { DetectedBodyType = BodyType.Json, BodyAsJson = new { a = 1 } }, headers);
-            var response = Response.Create().WithProxy(_server.Urls[0]);
+            var responseBuilder = Response.Create().WithProxy(_server.Urls[0]);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
            Check.That(request.ProxyUrl).IsNotNull();
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo(expectedBody);
-            Check.That(responseMessage.StatusCode).IsEqualTo(201);
-            Check.That(responseMessage.Headers["Content-Type"].ToString()).IsEqualTo("application/json");
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualTo(expectedBody);
+            Check.That(response.Message.StatusCode).IsEqualTo(201);
+            Check.That(response.Message.Headers["Content-Type"].ToString()).IsEqualTo("application/json");
        }

        [Fact]
@@ -72,12 +72,12 @@ namespace WireMock.Net.Tests.ResponseBuilders
                    Password = "y"
                }
            };
-            var response = Response.Create().WithProxy(settings);
+            var responseBuilder = Response.Create().WithProxy(settings);

            // Act
            var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}/{_guid}"), "GET", ClientIp);

-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<HttpRequestException>();
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<HttpRequestException>();
        }

        public void Dispose()
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs
@@ -40,13 +40,13 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var urlDetails = UrlUtils.Parse(new Uri("http://localhost/wiremock/a/b"), new PathString("/wiremock"));
            var request = new RequestMessage(urlDetails, "GET", ClientIp);

-            var response = Response.Create().WithTransformer(TransformerType.ScribanDotLiquid);
+            var responseBuilder = Response.Create().WithTransformer(TransformerType.ScribanDotLiquid);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            responseMessage.BodyData.Should().BeNull();
+            response.Message.BodyData.Should().BeNull();
        }

        [Fact]
@@ -60,15 +60,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POSt", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("test {{request.Url}} {{request.Path}} {{request.Method}}")
                .WithTransformer(TransformerType.Scriban);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs
@@ -24,26 +24,26 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request = new RequestMessage(new UrlDetails("http://localhost/fault"), "GET", ClientIp);

            // Act
-            var response = Response.Create();
+            var responseBuilder = Response.Create();
            switch (statusCode)
            {
                case string statusCodeAsString:
-                    response = response.WithStatusCode(statusCodeAsString);
+                    responseBuilder = responseBuilder.WithStatusCode(statusCodeAsString);
                    break;

                case int statusCodeAInteger:
-                    response = response.WithStatusCode(statusCodeAInteger);
+                    responseBuilder = responseBuilder.WithStatusCode(statusCodeAInteger);
                    break;

                case HttpStatusCode statusCodeAsEnum:
-                    response = response.WithStatusCode(statusCodeAsEnum);
+                    responseBuilder = responseBuilder.WithStatusCode(statusCodeAsEnum);
                    break;
            }

-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settingsMock.Object);

            // Assert
-            responseMessage.StatusCode.Should().Be(expectedStatusCode);
+            response.Message.StatusCode.Should().Be(expectedStatusCode);
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs
@@ -46,13 +46,13 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var urlDetails = UrlUtils.Parse(new Uri("http://localhost/wiremock/a/b"), new PathString("/wiremock"));
            var request = new RequestMessage(urlDetails, "GET", ClientIp);

-            var response = Response.Create().WithTransformer(transformerType);
+            var responseBuilder = Response.Create().WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            responseMessage.BodyData.Should().BeNull();
+            response.Message.BodyData.Should().BeNull();
        }

        [Theory]
@@ -69,15 +69,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POSt", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("test {{request.Url}} {{request.Path}} {{request.Method}}")
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");
        }

        [Theory]
@@ -93,15 +93,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var urlDetails = UrlUtils.Parse(new Uri("http://localhost/wiremock/a/b"), new PathString("/wiremock"));
            var request = new RequestMessage(urlDetails, httpMethod, ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("url={{request.Url}} absoluteurl={{request.AbsoluteUrl}} path={{request.Path}} absolutepath={{request.AbsolutePath}}")
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("url=http://localhost/a/b absoluteurl=http://localhost/wiremock/a/b path=/a/b absolutepath=/wiremock/a/b");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("url=http://localhost/a/b absoluteurl=http://localhost/wiremock/a/b path=/a/b absolutepath=/wiremock/a/b");
        }

        [Fact]
@@ -111,15 +111,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var urlDetails = UrlUtils.Parse(new Uri("http://localhost/wiremock/a/b"), new PathString("/wiremock"));
            var request = new RequestMessage(urlDetails, "POST", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{request.PathSegments.[0]}} {{request.AbsolutePathSegments.[0]}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("a wiremock");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock");
        }

        [Theory(Skip = "Invalid token `OpenBracket`")]
@@ -131,15 +131,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var urlDetails = UrlUtils.Parse(new Uri("http://localhost/wiremock/a/b"), new PathString("/wiremock"));
            var request = new RequestMessage(urlDetails, "POST", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{request.PathSegments.[0]}} {{request.AbsolutePathSegments.[0]}}")
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("a wiremock");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock");
        }

        [Fact]
@@ -153,15 +153,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo?a=1&a=2&b=5"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("test keya={{request.query.a}} idx={{request.query.a.[0]}} idx={{request.query.a.[1]}} keyb={{request.query.b}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test keya=1,2 idx=1 idx=2 keyb=5");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1,2 idx=1 idx=2 keyb=5");
        }

        [Theory(Skip = "Invalid token `OpenBracket`")]
@@ -177,15 +177,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo?a=1&a=2&b=5"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("test keya={{request.query.a}} idx={{request.query.a.[0]}} idx={{request.query.a.[1]}} keyb={{request.query.b}}")
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5");
        }

        [Fact]
@@ -199,17 +199,17 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo?a=400"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithStatusCode("{{request.query.a}}")
                .WithBody("test")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.StatusCode).Equals("400");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+            Check.That(response.Message.StatusCode).Equals("400");
        }

        [Theory(Skip = "WireMockList is not supported by Scriban")]
@@ -225,17 +225,17 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo?a=400"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithStatusCode("{{request.Query.a}}")
                .WithBody("test")
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.StatusCode).Equals("400");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+            Check.That(response.Message.StatusCode).Equals("400");
        }

        [Theory]
@@ -252,16 +252,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo?a=400"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("test")
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.StatusCode).Equals(null);
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+            Check.That(response.Message.StatusCode).Equals(null);
        }

        [Fact]
@@ -275,15 +275,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body, new Dictionary<string, string[]> { { "Content-Type", new[] { "text/plain" } } });

-            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
+            var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.Headers).ContainsKey("x");
-            Check.That(responseMessage.Headers["x"]).ContainsExactly("text/plain");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+            Check.That(response.Message.Headers).ContainsKey("x");
+            Check.That(response.Message.Headers["x"]).ContainsExactly("text/plain");
        }

        [Fact]
@@ -297,16 +297,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body, new Dictionary<string, string[]> { { "Content-Type", new[] { "text/plain" } } });

-            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer();
+            var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.Headers).ContainsKey("x");
-            Check.That(responseMessage.Headers["x"]).Contains("text/plain");
-            Check.That(responseMessage.Headers["x"]).Contains("http://localhost/foo");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+            Check.That(response.Message.Headers).ContainsKey("x");
+            Check.That(response.Message.Headers["x"]).Contains("text/plain");
+            Check.That(response.Message.Headers["x"]).Contains("http://localhost/foo");
        }

        [Theory(Skip = "WireMockList is not supported by Scriban")]
@@ -322,16 +322,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body, new Dictionary<string, string[]> { { "Content-Type", new[] { "text/plain" } } });

-            var response = Response.Create().WithHeader("x", "{{request.Headers[\"Content-Type\"]}}", "{{request.Url}}").WithBody("test").WithTransformer(transformerType);
+            var responseBuilder = Response.Create().WithHeader("x", "{{request.Headers[\"Content-Type\"]}}", "{{request.Url}}").WithBody("test").WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.Headers).ContainsKey("x");
-            Check.That(responseMessage.Headers["x"]).Contains("text/plain");
-            Check.That(responseMessage.Headers["x"]).Contains("http://localhost/foo");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+            Check.That(response.Message.Headers).ContainsKey("x");
+            Check.That(response.Message.Headers["x"]).Contains("text/plain");
+            Check.That(response.Message.Headers["x"]).Contains("http://localhost/foo");
        }

        [Theory]
@@ -348,15 +348,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("test {{request.Origin}} {{request.Port}} {{request.Protocol}} {{request.Host}}")
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test http://localhost:1234 1234 http localhost");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost:1234 1234 http localhost");
        }

        [Theory]
@@ -375,15 +375,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new { x = "test {{request.Path}}" })
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}");
+            Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}");
        }

        [Theory]
@@ -402,15 +402,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo_array"), "POST", ClientIp, bodyData);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new[] { "first", "{{request.path}}", "{{request.bodyAsJson.a}}", "{{request.bodyAsJson.b}}", "last" })
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]");
+            Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]");
        }

        [Fact]
@@ -419,15 +419,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost/foo?MyUniqueNumber=1"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithTransformer()
                .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
+            Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
        }

        [Theory(Skip = @"Does not work in Scriban --> c:\\[""1""]\\test.xml")]
@@ -438,15 +438,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost/foo?MyUniqueNumber=1"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithTransformer(transformerType)
                .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
+            Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
        }

        [Theory]
@@ -463,17 +463,17 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost/foo?MyUniqueNumber=1"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithTransformer(transformerType, true)
                .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
-            Check.That(responseMessage.BodyData.DetectedBodyType).Equals(BodyType.String);
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("<xml MyUniqueNumber=\"1\"></xml>");
+            Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
+            Check.That(response.Message.BodyData.DetectedBodyType).Equals(BodyType.String);
+            Check.That(response.Message.BodyData.BodyAsString).Equals("<xml MyUniqueNumber=\"1\"></xml>");
        }

        [Theory]
@@ -492,15 +492,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson("test")
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("\"test\"");
+            Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("\"test\"");
        }

        [Fact(Skip = "todo...")]
@@ -516,15 +516,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson("{{{request.BodyAsJson}}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
+            Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
        }

        [Theory(Skip = "{{{ }}} Does not work in Scriban")]
@@ -542,15 +542,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson("{{{request.BodyAsJson}}}")
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
+            Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
        }

        [Theory]
@@ -570,16 +570,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{request.Body}}", BodyDestinationFormat.SameAsSource, enc)
                .WithTransformer(transformerType);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            responseMessage.BodyData.BodyAsString.Should().Be(text);
-            responseMessage.BodyData.Encoding.Should().Be(enc);
+            response.Message.BodyData.BodyAsString.Should().Be(text);
+            response.Message.BodyData.Encoding.Should().Be(enc);
        }
    }
 }
--- a/test/WireMock.Net.Tests/WireMockAdminApiTests.cs
+++ b/test/WireMock.Net.Tests/WireMockAdminApiTests.cs
Author	SHA1	Message	Date
Stef Heyenrath	660a09e656	1.4.11	2021-04-18 21:32:42 +02:00
Stef Heyenrath	fbecd3b119	Fix match logic (#604 )	2021-04-18 21:30:03 +02:00
Stef Heyenrath	b17840cea9	1.4.10	2021-04-15 19:46:41 +02:00
Stef Heyenrath	969b0da8e2	Fix callback with Headers (#603 )	2021-04-15 19:41:45 +02:00
Stef Heyenrath	dc078b57ea	1.4.9	2021-03-31 18:23:49 +02:00
Stef Heyenrath	8140b37095	WithProxy() should save the new mapping (#600 ) * WithProxy should save the new mapping * fix ut * .	2021-03-31 18:17:27 +02:00