[bcl] Remove AssertExtensions helper classes (#5828)

* [bcl] Remove AssertExtensions helper classes

Since we're on nunitlite now we can use the proper `Assert.Throws<>()`
instead and remove the helper class (which we actually duplicated!)

27 files changed, 114 insertions, 144 deletions

diff --git a/mcs/class/System.Web/System.Web_test.dll.sources b/mcs/class/System.Web/System.Web_test.dll.sources
index 7b1f02c8e82..d658e963f1b 100644
--- a/mcs/class/System.Web/System.Web_test.dll.sources
+++ b/mcs/class/System.Web/System.Web_test.dll.sources
@@ -1,5 +1,4 @@
 ../../test-helpers/NunitHelpers.cs
-../../System.Web.DynamicData/Test/Common/AssertExtensions.cs
 mainsoft/MainsoftWebTest/HtmlAgilityPack/AssemblyInfo.cs
 mainsoft/MainsoftWebTest/HtmlAgilityPack/crc32.cs
 mainsoft/MainsoftWebTest/HtmlAgilityPack/Header.cs
diff --git a/mcs/class/System.Web/Test/System.Web.Caching/FileResponseElementTest.cs b/mcs/class/System.Web/Test/System.Web.Caching/FileResponseElementTest.cs
index ac14cee58ba..0397f44a43e 100644
--- a/mcs/class/System.Web/Test/System.Web.Caching/FileResponseElementTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Caching/FileResponseElementTest.cs
@@ -33,7 +33,6 @@ using System.Web;
 using System.Web.Caching;
 
 using NUnit.Framework;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.Caching
 {
@@ -45,15 +44,15 @@ namespace MonoTests.System.Web.Caching
 		{
 			FileResponseElement fre;
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				fre = new FileResponseElement (null, 0, 0);
 			}, "#A1");
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				fre = new FileResponseElement ("file.txt", -1, 0);
 			}, "#A2");
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				fre = new FileResponseElement ("file.txt", 0, -1);
 			}, "#A3");
 
diff --git a/mcs/class/System.Web/Test/System.Web.Caching/HeaderElementTest.cs b/mcs/class/System.Web/Test/System.Web.Caching/HeaderElementTest.cs
index 7a6a7434b8a..f21202c0bb1 100644
--- a/mcs/class/System.Web/Test/System.Web.Caching/HeaderElementTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Caching/HeaderElementTest.cs
@@ -33,7 +33,6 @@ using System.Web;
 using System.Web.Caching;
 
 using NUnit.Framework;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.Caching
 {
@@ -45,11 +44,11 @@ namespace MonoTests.System.Web.Caching
 		{
 			HeaderElement he;
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				he = new HeaderElement (null, String.Empty);
 			}, "#A1");
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				he = new HeaderElement ("Header", null);
 			}, "#A2");
 
diff --git a/mcs/class/System.Web/Test/System.Web.Caching/MemoryResponseElementTest.cs b/mcs/class/System.Web/Test/System.Web.Caching/MemoryResponseElementTest.cs
index bfee3cc479b..2f7ba0e5571 100644
--- a/mcs/class/System.Web/Test/System.Web.Caching/MemoryResponseElementTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Caching/MemoryResponseElementTest.cs
@@ -33,7 +33,7 @@ using System.Web;
 using System.Web.Caching;
 
 using NUnit.Framework;
-using MonoTests.Common;
+
 
 namespace MonoTests.System.Web.Caching
 {
@@ -45,15 +45,15 @@ namespace MonoTests.System.Web.Caching
 		{
 			MemoryResponseElement mre;
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				mre = new MemoryResponseElement (null, 0);
 			}, "#A1");
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				mre = new MemoryResponseElement (new byte[1], -1);
 			}, "#A2");
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				mre = new MemoryResponseElement (new byte[1], 2);
 			}, "#A2");
 
diff --git a/mcs/class/System.Web/Test/System.Web.Caching/OutputCacheTest.cs b/mcs/class/System.Web/Test/System.Web.Caching/OutputCacheTest.cs
index 9c36368ba7d..7b45144d423 100644
--- a/mcs/class/System.Web/Test/System.Web.Caching/OutputCacheTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Caching/OutputCacheTest.cs
@@ -36,7 +36,6 @@ using System.Web.Caching;
 using System.Web.Configuration;
 
 using NUnit.Framework;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.Caching
 {
@@ -166,17 +165,17 @@ namespace MonoTests.System.Web.Caching
 		{
 			ResponseElement data = new MemoryResponseElement (new byte[10], 10);
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				OutputCache.Serialize (null, data);
 			}, "#A1");
 
 			var ms = new MemoryStream ();
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				OutputCache.Serialize (ms, null);
 			}, "#A2");
 
 			foreach (object o in serializeObjects) {
-				AssertExtensions.Throws<ArgumentException> (() => {
+				Assert.Throws<ArgumentException> (() => {
 					OutputCache.Serialize (ms, o);
 				}, String.Format ("#A3-{0}", o.GetType ()));
 			}
@@ -194,28 +193,28 @@ namespace MonoTests.System.Web.Caching
 #endif
 			
 			byte[] bytes = SerializeElement (mre);
-			AssertExtensions.AreEqual (bytes, memoryResponseElement, "#B1");
+			Assert.AreEqual (bytes, memoryResponseElement, "#B1");
 
 			bytes = SerializeElement (fre);
-			AssertExtensions.AreEqual (bytes, fileResponseElement, "#B2");
+			Assert.AreEqual (bytes, fileResponseElement, "#B2");
 
 			bytes = SerializeElement (sre);
-			AssertExtensions.AreEqual (bytes, substitutionResponseElement, "#B3");
+			Assert.AreEqual (bytes, substitutionResponseElement, "#B3");
 
 			bytes = SerializeElement (sreBad);
-			AssertExtensions.AreEqual (bytes, badSubstitutionResponseElement, "#B4");
+			Assert.AreEqual (bytes, badSubstitutionResponseElement, "#B4");
 		}
 
 		[Test]
 		public void Deserialize ()
 		{
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				OutputCache.Deserialize (null);
 			}, "#A1");
 
 			foreach (object o in serializeObjects) {
 				using (var m = new MemoryStream (SerializeToBinary (o))) {
-					AssertExtensions.Throws<ArgumentException> (() => {
+					Assert.Throws<ArgumentException> (() => {
 						OutputCache.Deserialize (m);
 					}, String.Format ("#A2-{0}", o.GetType ()));
 				}
@@ -231,7 +230,7 @@ namespace MonoTests.System.Web.Caching
 			using (ms = new MemoryStream (memoryResponseElement))
 				mreOrig = OutputCache.Deserialize (ms) as MemoryResponseElement;
 			Assert.IsNotNull (mreOrig, "#B1-1");
-			AssertExtensions.AreEqual (mreOrig.Buffer, mre.Buffer, "#B1-2");
+			Assert.AreEqual (mreOrig.Buffer, mre.Buffer, "#B1-2");
 			Assert.AreEqual (mreOrig.Length, mre.Length, "#B1-3");
 
 			using (ms = new MemoryStream (fileResponseElement))
@@ -247,7 +246,7 @@ namespace MonoTests.System.Web.Caching
 			Assert.AreEqual (sreOrig.Callback, sre.Callback, "#D1");
 
 			// Callback here is not a static method - Substitution delegates must be static
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				using (ms = new MemoryStream (badSubstitutionResponseElement))
 					sreBadOrig = OutputCache.Deserialize (ms) as SubstitutionResponseElement;
 			}, "#E1");
diff --git a/mcs/class/System.Web/Test/System.Web.Caching/SqlCacheDependencyTest.cs b/mcs/class/System.Web/Test/System.Web.Caching/SqlCacheDependencyTest.cs
index e26dafb8ce9..6e3c48fad14 100644
--- a/mcs/class/System.Web/Test/System.Web.Caching/SqlCacheDependencyTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Caching/SqlCacheDependencyTest.cs
@@ -30,7 +30,6 @@ using System.Web;
 using System.Web.Caching;
 
 using NUnit.Framework;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.Caching
 {
@@ -41,7 +40,7 @@ namespace MonoTests.System.Web.Caching
 		public void Constructor_1 ()
 		{
 			SqlCacheDependency sqc;
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				sqc = new SqlCacheDependency (null);
 			}, "#A1");
 		}
@@ -51,16 +50,16 @@ namespace MonoTests.System.Web.Caching
 		{
 			SqlCacheDependency sqc;
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				sqc = new SqlCacheDependency (null, "myTable");
 			}, "#A1");
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				sqc = new SqlCacheDependency ("myDatabase", null);
 			}, "#A2");
 
 			// Cannot be tested without an existing database
-			//AssertExtensions.Throws<ArgumentNullException> (() => {
+			//Assert.Throws<ArgumentNullException> (() => {
 			//	sqc = new SqlCacheDependency ("myDatabase", "myTable");
 			//}, "#A3");
 		}
@@ -70,15 +69,15 @@ namespace MonoTests.System.Web.Caching
 		{
 			CacheDependency sqc;
 
-			AssertExtensions.Throws<HttpException> (() => {
+			Assert.Throws<HttpException> (() => {
 				sqc = SqlCacheDependency.CreateOutputCacheDependency (null);
 			}, "#A1");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				sqc = SqlCacheDependency.CreateOutputCacheDependency (String.Empty);
 			}, "#A2");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				sqc = SqlCacheDependency.CreateOutputCacheDependency ("Database");
 			}, "#A2");
 
diff --git a/mcs/class/System.Web/Test/System.Web.Caching/SubstitutionResponseElementTest.cs b/mcs/class/System.Web/Test/System.Web.Caching/SubstitutionResponseElementTest.cs
index 64a32af27ba..b267e8a03ad 100644
--- a/mcs/class/System.Web/Test/System.Web.Caching/SubstitutionResponseElementTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Caching/SubstitutionResponseElementTest.cs
@@ -33,7 +33,6 @@ using System.Web;
 using System.Web.Caching;
 
 using NUnit.Framework;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.Caching
 {
@@ -50,7 +49,7 @@ namespace MonoTests.System.Web.Caching
 		{
 			SubstitutionResponseElement sre;
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				sre = new SubstitutionResponseElement (null);
 			}, "#A1");
 
diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/BuildManagerTest.cs b/mcs/class/System.Web/Test/System.Web.Compilation/BuildManagerTest.cs
index 28de9a7623f..a4f73590c0b 100644
--- a/mcs/class/System.Web/Test/System.Web.Compilation/BuildManagerTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Compilation/BuildManagerTest.cs
@@ -33,7 +33,7 @@ using System.Web.Compilation;
 using System.Web.Hosting;
 
 using NUnit.Framework;
-using MonoTests.Common;
+
 
 namespace MonoTests.System.Web.Compilation
 {
@@ -45,7 +45,7 @@ namespace MonoTests.System.Web.Compilation
 		[Ignore ("Pending investigation if it is indeed the correct test.")]
 		public void GetGlobalAsaxType ()
 		{
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				BuildManager.GetGlobalAsaxType ();
 			}, "#A1");
 		}
diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/BuildProviderTest.cs b/mcs/class/System.Web/Test/System.Web.Compilation/BuildProviderTest.cs
index 852b3773c95..fd15a3b2930 100644
--- a/mcs/class/System.Web/Test/System.Web.Compilation/BuildProviderTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Compilation/BuildProviderTest.cs
@@ -39,7 +39,6 @@ using NUnit.Framework;
 
 using MonoTests.SystemWeb.Framework;
 using MonoTests.stand_alone.WebHarness;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.Compilation
 {
@@ -49,25 +48,25 @@ namespace MonoTests.System.Web.Compilation
 		[Test]
 		public void RegisterBuildProvider ()
 		{
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				BuildProvider.RegisterBuildProvider (null, typeof (FooBuildProvider));
 			}, "#A1-1");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				BuildProvider.RegisterBuildProvider (String.Empty, typeof (FooBuildProvider));
 			}, "#A1-2");
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				BuildProvider.RegisterBuildProvider (".foo", null);
 			}, "#A1-3");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				BuildProvider.RegisterBuildProvider (".foo", typeof (string));
 			}, "#A1-4");
 
 			// This would have worked if we called the method during the pre-application start stage
 			// (we have a test for this in the standalone test suite)
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				BuildProvider.RegisterBuildProvider (".foo", typeof (BuildProvider));
 			}, "#A1-5");
 		}
diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs b/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs
index 68a97a2e7e4..d1369eb2c67 100644
--- a/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs
@@ -39,7 +39,7 @@ using NUnit.Framework;
 
 using MonoTests.SystemWeb.Framework;
 using MonoTests.stand_alone.WebHarness;
-using MonoTests.Common;
+
 
 namespace MonoTests.System.Web.Compilation
 {
@@ -84,11 +84,11 @@ namespace MonoTests.System.Web.Compilation
 			obj = bldr.EvaluateExpression (null, entry, null, context);
 			Assert.IsNull (obj, "#A4");
 
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				bldr.EvaluateExpression (null, null, null, context);
 			}, "#A5-1");
 
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				bldr.EvaluateExpression (null, entry, null, null);
 			}, "#A5-2");
 		}
@@ -105,7 +105,7 @@ namespace MonoTests.System.Web.Compilation
 		[Test]
 		public void GetRouteUrl ()
 		{
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				RouteUrlExpressionBuilder.GetRouteUrl (null, "bar=test");
 			}, "#A1-1");
 
@@ -139,15 +139,15 @@ namespace MonoTests.System.Web.Compilation
 			Assert.IsNotNull (url, "#A6-1");
 			Assert.AreEqual ("/NunitWeb/test-foo", url, "#A6-2");
 
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				url = RouteUrlExpressionBuilder.GetRouteUrl (new Control (), "routename");
 			}, "#A7-1");
 
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				url = RouteUrlExpressionBuilder.GetRouteUrl (new Control (), String.Empty);
 			}, "#A7-2");
 
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				url = RouteUrlExpressionBuilder.GetRouteUrl (new Control (), null);
 			}, "#A7-2");
 		}
@@ -165,7 +165,7 @@ namespace MonoTests.System.Web.Compilation
 			Assert.AreEqual (1, rvd.Count, "#A1-4-1");
 			Assert.AreEqual (String.Empty, rvd ["route"], "#A1-4-2");
 
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				RouteUrlExpressionBuilder.TryParseRouteExpression ("foo=bar", null, out routeName);
 			}, "#A1-5");
 
@@ -235,7 +235,7 @@ namespace MonoTests.System.Web.Compilation
 			var context = new ExpressionBuilderContext (new FakePage ());
 			CodeExpression expr;
 
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				expr = bldr.GetCodeExpression (null, "data", context);
 			}, "#A1-1");
 
diff --git a/mcs/class/System.Web/Test/System.Web.Security/MachineKeyTest.cs b/mcs/class/System.Web/Test/System.Web.Security/MachineKeyTest.cs
index a88bfa88c0e..062a0f4bef0 100644
--- a/mcs/class/System.Web/Test/System.Web.Security/MachineKeyTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Security/MachineKeyTest.cs
@@ -32,7 +32,6 @@ using System;
 using System.Text;
 using System.Web.Security;
 
-using MonoTests.Common;
 using NUnit.Framework;
 
 namespace MonoTests.System.Web.Security
@@ -53,7 +52,7 @@ namespace MonoTests.System.Web.Security
 #endif
 			const int VALIDATION_EXPECTED_SIZE = 64;
 			
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				MachineKey.Encode (null, MachineKeyProtection.All);
 			}, "#A1-1");
 
@@ -79,11 +78,11 @@ namespace MonoTests.System.Web.Security
 		{
 			byte[] decoded;
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				MachineKey.Decode (null, MachineKeyProtection.All);
 			}, "#A1-1");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				decoded = MachineKey.Decode (String.Empty, MachineKeyProtection.All);
 			}, "#A1-2");
 
@@ -107,15 +106,15 @@ namespace MonoTests.System.Web.Security
 			Assert.IsNotNull (decoded, "#A5-1");
 			Assert.AreEqual (5, decoded.Length, "#A5-2");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				decoded = MachineKey.Decode ("test", MachineKeyProtection.All);
 			}, "#B1-1");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				decoded = MachineKey.Decode ("test", MachineKeyProtection.Encryption);
 			}, "#B1-2");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				decoded = MachineKey.Decode ("test", MachineKeyProtection.Validation);
 			}, "#B1-3");
 
@@ -172,11 +171,11 @@ namespace MonoTests.System.Web.Security
 		[Test]
 		public void Protect ()
 		{
-			AssertExtensions.Throws<ArgumentNullException> (() =>
+			Assert.Throws<ArgumentNullException> (() =>
 				MachineKey.Protect (null, null), 
 				"MachineKey.Protect not throwing an ArgumentNullException");
 
-			AssertExtensions.Throws<ArgumentNullException> (() => 
+			Assert.Throws<ArgumentNullException> (() => 
 				MachineKey.Protect (null, new [] { "test" }), 
 				"MachineKey.Protect not throwing an ArgumentNullException");
 
@@ -191,11 +190,11 @@ namespace MonoTests.System.Web.Security
 
 			Assert.AreEqual (plainBytes, validDecryptedBytes, "Decryption didn't work");
 
-			AssertExtensions.Throws<CryptographicException> (() => 
+			Assert.Throws<CryptographicException> (() => 
 				MachineKey.Unprotect (encryptedBytes, invalidUsages), 
 				"Purposes not encrypting properly");
 
-			AssertExtensions.Throws<CryptographicException> (() => 
+			Assert.Throws<CryptographicException> (() => 
 				MachineKey.Unprotect (encryptedBytes, oneUsage), 
 				"Single purpose working when multiple supplied");
 		}
diff --git a/mcs/class/System.Web/Test/System.Web.Security/MembershipTest.cs b/mcs/class/System.Web/Test/System.Web.Security/MembershipTest.cs
index 6169a23520b..ab8abdf105e 100644
--- a/mcs/class/System.Web/Test/System.Web.Security/MembershipTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Security/MembershipTest.cs
@@ -32,7 +32,6 @@ using System.Text;
 using System.Web.Security;
 
 using NUnit.Framework;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.Security {
 
@@ -70,19 +69,19 @@ namespace MonoTests.System.Web.Security {
 		{
 			MembershipUser user;
 
-			AssertExtensions.Throws<MembershipCreateUserException> (() => {
+			Assert.Throws<MembershipCreateUserException> (() => {
 				user = Membership.CreateUser (null, "password");
 			}, "#A1");
 
-			AssertExtensions.Throws<MembershipCreateUserException> (() => {
+			Assert.Throws<MembershipCreateUserException> (() => {
 				user = Membership.CreateUser (String.Empty, "password");
 			}, "#A2");
 
-			AssertExtensions.Throws<MembershipCreateUserException> (() => {
+			Assert.Throws<MembershipCreateUserException> (() => {
 				user = Membership.CreateUser ("user", null);
 			}, "#B1");
 
-			AssertExtensions.Throws<MembershipCreateUserException> (() => {
+			Assert.Throws<MembershipCreateUserException> (() => {
 				user = Membership.CreateUser ("user", String.Empty);
 			}, "#B2");
 		}
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs
index 4fc1f75f851..c73f11d0e3b 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs
@@ -40,7 +40,6 @@ using System.Web.Security;
 using System.Text.RegularExpressions;
 using MonoTests.SystemWeb.Framework;
 using MonoTests.stand_alone.WebHarness;
-using MonoTests.Common;
 
 using NUnit.Framework;
 using System.Collections.Specialized;
@@ -879,7 +878,7 @@ namespace MonoTests.System.Web.UI.WebControls
 			using (var sw = new StringWriter ()) {
 				using (var w = new HtmlTextWriter (sw)) {
 					if (shouldFail)
-						AssertExtensions.Throws<InvalidOperationException> (() => {
+						Assert.Throws<InvalidOperationException> (() => {
 							cp.RenderControl (w);
 						}, message);
 					else {
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs
index 9e61762f001..bd56446b65e 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs
@@ -38,7 +38,6 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 
 using NUnit.Framework;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.UI.WebControls {
 
@@ -327,11 +326,11 @@ namespace MonoTests.System.Web.UI.WebControls {
 		{
 			TestDataList dl = new TestDataList ();
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				dl.RepeatLayout = RepeatLayout.OrderedList;
 			}, "#A1");
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				dl.RepeatLayout = RepeatLayout.UnorderedList;
 			}, "#A2");
 		}
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
index 02fc8537059..33df3634b1a 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
@@ -42,7 +42,6 @@ using System.Collections;
 using MonoTests.SystemWeb.Framework;
 using MonoTests.stand_alone.WebHarness;
 using System.Threading;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.UI.WebControls
 {
@@ -219,17 +218,17 @@ namespace MonoTests.System.Web.UI.WebControls
 			var mp = new MasterPage ();
 			ITemplate template = new MyTemplate ();
 
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				mp.InstantiateInContentPlaceHolder (null, template);
 			}, "#A1-1");
 
 			Control container = new Control ();
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				mp.InstantiateInContentPlaceHolder (container, null);
 			}, "#A1-2");
 #if DOTNET
 			// TODO: why does it throw? Unchecked 'as' type cast?
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				mp.InstantiateInContentPlaceHolder (container, template);
 			}, "#B1-1");
 #endif
@@ -257,12 +256,12 @@ namespace MonoTests.System.Web.UI.WebControls
 
 			ITemplate template = new MyTemplate ();
 
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				mp.InstantiateInContentPlaceHolder (null, template);
 			}, "#A1-1");
 
 			Control container = new Control ();
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				mp.InstantiateInContentPlaceHolder (container, null);
 			}, "#A1-2");
 
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
index 868e447a276..21f84371d96 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
@@ -47,8 +47,6 @@ using System.Text.RegularExpressions;
 using System.Reflection;
 using System.Xml;
 
-using MonoTests.Common;
-
 namespace MonoTests.System.Web.UI.WebControls
 {
 	class MenuTable : Menu
@@ -1774,11 +1772,11 @@ namespace MonoTests.System.Web.UI.WebControls
 					maxValue = value;
 			}
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				m.RenderingMode = (MenuRenderingMode) (minValue - 1);
 			}, "#A2-1");
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				m.RenderingMode = (MenuRenderingMode) (maxValue + 1);
 			}, "#A2-2");
 		}
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RouteParameterTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RouteParameterTest.cs
index eec1e9bc2c2..fc3959c0c49 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RouteParameterTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RouteParameterTest.cs
@@ -31,7 +31,6 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 
 using NUnit.Framework;
-using MonoTests.Common;
 using MonoTests.System.Web;
 
 namespace MonoTests.System.Web.UI.WebControls
@@ -60,7 +59,7 @@ namespace MonoTests.System.Web.UI.WebControls
 			RouteParameter rp;
 			RouteParameter original;
 
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				rp = new FakeRouteParameter ((RouteParameter) null);
 			}, "#A1");
 
@@ -137,7 +136,7 @@ namespace MonoTests.System.Web.UI.WebControls
 
 			Assert.IsNull (rp.DoEvaluate (null, new Control ()), "#A1-1");
 			Assert.IsNull (rp.DoEvaluate (ctx, null), "#A1-2");
-			AssertExtensions.Throws <NullReferenceException> (() => {
+			Assert.Throws <NullReferenceException> (() => {
 				rp.DoEvaluate (ctx, new Control ());
 			}, "#A1-2");
 		}
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardTest.cs
index df2d7118b2b..b4e3f992b6b 100755
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardTest.cs
@@ -46,9 +46,6 @@ using MonoTests.SystemWeb.Framework;
 using MonoTests.stand_alone.WebHarness;
 using System.Threading;
 
-using MonoTests.Common;
-
-
 namespace MonoTests.System.Web.UI.WebControls
 {
 
@@ -1501,7 +1498,7 @@ namespace MonoTests.System.Web.UI.WebControls
 			t.UserData = "Empty";
 			string result;
 
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				result = t.Run ();
 			}, "#A1");
 		}
@@ -1517,7 +1514,7 @@ namespace MonoTests.System.Web.UI.WebControls
 			Assert.AreEqual (String.Empty, renderedHtml, "#A1");
 
 			t.UserData = "OptionalSideBar_WithSideBar";
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				result = t.Run ();
 			}, "#A2");
 		}
@@ -1552,7 +1549,7 @@ namespace MonoTests.System.Web.UI.WebControls
 			Assert.AreEqual (String.Empty, renderedHtml, "#A1");
 
 			t.UserData = "OptionalHeader_WithHeaderTemplate";
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				result = t.Run ();
 			}, "#A2");
 		}
@@ -1580,7 +1577,7 @@ namespace MonoTests.System.Web.UI.WebControls
 		{
 			WebTest t = new WebTest (PageInvoker.CreateOnInit (LayoutTemplateRender));
 			t.UserData = "StepPlaceHolder";
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				string result = t.Run ();
 			}, "#A1");
 		}
@@ -1590,7 +1587,7 @@ namespace MonoTests.System.Web.UI.WebControls
 		{
 			WebTest t = new WebTest (PageInvoker.CreateOnInit (LayoutTemplateRender));
 			t.UserData = "NavigationPlaceHolder";
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				string result = t.Run ();
 			}, "#A1");
 		}
diff --git a/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs b/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
index 604365e428e..3d4451ab9e8 100644
--- a/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
@@ -40,7 +40,6 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using MonoTests.SystemWeb.Framework;
 using MonoTests.stand_alone.WebHarness;
-using MonoTests.Common;
 
 using System.Web.UI.Adapters;
 
@@ -1059,7 +1058,7 @@ namespace MonoTests.System.Web.UI
 			var ctl = new Control ();
 			object obj = new { foo = "one", bar = "two" };
 			string path;
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				path = ctl.GetRouteUrl ("myroute1", obj);
 			}, "#A1");
 
@@ -1090,7 +1089,7 @@ namespace MonoTests.System.Web.UI
 				{"bar", "two"}
 			};
 			string path;
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				path = ctl.GetRouteUrl ("myroute", rvd);
 			}, "#A1");
 
diff --git a/mcs/class/System.Web/Test/System.Web.UI/DataSourceCacheDurationConverterTest.cs b/mcs/class/System.Web/Test/System.Web.UI/DataSourceCacheDurationConverterTest.cs
index 37ea277df8b..efdb5a5ea67 100644
--- a/mcs/class/System.Web/Test/System.Web.UI/DataSourceCacheDurationConverterTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/DataSourceCacheDurationConverterTest.cs
@@ -32,7 +32,6 @@ using System.Text;
 using System.Web.UI;
 
 using NUnit.Framework;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.UI
 {
@@ -76,7 +75,7 @@ namespace MonoTests.System.Web.UI
 			Assert.AreEqual (0, cvt.ConvertFrom (null, null, String.Empty), "#A1-2");
 			Assert.AreEqual (0, cvt.ConvertFrom (null, null, "infinite"), "#A1-3");
 			Assert.AreEqual (0, cvt.ConvertFrom (null, null, "INfINiTE"), "#A1-4");
-			AssertExtensions.Throws<Exception> (() => {
+			Assert.Throws<Exception> (() => {
 				cvt.ConvertFrom (null, null, "dummy");
 			}, "#A1-5");
 			Assert.AreEqual (5, cvt.ConvertFrom (null, null, "5"), "#A1-6");
diff --git a/mcs/class/System.Web/Test/System.Web.UI/MinimizableAttributeTypeConverterTest.cs b/mcs/class/System.Web/Test/System.Web.UI/MinimizableAttributeTypeConverterTest.cs
index 8dff094c30d..677d0dfd74c 100644
--- a/mcs/class/System.Web/Test/System.Web.UI/MinimizableAttributeTypeConverterTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/MinimizableAttributeTypeConverterTest.cs
@@ -37,8 +37,6 @@ using System.Web.UI.HtmlControls;
 using System.Reflection;
 using NUnit.Framework;
 
-using MonoTests.Common;
-
 namespace MonoTests.System.Web.UI {
 
 	[TestFixture]
@@ -101,16 +99,16 @@ namespace MonoTests.System.Web.UI {
 			Assert.AreEqual (false, tc.ConvertFrom (null, culture, "FALSE"), "A5");
 			Assert.AreEqual (true, tc.ConvertFrom (null, culture, "true"), "A6");
 			Assert.AreEqual (true, tc.ConvertFrom (null, culture, "True"), "A");
-			AssertExtensions.Throws<NotSupportedException> (() => {
+			Assert.Throws<NotSupportedException> (() => {
 				tc.ConvertFrom (null, culture, true);
 			}, "A8");
-			AssertExtensions.Throws<NotSupportedException> (() => {
+			Assert.Throws<NotSupportedException> (() => {
 				tc.ConvertFrom (null, culture, false);
 			}, "A9");
-			AssertExtensions.Throws<NotSupportedException> (() => {
+			Assert.Throws<NotSupportedException> (() => {
 				tc.ConvertFrom (null, culture, 1234);
 			}, "A10");
-			AssertExtensions.Throws<NotSupportedException> (() => {
+			Assert.Throws<NotSupportedException> (() => {
 				tc.ConvertFrom (null, culture, null);
 			}, "A11");
 		}
diff --git a/mcs/class/System.Web/Test/System.Web.Util/HttpEncoderTest.cs b/mcs/class/System.Web/Test/System.Web.Util/HttpEncoderTest.cs
index 4ea7ad9ab5a..58269e6fc18 100644
--- a/mcs/class/System.Web/Test/System.Web.Util/HttpEncoderTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Util/HttpEncoderTest.cs
@@ -34,7 +34,6 @@ using NUnit.Framework;
 
 using MonoTests.SystemWeb.Framework;
 using MonoTests.stand_alone.WebHarness;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.Util
 {
@@ -83,7 +82,7 @@ namespace MonoTests.System.Web.Util
 			var encoder = new HttpEncoderPoker ();
 			var sw = new StringWriter ();
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				encoder.CallHtmlAttributeEncode ("string", null);
 			}, "#A1");
 
@@ -117,7 +116,7 @@ namespace MonoTests.System.Web.Util
 			var encoder = new HttpEncoderPoker ();
 			StringWriter sw;
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				encoder.CallHtmlDecode ("string", null);
 			}, "#A1");
 
@@ -152,7 +151,7 @@ namespace MonoTests.System.Web.Util
 			var encoder = new HttpEncoderPoker ();
 			StringWriter sw;
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				encoder.CallHtmlEncode ("string", null);
 			}, "#A1");
 
@@ -177,23 +176,23 @@ namespace MonoTests.System.Web.Util
 			var encoder = new HttpEncoderPoker ();
 			byte [] bytes = new byte [10];
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				encoder.CallUrlEncode (bytes, -1, 1);
 			}, "#A1-1");
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				encoder.CallUrlEncode (bytes, 11, 1);
 			}, "#A1-2");
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				encoder.CallUrlEncode (bytes, 0, -1);
 			}, "#A1-3");
 
-			AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
 				encoder.CallUrlEncode (bytes, 01, 11);
 			}, "#A1-4");
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				encoder.CallUrlEncode (null, 0, 1);
 			}, "#A1-5");
 
diff --git a/mcs/class/System.Web/Test/System.Web.Util/RequestValidatorTest.cs b/mcs/class/System.Web/Test/System.Web.Util/RequestValidatorTest.cs
index b185d1290fd..cb464415c44 100644
--- a/mcs/class/System.Web/Test/System.Web.Util/RequestValidatorTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Util/RequestValidatorTest.cs
@@ -33,7 +33,6 @@ using System.Web.Caching;
 using System.Web.Util;
 
 using NUnit.Framework;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web.Util
 {	
@@ -74,7 +73,7 @@ namespace MonoTests.System.Web.Util
 		{
 			Assert.IsNotNull (RequestValidator.Current, "#A1");
 			Assert.AreEqual (typeof (RequestValidator).AssemblyQualifiedName, RequestValidator.Current.GetType ().AssemblyQualifiedName, "#A2");
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				RequestValidator.Current = null;
 			}, "#A3");
 
diff --git a/mcs/class/System.Web/Test/System.Web/HttpApplicationTest.cs b/mcs/class/System.Web/Test/System.Web/HttpApplicationTest.cs
index 7d572081fcd..e20e8d38d03 100644
--- a/mcs/class/System.Web/Test/System.Web/HttpApplicationTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpApplicationTest.cs
@@ -30,7 +30,6 @@ using System.Web;
 using System.Web.Caching;
 
 using NUnit.Framework;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web
 {
diff --git a/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs b/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs
index 15d1f137a0a..117648b6e8e 100644
--- a/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs
@@ -38,8 +38,6 @@ using System.IO;
 using System.Threading;
 using System.Globalization;
 
-using MonoTests.Common;
-
 namespace MonoTests.System.Web {
 
 	[TestFixture]
@@ -204,21 +202,21 @@ namespace MonoTests.System.Web {
 			Assert.AreEqual (Path.Combine (appBase, "DIR" + Path.DirectorySeparatorChar + "Web.config"),
 				r.MapPath ("Web.config", "~/DIR", false), "test11");
 
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				// Throws because the test's virtual dir is /NunitWeb and / is above it
 				r.MapPath ("/test.txt");
 			}, "test12");
 
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				// Throws because the test's virtual dir is /NunitWeb and /NunitWeb1 does not match it
 				r.MapPath ("/NunitWeb1/test.txt");
 			}, "test13");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				r.MapPath ("/test.txt", "/", false);
 			}, "test14");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				r.MapPath ("/test.txt", "/NunitWeb", false);
 			}, "test15");
 
diff --git a/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs b/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
index 0342a707978..8b24201cd91 100644
--- a/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
@@ -38,8 +38,6 @@ using System.Web.Caching;
 
 using NUnit.Framework;
 
-using MonoTests.Common;
-
 namespace MonoTests.System.Web {
 
 	public class FakeHttpWorkerRequest2 : HttpWorkerRequest {
@@ -637,19 +635,19 @@ namespace MonoTests.System.Web {
 		{
 			FakeHttpWorkerRequest2 request;
 			HttpContext context = Cook (1, out request);
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				context.Response.RedirectPermanent (null);
 			}, "#A1");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				context.Response.RedirectPermanent ("http://invalid\nurl.com");
 			}, "#A2");
 
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				context.Response.RedirectPermanent (null, true);
 			}, "#A3");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				context.Response.RedirectPermanent ("http://invalid\nurl.com", true);
 			}, "#A4");
 		}
@@ -659,7 +657,7 @@ namespace MonoTests.System.Web {
 		{
 			var resp = new HttpResponse (new StringWriter ());
 			// Ho, ho, ho!
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				resp.RedirectToRoute ("SomeRoute");
 			}, "#A1");
 
@@ -667,11 +665,11 @@ namespace MonoTests.System.Web {
 			HttpContext context = Cook (1, out request);
 
 			// From RouteCollection.GetVirtualPath
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				context.Response.RedirectToRoute ("SomeRoute");
 			}, "#A2");
 
-			AssertExtensions.Throws<InvalidOperationException> (() => {
+			Assert.Throws<InvalidOperationException> (() => {
 				context.Response.RedirectToRoute (new { productId = "1", category = "widgets" });
 			}, "#A3");
 		}
@@ -679,22 +677,22 @@ namespace MonoTests.System.Web {
 		[Test]
 		public void RemoveOutputCacheItem ()
 		{
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				HttpResponse.RemoveOutputCacheItem (null, "MyProvider");
 			}, "#A1");
 
-			AssertExtensions.Throws<ArgumentException> (() => {
+			Assert.Throws<ArgumentException> (() => {
 				HttpResponse.RemoveOutputCacheItem ("badPath", null);
 			}, "#A2");
 
 			Assert.IsNull (OutputCache.Providers, "#A3");
 			HttpResponse.RemoveOutputCacheItem ("/Path", null);
 
-			AssertExtensions.Throws<ProviderException> (() => {
+			Assert.Throws<ProviderException> (() => {
 				HttpResponse.RemoveOutputCacheItem ("/Path", String.Empty);
 			}, "#A3");
 
-			AssertExtensions.Throws<ProviderException> (() => {
+			Assert.Throws<ProviderException> (() => {
 				HttpResponse.RemoveOutputCacheItem ("/Path", "MyProvider");
 			}, "#A4");
 		}
@@ -710,23 +708,23 @@ namespace MonoTests.System.Web {
 			Assert.IsNull (context.Response.Output, "#A2");
 
 			// Classy...
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				context.Response.Write ('t');
 			}, "#A3-1");
 
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				context.Response.Write ((object) 5);
 			}, "#A3-2");
 
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				context.Response.Write ("string");
 			}, "#A3-3");
 
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				context.Response.Write (new char [] { '1' }, 0, 1);
 			}, "#A3-4");
 
-			AssertExtensions.Throws<NullReferenceException> (() => {
+			Assert.Throws<NullReferenceException> (() => {
 				context.Response.Write ((object) null);
 			}, "#A3-5");
 		}
diff --git a/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs b/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
index d320a54f1f0..10736a82b88 100644
--- a/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
@@ -33,7 +33,6 @@ using System.IO;
 using System.Collections.Specialized;
 
 using NUnit.Framework;
-using MonoTests.Common;
 
 namespace MonoTests.System.Web {
 
@@ -55,7 +54,7 @@ namespace MonoTests.System.Web {
 		public void HtmlAttributeEncode_String_TextWriter ()
 		{
 			var sw = new StringWriter ();
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				HttpUtility.HtmlAttributeEncode ("string", null);
 			}, "#A1");
 
@@ -96,7 +95,7 @@ namespace MonoTests.System.Web {
 		public void HtmlDecode_String_TextWriter ()
 		{
 			StringWriter sw;
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				HttpUtility.HtmlDecode ("string", null);
 			}, "#A1");
 
@@ -237,7 +236,7 @@ namespace MonoTests.System.Web {
 		public void HtmlEncode_2 ()
 		{
 			StringWriter sw;
-			AssertExtensions.Throws<ArgumentNullException> (() => {
+			Assert.Throws<ArgumentNullException> (() => {
 				HttpUtility.HtmlEncode ("string", null);
 			}, "#A1");