diff --git a/src/TestFramework/MSTest.Core/Assertions/Assert.cs b/src/TestFramework/MSTest.Core/Assertions/Assert.cs
index 33f63b3712..d8da2da88a 100644
--- a/src/TestFramework/MSTest.Core/Assertions/Assert.cs
+++ b/src/TestFramework/MSTest.Core/Assertions/Assert.cs
@@ -88,8 +88,8 @@ public static void IsTrue([DoesNotReturnIf(false)] bool? condition)
/// The condition the test expects to be true.
///
///
- /// The format to include in the exception when
- /// is false. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is false. The message is shown in test results.
///
///
/// Thrown if is false.
@@ -107,8 +107,8 @@ public static void IsTrue([DoesNotReturnIf(false)] bool condition, string messag
/// The condition the test expects to be true.
///
///
- /// The format to include in the exception when
- /// is false. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is false. The message is shown in test results.
///
///
/// Thrown if is false.
@@ -126,8 +126,8 @@ public static void IsTrue([DoesNotReturnIf(false)] bool? condition, string messa
/// The condition the test expects to be true.
///
///
- /// The format to include in the exception when
- /// is false. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is false. The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -151,8 +151,8 @@ public static void IsTrue([DoesNotReturnIf(false)] bool condition, string messag
/// The condition the test expects to be true.
///
///
- /// The format to include in the exception when
- /// is false. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is false. The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -206,8 +206,8 @@ public static void IsFalse([DoesNotReturnIf(true)] bool? condition)
/// The condition the test expects to be false.
///
///
- /// The format to include in the exception when
- /// is true. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is true. The message is shown in test results.
///
///
/// Thrown if is true.
@@ -225,8 +225,8 @@ public static void IsFalse([DoesNotReturnIf(true)] bool condition, string messag
/// The condition the test expects to be false.
///
///
- /// The format to include in the exception when
- /// is true. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is true. The message is shown in test results.
///
///
/// Thrown if is true.
@@ -244,8 +244,8 @@ public static void IsFalse([DoesNotReturnIf(true)] bool? condition, string messa
/// The condition the test expects to be false.
///
///
- /// The format to include in the exception when
- /// is true. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is true. The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -269,8 +269,8 @@ public static void IsFalse([DoesNotReturnIf(true)] bool condition, string messag
/// The condition the test expects to be false.
///
///
- /// The format to include in the exception when
- /// is true. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is true. The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -313,8 +313,8 @@ public static void IsNull(object value)
/// The object the test expects to be null.
///
///
- /// The format to include in the exception when
- /// is not null. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is not null. The message is shown in test results.
///
///
/// Thrown if is not null.
@@ -332,8 +332,8 @@ public static void IsNull(object value, string message)
/// The object the test expects to be null.
///
///
- /// The format to include in the exception when
- /// is not null. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is not null. The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -372,8 +372,8 @@ public static void IsNotNull([NotNull] object value)
/// The object the test expects not to be null.
///
///
- /// The format to include in the exception when
- /// is null. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is null. The message is shown in test results.
///
///
/// Thrown if is null.
@@ -391,8 +391,8 @@ public static void IsNotNull([NotNull] object value, string message)
/// The object the test expects not to be null.
///
///
- /// The format to include in the exception when
- /// is null. The format is shown in test results.
+ /// The message to include in the exception when
+ /// is null. The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -442,8 +442,8 @@ public static void AreSame(object expected, object actual)
/// The second object to compare. This is the value produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is not the same as . The format is shown
+ /// The message to include in the exception when
+ /// is not the same as . The message is shown
/// in test results.
///
///
@@ -466,8 +466,8 @@ public static void AreSame(object expected, object actual, string message)
/// The second object to compare. This is the value produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is not the same as . The format is shown
+ /// The message to include in the exception when
+ /// is not the same as . The message is shown
/// in test results.
///
///
@@ -531,8 +531,8 @@ public static void AreNotSame(object notExpected, object actual)
/// The second object to compare. This is the value produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is the same as . The format is shown in
+ /// The message to include in the exception when
+ /// is the same as . The message is shown in
/// test results.
///
///
@@ -556,8 +556,8 @@ public static void AreNotSame(object notExpected, object actual, string message)
/// The second object to compare. This is the value produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is the same as . The format is shown in
+ /// The message to include in the exception when
+ /// is the same as . The message is shown in
/// test results.
///
///
@@ -616,8 +616,8 @@ public static void AreEqual(T expected, T actual)
/// The second value to compare. This is the value produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is not equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is not equal to . The message is shown in
/// test results.
///
///
@@ -644,8 +644,8 @@ public static void AreEqual(T expected, T actual, string message)
/// The second value to compare. This is the value produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is not equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is not equal to . The message is shown in
/// test results.
///
///
@@ -726,8 +726,8 @@ public static void AreNotEqual(T notExpected, T actual)
/// The second value to compare. This is the value produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is equal to . The message is shown in
/// test results.
///
///
@@ -754,8 +754,8 @@ public static void AreNotEqual(T notExpected, T actual, string message)
/// The second value to compare. This is the value produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is equal to . The message is shown in
/// test results.
///
///
@@ -811,8 +811,8 @@ public static void AreEqual(object expected, object actual)
/// The second object to compare. This is the object produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is not equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is not equal to . The message is shown in
/// test results.
///
///
@@ -836,8 +836,8 @@ public static void AreEqual(object expected, object actual, string message)
/// The second object to compare. This is the object produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is not equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is not equal to . The message is shown in
/// test results.
///
///
@@ -885,8 +885,8 @@ public static void AreNotEqual(object notExpected, object actual)
/// The second object to compare. This is the object produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is equal to . The message is shown in
/// test results.
///
///
@@ -910,8 +910,8 @@ public static void AreNotEqual(object notExpected, object actual, string message
/// The second object to compare. This is the object produced by the code under test.
///
///
- /// The format to include in the exception when
- /// is equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is equal to . The message is shown in
/// test results.
///
///
@@ -965,9 +965,9 @@ public static void AreEqual(float expected, float actual, float delta)
/// by more than .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is different than by more than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// Thrown if is not equal to
@@ -994,9 +994,9 @@ public static void AreEqual(float expected, float actual, float delta, string me
/// by more than .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is different than by more than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -1075,9 +1075,9 @@ public static void AreNotEqual(float notExpected, float actual, float delta)
/// by at most .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is equal to or different by less than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// Thrown if is equal to .
@@ -1104,9 +1104,9 @@ public static void AreNotEqual(float notExpected, float actual, float delta, str
/// by at most .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is equal to or different by less than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -1170,9 +1170,9 @@ public static void AreEqual(decimal expected, decimal actual, decimal delta)
/// by more than .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is different than by more than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// Thrown if is not equal to
@@ -1199,9 +1199,9 @@ public static void AreEqual(decimal expected, decimal actual, decimal delta, str
/// by more than .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is different than by more than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -1267,9 +1267,9 @@ public static void AreNotEqual(decimal notExpected, decimal actual, decimal delt
/// by at most .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is equal to or different by less than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// Thrown if is equal to .
@@ -1296,9 +1296,9 @@ public static void AreNotEqual(decimal notExpected, decimal actual, decimal delt
/// by at most .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is equal to or different by less than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -1362,9 +1362,9 @@ public static void AreEqual(long expected, long actual, long delta)
/// by more than .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is different than by more than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// Thrown if is not equal to
@@ -1391,9 +1391,9 @@ public static void AreEqual(long expected, long actual, long delta, string messa
/// by more than .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is different than by more than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -1459,9 +1459,9 @@ public static void AreNotEqual(long notExpected, long actual, long delta)
/// by at most .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is equal to or different by less than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// Thrown if is equal to .
@@ -1488,9 +1488,9 @@ public static void AreNotEqual(long notExpected, long actual, long delta, string
/// by at most .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is equal to or different by less than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -1554,9 +1554,9 @@ public static void AreEqual(double expected, double actual, double delta)
/// by more than .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is different than by more than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// Thrown if is not equal to .
@@ -1582,9 +1582,9 @@ public static void AreEqual(double expected, double actual, double delta, string
/// by more than .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is different than by more than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -1662,9 +1662,9 @@ public static void AreNotEqual(double notExpected, double actual, double delta)
/// by at most .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is equal to or different by less than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// Thrown if is equal to .
@@ -1691,9 +1691,9 @@ public static void AreNotEqual(double notExpected, double actual, double delta,
/// by at most .
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// is equal to or different by less than
- /// . The format is shown in test results.
+ /// . The message is shown in test results.
///
///
/// An array of parameters to use when formatting .
@@ -1754,8 +1754,8 @@ public static void AreEqual(string expected, string actual, bool ignoreCase)
/// indicates a case-insensitive comparison.)
///
///
- /// The format to include in the exception when
- /// is not equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is not equal to . The message is shown in
/// test results.
///
///
@@ -1781,8 +1781,8 @@ public static void AreEqual(string expected, string actual, bool ignoreCase, str
/// indicates a case-insensitive comparison.)
///
///
- /// The format to include in the exception when
- /// is not equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is not equal to . The message is shown in
/// test results.
///
///
@@ -1839,8 +1839,8 @@ public static void AreEqual(string expected, string actual, bool ignoreCase, Cul
/// A CultureInfo object that supplies culture-specific comparison information.
///
///
- /// The format to include in the exception when
- /// is not equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is not equal to . The message is shown in
/// test results.
///
///
@@ -1869,8 +1869,8 @@ public static void AreEqual(string expected, string actual, bool ignoreCase, Cul
/// A CultureInfo object that supplies culture-specific comparison information.
///
///
- /// The format to include in the exception when
- /// is not equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is not equal to . The message is shown in
/// test results.
///
///
@@ -1951,8 +1951,8 @@ public static void AreNotEqual(string notExpected, string actual, bool ignoreCas
/// indicates a case-insensitive comparison.)
///
///
- /// The format to include in the exception when
- /// is equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is equal to . The message is shown in
/// test results.
///
///
@@ -1979,8 +1979,8 @@ public static void AreNotEqual(string notExpected, string actual, bool ignoreCas
/// indicates a case-insensitive comparison.)
///
///
- /// The format to include in the exception when
- /// is equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is equal to . The message is shown in
/// test results.
///
///
@@ -2039,8 +2039,8 @@ public static void AreNotEqual(string notExpected, string actual, bool ignoreCas
/// A CultureInfo object that supplies culture-specific comparison information.
///
///
- /// The format to include in the exception when
- /// is equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is equal to . The message is shown in
/// test results.
///
///
@@ -2070,8 +2070,8 @@ public static void AreNotEqual(string notExpected, string actual, bool ignoreCas
/// A CultureInfo object that supplies culture-specific comparison information.
///
///
- /// The format to include in the exception when
- /// is equal to . The format is shown in
+ /// The message to include in the exception when
+ /// is equal to . The message is shown in
/// test results.
///
///
@@ -2133,8 +2133,8 @@ public static void IsInstanceOfType(object value, Type expectedType)
/// The expected type of .
///
///
- /// The format to include in the exception when
- /// is not an instance of . The format is
+ /// The message to include in the exception when
+ /// is not an instance of . The message is
/// shown in test results.
///
///
@@ -2159,8 +2159,8 @@ public static void IsInstanceOfType(object value, Type expectedType, string mess
/// The expected type of .
///
///
- /// The format to include in the exception when
- /// is not an instance of . The format is
+ /// The message to include in the exception when
+ /// is not an instance of . The message is
/// shown in test results.
///
///
@@ -2226,8 +2226,8 @@ public static void IsNotInstanceOfType(object value, Type wrongType)
/// The type that should not be.
///
///
- /// The format to include in the exception when
- /// is an instance of . The format is shown
+ /// The message to include in the exception when
+ /// is an instance of . The message is shown
/// in test results.
///
///
@@ -2252,8 +2252,8 @@ public static void IsNotInstanceOfType(object value, Type wrongType, string mess
/// The type that should not be.
///
///
- /// The format to include in the exception when
- /// is an instance of . The format is shown
+ /// The message to include in the exception when
+ /// is an instance of . The message is shown
/// in test results.
///
///
@@ -2312,7 +2312,7 @@ public static void Fail()
/// Throws an AssertFailedException.
///
///
- /// The format to include in the exception. The format is shown in
+ /// The message to include in the exception. The message is shown in
/// test results.
///
///
@@ -2328,7 +2328,7 @@ public static void Fail(string message)
/// Throws an AssertFailedException.
///
///
- /// The format to include in the exception. The format is shown in
+ /// The message to include in the exception. The message is shown in
/// test results.
///
///
@@ -2362,7 +2362,7 @@ public static void Inconclusive()
/// Throws an AssertInconclusiveException.
///
///
- /// The format to include in the exception. The format is shown in
+ /// The message to include in the exception. The message is shown in
/// test results.
///
///
@@ -2377,7 +2377,7 @@ public static void Inconclusive(string message)
/// Throws an AssertInconclusiveException.
///
///
- /// The format to include in the exception. The format is shown in
+ /// The message to include in the exception. The message is shown in
/// test results.
///
///
@@ -2446,7 +2446,7 @@ public static T ThrowsException(Action action)
/// Delegate to code to be tested and which is expected to throw exception.
///
///
- /// The format to include in the exception when
+ /// The message to include in the exception when
/// does not throws exception of type .
///
///
@@ -2494,7 +2494,7 @@ public static T ThrowsException(Func