2 files changed, 10 insertions, 4 deletions
diff --git a/src/DotNetOAuth.Test/Messaging/ChannelTests.cs b/src/DotNetOAuth.Test/Messaging/ChannelTests.cs
index 7fef82d..e8c4514 100644
--- a/src/DotNetOAuth.Test/Messaging/ChannelTests.cs
+++ b/src/DotNetOAuth.Test/Messaging/ChannelTests.cs
@@ -283,15 +283,12 @@ namespace DotNetOAuth.Test.Messaging {
 				transformB,
 				transformA);
 
-			Assert.AreEqual(6, channel.BindingElements.Count);
+			Assert.AreEqual(5, channel.BindingElements.Count);
 			Assert.AreSame(transformB, channel.BindingElements[0]);
 			Assert.AreSame(transformA, channel.BindingElements[1]);
 			Assert.AreSame(replay, channel.BindingElements[2]);
 			Assert.AreSame(expire, channel.BindingElements[3]);
 			Assert.AreSame(sign, channel.BindingElements[4]);
-			
-			// This last one is added by the channel.
-			Assert.IsInstanceOfType(channel.BindingElements[5], typeof(EnsureCompleteMessageBindingElement));
 		}
 
 		[TestMethod, ExpectedException(typeof(UnprotectedMessageException))]
diff --git a/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs b/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs
index 5c032e6..b6c3b9d 100644
--- a/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs
+++ b/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs
@@ -32,6 +32,10 @@ namespace DotNetOAuth.Test.Messaging.Reflection {
 			[MessagePart(IsRequired = false)]
 			internal int? optionalInt = 0;
 		}
+		class MessageWithNullableRequiredStruct : TestMessage {
+			[MessagePart(IsRequired = true)]
+			internal int? optionalInt;
+		}
 
 		[TestMethod, ExpectedException(typeof(ArgumentException))]
 		public void OptionalNonNullableStruct() {
@@ -48,6 +52,11 @@ namespace DotNetOAuth.Test.Messaging.Reflection {
 			ParameterizedMessageTypeTest(typeof(MessageWithNullableOptionalStruct));
 		}
 
+		[TestMethod]
+		public void RequiredNullableStruct() {
+			ParameterizedMessageTypeTest(typeof(MessageWithNullableRequiredStruct));
+		}
+
 		[TestMethod, ExpectedException(typeof(ArgumentNullException))]
 		public void CtorNullMember() {
 			new MessagePart(null, new MessagePartAttribute());