2 files changed, 13 insertions, 4 deletions

diff --git a/src/DotNetOpenAuth.Test/Messaging/Reflection/MessageDictionaryTests.cs b/src/DotNetOpenAuth.Test/Messaging/Reflection/MessageDictionaryTests.cs
index 7083b1e..24171e1 100644
--- a/src/DotNetOpenAuth.Test/Messaging/Reflection/MessageDictionaryTests.cs
+++ b/src/DotNetOpenAuth.Test/Messaging/Reflection/MessageDictionaryTests.cs
@@ -331,17 +331,26 @@ namespace DotNetOpenAuth.Test.Messaging.Reflection {
 		/// A test for System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String,System.String<<.Clear
 		/// </summary>
 		[TestMethod]
-		public void Clear() {
-			ICollection<KeyValuePair<string, string>> target = this.MessageDescriptions.GetAccessor(this.message);
+		public void ClearValues() {
+			MessageDictionary target = this.MessageDescriptions.GetAccessor(this.message);
 			IDictionary<string, string> targetAsDictionary = ((IDictionary<string, string>)target);
 			this.message.Name = "Andrew";
 			this.message.Age = 15;
 			targetAsDictionary["extra"] = "value";
-			target.Clear();
+			target.ClearValues();
 			Assert.AreEqual(2, target.Count, "Clearing should remove all keys except for declared non-nullable structs.");
 			Assert.IsFalse(targetAsDictionary.ContainsKey("extra"));
 			Assert.IsNull(this.message.Name);
 			Assert.AreEqual(0, this.message.Age);
 		}
+
+		/// <summary>
+		/// Verifies that the Clear method throws the expected exception.
+		/// </summary>
+		[TestMethod, ExpectedException(typeof(NotSupportedException))]
+		public void Clear() {
+			MessageDictionary target = this.MessageDescriptions.GetAccessor(this.message);
+			target.Clear();
+		}
 	}
 }
diff --git a/src/DotNetOpenAuth.Test/Messaging/Reflection/MessagePartTests.cs b/src/DotNetOpenAuth.Test/Messaging/Reflection/MessagePartTests.cs
index 0215801..19e6a82 100644
--- a/src/DotNetOpenAuth.Test/Messaging/Reflection/MessagePartTests.cs
+++ b/src/DotNetOpenAuth.Test/Messaging/Reflection/MessagePartTests.cs
@@ -82,7 +82,7 @@ namespace DotNetOpenAuth.Test.Messaging.Reflection {
 			Assert.AreEqual("abc", part.GetValue(message));
 		}
 
-		[TestMethod, ExpectedException(typeof(ArgumentException))]
+		[TestMethod, ExpectedException(typeof(ProtocolException))]
 		public void ConstantFieldMemberInvalidValues() {
 			var message = new MessageWithConstantField();
 			MessagePart part = GetMessagePart(message.GetType(), "ConstantField");