diff --git a/src/WireMock.Net.FluentAssertions/Assertions/WireMockReceivedAssertions.cs b/src/WireMock.Net.FluentAssertions/Assertions/WireMockReceivedAssertions.cs
index 0eba33b7e..39b7a734a 100644
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockReceivedAssertions.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockReceivedAssertions.cs
@@ -4,23 +4,39 @@
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions
 {
+    /// <summary>
+    /// Contains a number of methods to assert that the <see cref="IWireMockServer"/> is in the expected state.
+    /// </summary>
     public class WireMockReceivedAssertions : ReferenceTypeAssertions<IWireMockServer, WireMockReceivedAssertions>
     {
-        public WireMockReceivedAssertions(IWireMockServer server)
+        /// <summary>
+        /// Create a WireMockReceivedAssertions. 
+        /// </summary>
+        /// <param name="server">The <see cref="IWireMockServer"/>.</param>
+        public WireMockReceivedAssertions(IWireMockServer server) : base(server)
         {
-            Subject = server;
         }
-        
+
+        /// <summary>
+        /// Asserts if <see cref="IWireMockServer"/> has received a call.
+        /// </summary>
+        /// <returns><see cref="WireMockAssertions"/></returns>
         public WireMockAssertions HaveReceivedACall()
         {
             return new WireMockAssertions(Subject, null);
         }
-        
+
+        /// <summary>
+        /// Asserts if <see cref="IWireMockServer"/> has received n-calls.
+        /// </summary>
+        /// <param name="callsCount"></param>
+        /// <returns><see cref="WireMockAssertions"/></returns>
         public WireMockANumberOfCallsAssertions HaveReceived(int callsCount)
         {
             return new WireMockANumberOfCallsAssertions(Subject, callsCount);
         }
 
+        /// <inheritdoc/>
         protected override string Identifier => "wiremockserver";
     }
 }
\ No newline at end of file
diff --git a/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj b/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
index ca4f270c2..92b1da839 100644
--- a/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
+++ b/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
@@ -37,7 +37,7 @@
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
   </ItemGroup>
 
-  <ItemGroup Condition="('$(TargetFramework)' != 'net451' and '$(TargetFramework)' == 'netstandard1.3')">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'netstandard1.3'">
     <PackageReference Include="FluentAssertions" Version="6.1.0" />
   </ItemGroup>
 
diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs
index 6fc457a5b..2ce7c1dbd 100644
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using FluentAssertions;
 using HandlebarsDotNet;
@@ -216,7 +216,7 @@ public void Response_ProvideResponse_Handlebars_Linq1_ParseError_Throws_Exceptio
             Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings);
 
             // Assert
-            a.Should().Throw<HandlebarsException>();
+            a.Should().ThrowAsync<HandlebarsException>();
         }
 
         [Fact]
@@ -243,7 +243,7 @@ public void Response_ProvideResponse_Handlebars_Linq2_ParseError_Throws_Exceptio
             Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings);
 
             // Assert
-            a.Should().Throw<HandlebarsException>();
+            a.Should().ThrowAsync<HandlebarsException>();
         }
     }
 }
\ No newline at end of file
diff --git a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs
index d1d1a8f24..a6617b14f 100644
--- a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs
+++ b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -691,7 +691,7 @@ public async Task WireMockServer_Proxy_WhenTargetIsNotAvailable_Should_Return_Co
             var result = await new HttpClient(httpClientHandler).SendAsync(requestMessage);
 
             // Assert
-            result.StatusCode.Should().Be(500);
+            result.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
 
             var content = await result.Content.ReadAsStringAsync();
             content.Should().NotBeEmpty();
diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs
index a0b7b1fb1..030a4304b 100644
--- a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs
+++ b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs
@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -31,7 +31,7 @@ public async Task WireMockServer_WithCallback_Should_Use_StatusCodeFromResponse(
 			var response = await httpClient.PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("dummy"));
 
 			// Assert
-			response.StatusCode.Should().Be(409);
+			response.StatusCode.Should().Be(HttpStatusCode.Conflict);
 
             server.Stop();
 		}