1.0.2.6

Fix proxy headers handling (#60 )
* Fix proxy headers handling * Small refactor and moved proxy tests to new test-file.
2026-01-14 06:13:35 +01:00 · 2017-10-30 08:49:16 +01:00 · 2017-10-28 18:59:34 +02:00 · 2017-10-27 21:49:03 +02:00 · 2017-10-27 12:12:13 +02:00 · 2017-10-25 21:33:57 +02:00
39 changed files with 702 additions and 402 deletions
--- a/Solution.sln
+++ b/Solution.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2002
+VisualStudioVersion = 15.0.27004.2005
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF242EDF-7133-4277-9A0C-18744DE08707}"
 EndProject
@@ -14,6 +14,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{F0C22C47-DF71-463C-9B04-B4E0F3B8708A}"
+	ProjectSection(SolutionItems) = preProject
+		examples\WireMock.Net.Console.Record.NETCoreApp\__admin\mappings\ab38efae-4e4d-4f20-8afe-635533ec2535.json = examples\WireMock.Net.Console.Record.NETCoreApp\__admin\mappings\ab38efae-4e4d-4f20-8afe-635533ec2535.json
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{890A1DED-C229-4FA1-969E-AAC3BBFC05E5}"
 EndProject
--- a/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
@@ -18,9 +18,6 @@
    <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
-    <Content Include="__admin\mappings\826aff7c-6208-4a3c-923d-575248907db4.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
  </ItemGroup>

  <ItemGroup>
@@ -28,4 +25,13 @@
    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
  </ItemGroup>

+  <ItemGroup>
+    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
--- a/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json
+++ b/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json
@@ -14,8 +14,9 @@
    },
    "Response": {
        "BodyAsJson": { "body": "static mapping" },
-        "Headers": {
-            "Content-Type": "application/json"
-        }
+      "Headers": {
+        "Content-Type": "application/json",
+        "Test-X": [ "test 1", "test 2" ]
+      }
    }
 }
--- a/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/791a3f31-6946-4ce7-8e6f-0237c7443275.json
+++ b/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/791a3f31-6946-4ce7-8e6f-0237c7443275.json
@@ -0,0 +1,36 @@
+{
+  "Guid": "791a3f31-6946-4ce7-8e6f-0237c7443275",
+  "Title": "",
+  "Priority": 0,
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "WildcardMatcher",
+          "Pattern": "/proxy-google-test-post"
+        }
+      ]
+    },
+    "Methods": [
+      "post"
+    ],
+    "Body": {}
+  },
+  "Response": {
+    "StatusCode": 404,
+    "Body": "<!DOCTYPE html>\n<html lang=en>\n  <meta charset=utf-8>\n  <meta name=viewport content=\"initial-scale=1, minimum-scale=1, width=device-width\">\n  <title>Error 404 (Not Found)!!1</title>\n  <style>\n    *{margin:0;padding:0}html,code{font:15px/22px arial,sans-serif}html{background:#fff;color:#222;padding:15px}body{margin:7% auto 0;max-width:390px;min-height:180px;padding:30px 0 15px}* > body{background:url(//www.google.com/images/errors/robot.png) 100% 5px no-repeat;padding-right:205px}p{margin:11px 0 22px;overflow:hidden}ins{color:#777;text-decoration:none}a img{border:0}@media screen and (max-width:772px){body{background:none;margin-top:0;max-width:none;padding-right:0}}#logo{background:url(//www.google.com/images/branding/googlelogo/1x/googlelogo_color_150x54dp.png) no-repeat;margin-left:-5px}@media only screen and (min-resolution:192dpi){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat 0% 0%/100% 100%;-moz-border-image:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) 0}}@media only screen and (-webkit-min-device-pixel-ratio:2){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat;-webkit-background-size:100% 100%}}#logo{display:inline-block;height:54px;width:150px}\n  </style>\n  <a href=//www.google.com/><span id=logo aria-label=Google></span></a>\n  <p><b>404.</b> <ins>That’s an error.</ins>\n  <p>The requested URL <code>/proxy-google-test-post</code> was not found on this server.  <ins>That’s all we know.</ins>\n",
+    "BodyAsBytes": "PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ZW4+CiAgPG1ldGEgY2hhcnNldD11dGYtOD4KICA8bWV0YSBuYW1lPXZpZXdwb3J0IGNvbnRlbnQ9ImluaXRpYWwtc2NhbGU9MSwgbWluaW11bS1zY2FsZT0xLCB3aWR0aD1kZXZpY2Utd2lkdGgiPgogIDx0aXRsZT5FcnJvciA0MDQgKE5vdCBGb3VuZCkhITE8L3RpdGxlPgogIDxzdHlsZT4KICAgICp7bWFyZ2luOjA7cGFkZGluZzowfWh0bWwsY29kZXtmb250OjE1cHgvMjJweCBhcmlhbCxzYW5zLXNlcmlmfWh0bWx7YmFja2dyb3VuZDojZmZmO2NvbG9yOiMyMjI7cGFkZGluZzoxNXB4fWJvZHl7bWFyZ2luOjclIGF1dG8gMDttYXgtd2lkdGg6MzkwcHg7bWluLWhlaWdodDoxODBweDtwYWRkaW5nOjMwcHggMCAxNXB4fSogPiBib2R5e2JhY2tncm91bmQ6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2Vycm9ycy9yb2JvdC5wbmcpIDEwMCUgNXB4IG5vLXJlcGVhdDtwYWRkaW5nLXJpZ2h0OjIwNXB4fXB7bWFyZ2luOjExcHggMCAyMnB4O292ZXJmbG93OmhpZGRlbn1pbnN7Y29sb3I6Izc3Nzt0ZXh0LWRlY29yYXRpb246bm9uZX1hIGltZ3tib3JkZXI6MH1AbWVkaWEgc2NyZWVuIGFuZCAobWF4LXdpZHRoOjc3MnB4KXtib2R5e2JhY2tncm91bmQ6bm9uZTttYXJnaW4tdG9wOjA7bWF4LXdpZHRoOm5vbmU7cGFkZGluZy1yaWdodDowfX0jbG9nb3tiYWNrZ3JvdW5kOnVybCgvL3d3dy5nb29nbGUuY29tL2ltYWdlcy9icmFuZGluZy9nb29nbGVsb2dvLzF4L2dvb2dsZWxvZ29fY29sb3JfMTUweDU0ZHAucG5nKSBuby1yZXBlYXQ7bWFyZ2luLWxlZnQ6LTVweH1AbWVkaWEgb25seSBzY3JlZW4gYW5kIChtaW4tcmVzb2x1dGlvbjoxOTJkcGkpeyNsb2dve2JhY2tncm91bmQ6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2JyYW5kaW5nL2dvb2dsZWxvZ28vMngvZ29vZ2xlbG9nb19jb2xvcl8xNTB4NTRkcC5wbmcpIG5vLXJlcGVhdCAwJSAwJS8xMDAlIDEwMCU7LW1vei1ib3JkZXItaW1hZ2U6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2JyYW5kaW5nL2dvb2dsZWxvZ28vMngvZ29vZ2xlbG9nb19jb2xvcl8xNTB4NTRkcC5wbmcpIDB9fUBtZWRpYSBvbmx5IHNjcmVlbiBhbmQgKC13ZWJraXQtbWluLWRldmljZS1waXhlbC1yYXRpbzoyKXsjbG9nb3tiYWNrZ3JvdW5kOnVybCgvL3d3dy5nb29nbGUuY29tL2ltYWdlcy9icmFuZGluZy9nb29nbGVsb2dvLzJ4L2dvb2dsZWxvZ29fY29sb3JfMTUweDU0ZHAucG5nKSBuby1yZXBlYXQ7LXdlYmtpdC1iYWNrZ3JvdW5kLXNpemU6MTAwJSAxMDAlfX0jbG9nb3tkaXNwbGF5OmlubGluZS1ibG9jaztoZWlnaHQ6NTRweDt3aWR0aDoxNTBweH0KICA8L3N0eWxlPgogIDxhIGhyZWY9Ly93d3cuZ29vZ2xlLmNvbS8+PHNwYW4gaWQ9bG9nbyBhcmlhLWxhYmVsPUdvb2dsZT48L3NwYW4+PC9hPgogIDxwPjxiPjQwNC48L2I+IDxpbnM+VGhhdOKAmXMgYW4gZXJyb3IuPC9pbnM+CiAgPHA+VGhlIHJlcXVlc3RlZCBVUkwgPGNvZGU+L3Byb3h5LWdvb2dsZS10ZXN0LXBvc3Q8L2NvZGU+IHdhcyBub3QgZm91bmQgb24gdGhpcyBzZXJ2ZXIuICA8aW5zPlRoYXTigJlzIGFsbCB3ZSBrbm93LjwvaW5zPgo=",
+    "BodyEncoding": {
+      "CodePage": 65001,
+      "EncodingName": "Unicode (UTF-8)",
+      "WebName": "utf-8"
+    },
+    "UseTransformer": false,
+    "Headers": {
+      "Date": "Wed, 25 Oct 2017 18:57:40 GMT",
+      "Alt-Svc": "quic=\":443\"; ma=2592000; v=\"39,38,37,35\"",
+      "Referrer-Policy": "no-referrer",
+      "Connection": "close"
+    }
+  }
+}
--- a/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/826aff7c-6208-4a3c-923d-575248907db4.json
+++ b/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/826aff7c-6208-4a3c-923d-575248907db4.json
--- a/examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs
+++ b/examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs
@@ -10,11 +10,12 @@ namespace WireMock.Net.Console.Record.NETCoreApp
        {
            var server = FluentMockServer.Start(new FluentMockServerSettings
            {
-                Urls = new[] { "http://localhost:9095/", "https://localhost:9096/" },
+                Urls = new[] { "http://localhost:9091/", "https://localhost:9443/" },
                StartAdminInterface = true,
+                ReadStaticMappings = true,
                ProxyAndRecordSettings = new ProxyAndRecordSettings
                {
-                    Url = "https://www.msn.com",
+                    Url = "https://www.google.com",
                    //X509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
                    SaveMapping = true
                }
--- a/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Record.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Record.NETCoreApp.csproj
@@ -15,4 +15,8 @@
    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
  </ItemGroup>

+  <ItemGroup>
+    <Folder Include="__admin\mappings\" />
+  </ItemGroup>
+
 </Project>
--- a/examples/WireMock.Net.Console.Record.NETCoreApp/__admin/mappings/ab38efae-4e4d-4f20-8afe-635533ec2535.json
+++ b/examples/WireMock.Net.Console.Record.NETCoreApp/__admin/mappings/ab38efae-4e4d-4f20-8afe-635533ec2535.json
--- a/examples/WireMock.Net.ConsoleApplication/MainApp.cs
+++ b/examples/WireMock.Net.ConsoleApplication/MainApp.cs
@@ -20,7 +20,7 @@ namespace WireMock.Net.ConsoleApplication
            {
                Urls = new[] { url1, url2, url3 },
                StartAdminInterface = true,
-                ReadStaticMappings = false,
+                ReadStaticMappings = true,
                PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
                PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); }
            });
@@ -30,6 +30,31 @@ namespace WireMock.Net.ConsoleApplication

            // server.AllowPartialMapping();

+            server
+                .Given(Request.Create().WithPath("/headers", "/headers_test").UsingPost().WithHeader("Content-Type", "application/json*"))
+                .RespondWith(Response.Create()
+                    .WithStatusCode(201)
+                    .WithHeader("MyHeader", "application/json", "application/json2")
+                    .WithBody(@"{ ""result"": ""data posted with 201""}"));
+
+            server
+                .Given(Request.Create().WithPath("/file").UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBodyFromFile(@"c:\temp\x.json", false)
+                );
+
+            server
+                .Given(Request.Create().WithPath("/filecache").UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBodyFromFile(@"c:\temp\x.json")
+                );
+
+            server
+                .Given(Request.Create().WithPath("/file_rel").UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBodyFromFile("Program.cs", false)
+                );
+
            server
                .Given(Request.Create().WithHeader("ProxyThis", "true")
                    .UsingGet())
@@ -74,13 +99,6 @@ namespace WireMock.Net.ConsoleApplication
                    .WithHeader("Content-Type", "application/json")
                    .WithBody(@"{ ""result"": ""data posted with FUNC 201""}"));

-            server
-                .Given(Request.Create().WithPath("/data", "/ax").UsingPost().WithHeader("Content-Type", "application/json*"))
-                .RespondWith(Response.Create()
-                    .WithStatusCode(201)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""data posted with 201""}"));
-
            server
                .Given(Request.Create().WithPath("/json").UsingPost().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]")))
                .RespondWith(Response.Create()
--- a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
+++ b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
    <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Version>1.0.2.5</Version>
+    <Version>1.0.2.6</Version>
    <Authors>Stef Heyenrath</Authors>
    <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
--- a/src/WireMock.Net/Admin/Mappings/ResponseModel.cs
+++ b/src/WireMock.Net/Admin/Mappings/ResponseModel.cs
@@ -10,9 +10,6 @@ namespace WireMock.Admin.Mappings
        /// <summary>
        /// Gets or sets the HTTP status.
        /// </summary>
-        /// <value>
-        /// The HTTP status.
-        /// </value>
        public int? StatusCode { get; set; }

        /// <summary>
@@ -23,79 +20,61 @@ namespace WireMock.Admin.Mappings
        /// <summary>
        /// Gets or sets the body.
        /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
        public string Body { get; set; }

        /// <summary>
        /// Gets or sets the body.
        /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
        public string BodyFromBase64 { get; set; }

        /// <summary>
        /// Gets or sets the body (as JSON object).
        /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
        public object BodyAsJson { get; set; }

        /// <summary>
        /// Gets or sets the body (as bytearray).
        /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
        public byte[] BodyAsBytes { get; set; }

+        /// <summary>
+        /// Gets or sets the body as a file.
+        /// </summary>
+        public string BodyAsFile { get; set; }
+
+        /// <summary>
+        /// Is the body as file cached?
+        /// </summary>
+        public bool? BodyAsFileIsCached { get; set; }
+
        /// <summary>
        /// Gets or sets the body encoding.
        /// </summary>
-        /// <value>
-        /// The body encoding.
-        /// </value>
        public EncodingModel BodyEncoding { get; set; }

        /// <summary>
        /// Gets or sets a value indicating whether [use transformer].
        /// </summary>
-        /// <value>
-        ///   <c>true</c> if [use transformer]; otherwise, <c>false</c>.
-        /// </value>
        public bool UseTransformer { get; set; }

        /// <summary>
        /// Gets or sets the headers.
        /// </summary>
-        /// <value>
-        /// The headers.
-        /// </value>
-        public IDictionary<string, string> Headers { get; set; }
+        public IDictionary<string, object> Headers { get; set; }

        /// <summary>
        /// Gets or sets the Headers (Raw).
        /// </summary>
-        /// <value>
-        /// The Headers (Raw).
-        /// </value>
        public string HeadersRaw { get; set; }

        /// <summary>
        /// Gets or sets the delay in milliseconds.
        /// </summary>
-        /// <value>
-        /// The delay in milliseconds.
-        /// </value>
        public int? Delay { get; set; }

        /// <summary>
        /// Gets or sets the Proxy URL.
        /// </summary>
-        /// <value>ProxyUrl</value>
        public string ProxyUrl { get; set; }

        /// <summary>
--- a/src/WireMock.Net/Admin/Requests/LogRequestModel.cs
+++ b/src/WireMock.Net/Admin/Requests/LogRequestModel.cs
@@ -23,17 +23,11 @@ namespace WireMock.Admin.Requests
        /// <summary>
        /// Gets or sets the Path.
        /// </summary>
-        /// <value>
-        /// The Path.
-        /// </value>
        public string Path { get; set; }

        /// <summary>
        /// Gets or sets the absolete URL.
        /// </summary>
-        /// <value>
-        /// The absolute URL.
-        /// </value>
        public string AbsoluteUrl { get; set; }

        /// <summary>
@@ -44,41 +38,26 @@ namespace WireMock.Admin.Requests
        /// <summary>
        /// Gets or sets the method.
        /// </summary>
-        /// <value>
-        /// The method.
-        /// </value>
        public string Method { get; set; }

        /// <summary>
        /// Gets or sets the Headers.
        /// </summary>
-        /// <value>
-        /// The Headers.
-        /// </value>
-        public IDictionary<string, string> Headers { get; set; }
+        public IDictionary<string, WireMockList<string>> Headers { get; set; }

        /// <summary>
        /// Gets or sets the Cookies.
        /// </summary>
-        /// <value>
-        /// The Cookies.
-        /// </value>
        public IDictionary<string, string> Cookies { get; set; }

        /// <summary>
        /// Gets or sets the body.
        /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
        public string Body { get; set; }

        /// <summary>
        /// Gets or sets the body encoding.
        /// </summary>
-        /// <value>
-        /// The body encoding.
-        /// </value>
        public EncodingModel BodyEncoding { get; set; }
    }
 }
--- a/src/WireMock.Net/Admin/Requests/LogResponseModel.cs
+++ b/src/WireMock.Net/Admin/Requests/LogResponseModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using WireMock.Admin.Mappings;
+using WireMock.Util;

 namespace WireMock.Admin.Requests
 {
@@ -16,7 +17,7 @@ namespace WireMock.Admin.Requests
        /// <summary>
        /// Gets the headers.
        /// </summary>
-        public IDictionary<string, string> Headers { get; set; }
+        public IDictionary<string, WireMockList<string>> Headers { get; set; }

        /// <summary>
        /// Gets or sets the body destination (SameAsSource, String or Bytes).
@@ -29,10 +30,20 @@ namespace WireMock.Admin.Requests
        public string Body { get; set; }

        /// <summary>
-        /// Gets or sets the body.
+        /// Gets or sets the body as bytes.
        /// </summary>
        public byte[] BodyAsBytes { get; set; }

+        /// <summary>
+        /// Gets or sets the body as file.
+        /// </summary>
+        public string BodyAsFile { get; set; }
+
+        /// <summary>
+        /// Is the body as file cached?
+        /// </summary>
+        public bool? BodyAsFileIsCached { get; set; }
+
        /// <summary>
        /// Gets or sets the original body.
        /// </summary>
--- a/src/WireMock.Net/Http/HttpClientHelper.cs
+++ b/src/WireMock.Net/Http/HttpClientHelper.cs
@@ -1,19 +1,25 @@
 using System;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using WireMock.Validation;

 namespace WireMock.Http
 {
    internal static class HttpClientHelper
    {
-        private static HttpClient CreateHttpClient(string clientX509Certificate2ThumbprintOrSubjectName = null)
+        public static HttpClient CreateHttpClient(string clientX509Certificate2ThumbprintOrSubjectName = null)
        {
-            if (!string.IsNullOrEmpty(clientX509Certificate2ThumbprintOrSubjectName))
+            HttpClientHandler handler;
+
+            if (string.IsNullOrEmpty(clientX509Certificate2ThumbprintOrSubjectName))
+            {
+                handler = new HttpClientHandler();
+            }
+            else
            {
 #if NETSTANDARD || NET46
-                var handler = new HttpClientHandler
+                handler = new HttpClientHandler
                {
                    ClientCertificateOptions = ClientCertificateOption.Manual,
                    SslProtocols = System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls,
@@ -23,46 +29,60 @@ namespace WireMock.Http
                var x509Certificate2 = CertificateUtil.GetCertificate(clientX509Certificate2ThumbprintOrSubjectName);
                handler.ClientCertificates.Add(x509Certificate2);
 #else
-                var handler = new WebRequestHandler
+
+                var webRequestHandler = new WebRequestHandler
                {
                    ClientCertificateOptions = ClientCertificateOption.Manual,
                    ServerCertificateValidationCallback = (sender, certificate, chain, errors) => true,
-                    AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+                    AutomaticDecompression = System.Net.DecompressionMethods.GZip | System.Net.DecompressionMethods.Deflate
                };

                var x509Certificate2 = CertificateUtil.GetCertificate(clientX509Certificate2ThumbprintOrSubjectName);
-                handler.ClientCertificates.Add(x509Certificate2);
-                return new HttpClient(handler);
+                webRequestHandler.ClientCertificates.Add(x509Certificate2);
+                handler = webRequestHandler;
 #endif
            }

-            return new HttpClient();
+            // For proxy we shouldn't follow auto redirects
+            handler.AllowAutoRedirect = false;
+
+            // If UseCookies enabled, httpClient ignores Cookie header
+            handler.UseCookies = false;
+
+            return new HttpClient(handler);
        }

-        public static async Task<ResponseMessage> SendAsync(RequestMessage requestMessage, string url, string clientX509Certificate2ThumbprintOrSubjectName = null)
+        public static async Task<ResponseMessage> SendAsync(HttpClient client, RequestMessage requestMessage, string url)
        {
-            var client = CreateHttpClient(clientX509Certificate2ThumbprintOrSubjectName);
+            Check.NotNull(client, nameof(client));
+
+            var originalUri = new Uri(requestMessage.Url);
+            var requiredUri = new Uri(url);

            var httpRequestMessage = new HttpRequestMessage(new HttpMethod(requestMessage.Method), url);

-            // Overwrite the host header
-            httpRequestMessage.Headers.Host = new Uri(url).Authority;
-
-            // Set headers if present
-            if (requestMessage.Headers != null)
-            {
-                foreach (var headerName in requestMessage.Headers.Keys.Where(k => k.ToUpper() != "HOST"))
-                {
-                    httpRequestMessage.Headers.TryAddWithoutValidation(headerName, new[] { requestMessage.Headers[headerName] });
-                }
-            }
-
            // Set Body if present
            if (requestMessage.BodyAsBytes != null && requestMessage.BodyAsBytes.Length > 0)
            {
                httpRequestMessage.Content = new ByteArrayContent(requestMessage.BodyAsBytes);
            }

+            // Overwrite the host header
+            httpRequestMessage.Headers.Host = requiredUri.Authority;
+
+            // Set headers if present
+            if (requestMessage.Headers != null)
+            {
+                foreach (var header in requestMessage.Headers.Where(header => !string.Equals(header.Key, "HOST", StringComparison.OrdinalIgnoreCase)))
+                {
+                    // Try to add to request headers. If failed - try to add to content headers
+                    if (!httpRequestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value))
+                    {
+                        httpRequestMessage.Content?.Headers.TryAddWithoutValidation(header.Key, header.Value);
+                    }
+                }
+            }
+
            // Call the URL
            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);

@@ -75,9 +95,24 @@ namespace WireMock.Http
                Body = await httpResponseMessage.Content.ReadAsStringAsync()
            };

-            foreach (var header in httpResponseMessage.Headers)
+            // Set both content and response headers, replacing URLs in values
+            var headers = httpResponseMessage.Content?.Headers.Union(httpResponseMessage.Headers);
+
+            foreach (var header in headers)
            {
-                responseMessage.AddHeader(header.Key, header.Value.FirstOrDefault());
+                // if Location header contains absolute redirect URL, and base URL is one that we proxy to,
+                // we need to replace it to original one.
+                if (string.Equals(header.Key, "Location", StringComparison.OrdinalIgnoreCase)
+                    && Uri.TryCreate(header.Value.First(), UriKind.Absolute, out Uri absoluteLocationUri)
+                    && string.Equals(absoluteLocationUri.Host, requiredUri.Host, StringComparison.OrdinalIgnoreCase))
+                {
+                    var replacedLocationUri = new Uri(originalUri, absoluteLocationUri.PathAndQuery);
+                    responseMessage.AddHeader(header.Key, replacedLocationUri.ToString());
+                }
+                else
+                {
+                    responseMessage.AddHeader(header.Key, header.Value.ToArray());
+                }
            }

            return responseMessage;
--- a/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
+using WireMock.Util;
 using WireMock.Validation;

 namespace WireMock.Matchers.Request
@@ -14,7 +15,7 @@ namespace WireMock.Matchers.Request
        /// <summary>
        /// The functions
        /// </summary>
-        public Func<IDictionary<string, string>, bool>[] Funcs { get; }
+        public Func<IDictionary<string, string[]>, bool>[] Funcs { get; }

        /// <summary>
        /// The name
@@ -59,7 +60,7 @@ namespace WireMock.Matchers.Request
        /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
        /// </summary>
        /// <param name="funcs">The funcs.</param>
-        public RequestMessageHeaderMatcher([NotNull] params Func<IDictionary<string, string>, bool>[] funcs)
+        public RequestMessageHeaderMatcher([NotNull] params Func<IDictionary<string, string[]>, bool>[] funcs)
        {
            Check.NotNull(funcs, nameof(funcs));

@@ -86,7 +87,7 @@ namespace WireMock.Matchers.Request
                return MatchScores.Mismatch;

            if (Funcs != null)
-                return MatchScores.ToScore(Funcs.Any(f => f(requestMessage.Headers)));
+                return MatchScores.ToScore(Funcs.Any(f => f(requestMessage.Headers.ToDictionary(entry => entry.Key, entry => entry.Value.ToArray()))));

            if (Matchers == null)
                return MatchScores.Mismatch;
@@ -94,8 +95,8 @@ namespace WireMock.Matchers.Request
            if (!requestMessage.Headers.ContainsKey(Name))
                return MatchScores.Mismatch;

-            string value = requestMessage.Headers[Name];
-            return Matchers.Max(m => m.IsMatch(value));
+            WireMockList<string> list = requestMessage.Headers[Name];
+            return Matchers.Max(m => list.Max(value => m.IsMatch(value))); // TODO : is this correct ?
        }
    }
 }
--- a/src/WireMock.Net/Owin/OwinRequestMapper.cs
+++ b/src/WireMock.Net/Owin/OwinRequestMapper.cs
@@ -57,13 +57,13 @@ namespace WireMock.Owin
                body = bodyEncoding.GetBytes(bodyAsString);
            }

-            Dictionary<string, string> headers = null;
+            Dictionary<string, string[]> headers = null;
            if (request.Headers.Any())
            {
-                headers = new Dictionary<string, string>();
+                headers = new Dictionary<string, string[]>();
                foreach (var header in request.Headers)
                {
-                    headers.Add(header.Key, header.Value.FirstOrDefault());
+                    headers.Add(header.Key, header.Value);
                }
            }

--- a/src/WireMock.Net/Owin/OwinResponseMapper.cs
+++ b/src/WireMock.Net/Owin/OwinResponseMapper.cs
@@ -35,11 +35,18 @@ namespace WireMock.Owin

            if (responseMessage.Headers.ContainsKey(HttpKnownHeaderNames.ContentType))
            {
-                response.ContentType = responseMessage.Headers[HttpKnownHeaderNames.ContentType];
+                response.ContentType = responseMessage.Headers[HttpKnownHeaderNames.ContentType].FirstOrDefault();
            }
-            responseMessage.Headers.Where(h => h.Key != HttpKnownHeaderNames.ContentType).ToList().ForEach(pair => response.Headers.Append(pair.Key, pair.Value));

-            if (responseMessage.Body == null && responseMessage.BodyAsBytes == null)
+            var headers = responseMessage.Headers.Where(h => h.Key != HttpKnownHeaderNames.ContentType).ToList();
+
+#if !NETSTANDARD
+            headers.ForEach(pair => response.Headers.AppendValues(pair.Key, pair.Value.ToArray()));
+#else
+            headers.ForEach(pair => response.Headers.Append(pair.Key, pair.Value.ToArray()));
+#endif
+
+            if (responseMessage.Body == null && responseMessage.BodyAsBytes == null && responseMessage.BodyAsFile == null)
            {
                return;
            }
@@ -50,6 +57,14 @@ namespace WireMock.Owin
                return;
            }

+            if (responseMessage.BodyAsFile != null)
+            {
+                byte[] bytes = File.ReadAllBytes(responseMessage.BodyAsFile);
+
+                await response.Body.WriteAsync(bytes, 0, bytes.Length);
+                return;
+            }
+
            Encoding encoding = responseMessage.BodyEncoding ?? _utf8NoBom;
            using (var writer = new StreamWriter(response.Body, encoding))
            {
--- a/src/WireMock.Net/Owin/WireMockMiddleware.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddleware.cs
@@ -4,6 +4,7 @@ using WireMock.Logging;
 using WireMock.Matchers.Request;
 using System.Linq;
 using WireMock.Matchers;
+using WireMock.Util;
 #if !NETSTANDARD
 using Microsoft.Owin;
 #else
@@ -101,8 +102,8 @@ namespace WireMock.Owin

                if (targetMapping.IsAdminInterface && _options.AuthorizationMatcher != null)
                {
-                    bool present = request.Headers.TryGetValue("Authorization", out string authorization);
-                    if (!present || _options.AuthorizationMatcher.IsMatch(authorization) < MatchScores.Perfect)
+                    bool present = request.Headers.TryGetValue("Authorization", out WireMockList<string> authorization);
+                    if (!present || _options.AuthorizationMatcher.IsMatch(authorization.ToString()) < MatchScores.Perfect)
                    {
                        response = new ResponseMessage { StatusCode = 401 };
                        return;
--- a/src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs
+++ b/src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs
@@ -33,7 +33,7 @@ namespace WireMock.RequestBuilders
        /// </summary>
        /// <param name="funcs">The headers funcs.</param>
        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] params Func<IDictionary<string, string>, bool>[] funcs);
+        IRequestBuilder WithHeader([NotNull] params Func<IDictionary<string, string[]>, bool>[] funcs);

        /// <summary>
        /// The with cookie.
--- a/src/WireMock.Net/RequestBuilders/Request.cs
+++ b/src/WireMock.Net/RequestBuilders/Request.cs
@@ -395,7 +395,7 @@ namespace WireMock.RequestBuilders
        /// </summary>
        /// <param name="funcs">The funcs.</param>
        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithHeader(params Func<IDictionary<string, string>, bool>[] funcs)
+        public IRequestBuilder WithHeader(params Func<IDictionary<string, string[]>, bool>[] funcs)
        {
            Check.NotEmpty(funcs, nameof(funcs));

--- a/src/WireMock.Net/RequestMessage.cs
+++ b/src/WireMock.Net/RequestMessage.cs
@@ -41,7 +41,7 @@ namespace WireMock
        /// <summary>
        /// Gets the headers.
        /// </summary>
-        public IDictionary<string, string> Headers { get; }
+        public IDictionary<string, WireMockList<string>> Headers { get; }

        /// <summary>
        /// Gets the cookies.
@@ -79,7 +79,7 @@ namespace WireMock
        /// <param name="bodyEncoding">The body encoding</param>
        /// <param name="headers">The headers.</param>
        /// <param name="cookies">The cookies.</param>
-        public RequestMessage([NotNull] Uri url, [NotNull] string method, [NotNull] string clientIP, [CanBeNull] byte[] bodyAsBytes = null, [CanBeNull] string body = null, [CanBeNull] Encoding bodyEncoding = null, [CanBeNull] IDictionary<string, string> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
+        public RequestMessage([NotNull] Uri url, [NotNull] string method, [NotNull] string clientIP, [CanBeNull] byte[] bodyAsBytes = null, [CanBeNull] string body = null, [CanBeNull] Encoding bodyEncoding = null, [CanBeNull] IDictionary<string, string[]> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
        {
            Check.NotNull(url, nameof(url));
            Check.NotNull(method, nameof(method));
@@ -92,7 +92,7 @@ namespace WireMock
            BodyAsBytes = bodyAsBytes;
            Body = body;
            BodyEncoding = bodyEncoding;
-            Headers = headers;
+            Headers = headers?.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
            Cookies = cookies;
            Query = ParseQuery(url.Query);
        }
--- a/src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
+++ b/src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
@@ -9,14 +9,6 @@ namespace WireMock.ResponseBuilders
    /// </summary>
    public interface IBodyResponseBuilder : ITransformResponseBuilder
    {
-        ///// <summary>
-        ///// WithBody : Create a string response based on a string.
-        ///// </summary>
-        ///// <param name="body">The body.</param>
-        ///// <param name="encoding">The body encoding.</param>
-        ///// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        //// IResponseBuilder WithBody([NotNull] string body, [CanBeNull] Encoding encoding = null);
-
        /// <summary>
        /// WithBody : Create a ... response based on a string.
        /// </summary>
@@ -51,5 +43,13 @@ namespace WireMock.ResponseBuilders
        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
        [Obsolete]
        IResponseBuilder WithBodyFromBase64([NotNull] string bodyAsbase64, [CanBeNull] Encoding encoding = null);
+
+        /// <summary>
+        /// WithBodyFromFile : Create a ... response based on a File.
+        /// </summary>
+        /// <param name="filename">The filename.</param>
+        /// <param name="cache">Defines if this file is cached in memory or retrieved from disk everytime the response is created.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBodyFromFile([NotNull] string filename, bool cache = true);
    }
 }
--- a/src/WireMock.Net/ResponseBuilders/IHeadersResponseBuilder.cs
+++ b/src/WireMock.Net/ResponseBuilders/IHeadersResponseBuilder.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
+using WireMock.Util;

 namespace WireMock.ResponseBuilders
 {
@@ -12,15 +13,29 @@ namespace WireMock.ResponseBuilders
        /// The with header.
        /// </summary>
        /// <param name="name">The name.</param>
-        /// <param name="value">The value.</param>
+        /// <param name="values">The values.</param>
        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithHeader([NotNull] string name, string value);
+        IResponseBuilder WithHeader([NotNull] string name, params string[] values);

        /// <summary>
        /// The with headers.
        /// </summary>
        /// <param name="headers">The headers.</param>
        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithHeaders([NotNull] IDictionary<string,string> headers);
+        IResponseBuilder WithHeaders([NotNull] IDictionary<string, string> headers);
+
+        /// <summary>
+        /// The with headers.
+        /// </summary>
+        /// <param name="headers">The headers.</param>
+        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithHeaders([NotNull] IDictionary<string, string[]> headers);
+
+        /// <summary>
+        /// The with headers.
+        /// </summary>
+        /// <param name="headers">The headers.</param>
+        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithHeaders([NotNull] IDictionary<string, WireMockList<string>> headers);
    }
 }
--- a/src/WireMock.Net/ResponseBuilders/Response.cs
+++ b/src/WireMock.Net/ResponseBuilders/Response.cs
@@ -1,13 +1,17 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using WireMock.Validation;
 using WireMock.Http;
 using WireMock.Transformers;
+using WireMock.Util;
+using WireMock.Validation;

 namespace WireMock.ResponseBuilders
 {
@@ -16,6 +20,8 @@ namespace WireMock.ResponseBuilders
    /// </summary>
    public class Response : IResponseBuilder
    {
+        private HttpClient httpClientForProxy;
+
        /// <summary>
        /// The delay
        /// </summary>
@@ -125,26 +131,35 @@ namespace WireMock.ResponseBuilders
            return WithStatusCode((int)HttpStatusCode.NotFound);
        }

-        /// <summary>
-        /// The with header.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="value">The value.</param>
-        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-        public IResponseBuilder WithHeader(string name, string value)
+        /// <inheritdoc cref="IHeadersResponseBuilder.WithHeader(string, string[])"/>
+        public IResponseBuilder WithHeader(string name, params string[] values)
        {
            Check.NotNull(name, nameof(name));

-            ResponseMessage.AddHeader(name, value);
+            ResponseMessage.AddHeader(name, values);
            return this;
        }

-        /// <summary>
-        /// The with headers.
-        /// </summary>
-        /// <param name="headers">The headers.</param>
-        /// <returns></returns>
+        /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, string})"/>
        public IResponseBuilder WithHeaders(IDictionary<string, string> headers)
+        {
+            Check.NotNull(headers, nameof(headers));
+
+            ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+            return this;
+        }
+
+        /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, string[]})"/>
+        public IResponseBuilder WithHeaders(IDictionary<string, string[]> headers)
+        {
+            Check.NotNull(headers, nameof(headers));
+
+            ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+            return this;
+        }
+
+        /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, WireMockList{string}})"/>
+        public IResponseBuilder WithHeaders(IDictionary<string, WireMockList<string>> headers)
        {
            ResponseMessage.Headers = headers;
            return this;
@@ -175,6 +190,30 @@ namespace WireMock.ResponseBuilders
            return this;
        }

+        /// <inheritdoc cref="IBodyResponseBuilder.WithBodyFromFile"/>
+        public IResponseBuilder WithBodyFromFile(string filename, bool cache = true)
+        {
+            Check.NotNull(filename, nameof(filename));
+
+            ResponseMessage.BodyEncoding = null;
+            ResponseMessage.BodyAsFileIsCached = cache;
+
+            if (cache)
+            {
+                ResponseMessage.Body = null;
+                ResponseMessage.BodyAsBytes = File.ReadAllBytes(filename);
+                ResponseMessage.BodyAsFile = null;
+            }
+            else
+            {
+                ResponseMessage.Body = null;
+                ResponseMessage.BodyAsBytes = null;
+                ResponseMessage.BodyAsFile = filename;
+            }
+
+            return this;
+        }
+
        /// <inheritdoc cref="IBodyResponseBuilder.WithBody(string, string, Encoding)"/>
        public IResponseBuilder WithBody(string body, string destination = BodyDestinationFormat.SameAsSource, Encoding encoding = null)
        {
@@ -281,6 +320,7 @@ namespace WireMock.ResponseBuilders

            ProxyUrl = proxyUrl;
            X509Certificate2ThumbprintOrSubjectName = clientX509Certificate2ThumbprintOrSubjectName;
+            httpClientForProxy = HttpClientHelper.CreateHttpClient(clientX509Certificate2ThumbprintOrSubjectName);
            return this;
        }

@@ -296,12 +336,12 @@ namespace WireMock.ResponseBuilders
            if (Delay != null)
                await Task.Delay(Delay.Value);

-            if (ProxyUrl != null)
+            if (ProxyUrl != null && httpClientForProxy != null)
            {
                var requestUri = new Uri(requestMessage.Url);
                var proxyUri = new Uri(ProxyUrl);
                var proxyUriWithRequestPathAndQuery = new Uri(proxyUri, requestUri.PathAndQuery);
-                return await HttpClientHelper.SendAsync(requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri, X509Certificate2ThumbprintOrSubjectName);
+                return await HttpClientHelper.SendAsync(httpClientForProxy, requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri);
            }

            if (UseTransformer)
--- a/src/WireMock.Net/ResponseMessage.cs
+++ b/src/WireMock.Net/ResponseMessage.cs
@@ -1,6 +1,9 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using WireMock.Util;
+using WireMock.Validation;

 namespace WireMock
 {
@@ -12,7 +15,7 @@ namespace WireMock
        /// <summary>
        /// Gets the headers.
        /// </summary>
-        public IDictionary<string, string> Headers { get; set; } = new ConcurrentDictionary<string, string>();
+        public IDictionary<string, WireMockList<string>> Headers { get; set; } = new ConcurrentDictionary<string, WireMockList<string>>();

        /// <summary>
        /// Gets or sets the status code.
@@ -30,32 +33,54 @@ namespace WireMock
        public string BodyDestination { get; set; }

        /// <summary>
-        /// Gets or sets the body.
+        /// Gets or sets the body as a string.
        /// </summary>
        public string Body { get; set; }

        /// <summary>
-        /// Gets or sets the body.
+        /// Gets or sets the body as bytes.
        /// </summary>
        public byte[] BodyAsBytes { get; set; }

+        /// <summary>
+        /// Gets or sets the body as a file.
+        /// </summary>
+        public string BodyAsFile { get; set; }
+
+        /// <summary>
+        /// Is the body as file cached?
+        /// </summary>
+        public bool? BodyAsFileIsCached { get; set; }
+
        /// <summary>
        /// Gets or sets the body encoding.
        /// </summary>
        public Encoding BodyEncoding { get; set; } = new UTF8Encoding(false);

        /// <summary>
-        /// The add header.
+        /// Adds the header.
        /// </summary>
-        /// <param name="name">
-        /// The name.
-        /// </param>
-        /// <param name="value">
-        /// The value.
-        /// </param>
+        /// <param name="name">The name.</param>
+        /// <param name="value">The value.</param>
        public void AddHeader(string name, string value)
        {
-            Headers.Add(name, value);
+            Headers.Add(name, new WireMockList<string>(value));
+        }
+
+        /// <summary>
+        /// Adds the header.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="values">The values.</param>
+        public void AddHeader(string name, params string[] values)
+        {
+            Check.NotEmpty(values, nameof(values));
+
+            var newHeaderValues = Headers.TryGetValue(name, out WireMockList<string> existingValues)
+                ? values.Union(existingValues).ToArray()
+                : values;
+
+            Headers[name] = new WireMockList<string>(newHeaderValues);
        }
    }
 }
--- a/src/WireMock.Net/Serialization/MappingConverter.cs
+++ b/src/WireMock.Net/Serialization/MappingConverter.cs
@@ -8,6 +8,7 @@ using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
+using WireMock.Util;

 namespace WireMock.Serialization
 {
@@ -98,6 +99,8 @@ namespace WireMock.Serialization
                mappingModel.Response.BodyDestination = null;
                mappingModel.Response.Body = null;
                mappingModel.Response.BodyAsBytes = null;
+                mappingModel.Response.BodyAsFile = null;
+                mappingModel.Response.BodyAsFileIsCached = null;
                mappingModel.Response.UseTransformer = false;
                mappingModel.Response.BodyEncoding = null;
                mappingModel.Response.ProxyUrl = response.ProxyUrl;
@@ -106,9 +109,11 @@ namespace WireMock.Serialization
            {
                mappingModel.Response.BodyDestination = response.ResponseMessage.BodyDestination;
                mappingModel.Response.StatusCode = response.ResponseMessage.StatusCode;
-                mappingModel.Response.Headers = response.ResponseMessage.Headers;
+                mappingModel.Response.Headers = Map(response.ResponseMessage.Headers);
                mappingModel.Response.Body = response.ResponseMessage.Body;
                mappingModel.Response.BodyAsBytes = response.ResponseMessage.BodyAsBytes;
+                mappingModel.Response.BodyAsFile = response.ResponseMessage.BodyAsFile;
+                mappingModel.Response.BodyAsFileIsCached = response.ResponseMessage.BodyAsFileIsCached;
                mappingModel.Response.UseTransformer = response.UseTransformer;
                mappingModel.Response.BodyEncoding = response.ResponseMessage.BodyEncoding != null
                    ? new EncodingModel
@@ -123,7 +128,24 @@ namespace WireMock.Serialization
            return mappingModel;
        }

-        public static MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
+        private static IDictionary<string, object> Map(IDictionary<string, WireMockList<string>> dictionary)
+        {
+            if (dictionary == null)
+            {
+                return null;
+            }
+
+            var newDictionary = new Dictionary<string, object>();
+            foreach (var entry in dictionary)
+            {
+                object value = entry.Value.Count == 1 ? (object)entry.Value.ToString() : entry.Value;
+                newDictionary.Add(entry.Key, value);
+            }
+
+            return newDictionary;
+        }
+
+        private static MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
        {
            if (matchers == null || !matchers.Any())
                return null;
@@ -131,7 +153,7 @@ namespace WireMock.Serialization
            return matchers.Select(Map).Where(x => x != null).ToArray();
        }

-        public static MatcherModel Map([CanBeNull] IMatcher matcher)
+        private static MatcherModel Map([CanBeNull] IMatcher matcher)
        {
            if (matcher == null)
                return null;
@@ -146,7 +168,7 @@ namespace WireMock.Serialization
            };
        }

-        public static string[] Map<T>([CanBeNull] IEnumerable<Func<T, bool>> funcs)
+        private static string[] Map<T>([CanBeNull] IEnumerable<Func<T, bool>> funcs)
        {
            if (funcs == null || !funcs.Any())
                return null;
@@ -154,7 +176,7 @@ namespace WireMock.Serialization
            return funcs.Select(Map).Where(x => x != null).ToArray();
        }

-        public static string Map<T>([CanBeNull] Func<T, bool> func)
+        private static string Map<T>([CanBeNull] Func<T, bool> func)
        {
            return func?.ToString();
        }
--- a/src/WireMock.Net/Server/FluentMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
@@ -2,23 +2,24 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
+using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
 using WireMock.Admin.Settings;
+using WireMock.Http;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
+using WireMock.Serialization;
+using WireMock.Settings;
 using WireMock.Util;
 using WireMock.Validation;
-using WireMock.Http;
-using System.Threading.Tasks;
-using WireMock.Settings;
-using WireMock.Serialization;

 namespace WireMock.Server
 {
@@ -129,8 +130,11 @@ namespace WireMock.Server
        }

        #region Proxy and Record
+        private HttpClient httpClientForProxy;
+
        private void InitProxyAndRecord(ProxyAndRecordSettings settings)
        {
+            httpClientForProxy = HttpClientHelper.CreateHttpClient(settings.X509Certificate2ThumbprintOrSubjectName);
            Given(Request.Create().WithPath("/*").UsingAnyVerb()).RespondWith(new ProxyAsyncResponseProvider(ProxyAndRecordAsync, settings));
        }

@@ -140,7 +144,7 @@ namespace WireMock.Server
            var proxyUri = new Uri(settings.Url);
            var proxyUriWithRequestPathAndQuery = new Uri(proxyUri, requestUri.PathAndQuery);

-            var responseMessage = await HttpClientHelper.SendAsync(requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri, settings.X509Certificate2ThumbprintOrSubjectName);
+            var responseMessage = await HttpClientHelper.SendAsync(httpClientForProxy, requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri);

            if (settings.SaveMapping)
            {
@@ -416,6 +420,8 @@ namespace WireMock.Server
                    Body = logEntry.ResponseMessage.Body,
                    BodyAsBytes = logEntry.ResponseMessage.BodyAsBytes,
                    BodyOriginal = logEntry.ResponseMessage.BodyOriginal,
+                    BodyAsFile = logEntry.ResponseMessage.BodyAsFile,
+                    BodyAsFileIsCached = logEntry.ResponseMessage.BodyAsFileIsCached,
                    Headers = logEntry.ResponseMessage.Headers,
                    BodyEncoding = logEntry.ResponseMessage.BodyEncoding != null ? new EncodingModel
                    {
@@ -517,12 +523,15 @@ namespace WireMock.Server
            {
                string path = requestModel.Path as string;
                if (path != null)
+                {
                    requestBuilder = requestBuilder.WithPath(path);
+                }
                else
                {
                    var pathModel = JsonUtils.ParseJTokenToObject<PathModel>(requestModel.Path);
                    if (pathModel?.Matchers != null)
-                        requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(MappingConverter.Map).ToArray());
+                        requestBuilder =
+                            requestBuilder.WithPath(pathModel.Matchers.Select(MappingConverter.Map).ToArray());
                }
            }

@@ -530,17 +539,22 @@ namespace WireMock.Server
            {
                string url = requestModel.Url as string;
                if (url != null)
+                {
                    requestBuilder = requestBuilder.WithUrl(url);
+                }
                else
                {
                    var urlModel = JsonUtils.ParseJTokenToObject<UrlModel>(requestModel.Url);
                    if (urlModel?.Matchers != null)
-                        requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(MappingConverter.Map).ToArray());
+                        requestBuilder =
+                            requestBuilder.WithUrl(urlModel.Matchers.Select(MappingConverter.Map).ToArray());
                }
            }

            if (requestModel.Methods != null)
+            {
                requestBuilder = requestBuilder.UsingVerb(requestModel.Methods);
+            }

            if (requestModel.Headers != null)
            {
@@ -601,7 +615,12 @@ namespace WireMock.Server

            if (responseModel.Headers != null)
            {
-                responseBuilder = responseBuilder.WithHeaders(responseModel.Headers);
+                foreach (var entry in responseModel.Headers)
+                {
+                    responseBuilder = entry.Value is string value ?
+                        responseBuilder.WithHeader(entry.Key, value) :
+                        responseBuilder.WithHeader(entry.Key, JsonUtils.ParseJTokenToObject<string[]>(entry.Value));
+                }
            }
            else if (responseModel.HeadersRaw != null)
            {
@@ -645,7 +664,7 @@ namespace WireMock.Server
            {
                Body = JsonConvert.SerializeObject(result, _settings),
                StatusCode = 200,
-                Headers = new Dictionary<string, string> { { "Content-Type", "application/json" } }
+                Headers = new Dictionary<string, WireMockList<string>> { { "Content-Type", new WireMockList<string>("application/json") } }
            };
        }

--- a/src/WireMock.Net/Transformers/ResponseMessageTransformer.cs
+++ b/src/WireMock.Net/Transformers/ResponseMessageTransformer.cs
@@ -1,5 +1,7 @@
-using HandlebarsDotNet;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Linq;
+using HandlebarsDotNet;
+using WireMock.Util;

 namespace WireMock.Transformers
 {
@@ -16,13 +18,16 @@ namespace WireMock.Transformers
            responseMessage.Body = templateBody(template);

            // Headers
-            var newHeaders = new Dictionary<string, string>();
+            var newHeaders = new Dictionary<string, WireMockList<string>>();
            foreach (var header in original.Headers)
            {
                var templateHeaderKey = Handlebars.Compile(header.Key);
-                var templateHeaderValue = Handlebars.Compile(header.Value);
+                var templateHeaderValues = header.Value
+                    .Select(Handlebars.Compile)
+                    .Select(func => func(template))
+                    .ToArray();

-                newHeaders.Add(templateHeaderKey(template), templateHeaderValue(template));
+                newHeaders.Add(templateHeaderKey(template), new WireMockList<string>(templateHeaderValues));
            }

            responseMessage.Headers = newHeaders;
--- a/src/WireMock.Net/Util/JsonUtils.cs
+++ b/src/WireMock.Net/Util/JsonUtils.cs
@@ -7,13 +7,12 @@ namespace WireMock.Util
        public static T ParseJTokenToObject<T>(object value)
        {
            if (value == null)
+            {
                return default(T);
+            }

-            JToken token = value as JToken;
-            if (token == null)
-                return default(T);
-
-            return token.ToObject<T>();
+            var token = value as JToken;
+            return token == null ? default(T) : token.ToObject<T>();
        }
    }
 }
--- a/src/WireMock.Net/Util/WireMockList.cs
+++ b/src/WireMock.Net/Util/WireMockList.cs
@@ -36,9 +36,6 @@ namespace WireMock.Util
        /// <summary>
        /// Returns a <see cref="string" /> that represents this instance.
        /// </summary>
-        /// <returns>
-        /// A <see cref="string" /> that represents this instance.
-        /// </returns>
        public override string ToString()
        {
            if (this != null && this.Any())
--- a/src/WireMock.Net/WireMock.Net.csproj
+++ b/src/WireMock.Net/WireMock.Net.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
    <AssemblyTitle>WireMock.Net</AssemblyTitle>
-    <Version>1.0.2.5</Version>
+    <Version>1.0.2.6</Version>
    <Authors>Alexandre Victoor;Stef Heyenrath</Authors>
    <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
--- a/test/WireMock.Net.Tests/FluentMockServerTests.Proxy.cs
+++ b/test/WireMock.Net.Tests/FluentMockServerTests.Proxy.cs
@@ -0,0 +1,157 @@
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using NFluent;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using Xunit;
+
+namespace WireMock.Net.Tests
+{
+    public partial class FluentMockServerTests
+    {
+        private FluentMockServer _serverForProxyForwarding;
+
+        [Fact]
+        public async Task FluentMockServer_Should_proxy_responses()
+        {
+            // given
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create().WithProxy("http://www.google.com"));
+
+            // when
+            var result = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/search?q=test");
+
+            // then
+            Check.That(result).Contains("google");
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Should_preserve_content_header_in_proxied_request()
+        {
+            // given
+            _serverForProxyForwarding = FluentMockServer.Start();
+            _serverForProxyForwarding
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create());
+
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+
+            // when
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Post,
+                RequestUri = new Uri(_server.Urls[0]),
+                Content = new StringContent("stringContent")
+            };
+            requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
+            await new HttpClient().SendAsync(requestMessage);
+
+            // then
+            var receivedRequest = _serverForProxyForwarding.LogEntries.First().RequestMessage;
+            Check.That(receivedRequest.Body).IsEqualTo("stringContent");
+            Check.That(receivedRequest.Headers).ContainsKey("Content-Type");
+            Check.That(receivedRequest.Headers["Content-Type"]).ContainsExactly("text/plain");
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Should_preserve_content_header_in_proxied_response()
+        {
+            // given
+            _serverForProxyForwarding = FluentMockServer.Start();
+            _serverForProxyForwarding
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create()
+                    .WithBody("body")
+                    .WithHeader("Content-Type", "text/plain"));
+
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+
+            // when
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri(_server.Urls[0])
+            };
+            var response = await new HttpClient().SendAsync(requestMessage);
+
+            // then
+            Check.That(await response.Content.ReadAsStringAsync()).IsEqualTo("body");
+            Check.That(response.Content.Headers.Contains("Content-Type")).IsTrue();
+            Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("text/plain");
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Should_change_absolute_location_header_in_proxied_response()
+        {
+            // given
+            _serverForProxyForwarding = FluentMockServer.Start();
+            _serverForProxyForwarding
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create()
+                    .WithStatusCode(HttpStatusCode.Redirect)
+                    .WithHeader("Location", _serverForProxyForwarding.Urls[0] + "testpath"));
+
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+
+            // when
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri(_server.Urls[0])
+            };
+            var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
+            var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+
+            // then
+            Check.That(response.Headers.Contains("Location")).IsTrue();
+            Check.That(response.Headers.GetValues("Location")).ContainsExactly(_server.Urls[0] + "testpath");
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Should_preserve_cookie_header_in_proxied_request()
+        {
+            // given
+            _serverForProxyForwarding = FluentMockServer.Start();
+            _serverForProxyForwarding
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create());
+
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+
+            // when
+            var requestUri = new Uri(_server.Urls[0]);
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = requestUri
+            };
+            var clientHandler = new HttpClientHandler();
+            clientHandler.CookieContainer.Add(requestUri, new Cookie("name", "value"));
+            await new HttpClient(clientHandler).SendAsync(requestMessage);
+
+            // then
+            var receivedRequest = _serverForProxyForwarding.LogEntries.First().RequestMessage;
+            Check.That(receivedRequest.Cookies).IsNotNull();
+            Check.That(receivedRequest.Cookies).ContainsPair("name", "value");
+        }
+    }
+}
--- a/test/WireMock.Net.Tests/FluentMockServerTests.cs
+++ b/test/WireMock.Net.Tests/FluentMockServerTests.cs
@@ -6,17 +6,15 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using NFluent;
-using Xunit;
 using WireMock.Matchers;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
+using Xunit;

 namespace WireMock.Net.Tests
 {
-    //[TestFixture]
-    //[Timeout(5000)]
-    public class FluentMockServerTests : IDisposable
+    public partial class FluentMockServerTests : IDisposable
    {
        private FluentMockServer _server;

@@ -178,7 +176,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_respond_to_request_bodyAsString()
+        public async Task FluentMockServer_Should_respond_to_request_bodyAsString()
        {
            // given
            _server = FluentMockServer.Start();
@@ -199,7 +197,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_respond_to_request_bodyAsBase64()
+        public async Task FluentMockServer_Should_respond_to_request_bodyAsBase64()
        {
            // given
            _server = FluentMockServer.Start();
@@ -214,7 +212,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_respond_to_request_bodyAsBytes()
+        public async Task FluentMockServer_Should_respond_to_request_bodyAsBytes()
        {
            // given
            _server = FluentMockServer.Start();
@@ -231,7 +229,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_respond_404_for_unexpected_request()
+        public async Task FluentMockServer_Should_respond_404_for_unexpected_request()
        {
            // given
            _server = FluentMockServer.Start();
@@ -245,7 +243,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_find_a_request_satisfying_a_request_spec()
+        public async Task FluentMockServer_Should_find_a_request_satisfying_a_request_spec()
        {
            // given
            _server = FluentMockServer.Start();
@@ -264,7 +262,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_reset_requestlogs()
+        public async Task FluentMockServer_Should_reset_requestlogs()
        {
            // given
            _server = FluentMockServer.Start();
@@ -278,7 +276,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public void Should_reset_mappings()
+        public void FluentMockServer_Should_reset_mappings()
        {
            // given
            _server = FluentMockServer.Start();
@@ -300,7 +298,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_respond_a_redirect_without_body()
+        public async Task FluentMockServer_Should_respond_a_redirect_without_body()
        {
            // given
            _server = FluentMockServer.Start();
@@ -328,7 +326,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_delay_responses_for_a_given_route()
+        public async Task FluentMockServer_Should_delay_responses_for_a_given_route()
        {
            // given
            _server = FluentMockServer.Start();
@@ -351,7 +349,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_delay_responses()
+        public async Task FluentMockServer_Should_delay_responses()
        {
            // given
            _server = FluentMockServer.Start();
@@ -370,22 +368,6 @@ namespace WireMock.Net.Tests
            Check.That(watch.ElapsedMilliseconds).IsStrictlyGreaterThan(200);
        }

-        [Fact]
-        public async Task Should_proxy_responses()
-        {
-            // given
-            _server = FluentMockServer.Start();
-            _server
-                .Given(Request.Create().WithPath("/*"))
-                .RespondWith(Response.Create().WithProxy("http://www.google.com"));
-
-            // when
-            var result = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/search?q=test");
-
-            // then
-            Check.That(result).Contains("google");
-        }
-
        //Leaving commented as this requires an actual certificate with password, along with a service that expects a client certificate
        //[Fact]
        //public async Task Should_proxy_responses_with_client_certificate()
@@ -429,6 +411,7 @@ namespace WireMock.Net.Tests
        public void Dispose()
        {
            _server?.Stop();
+            _serverForProxyForwarding?.Stop();
        }
    }
 }
--- a/test/WireMock.Net.Tests/RequestMessageTests.cs
+++ b/test/WireMock.Net.Tests/RequestMessageTests.cs
@@ -8,13 +8,13 @@ namespace WireMock.Net.Tests
    //[TestFixture]
    public class RequestMessageTests
    {
-        private const string clientIP = "::1";
+        private const string ClientIp = "::1";

        [Fact]
        public void Should_handle_empty_query()
        {
            // given
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp);

            // then
            Check.That(request.GetParameter("not_there")).IsNull();
@@ -26,7 +26,7 @@ namespace WireMock.Net.Tests
            // given
            string bodyAsString = "whatever";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost?foo=bar&multi=1&multi=2"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost?foo=bar&multi=1&multi=2"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            Check.That(request.GetParameter("foo")).Contains("bar");
--- a/test/WireMock.Net.Tests/RequestTests.ClientIP.cs
+++ b/test/WireMock.Net.Tests/RequestTests.ClientIP.cs
@@ -1,4 +1,3 @@
-
 using System;
 using NFluent;
 using WireMock.Matchers.Request;
--- a/test/WireMock.Net.Tests/RequestTests.cs
+++ b/test/WireMock.Net.Tests/RequestTests.cs
@@ -12,7 +12,7 @@ namespace WireMock.Net.Tests
    //[TestFixture]
    public partial class RequestTests
    {
-        private const string clientIP = "::1";
+        private const string ClientIp = "::1";

        [Fact]
        public void Should_specify_requests_matching_given_path()
@@ -21,7 +21,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath("/foo");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -33,8 +33,8 @@ namespace WireMock.Net.Tests
        {
            var requestBuilder = Request.Create().WithPath("/x1", "/x2");

-            var request1 = new RequestMessage(new Uri("http://localhost/x1"), "blabla", clientIP);
-            var request2 = new RequestMessage(new Uri("http://localhost/x2"), "blabla", clientIP);
+            var request1 = new RequestMessage(new Uri("http://localhost/x1"), "blabla", ClientIp);
+            var request2 = new RequestMessage(new Uri("http://localhost/x2"), "blabla", ClientIp);

            var requestMatchResult = new RequestMatchResult();
            Check.That(requestBuilder.GetMatchingScore(request1, requestMatchResult)).IsEqualTo(1.0);
@@ -48,7 +48,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath(url => url.EndsWith("/foo"));

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -62,7 +62,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath(new RegexMatcher("^/foo"));

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo/bar"), "blabla", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo/bar"), "blabla", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -76,7 +76,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath("/foo");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/bar"), "blabla", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/bar"), "blabla", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -90,7 +90,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithUrl("*/foo");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -104,7 +104,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath("/foo").UsingPut();

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -118,7 +118,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath("/foo").UsingPost();

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -132,7 +132,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath("/foo").UsingGet();

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "GET", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "GET", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -148,7 +148,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "whatever";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "Delete", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "Delete", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -162,7 +162,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath("/foo").UsingHead();

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "HEAD", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "HEAD", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -176,7 +176,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath("/foo").UsingPut();

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "HEAD", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "HEAD", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -190,7 +190,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath("/bar").UsingPut();

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -206,7 +206,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "whatever";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tata" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new [] { "tata" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -222,7 +222,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "whatever";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tata" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new[] { "tata" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -238,7 +238,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "whatever";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "ABC" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new[] { "ABC" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -254,7 +254,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "whatever";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "TaTa" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new[] { "TaTa" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -268,7 +268,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().UsingAnyVerb().WithCookie("session", "a*");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, null, null, null, null, new Dictionary<string, string> { { "session", "abc" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, null, null, null, null, new Dictionary<string, string> { { "session", "abc" } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -284,7 +284,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "Hello world!";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -300,7 +300,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "cat";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -316,7 +316,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "cat";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -332,7 +332,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "caR";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -348,7 +348,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "The car drives in the street.";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -364,7 +364,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "Hello";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -380,7 +380,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "Hello world!";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tatata" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new[] { "tatata" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -396,7 +396,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "Hello world!";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -417,7 +417,7 @@ namespace WireMock.Net.Tests
                        <todo-item id='a3'>xyz</todo-item>
                    </todo-list>";
            byte[] body = Encoding.UTF8.GetBytes(xmlBodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, xmlBodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, xmlBodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -438,7 +438,7 @@ namespace WireMock.Net.Tests
                        <todo-item id='a3'>xyz</todo-item>
                    </todo-list>";
            byte[] body = Encoding.UTF8.GetBytes(xmlBodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, xmlBodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, xmlBodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -454,7 +454,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "{ \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"Wiremock\" } ] }";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -470,7 +470,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "{ \"things\": { \"name\": \"Wiremock\" } }";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -486,7 +486,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "xxx";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tatata" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new[] { "tata" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -500,7 +500,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithParam("bar", "1", "2");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -514,7 +514,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithParam("bar");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar"), "PUT", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo?bar"), "PUT", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -528,7 +528,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().UsingAnyVerb().WithParam(p => p.ContainsKey("bar"));

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -542,7 +542,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithParam("bar", "1");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/test=7"), "PUT", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/test=7"), "PUT", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
--- a/test/WireMock.Net.Tests/ResponseTests.Handlebars.cs
+++ b/test/WireMock.Net.Tests/ResponseTests.Handlebars.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using NFluent;
+using WireMock.ResponseBuilders;
+using Xunit;
+
+namespace WireMock.Net.Tests
+{
+    public partial class ResponseTests
+    {
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_UrlPathVerb()
+        {
+            // given
+            string bodyAsString = "abc";
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);
+
+            var response = Response.Create()
+                .WithBody("test {{request.url}} {{request.path}} {{request.method}}")
+                .WithTransformer();
+
+            // act
+            var responseMessage = await response.ProvideResponseAsync(request);
+
+            // then
+            Check.That(responseMessage.Body).Equals("test http://localhost/foo /foo post");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Query()
+        {
+            // given
+            string bodyAsString = "abc";
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
+            var request = new RequestMessage(new Uri("http://localhost/foo?a=1&a=2&b=5"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);
+
+            var response = 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);
+
+            // then
+            Check.That(responseMessage.Body).Equals("test keya=1 idx=1 idx=2 keyb=5");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Header()
+        {
+            // given
+            string bodyAsString = "abc";
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "Content-Type", new[] { "text/plain" } } });
+
+            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
+
+            // act
+            var responseMessage = await response.ProvideResponseAsync(request);
+
+            // then
+            Check.That(responseMessage.Body).Equals("test");
+            Check.That(responseMessage.Headers).ContainsKey("x");
+            Check.That(responseMessage.Headers["x"]).ContainsExactly("text/plain");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Headers()
+        {
+            // given
+            string bodyAsString = "abc";
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "Content-Type", new[] { "text/plain" } } });
+
+            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer();
+
+            // act
+            var responseMessage = await response.ProvideResponseAsync(request);
+
+            // then
+            Check.That(responseMessage.Body).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");
+        }
+    }
+}
--- a/test/WireMock.Net.Tests/ResponseTests.cs
+++ b/test/WireMock.Net.Tests/ResponseTests.cs
@@ -1,73 +1,15 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using NFluent;
-using Xunit;
 using WireMock.ResponseBuilders;
+using Xunit;

 namespace WireMock.Net.Tests
 {
-    //[TestFixture]
-    public class ResponseTests
+    public partial class ResponseTests
    {
-        private const string clientIP = "::1";
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_UrlPathVerb()
-        {
-            // given
-            string bodyAsString = "abc";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
-
-            var response = Response.Create()
-                .WithBody("test {{request.url}} {{request.path}} {{request.method}}")
-                .WithTransformer();
-
-            // act
-            var responseMessage = await response.ProvideResponseAsync(request);
-
-            // then
-            Check.That(responseMessage.Body).Equals("test http://localhost/foo /foo post");
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Query()
-        {
-            // given
-            string bodyAsString = "abc";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo?a=1&a=2&b=5"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
-
-            var response = 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);
-
-            // then
-            Check.That(responseMessage.Body).Equals("test keya=1 idx=1 idx=2 keyb=5");
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Headers()
-        {
-            // given
-            string bodyAsString = "abc";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "Content-Type", "text/plain" } });
-
-            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
-
-            // act
-            var responseMessage = await response.ProvideResponseAsync(request);
-
-            // then
-            Check.That(responseMessage.Body).Equals("test");
-            Check.That(responseMessage.Headers).Contains(new KeyValuePair<string, string>("x", "text/plain"));
-        }
+        private const string ClientIp = "::1";

        [Fact]
        public async Task Response_ProvideResponse_WithBody_Bytes_Encoding_Destination_String()
@@ -75,7 +17,7 @@ namespace WireMock.Net.Tests
            // given
            string bodyAsString = "abc";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

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

@@ -94,7 +36,7 @@ namespace WireMock.Net.Tests
            // given
            string bodyAsString = "abc";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

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

@@ -113,7 +55,7 @@ namespace WireMock.Net.Tests
            // given
            string bodyAsString = "abc";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

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

@@ -131,7 +73,7 @@ namespace WireMock.Net.Tests
            // given
            string bodyAsString = "abc";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            var response = Response.Create().WithBodyAsJson(new { value = "test" }, Encoding.ASCII);

--- a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
+++ b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
@@ -7,7 +7,6 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using Xunit;
-using Xunit.Abstractions;

 namespace WireMock.Net.Tests
 {
Author	SHA1	Message	Date
Stef Heyenrath	d83f308591	1.0.2.6	2017-10-30 08:49:16 +01:00
Oleksandr Liakhevych	c8c9ab99c5	Fix proxy headers handling (#60 ) * Fix proxy headers handling * Small refactor and moved proxy tests to new test-file.	2017-10-28 18:59:34 +02:00
Oleksandr Liakhevych	d134684bcb	Add ability to provide multiple values for headers in response (#59 ) * Add ability to provide multiple values for headers * Updated json model	2017-10-27 21:49:03 +02:00
Stef Heyenrath	a96b7bca1e	WithBodyFromFile (relative)	2017-10-27 12:12:13 +02:00
Stef Heyenrath	cbe6a0a2b4	WithBodyFromFile (#56 )	2017-10-25 21:33:57 +02:00