diff --git a/src/TestFramework/TestFramework/Assertions/Assert.ThrowsException.cs b/src/TestFramework/TestFramework/Assertions/Assert.ThrowsException.cs
index c47ac376f2..f4765c6aee 100644
--- a/src/TestFramework/TestFramework/Assertions/Assert.ThrowsException.cs
+++ b/src/TestFramework/TestFramework/Assertions/Assert.ThrowsException.cs
@@ -537,7 +537,8 @@ private static async Task<ThrowsExceptionState> IsThrowsAsyncFailingAsync<TExcep
                             FrameworkMessages.WrongExceptionThrown,
                             userMessage,
                             typeof(TException),
-                            ex.GetType());
+                            ex.GetType(),
+                            ex.ToString());
                         ThrowAssertFailed("Assert." + assertMethodName, finalMessage);
                     }, ex);
         }
@@ -577,7 +578,8 @@ private static ThrowsExceptionState IsThrowsFailing<TException>(Action action, b
                             FrameworkMessages.WrongExceptionThrown,
                             userMessage,
                             typeof(TException),
-                            ex.GetType());
+                            ex.GetType(),
+                            ex.ToString());
                         ThrowAssertFailed("Assert." + assertMethodName, finalMessage);
                     }, ex);
         }
diff --git a/src/TestFramework/TestFramework/Resources/FrameworkMessages.resx b/src/TestFramework/TestFramework/Resources/FrameworkMessages.resx
index 6c020b112d..ea431eb468 100644
--- a/src/TestFramework/TestFramework/Resources/FrameworkMessages.resx
+++ b/src/TestFramework/TestFramework/Resources/FrameworkMessages.resx
@@ -254,7 +254,7 @@ Actual: {2}</value>
     <value>Expected exception type:&lt;{1}&gt; but no exception was thrown. {0}</value>
   </data>
   <data name="WrongExceptionThrown" xml:space="preserve">
-    <value>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</value>
+    <value>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</value>
   </data>
   <data name="DataDrivenResultDisplayName" xml:space="preserve">
     <value>{0} ({1})</value>
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.cs.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.cs.xlf
index eab65aa221..8879c78f95 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.cs.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.cs.xlf
@@ -359,8 +359,8 @@ Skutečnost: {2}</target>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">Očekávaný typ výjimky: &lt;{1}&gt; Skutečný typ výjimky: &lt;{2}&gt;. {0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.de.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.de.xlf
index f4afaa9934..0d3402d4fb 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.de.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.de.xlf
@@ -359,8 +359,8 @@ Tatsächlich: {2}</target>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">Erwarteter Ausnahmetyp:&lt;{1}&gt;. Tatsächlicher Ausnahmetyp:&lt;{2}&gt;. {0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.es.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.es.xlf
index c1dbf79e36..0ca7c57b0a 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.es.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.es.xlf
@@ -359,8 +359,8 @@ Real: {2}</target>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">Tipo de excepción esperada:&lt;{1}&gt;. Tipo de excepción actual: &lt;{2}&gt;. {0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.fr.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.fr.xlf
index 1a61f44795..91cd821573 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.fr.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.fr.xlf
@@ -359,8 +359,8 @@ Réel : {2}</target>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">Type d’exception attendu :&lt;{1}&gt;. Type d’exception réel :&lt;{2}&gt;. {0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.it.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.it.xlf
index 0506e80a37..e696a17e6b 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.it.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.it.xlf
@@ -359,8 +359,8 @@ Effettivo: {2}</target>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">Tipo di eccezione previsto:&lt;{1}&gt;. Tipo di eccezione effettivo: &lt;{2}&gt;. {0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ja.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ja.xlf
index 7f9a7f8ed8..d5528f92e0 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ja.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ja.xlf
@@ -359,8 +359,8 @@ Actual: {2}</source>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">予期される例外の種類: &lt;{1}&gt;。実際の例外の種類: &lt;{2}&gt;。{0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ko.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ko.xlf
index a650895266..a7bfd64a51 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ko.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ko.xlf
@@ -359,8 +359,8 @@ Actual: {2}</source>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">예상 예외 형식:&lt;{1}&gt;. 실제 예상 형식:&lt;{2}&gt;. {0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.pl.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.pl.xlf
index 1e73855a86..ef94220d03 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.pl.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.pl.xlf
@@ -359,8 +359,8 @@ Rzeczywiste: {2}</target>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">Oczekiwano typu wyjątku:&lt;{1}&gt;. Rzeczywisty typ wyjątku:&lt;{2}&gt;. {0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.pt-BR.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.pt-BR.xlf
index ae0177763d..8865617b63 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.pt-BR.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.pt-BR.xlf
@@ -359,8 +359,8 @@ Real: {2}</target>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">Tipo de exceção esperado:&lt;{1}&gt;. Tipo de exceção real:&lt;{2}&gt;. {0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ru.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ru.xlf
index 23d579aea8..b62a09c735 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ru.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.ru.xlf
@@ -359,8 +359,8 @@ Actual: {2}</source>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">Ожидаемый тип исключения:&lt;{1}&gt;. Фактический тип исключения:&lt;{2}&gt;. {0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.tr.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.tr.xlf
index 8621c19d21..79d7fb0915 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.tr.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.tr.xlf
@@ -359,8 +359,8 @@ Gerçekte olan: {2}</target>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">Beklenen özel durum türü:&lt;{1}&gt;. Gerçek özel durum türü:&lt;{2}&gt;. {0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.zh-Hans.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.zh-Hans.xlf
index 8587ad71a8..2ee67304ea 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.zh-Hans.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.zh-Hans.xlf
@@ -359,8 +359,8 @@ Actual: {2}</source>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">预期异常类型:&lt;{1}&gt;。实际异常类型:&lt;{2}&gt;。{0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.zh-Hant.xlf b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.zh-Hant.xlf
index 18d8fe9c41..f053ea6f76 100644
--- a/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.zh-Hant.xlf
+++ b/src/TestFramework/TestFramework/Resources/xlf/FrameworkMessages.zh-Hant.xlf
@@ -359,8 +359,8 @@ Actual: {2}</source>
         <note />
       </trans-unit>
       <trans-unit id="WrongExceptionThrown">
-        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. {0}</source>
-        <target state="translated">預期的例外狀況類型：&lt;{1}&gt;。實際的例外狀況類型：&lt;{2}&gt;。{0}</target>
+        <source>Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</source>
+        <target state="new">Expected exception type:&lt;{1}&gt;. Actual exception type:&lt;{2}&gt;. Actual exception: {3} {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="DataDrivenResultDisplayName">
diff --git a/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.ThrowsExceptionTests.cs b/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.ThrowsExceptionTests.cs
index c41eba3302..14b60eec16 100644
--- a/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.ThrowsExceptionTests.cs
+++ b/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.ThrowsExceptionTests.cs
@@ -70,7 +70,7 @@ public void ThrowsAsync_WhenExceptionIsNotExpectedType_ShouldThrow()
         Action action = t.Wait;
         action.Should().Throw<AggregateException>()
             .WithInnerException<AssertFailedException>()
-            .WithMessage("Assert.ThrowsAsync failed. Expected exception type:<System.ArgumentException>. Actual exception type:<System.Exception>. 'action' expression: '() => throw new Exception()'.");
+            .WithMessage("Assert.ThrowsAsync failed. Expected exception type:<System.ArgumentException>. Actual exception type:<System.Exception>. Actual exception: System.Exception: Exception of type 'System.Exception' was thrown.*'action' expression: '() => throw new Exception()'.");
     }
 
     public void ThrowsExactlyAsync_WhenExceptionIsDerivedFromExpectedType_ShouldThrow()
@@ -79,7 +79,7 @@ public void ThrowsExactlyAsync_WhenExceptionIsDerivedFromExpectedType_ShouldThro
         Action action = t.Wait;
         action.Should().Throw<AggregateException>()
             .WithInnerException<AssertFailedException>()
-            .WithMessage("Assert.ThrowsExactlyAsync failed. Expected exception type:<System.ArgumentException>. Actual exception type:<System.ArgumentNullException>. 'action' expression: '() => throw new ArgumentNullException()'.");
+            .WithMessage("Assert.ThrowsExactlyAsync failed. Expected exception type:<System.ArgumentException>. Actual exception type:<System.ArgumentNullException>. Actual exception: System.ArgumentNullException: Value cannot be null.*'action' expression: '() => throw new ArgumentNullException()'.");
     }
 
     public void Throws_WithMessageBuilder_Passes()
@@ -122,7 +122,7 @@ public void Throws_WithMessageBuilder_FailsBecauseTypeMismatch()
             return "message constructed via builder.";
         });
         action.Should().Throw<AssertFailedException>()
-            .WithMessage("Assert.Throws failed. Expected exception type:<System.ArgumentNullException>. Actual exception type:<System.ArgumentOutOfRangeException>. 'action' expression: '() => throw new ArgumentOutOfRangeException(\"MyParamNameHere\")'. message constructed via builder.");
+            .WithMessage("Assert.Throws failed. Expected exception type:<System.ArgumentNullException>. Actual exception type:<System.ArgumentOutOfRangeException>. Actual exception: System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.*'action' expression: '() => throw new ArgumentOutOfRangeException(\"MyParamNameHere\")'. message constructed via builder.");
 
         wasBuilderCalled.Should().BeTrue();
         exceptionPassedToBuilder.Should().BeOfType<ArgumentOutOfRangeException>();
@@ -169,7 +169,7 @@ public void ThrowsExactly_WithMessageBuilder_FailsBecauseTypeMismatch()
             return "message constructed via builder.";
         });
         action.Should().Throw<AssertFailedException>()
-            .WithMessage("Assert.ThrowsExactly failed. Expected exception type:<System.ArgumentNullException>. Actual exception type:<System.ArgumentOutOfRangeException>. 'action' expression: '() => throw new ArgumentOutOfRangeException(\"MyParamNameHere\")'. message constructed via builder.");
+            .WithMessage("Assert.ThrowsExactly failed. Expected exception type:<System.ArgumentNullException>. Actual exception type:<System.ArgumentOutOfRangeException>. Actual exception: System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.*'action' expression: '() => throw new ArgumentOutOfRangeException(\"MyParamNameHere\")'. message constructed via builder.");
 
         wasBuilderCalled.Should().BeTrue();
         exceptionPassedToBuilder.Should().BeOfType<ArgumentOutOfRangeException>();
@@ -216,7 +216,7 @@ public async Task ThrowsAsync_WithMessageBuilder_FailsBecauseTypeMismatch()
             return "message constructed via builder.";
         });
         (await action.Should().ThrowAsync<AssertFailedException>())
-            .WithMessage("Assert.ThrowsAsync failed. Expected exception type:<System.ArgumentNullException>. Actual exception type:<System.ArgumentOutOfRangeException>. 'action' expression: '() => Task.FromException(new ArgumentOutOfRangeException(\"MyParamNameHere\"))'. message constructed via builder.");
+            .WithMessage("Assert.ThrowsAsync failed. Expected exception type:<System.ArgumentNullException>. Actual exception type:<System.ArgumentOutOfRangeException>. Actual exception: System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.*'action' expression: '() => Task.FromException(new ArgumentOutOfRangeException(\"MyParamNameHere\"))'. message constructed via builder.");
 
         wasBuilderCalled.Should().BeTrue();
         exceptionPassedToBuilder.Should().BeOfType<ArgumentOutOfRangeException>();
@@ -263,7 +263,7 @@ public async Task ThrowsExactlyAsync_WithMessageBuilder_FailsBecauseTypeMismatch
             return "message constructed via builder.";
         });
         (await action.Should().ThrowAsync<AssertFailedException>())
-            .WithMessage("Assert.ThrowsExactlyAsync failed. Expected exception type:<System.ArgumentNullException>. Actual exception type:<System.ArgumentOutOfRangeException>. 'action' expression: '() => Task.FromException(new ArgumentOutOfRangeException(\"MyParamNameHere\"))'. message constructed via builder.");
+            .WithMessage("Assert.ThrowsExactlyAsync failed. Expected exception type:<System.ArgumentNullException>. Actual exception type:<System.ArgumentOutOfRangeException>. Actual exception: System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.*'action' expression: '() => Task.FromException(new ArgumentOutOfRangeException(\"MyParamNameHere\"))'. message constructed via builder.");
 
         wasBuilderCalled.Should().BeTrue();
         exceptionPassedToBuilder.Should().BeOfType<ArgumentOutOfRangeException>();