Remove Main methods from test classes

306 files changed, 4 insertions, 2138 deletions

diff --git a/crypto/test/UnitTests.csproj b/crypto/test/UnitTests.csproj

index 6a49efbc7..07e19947d 100644
--- a/crypto/test/UnitTests.csproj
+++ b/crypto/test/UnitTests.csproj
@@ -324,7 +324,6 @@
     <Compile Include="src\math\ec\test\ECAlgorithmsTest.cs" />
     <Compile Include="src\math\ec\test\ECPointPerformanceTest.cs" />
     <Compile Include="src\math\ec\test\ECPointTest.cs" />
-    <Compile Include="src\math\ec\test\F2mProofer.cs" />
     <Compile Include="src\math\ec\test\FixedPointTest.cs" />
     <Compile Include="src\math\ec\test\TnafTest.cs" />
     <Compile Include="src\math\test\AllTests.cs" />
diff --git a/crypto/test/src/asn1/test/ASN1IntegerTest.cs b/crypto/test/src/asn1/test/ASN1IntegerTest.cs

index c11a099bf..1735db9a6 100644
--- a/crypto/test/src/asn1/test/ASN1IntegerTest.cs
+++ b/crypto/test/src/asn1/test/ASN1IntegerTest.cs
@@ -376,12 +376,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             IsTrue(i.HasValue(n));
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new Asn1IntegerTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs b/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs

index 7e92fc02f..942f3a6e8 100644
--- a/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs
+++ b/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs
@@ -60,12 +60,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkMandatoryField("information", information, syntax.Information);
 		}
 
-        public static void Main(
-			string[] args)
-		{
-			RunTest(new AdditionalInformationSyntaxUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs b/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs

index 0a454f6a9..ecd29511a 100644
--- a/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs
+++ b/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs
@@ -82,12 +82,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
 		}
 
-        public static void Main(
-			string[] args)
-		{
-			RunTest(new AdmissionSyntaxUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/AdmissionsUnitTest.cs b/crypto/test/src/asn1/test/AdmissionsUnitTest.cs

index 8d65258ee..3e92c052b 100644
--- a/crypto/test/src/asn1/test/AdmissionsUnitTest.cs
+++ b/crypto/test/src/asn1/test/AdmissionsUnitTest.cs
@@ -73,12 +73,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkMandatoryField("namingAuthority", auth, admissions.NamingAuthority);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new AdmissionsUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/AllTests.cs b/crypto/test/src/asn1/test/AllTests.cs

index 981b5a4df..80ca9500f 100644
--- a/crypto/test/src/asn1/test/AllTests.cs
+++ b/crypto/test/src/asn1/test/AllTests.cs
@@ -8,11 +8,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 {
     public class AllTests
     {
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
 		public static TestSuite Suite
         {
diff --git a/crypto/test/src/asn1/test/AttributeTableUnitTest.cs b/crypto/test/src/asn1/test/AttributeTableUnitTest.cs

index 5dcf349cc..4848c50fa 100644
--- a/crypto/test/src/asn1/test/AttributeTableUnitTest.cs
+++ b/crypto/test/src/asn1/test/AttributeTableUnitTest.cs
@@ -134,12 +134,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new AttributeTableUnitTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/BiometricDataUnitTest.cs b/crypto/test/src/asn1/test/BiometricDataUnitTest.cs

index a542f71af..ca8e8ccb3 100644
--- a/crypto/test/src/asn1/test/BiometricDataUnitTest.cs
+++ b/crypto/test/src/asn1/test/BiometricDataUnitTest.cs
@@ -116,12 +116,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-		public static void Main(
-            string[] args)
-        {
-            RunTest(new BiometricDataUnitTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/BitStringTest.cs b/crypto/test/src/asn1/test/BitStringTest.cs

index af893fe9f..5e44aa40c 100644
--- a/crypto/test/src/asn1/test/BitStringTest.cs
+++ b/crypto/test/src/asn1/test/BitStringTest.cs
@@ -156,12 +156,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			get { return "BitString"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new BitStringTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/CMSTest.cs b/crypto/test/src/asn1/test/CMSTest.cs

index 9930830f1..064ae3790 100644
--- a/crypto/test/src/asn1/test/CMSTest.cs
+++ b/crypto/test/src/asn1/test/CMSTest.cs
@@ -296,15 +296,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			get { return "CMS"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new CmsTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/CertHashUnitTest.cs b/crypto/test/src/asn1/test/CertHashUnitTest.cs

index d3311a9ad..62bcc08f1 100644
--- a/crypto/test/src/asn1/test/CertHashUnitTest.cs
+++ b/crypto/test/src/asn1/test/CertHashUnitTest.cs
@@ -76,12 +76,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkMandatoryField("certificateHash", digest, certHash.CertificateHash);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new CertHashUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/CertificateTest.cs b/crypto/test/src/asn1/test/CertificateTest.cs

index 6163261ac..52c5ed1dc 100644
--- a/crypto/test/src/asn1/test/CertificateTest.cs
+++ b/crypto/test/src/asn1/test/CertificateTest.cs
@@ -522,12 +522,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			CheckMalformed();
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new CertificateTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/CommitmentTypeIndicationUnitTest.cs b/crypto/test/src/asn1/test/CommitmentTypeIndicationUnitTest.cs

index 20c2d18e3..1f8311cbb 100644
--- a/crypto/test/src/asn1/test/CommitmentTypeIndicationUnitTest.cs
+++ b/crypto/test/src/asn1/test/CommitmentTypeIndicationUnitTest.cs
@@ -90,12 +90,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-        public static void Main(
-            string[]    args)
-        {
-            RunTest(new CommitmentTypeIndicationUnitTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/CommitmentTypeQualifierUnitTest.cs b/crypto/test/src/asn1/test/CommitmentTypeQualifierUnitTest.cs

index 192ac52f6..ba6c12ab5 100644
--- a/crypto/test/src/asn1/test/CommitmentTypeQualifierUnitTest.cs
+++ b/crypto/test/src/asn1/test/CommitmentTypeQualifierUnitTest.cs
@@ -90,12 +90,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new CommitmentTypeQualifierUnitTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/ContentHintsUnitTest.cs b/crypto/test/src/asn1/test/ContentHintsUnitTest.cs

index 7d96fc5c4..531ee0fa5 100644
--- a/crypto/test/src/asn1/test/ContentHintsUnitTest.cs
+++ b/crypto/test/src/asn1/test/ContentHintsUnitTest.cs
@@ -76,12 +76,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkOptionalField("description", description, hints.ContentDescription);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new ContentHintsUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/CscaMasterListTest.cs b/crypto/test/src/asn1/test/CscaMasterListTest.cs

index 814e98b2a..8db7aa09a 100644
--- a/crypto/test/src/asn1/test/CscaMasterListTest.cs
+++ b/crypto/test/src/asn1/test/CscaMasterListTest.cs
@@ -40,12 +40,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			return Streams.ReadAll(SimpleTest.GetTestDataAsStream("asn1." + name));
 		}
 
-		public static void Main(
-            string[] args)
-        {
-            RunTest(new CscaMasterListTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/DERUTF8StringTest.cs b/crypto/test/src/asn1/test/DERUTF8StringTest.cs

index 15f98a7c4..751ce31c8 100644
--- a/crypto/test/src/asn1/test/DERUTF8StringTest.cs
+++ b/crypto/test/src/asn1/test/DERUTF8StringTest.cs
@@ -94,15 +94,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			DerUtf8StringTest test = new DerUtf8StringTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/DataGroupHashUnitTest.cs b/crypto/test/src/asn1/test/DataGroupHashUnitTest.cs

index dcebf4670..014a2b057 100644
--- a/crypto/test/src/asn1/test/DataGroupHashUnitTest.cs
+++ b/crypto/test/src/asn1/test/DataGroupHashUnitTest.cs
@@ -89,12 +89,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-		public static void Main(
-            string[] args)
-        {
-            RunTest(new DataGroupHashUnitTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs b/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs

index a7cf28798..0975ea1b8 100644
--- a/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs
+++ b/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs
@@ -76,12 +76,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new DeclarationOfMajorityUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/EncryptedPrivateKeyInfoTest.cs b/crypto/test/src/asn1/test/EncryptedPrivateKeyInfoTest.cs

index a84df59cc..f7140b9d2 100644
--- a/crypto/test/src/asn1/test/EncryptedPrivateKeyInfoTest.cs
+++ b/crypto/test/src/asn1/test/EncryptedPrivateKeyInfoTest.cs
@@ -132,15 +132,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new EncryptedPrivateKeyInfoTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/EqualsAndHashCodeTest.cs b/crypto/test/src/asn1/test/EqualsAndHashCodeTest.cs

index a296a806e..83f30fd73 100644
--- a/crypto/test/src/asn1/test/EqualsAndHashCodeTest.cs
+++ b/crypto/test/src/asn1/test/EqualsAndHashCodeTest.cs
@@ -80,12 +80,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			get { return "EqualsAndHashCode"; }
 		}
 
-        public static void Main(
-            string[] args)
-        {
-			RunTest(new EqualsAndHashCodeTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/EssCertIDv2UnitTest.cs b/crypto/test/src/asn1/test/EssCertIDv2UnitTest.cs

index 8f53c9b3d..daf76676c 100644
--- a/crypto/test/src/asn1/test/EssCertIDv2UnitTest.cs
+++ b/crypto/test/src/asn1/test/EssCertIDv2UnitTest.cs
@@ -29,12 +29,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			EssCertIDv2.GetInstance(asn1Object);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new EssCertIDv2UnitTest());
-		}
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/GeneralNameTest.cs b/crypto/test/src/asn1/test/GeneralNameTest.cs

index e9c3b5861..10776c59c 100644
--- a/crypto/test/src/asn1/test/GeneralNameTest.cs
+++ b/crypto/test/src/asn1/test/GeneralNameTest.cs
@@ -99,12 +99,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new GeneralNameTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/GeneralizedTimeTest.cs b/crypto/test/src/asn1/test/GeneralizedTimeTest.cs

index 51995e195..35767ccd9 100644
--- a/crypto/test/src/asn1/test/GeneralizedTimeTest.cs
+++ b/crypto/test/src/asn1/test/GeneralizedTimeTest.cs
@@ -214,12 +214,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             return time.ToString();
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new GeneralizedTimeTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/GenerationTest.cs b/crypto/test/src/asn1/test/GenerationTest.cs

index 862e66d22..76077712a 100644
--- a/crypto/test/src/asn1/test/GenerationTest.cs
+++ b/crypto/test/src/asn1/test/GenerationTest.cs
@@ -308,12 +308,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			get { return "Generation"; }
 		}
 
-        public static void Main(
-            string[] args)
-        {
-			RunTest(new GenerationTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/InputStreamTest.cs b/crypto/test/src/asn1/test/InputStreamTest.cs

index 8f29b41ac..a7641959b 100644
--- a/crypto/test/src/asn1/test/InputStreamTest.cs
+++ b/crypto/test/src/asn1/test/InputStreamTest.cs
@@ -120,12 +120,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new InputStreamTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/Iso4217CurrencyCodeUnitTest.cs b/crypto/test/src/asn1/test/Iso4217CurrencyCodeUnitTest.cs

index bb6076a93..1f3be3b9c 100644
--- a/crypto/test/src/asn1/test/Iso4217CurrencyCodeUnitTest.cs
+++ b/crypto/test/src/asn1/test/Iso4217CurrencyCodeUnitTest.cs
@@ -139,12 +139,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-        public static void Main(
-            string[]    args)
-        {
-            RunTest(new Iso4217CurrencyCodeUnitTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/IssuingDistributionPointTest.cs b/crypto/test/src/asn1/test/IssuingDistributionPointTest.cs

index f23edfaef..69bb81235 100644
--- a/crypto/test/src/asn1/test/IssuingDistributionPointTest.cs
+++ b/crypto/test/src/asn1/test/IssuingDistributionPointTest.cs
@@ -116,12 +116,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			return o1.Equals(o2);
 		}
 
-        public static void Main(
-			string[] args)
-		{
-			RunTest(new IssuingDistributionPointUnitTest());
-		}
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/KMacParamsTest.cs b/crypto/test/src/asn1/test/KMacParamsTest.cs

index a3d82694b..72a89f9f7 100644
--- a/crypto/test/src/asn1/test/KMacParamsTest.cs
+++ b/crypto/test/src/asn1/test/KMacParamsTest.cs
@@ -73,12 +73,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             Assert.IsTrue(Arrays.AreEqual(new byte[0], p256.CustomizationString));
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new KMacParamsTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/KeyUsageTest.cs b/crypto/test/src/asn1/test/KeyUsageTest.cs

index d7ed3655d..214ac07d9 100644
--- a/crypto/test/src/asn1/test/KeyUsageTest.cs
+++ b/crypto/test/src/asn1/test/KeyUsageTest.cs
@@ -32,12 +32,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			BitStringConstantTester.testFlagValueCorrect(8, KeyUsage.DecipherOnly);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new KeyUsageTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/LDSSecurityObjectUnitTest.cs b/crypto/test/src/asn1/test/LDSSecurityObjectUnitTest.cs

index 545399621..fe2be6c7f 100644
--- a/crypto/test/src/asn1/test/LDSSecurityObjectUnitTest.cs
+++ b/crypto/test/src/asn1/test/LDSSecurityObjectUnitTest.cs
@@ -192,12 +192,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
         }
 
-        public static void Main(
-            string[]    args)
-        {
-            RunTest(new LDSSecurityObjectUnitTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/LinkedCertificateTest.cs b/crypto/test/src/asn1/test/LinkedCertificateTest.cs

index 1ac5ab0fd..ff475eeca 100644
--- a/crypto/test/src/asn1/test/LinkedCertificateTest.cs
+++ b/crypto/test/src/asn1/test/LinkedCertificateTest.cs
@@ -81,11 +81,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             checkOptionalField("caCerts", caCerts, linked.CACerts);
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new LinkedCertificateTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/MiscTest.cs b/crypto/test/src/asn1/test/MiscTest.cs

index 44158ab3e..c2a5528dc 100644
--- a/crypto/test/src/asn1/test/MiscTest.cs
+++ b/crypto/test/src/asn1/test/MiscTest.cs
@@ -146,12 +146,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             get { return "Misc"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new MiscTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs b/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs

index 01f3b564d..074f5cbfa 100644
--- a/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs
+++ b/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs
@@ -76,12 +76,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkMandatoryField("exponent", exponent, limit.Exponent.IntValue);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new MonetaryLimitUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/MonetaryValueUnitTest.cs b/crypto/test/src/asn1/test/MonetaryValueUnitTest.cs

index c75d74505..3cf2a09f6 100644
--- a/crypto/test/src/asn1/test/MonetaryValueUnitTest.cs
+++ b/crypto/test/src/asn1/test/MonetaryValueUnitTest.cs
@@ -82,12 +82,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new MonetaryValueUnitTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/NameOrPseudonymUnitTest.cs b/crypto/test/src/asn1/test/NameOrPseudonymUnitTest.cs

index c8233fb08..ef86a2426 100644
--- a/crypto/test/src/asn1/test/NameOrPseudonymUnitTest.cs
+++ b/crypto/test/src/asn1/test/NameOrPseudonymUnitTest.cs
@@ -97,12 +97,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new NameOrPseudonymUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/NamingAuthorityUnitTest.cs b/crypto/test/src/asn1/test/NamingAuthorityUnitTest.cs

index 8eb1d2118..d98202ba1 100644
--- a/crypto/test/src/asn1/test/NamingAuthorityUnitTest.cs
+++ b/crypto/test/src/asn1/test/NamingAuthorityUnitTest.cs
@@ -89,12 +89,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkOptionalField("namingAuthorityText", namingAuthorityText, auth.NamingAuthorityText);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new NamingAuthorityUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/NetscapeCertTypeTest.cs b/crypto/test/src/asn1/test/NetscapeCertTypeTest.cs

index 8db5d990c..7e8767187 100644
--- a/crypto/test/src/asn1/test/NetscapeCertTypeTest.cs
+++ b/crypto/test/src/asn1/test/NetscapeCertTypeTest.cs
@@ -28,12 +28,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			BitStringConstantTester.testFlagValueCorrect(7, NetscapeCertType.ObjectSigningCA);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new NetscapeCertTypeTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/OCSPTest.cs b/crypto/test/src/asn1/test/OCSPTest.cs

index 13f59d3d1..9bad7137c 100644
--- a/crypto/test/src/asn1/test/OCSPTest.cs
+++ b/crypto/test/src/asn1/test/OCSPTest.cs
@@ -163,15 +163,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			get { return "Ocsp"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new OcspTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/OIDTest.cs b/crypto/test/src/asn1/test/OIDTest.cs

index 1a46d5993..6b6993855 100644
--- a/crypto/test/src/asn1/test/OIDTest.cs
+++ b/crypto/test/src/asn1/test/OIDTest.cs
@@ -123,11 +123,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			OnCheck("1.1", "1.1.2", true);
 		}
 
-		public static void Main(string[] args)
-		{
-            RunTest(new OidTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs b/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs

index a7b720679..784df4146 100644
--- a/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs
+++ b/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs
@@ -83,12 +83,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkOptionalField("issuerSerial", issuerSerial, certID.IssuerSerial);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new OtherCertIDUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/OtherSigningCertificateUnitTest.cs b/crypto/test/src/asn1/test/OtherSigningCertificateUnitTest.cs

index 692dd9cc1..ae7bd1f14 100644
--- a/crypto/test/src/asn1/test/OtherSigningCertificateUnitTest.cs
+++ b/crypto/test/src/asn1/test/OtherSigningCertificateUnitTest.cs
@@ -77,12 +77,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkMandatoryField("GetCerts()[0]", otherCertID, otherCert.GetCerts()[0]);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new OtherSigningCertificateUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/PKCS10Test.cs b/crypto/test/src/asn1/test/PKCS10Test.cs

index 8bb6ccf0e..24427ca4b 100644
--- a/crypto/test/src/asn1/test/PKCS10Test.cs
+++ b/crypto/test/src/asn1/test/PKCS10Test.cs
@@ -73,15 +73,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             return BasicPkcs10Test("Universal CR", req2);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ITest test = new Pkcs10Test();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/PKCS12Test.cs b/crypto/test/src/asn1/test/PKCS12Test.cs

index eae61de46..177c458d7 100644
--- a/crypto/test/src/asn1/test/PKCS12Test.cs
+++ b/crypto/test/src/asn1/test/PKCS12Test.cs
@@ -200,12 +200,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			get { return "Pkcs12"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Pkcs12Test());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/PKIFailureInfoTest.cs b/crypto/test/src/asn1/test/PKIFailureInfoTest.cs

index 7d51dbb5f..65d7613c3 100644
--- a/crypto/test/src/asn1/test/PKIFailureInfoTest.cs
+++ b/crypto/test/src/asn1/test/PKIFailureInfoTest.cs
@@ -72,12 +72,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             DoTestEncoding();
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new PkiFailureInfoTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/ParsingTest.cs b/crypto/test/src/asn1/test/ParsingTest.cs

index a243ac194..43a97555f 100644
--- a/crypto/test/src/asn1/test/ParsingTest.cs
+++ b/crypto/test/src/asn1/test/ParsingTest.cs
@@ -94,11 +94,5 @@ namespace Org.BouncyCastle.Asn1.Tests
 				}
 			}
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new ParsingTest());
-		}
 	}
 }
diff --git a/crypto/test/src/asn1/test/PersonalDataUnitTest.cs b/crypto/test/src/asn1/test/PersonalDataUnitTest.cs

index faeab6253..b965578c1 100644
--- a/crypto/test/src/asn1/test/PersonalDataUnitTest.cs
+++ b/crypto/test/src/asn1/test/PersonalDataUnitTest.cs
@@ -110,12 +110,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkOptionalField("postalAddress", postalAddress, data.PostalAddress);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new PersonalDataUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/PrivateKeyInfoTest.cs b/crypto/test/src/asn1/test/PrivateKeyInfoTest.cs

index eb17a54c3..6d197ccc6 100644
--- a/crypto/test/src/asn1/test/PrivateKeyInfoTest.cs
+++ b/crypto/test/src/asn1/test/PrivateKeyInfoTest.cs
@@ -44,11 +44,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             IsTrue("enc 2 failed", AreEqual(privWithPub, privInfo2.GetEncoded()));
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new PrivateKeyInfoTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs b/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs

index d89d7d83d..4a68cdb9d 100644
--- a/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs
+++ b/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs
@@ -94,12 +94,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkOptionalField("certRef", certRef, procuration.CertRef);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new ProcurationSyntaxUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/ProfessionInfoUnitTest.cs b/crypto/test/src/asn1/test/ProfessionInfoUnitTest.cs

index 9504c46b8..f523a059d 100644
--- a/crypto/test/src/asn1/test/ProfessionInfoUnitTest.cs
+++ b/crypto/test/src/asn1/test/ProfessionInfoUnitTest.cs
@@ -104,12 +104,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkOptionalField("addProfessionInfo", addProfInfo, profInfo.AddProfessionInfo);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new ProfessionInfoUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/QCStatementUnitTest.cs b/crypto/test/src/asn1/test/QCStatementUnitTest.cs

index 8d8ec9ec7..03e9948eb 100644
--- a/crypto/test/src/asn1/test/QCStatementUnitTest.cs
+++ b/crypto/test/src/asn1/test/QCStatementUnitTest.cs
@@ -91,12 +91,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-		public static void Main(
-            string[] args)
-        {
-            RunTest(new QCStatementUnitTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/ReasonFlagsTest.cs b/crypto/test/src/asn1/test/ReasonFlagsTest.cs

index ef404b3e1..6d98edc33 100644
--- a/crypto/test/src/asn1/test/ReasonFlagsTest.cs
+++ b/crypto/test/src/asn1/test/ReasonFlagsTest.cs
@@ -29,12 +29,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			BitStringConstantTester.testFlagValueCorrect(8, ReasonFlags.AACompromise);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new ReasonFlagsTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/RegressionTest.cs b/crypto/test/src/asn1/test/RegressionTest.cs

index fe612ba1b..ed2560fb9 100644
--- a/crypto/test/src/asn1/test/RegressionTest.cs
+++ b/crypto/test/src/asn1/test/RegressionTest.cs
@@ -75,15 +75,5 @@ namespace Org.BouncyCastle.Asn1.Tests
 			new X9Test(),
 			new KMacParamsTest()
         };
-
-        public static void Main(
-            string[] args)
-        {
-            for (int i = 0; i != tests.Length; i++)
-            {
-                ITestResult  result = tests[i].Perform();
-                Console.WriteLine(result);
-            }
-        }
     }
 }
diff --git a/crypto/test/src/asn1/test/RelativeOidTest.cs b/crypto/test/src/asn1/test/RelativeOidTest.cs

index e52c1b715..f3d5ba13b 100644
--- a/crypto/test/src/asn1/test/RelativeOidTest.cs
+++ b/crypto/test/src/asn1/test/RelativeOidTest.cs
@@ -113,11 +113,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             BranchCheck("1.1", "2.2");
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new RelativeOidTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/RequestedCertificateUnitTest.cs b/crypto/test/src/asn1/test/RequestedCertificateUnitTest.cs

index 767504173..2fbede744 100644
--- a/crypto/test/src/asn1/test/RequestedCertificateUnitTest.cs
+++ b/crypto/test/src/asn1/test/RequestedCertificateUnitTest.cs
@@ -100,12 +100,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new RequestedCertificateUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/RestrictionUnitTest.cs b/crypto/test/src/asn1/test/RestrictionUnitTest.cs

index 073b2ebf9..ce9a7483e 100644
--- a/crypto/test/src/asn1/test/RestrictionUnitTest.cs
+++ b/crypto/test/src/asn1/test/RestrictionUnitTest.cs
@@ -61,12 +61,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			checkMandatoryField("restriction", res, restriction.RestrictionString);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new RestrictionUnitTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/SMIMETest.cs b/crypto/test/src/asn1/test/SMIMETest.cs

index adb90e093..bc849e775 100644
--- a/crypto/test/src/asn1/test/SMIMETest.cs
+++ b/crypto/test/src/asn1/test/SMIMETest.cs
@@ -70,15 +70,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			get { return "SMIME"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new SmimeTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/SemanticsInformationUnitTest.cs b/crypto/test/src/asn1/test/SemanticsInformationUnitTest.cs

index 8f1f85f19..8fb29d9ad 100644
--- a/crypto/test/src/asn1/test/SemanticsInformationUnitTest.cs
+++ b/crypto/test/src/asn1/test/SemanticsInformationUnitTest.cs
@@ -121,12 +121,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-		public static void Main(
-            string[] args)
-        {
-            RunTest(new SemanticsInformationUnitTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/SetTest.cs b/crypto/test/src/asn1/test/SetTest.cs

index b7da0a9b7..09421225e 100644
--- a/crypto/test/src/asn1/test/SetTest.cs
+++ b/crypto/test/src/asn1/test/SetTest.cs
@@ -104,12 +104,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			s = new DerSet(v);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new SetTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/SignerLocationUnitTest.cs b/crypto/test/src/asn1/test/SignerLocationUnitTest.cs

index 5ce1bbe6c..40321b5cf 100644
--- a/crypto/test/src/asn1/test/SignerLocationUnitTest.cs
+++ b/crypto/test/src/asn1/test/SignerLocationUnitTest.cs
@@ -178,12 +178,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-		public static void Main(
-			string[] args)
-        {
-            RunTest(new SignerLocationUnitTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/StringTest.cs b/crypto/test/src/asn1/test/StringTest.cs

index acfd380b2..35b71c56e 100644
--- a/crypto/test/src/asn1/test/StringTest.cs
+++ b/crypto/test/src/asn1/test/StringTest.cs
@@ -88,12 +88,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new StringTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/SubjectKeyIdentifierTest.cs b/crypto/test/src/asn1/test/SubjectKeyIdentifierTest.cs

index 127c47a3a..c20003fc5 100644
--- a/crypto/test/src/asn1/test/SubjectKeyIdentifierTest.cs
+++ b/crypto/test/src/asn1/test/SubjectKeyIdentifierTest.cs
@@ -44,12 +44,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new SubjectKeyIdentifierTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/TagTest.cs b/crypto/test/src/asn1/test/TagTest.cs

index 44b4fd4f1..e2f84dfb5 100644
--- a/crypto/test/src/asn1/test/TagTest.cs
+++ b/crypto/test/src/asn1/test/TagTest.cs
@@ -110,12 +110,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-        public static void Main(
-			string[] args)
-		{
-			RunTest(new TagTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/TargetInformationTest.cs b/crypto/test/src/asn1/test/TargetInformationTest.cs

index 7fa04cd01..9117d18e3 100644
--- a/crypto/test/src/asn1/test/TargetInformationTest.cs
+++ b/crypto/test/src/asn1/test/TargetInformationTest.cs
@@ -41,12 +41,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new TargetInformationTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/TypeOfBiometricDataUnitTest.cs b/crypto/test/src/asn1/test/TypeOfBiometricDataUnitTest.cs

index a59415c31..ebeb0f6d7 100644
--- a/crypto/test/src/asn1/test/TypeOfBiometricDataUnitTest.cs
+++ b/crypto/test/src/asn1/test/TypeOfBiometricDataUnitTest.cs
@@ -135,12 +135,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-		public static void Main(
-            string[] args)
-        {
-            RunTest(new TypeOfBiometricDataUnitTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/UTCTimeTest.cs b/crypto/test/src/asn1/test/UTCTimeTest.cs

index 07abbc911..bac0e1188 100644
--- a/crypto/test/src/asn1/test/UTCTimeTest.cs
+++ b/crypto/test/src/asn1/test/UTCTimeTest.cs
@@ -105,12 +105,6 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new UtcTimeTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/asn1/test/X509ExtensionsTest.cs b/crypto/test/src/asn1/test/X509ExtensionsTest.cs

index 8656836f6..1fb4ce2c6 100644
--- a/crypto/test/src/asn1/test/X509ExtensionsTest.cs
+++ b/crypto/test/src/asn1/test/X509ExtensionsTest.cs
@@ -208,12 +208,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new X509ExtensionsTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/X509NameTest.cs b/crypto/test/src/asn1/test/X509NameTest.cs

index 43214c0e4..0df3a020e 100644
--- a/crypto/test/src/asn1/test/X509NameTest.cs
+++ b/crypto/test/src/asn1/test/X509NameTest.cs
@@ -649,15 +649,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             return true;
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ITest test = new X509NameTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/asn1/test/X9Test.cs b/crypto/test/src/asn1/test/X9Test.cs

index 0d2c58f0f..268374ab7 100644
--- a/crypto/test/src/asn1/test/X9Test.cs
+++ b/crypto/test/src/asn1/test/X9Test.cs
@@ -155,12 +155,6 @@ namespace Org.BouncyCastle.Asn1.Tests
             get { return "X9"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new X9Test());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/cms/test/AllTests.cs b/crypto/test/src/cms/test/AllTests.cs

index 52ca95f2b..e1deae0f0 100644
--- a/crypto/test/src/cms/test/AllTests.cs
+++ b/crypto/test/src/cms/test/AllTests.cs
@@ -10,11 +10,6 @@ namespace Org.BouncyCastle.Cms.Tests
 {
     public class AllTests
     {
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
         public static TestSuite Suite
         {
diff --git a/crypto/test/src/cms/test/AuthenticatedDataTest.cs b/crypto/test/src/cms/test/AuthenticatedDataTest.cs

index 0ad34a95b..55f220265 100644
--- a/crypto/test/src/cms/test/AuthenticatedDataTest.cs
+++ b/crypto/test/src/cms/test/AuthenticatedDataTest.cs
@@ -124,11 +124,6 @@ namespace Org.BouncyCastle.Cms.Tests
 //		super(name);
 //		}
 //		
-//		public static void main(string args[])
-//		{
-//		junit.textui.TestRunner.run(AuthenticatedDataTest.class);
-//		}
-//		
 //		public static Test suite()
 //		throws Exception
 //		{
diff --git a/crypto/test/src/crypto/agreement/test/AllTests.cs b/crypto/test/src/crypto/agreement/test/AllTests.cs

index 66853b285..4de240660 100644
--- a/crypto/test/src/crypto/agreement/test/AllTests.cs
+++ b/crypto/test/src/crypto/agreement/test/AllTests.cs
@@ -11,11 +11,6 @@ namespace Org.BouncyCastle.Crypto.Agreement.Tests
     [TestFixture]
     public class AllTests
     {
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
         public static TestSuite Suite
         {
diff --git a/crypto/test/src/crypto/agreement/test/JPakeParticipantTest.cs b/crypto/test/src/crypto/agreement/test/JPakeParticipantTest.cs

index c84264aa5..0a0ffeeb9 100644
--- a/crypto/test/src/crypto/agreement/test/JPakeParticipantTest.cs
+++ b/crypto/test/src/crypto/agreement/test/JPakeParticipantTest.cs
@@ -29,12 +29,6 @@ namespace Org.BouncyCastle.Crypto.Agreement.Tests
             get { return "JPakeParticipant"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new JPakeParticipantTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/agreement/test/JPakePrimeOrderGroupTest.cs b/crypto/test/src/crypto/agreement/test/JPakePrimeOrderGroupTest.cs

index 0f089f93c..f781fbdb9 100644
--- a/crypto/test/src/crypto/agreement/test/JPakePrimeOrderGroupTest.cs
+++ b/crypto/test/src/crypto/agreement/test/JPakePrimeOrderGroupTest.cs
@@ -22,12 +22,6 @@ namespace Org.BouncyCastle.Crypto.Agreement.Tests
             get { return "JPakePrimeOrderGroup"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new JPakePrimeOrderGroupTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/agreement/test/JPakeUtilitiesTest.cs b/crypto/test/src/crypto/agreement/test/JPakeUtilitiesTest.cs

index 04a52cc06..b3fabcfbb 100644
--- a/crypto/test/src/crypto/agreement/test/JPakeUtilitiesTest.cs
+++ b/crypto/test/src/crypto/agreement/test/JPakeUtilitiesTest.cs
@@ -32,12 +32,6 @@ namespace Org.BouncyCastle.Crypto.Agreement.Tests
             get { return "JPakeUtilities"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new JPakeUtilitiesTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/io/test/AllTests.cs b/crypto/test/src/crypto/io/test/AllTests.cs

index 2634b4ab1..821b11c2f 100644
--- a/crypto/test/src/crypto/io/test/AllTests.cs
+++ b/crypto/test/src/crypto/io/test/AllTests.cs
@@ -8,11 +8,6 @@ namespace Org.BouncyCastle.Crypto.IO.Tests
 {
 	public class AllTests
 	{
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
         public static TestSuite Suite
         {
diff --git a/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs b/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs

index 3a023fe3a..1fd051294 100644
--- a/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs
+++ b/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs
@@ -23,11 +23,6 @@ namespace Org.BouncyCastle.Crypto.Prng.Test
             get { return "CTRDRBGTest"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new CtrDrbgTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/prng/test/HMacDrbgTest.cs b/crypto/test/src/crypto/prng/test/HMacDrbgTest.cs

index a5ca30836..f523cc4d7 100644
--- a/crypto/test/src/crypto/prng/test/HMacDrbgTest.cs
+++ b/crypto/test/src/crypto/prng/test/HMacDrbgTest.cs
@@ -22,11 +22,6 @@ namespace Org.BouncyCastle.Crypto.Prng.Test
             get { return "HMacDRBG"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new HMacDrbgTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/prng/test/HashDrbgTest.cs b/crypto/test/src/crypto/prng/test/HashDrbgTest.cs

index 892ca74da..e043f03da 100644
--- a/crypto/test/src/crypto/prng/test/HashDrbgTest.cs
+++ b/crypto/test/src/crypto/prng/test/HashDrbgTest.cs
@@ -21,11 +21,6 @@ namespace Org.BouncyCastle.Crypto.Prng.Test
             get { return "HashDRBG"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new HashDrbgTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/prng/test/X931Test.cs b/crypto/test/src/crypto/prng/test/X931Test.cs

index 1132ea34a..6df6c6d7e 100644
--- a/crypto/test/src/crypto/prng/test/X931Test.cs
+++ b/crypto/test/src/crypto/prng/test/X931Test.cs
@@ -23,11 +23,6 @@ namespace Org.BouncyCastle.Crypto.Prng.Test
             get { return "X931"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new X931Test());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/AESLightTest.cs b/crypto/test/src/crypto/test/AESLightTest.cs

index 0b5777ba1..79bb9d1a4 100644
--- a/crypto/test/src/crypto/test/AESLightTest.cs
+++ b/crypto/test/src/crypto/test/AESLightTest.cs
@@ -148,15 +148,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			AesLightTest test = new AesLightTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/AESTest.cs b/crypto/test/src/crypto/test/AESTest.cs

index 7b8fc34cf..55c3c80f5 100644
--- a/crypto/test/src/crypto/test/AESTest.cs
+++ b/crypto/test/src/crypto/test/AESTest.cs
@@ -158,15 +158,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-        public static void Main(
-	        string[] args)
-        {
-            AesTest test = new AesTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/AESWrapTest.cs b/crypto/test/src/crypto/test/AESWrapTest.cs

index 11b46098e..beaa3d3cd 100644
--- a/crypto/test/src/crypto/test/AESWrapTest.cs
+++ b/crypto/test/src/crypto/test/AESWrapTest.cs
@@ -194,15 +194,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new SimpleTestResult(true, Name + ": Okay");
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			AesWrapTest test = new AesWrapTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/AllTests.cs b/crypto/test/src/crypto/test/AllTests.cs

index 2b690930d..b7d8ea254 100644
--- a/crypto/test/src/crypto/test/AllTests.cs
+++ b/crypto/test/src/crypto/test/AllTests.cs
@@ -13,11 +13,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 	public class AllTests
 	{
 #if !LIB
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
         public static TestSuite Suite
         {
diff --git a/crypto/test/src/crypto/test/AriaTest.cs b/crypto/test/src/crypto/test/AriaTest.cs

index 56244ed71..bf14cfa09 100644
--- a/crypto/test/src/crypto/test/AriaTest.cs
+++ b/crypto/test/src/crypto/test/AriaTest.cs
@@ -126,11 +126,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new AriaTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/BCryptTest.cs b/crypto/test/src/crypto/test/BCryptTest.cs

index 05c1cbff5..7d5e7ea81 100644
--- a/crypto/test/src/crypto/test/BCryptTest.cs
+++ b/crypto/test/src/crypto/test/BCryptTest.cs
@@ -147,11 +147,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(string[] args)
-		{
-            RunTest(new BCryptTest());
-		}
-
         [Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/Blake2bDigestTest.cs b/crypto/test/src/crypto/test/Blake2bDigestTest.cs

index c9dbfc9d5..e7835e2a7 100644
--- a/crypto/test/src/crypto/test/Blake2bDigestTest.cs
+++ b/crypto/test/src/crypto/test/Blake2bDigestTest.cs
@@ -309,11 +309,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(string[] args)
-		{
-			RunTest(new Blake2bDigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/Blake2sDigestTest.cs b/crypto/test/src/crypto/test/Blake2sDigestTest.cs

index cb075807c..2080e2871 100644
--- a/crypto/test/src/crypto/test/Blake2sDigestTest.cs
+++ b/crypto/test/src/crypto/test/Blake2sDigestTest.cs
@@ -295,11 +295,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             DoTestLengthConstruction();
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new Blake2sDigestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/BlowfishTest.cs b/crypto/test/src/crypto/test/BlowfishTest.cs

index b940d13ac..dd12c2540 100644
--- a/crypto/test/src/crypto/test/BlowfishTest.cs
+++ b/crypto/test/src/crypto/test/BlowfishTest.cs
@@ -65,14 +65,5 @@ namespace Org.BouncyCastle.Crypto.Tests
 
             Assert.AreEqual(Name + ": Okay", resultText);
         }
-
-		public static void Main(
-			string[] args)
-        {
-            ITest test = new BlowfishTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
     }
 }
diff --git a/crypto/test/src/crypto/test/CAST6Test.cs b/crypto/test/src/crypto/test/CAST6Test.cs

index 7517b6737..3454a29dd 100644
--- a/crypto/test/src/crypto/test/CAST6Test.cs
+++ b/crypto/test/src/crypto/test/CAST6Test.cs
@@ -39,14 +39,6 @@ namespace Org.BouncyCastle.Crypto.Tests
         {
         }
 
-		public static void Main(
-            string[] args)
-        {
-            ITest test = new Cast6Test();
-            ITestResult result = test.Perform();
-            Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/CCMTest.cs b/crypto/test/src/crypto/test/CCMTest.cs

index cf5f31f4f..c4e56a4cd 100644
--- a/crypto/test/src/crypto/test/CCMTest.cs
+++ b/crypto/test/src/crypto/test/CCMTest.cs
@@ -302,11 +302,5 @@ namespace Org.BouncyCastle.Crypto.Tests
 
 			Assert.AreEqual(Name + ": Okay", resultText);
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new CcmTest());
-		}
 	}
 }
diff --git a/crypto/test/src/crypto/test/CMacTest.cs b/crypto/test/src/crypto/test/CMacTest.cs

index 23ae7cb88..636e9d3da 100644
--- a/crypto/test/src/crypto/test/CMacTest.cs
+++ b/crypto/test/src/crypto/test/CMacTest.cs
@@ -285,12 +285,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             get { return "CMac"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new CMacTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/CSHAKETest.cs b/crypto/test/src/crypto/test/CSHAKETest.cs

index bd25a6928..6a3c99a0f 100644
--- a/crypto/test/src/crypto/test/CSHAKETest.cs
+++ b/crypto/test/src/crypto/test/CSHAKETest.cs
@@ -207,12 +207,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             Assert.IsTrue(Arrays.AreEqual(res1, res2));
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new CShakeTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/CTSTest.cs b/crypto/test/src/crypto/test/CTSTest.cs

index 9d001bc68..8f0874425 100644
--- a/crypto/test/src/crypto/test/CTSTest.cs
+++ b/crypto/test/src/crypto/test/CTSTest.cs
@@ -163,23 +163,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-        public static void Main(
-            string[] args)
-        {
-            CTSTest test = new CTSTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
-        [Test]
-        public void TestFunction()
-        {
-            string resultText = Perform().ToString();
-
-            Assert.AreEqual(Name + ": Okay", resultText);
-        }
-
         static CTSTest()
         {
             in1 = Hex.Decode("4e6f7720697320746865207420");
diff --git a/crypto/test/src/crypto/test/CamelliaLightTest.cs b/crypto/test/src/crypto/test/CamelliaLightTest.cs

index 2247178f2..7bbb92f11 100644
--- a/crypto/test/src/crypto/test/CamelliaLightTest.cs
+++ b/crypto/test/src/crypto/test/CamelliaLightTest.cs
@@ -70,11 +70,5 @@ namespace Org.BouncyCastle.Crypto.Tests
 
 			Assert.AreEqual(Name + ": Okay", resultText);
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new CamelliaLightTest());
-		}
 	}
 }
diff --git a/crypto/test/src/crypto/test/CamelliaTest.cs b/crypto/test/src/crypto/test/CamelliaTest.cs

index a134546b7..c2b3846dd 100644
--- a/crypto/test/src/crypto/test/CamelliaTest.cs
+++ b/crypto/test/src/crypto/test/CamelliaTest.cs
@@ -70,11 +70,5 @@ namespace Org.BouncyCastle.Crypto.Tests
 
 			Assert.AreEqual(Name + ": Okay", resultText);
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new CamelliaTest());
-		}
 	}
 }
diff --git a/crypto/test/src/crypto/test/Cast5Test.cs b/crypto/test/src/crypto/test/Cast5Test.cs

index ea2e0c540..1c6bbbc0d 100644
--- a/crypto/test/src/crypto/test/Cast5Test.cs
+++ b/crypto/test/src/crypto/test/Cast5Test.cs
@@ -29,15 +29,6 @@ namespace Org.BouncyCastle.Crypto.Tests
         {
         }
 
-        public static void Main(
-			string[] args)
-        {
-            ITest test = new Cast5Test();
-            ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/ChaCha20Poly1305Test.cs b/crypto/test/src/crypto/test/ChaCha20Poly1305Test.cs

index b0b3f4606..d8fc46284 100644
--- a/crypto/test/src/crypto/test/ChaCha20Poly1305Test.cs
+++ b/crypto/test/src/crypto/test/ChaCha20Poly1305Test.cs
@@ -440,11 +440,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new ChaCha20Poly1305Test());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/ChaChaTest.cs b/crypto/test/src/crypto/test/ChaChaTest.cs

index 0b394c91e..32af9fcb3 100644
--- a/crypto/test/src/crypto/test/ChaChaTest.cs
+++ b/crypto/test/src/crypto/test/ChaChaTest.cs
@@ -302,12 +302,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new ChaChaTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/DESTest.cs b/crypto/test/src/crypto/test/DESTest.cs

index cf1022eae..fb3c4c892 100644
--- a/crypto/test/src/crypto/test/DESTest.cs
+++ b/crypto/test/src/crypto/test/DESTest.cs
@@ -197,12 +197,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "DES"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new DesTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/DESedeTest.cs b/crypto/test/src/crypto/test/DESedeTest.cs

index aa61844f2..50ccb0080 100644
--- a/crypto/test/src/crypto/test/DESedeTest.cs
+++ b/crypto/test/src/crypto/test/DESedeTest.cs
@@ -170,12 +170,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "DESede"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new DesEdeTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/DHKEKGeneratorTest.cs b/crypto/test/src/crypto/test/DHKEKGeneratorTest.cs

index eee408f97..f99dc323e 100644
--- a/crypto/test/src/crypto/test/DHKEKGeneratorTest.cs
+++ b/crypto/test/src/crypto/test/DHKEKGeneratorTest.cs
@@ -62,12 +62,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "DHKekGenerator"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new DHKekGeneratorTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/DHTest.cs b/crypto/test/src/crypto/test/DHTest.cs

index b460f41a5..70962281d 100644
--- a/crypto/test/src/crypto/test/DHTest.cs
+++ b/crypto/test/src/crypto/test/DHTest.cs
@@ -383,15 +383,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new DHTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/DSATest.cs b/crypto/test/src/crypto/test/DSATest.cs

index 0e6367150..b81ef511f 100644
--- a/crypto/test/src/crypto/test/DSATest.cs
+++ b/crypto/test/src/crypto/test/DSATest.cs
@@ -574,12 +574,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new DsaTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/DSTU7564Test.cs b/crypto/test/src/crypto/test/DSTU7564Test.cs

index ecbfb7453..c34ea4395 100644
--- a/crypto/test/src/crypto/test/DSTU7564Test.cs
+++ b/crypto/test/src/crypto/test/DSTU7564Test.cs
@@ -614,11 +614,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new Dstu7564Digest((Dstu7564Digest)digest);
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new Dstu7564Test());
-        }
-
         [Test]
         public void Dstu7564TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/DSTU7624Test.cs b/crypto/test/src/crypto/test/DSTU7624Test.cs

index 234474db6..2a6926a9b 100644
--- a/crypto/test/src/crypto/test/DSTU7624Test.cs
+++ b/crypto/test/src/crypto/test/DSTU7624Test.cs
@@ -722,14 +722,5 @@ namespace Org.BouncyCastle.Crypto.Tests
         {
             get { return "Dstu7624"; }
         }
-
-        public static void Main(
-           string[] args)
-        {
-            Dstu7624Test test = new Dstu7624Test();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result.ToString());
-        }
     }
 }
diff --git a/crypto/test/src/crypto/test/DeterministicDSATest.cs b/crypto/test/src/crypto/test/DeterministicDSATest.cs

index 914a770bd..cc4886794 100644
--- a/crypto/test/src/crypto/test/DeterministicDSATest.cs
+++ b/crypto/test/src/crypto/test/DeterministicDSATest.cs
@@ -494,12 +494,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             TestECHMacDeterministic();
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new DeterministicDsaTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/DigestRandomNumberTest.cs b/crypto/test/src/crypto/test/DigestRandomNumberTest.cs

index cee2e354e..26d1bd808 100644
--- a/crypto/test/src/crypto/test/DigestRandomNumberTest.cs
+++ b/crypto/test/src/crypto/test/DigestRandomNumberTest.cs
@@ -153,11 +153,5 @@ namespace Org.BouncyCastle.Crypto.Tests
 
 			Assert.AreEqual(Name + ": Okay", resultText);
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new DigestRandomNumberTest());
-		}
 	}
 }
diff --git a/crypto/test/src/crypto/test/EAXTest.cs b/crypto/test/src/crypto/test/EAXTest.cs

index 838f26a1b..9680f61c9 100644
--- a/crypto/test/src/crypto/test/EAXTest.cs
+++ b/crypto/test/src/crypto/test/EAXTest.cs
@@ -335,12 +335,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new EaxTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/ECDHKEKGeneratorTest.cs b/crypto/test/src/crypto/test/ECDHKEKGeneratorTest.cs

index 250b2ca22..ae5d43a92 100644
--- a/crypto/test/src/crypto/test/ECDHKEKGeneratorTest.cs
+++ b/crypto/test/src/crypto/test/ECDHKEKGeneratorTest.cs
@@ -63,12 +63,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "ECDHKekGenerator"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new ECDHKekGeneratorTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/ECGOST3410Test.cs b/crypto/test/src/crypto/test/ECGOST3410Test.cs

index 4c938378a..e8c6a2bd9 100644
--- a/crypto/test/src/crypto/test/ECGOST3410Test.cs
+++ b/crypto/test/src/crypto/test/ECGOST3410Test.cs
@@ -325,15 +325,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             ecGOST3410_CParam();
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ECGost3410Test test = new ECGost3410Test();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/ECIESTest.cs b/crypto/test/src/crypto/test/ECIESTest.cs

index 1e2e8f711..9ed49a91d 100644
--- a/crypto/test/src/crypto/test/ECIESTest.cs
+++ b/crypto/test/src/crypto/test/ECIESTest.cs
@@ -235,12 +235,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             DoTest(p1, p2);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new EcIesTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/ECNRTest.cs b/crypto/test/src/crypto/test/ECNRTest.cs

index 1ab67546c..80d11c1ca 100644
--- a/crypto/test/src/crypto/test/ECNRTest.cs
+++ b/crypto/test/src/crypto/test/ECNRTest.cs
@@ -87,10 +87,7 @@ namespace Org.BouncyCastle.Crypto.Tests
 
         public override string Name
         {
-            get
-            {
-                return "ECNR";
-            }
+            get { return "ECNR"; }
         }
 
         public override void PerformTest()
@@ -98,15 +95,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             ecNR239bitPrime();
         }
 
-        public static void Main(
-            string[] args)
-        {
-            EcNrTest test = new EcNrTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/ECTest.cs b/crypto/test/src/crypto/test/ECTest.cs

index 7dc847ebe..18abb8df1 100644
--- a/crypto/test/src/crypto/test/ECTest.cs
+++ b/crypto/test/src/crypto/test/ECTest.cs
@@ -949,11 +949,5 @@ namespace Org.BouncyCastle.Crypto.Tests
             TestECMqvTestVector2();
             TestECMqvRandom();
         }
-
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new ECTest());
-        }
     }
 }
diff --git a/crypto/test/src/crypto/test/Ed25519Test.cs b/crypto/test/src/crypto/test/Ed25519Test.cs

index d771a8c01..b604916de 100644
--- a/crypto/test/src/crypto/test/Ed25519Test.cs
+++ b/crypto/test/src/crypto/test/Ed25519Test.cs
@@ -24,11 +24,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             get { return "Ed25519"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new Ed25519Test());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/Ed448Test.cs b/crypto/test/src/crypto/test/Ed448Test.cs

index bfd9d09f9..6ecbdebf7 100644
--- a/crypto/test/src/crypto/test/Ed448Test.cs
+++ b/crypto/test/src/crypto/test/Ed448Test.cs
@@ -24,11 +24,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             get { return "Ed448"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new Ed448Test());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/ElGamalTest.cs b/crypto/test/src/crypto/test/ElGamalTest.cs

index 1caa70387..005cdcdcf 100644
--- a/crypto/test/src/crypto/test/ElGamalTest.cs
+++ b/crypto/test/src/crypto/test/ElGamalTest.cs
@@ -268,11 +268,5 @@ namespace Org.BouncyCastle.Crypto.Tests
 			TestGeneration258();
 			TestInitCheck();
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new ElGamalTest());
-		}
 	}
 }
diff --git a/crypto/test/src/crypto/test/EqualsHashCodeTest.cs b/crypto/test/src/crypto/test/EqualsHashCodeTest.cs

index 05cc9ad53..c1e089e0a 100644
--- a/crypto/test/src/crypto/test/EqualsHashCodeTest.cs
+++ b/crypto/test/src/crypto/test/EqualsHashCodeTest.cs
@@ -252,11 +252,5 @@ namespace Org.BouncyCastle.Crypto.Tests
 			TestGost3410();
 			TestDsa();
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new EqualsHashCodeTest());
-		}
 	}
 }
diff --git a/crypto/test/src/crypto/test/GCMTest.cs b/crypto/test/src/crypto/test/GCMTest.cs

index a225708ef..f61aee4e2 100644
--- a/crypto/test/src/crypto/test/GCMTest.cs
+++ b/crypto/test/src/crypto/test/GCMTest.cs
@@ -728,12 +728,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return value;
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new GcmTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/GMacTest.cs b/crypto/test/src/crypto/test/GMacTest.cs

index 0b37e1a03..51d9ece92 100644
--- a/crypto/test/src/crypto/test/GMacTest.cs
+++ b/crypto/test/src/crypto/test/GMacTest.cs
@@ -174,12 +174,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             get { return "GMac"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new GMacTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/GOST28147MacTest.cs b/crypto/test/src/crypto/test/GOST28147MacTest.cs

index 5f3188f48..bad05f2b3 100644
--- a/crypto/test/src/crypto/test/GOST28147MacTest.cs
+++ b/crypto/test/src/crypto/test/GOST28147MacTest.cs
@@ -85,15 +85,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "Gost28147Mac"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new Gost28147MacTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/GOST28147Test.cs b/crypto/test/src/crypto/test/GOST28147Test.cs

index 865dcc2a7..c86546f76 100644
--- a/crypto/test/src/crypto/test/GOST28147Test.cs
+++ b/crypto/test/src/crypto/test/GOST28147Test.cs
@@ -357,15 +357,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "Gost28147"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new Gost28147Test();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/GOST3410Test.cs b/crypto/test/src/crypto/test/GOST3410Test.cs

index 1369d3506..93c234ca1 100644
--- a/crypto/test/src/crypto/test/GOST3410Test.cs
+++ b/crypto/test/src/crypto/test/GOST3410Test.cs
@@ -1584,15 +1584,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new SimpleTestResult(true, "Gost3410: Okay");
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new Gost3410Test();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/GOST3411DigestTest.cs b/crypto/test/src/crypto/test/GOST3411DigestTest.cs

index 329a158d6..70bdfdd8b 100644
--- a/crypto/test/src/crypto/test/GOST3411DigestTest.cs
+++ b/crypto/test/src/crypto/test/GOST3411DigestTest.cs
@@ -75,15 +75,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new Gost3411Digest((Gost3411Digest)digest);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new Gost3411DigestTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/GcmSivTest.cs b/crypto/test/src/crypto/test/GcmSivTest.cs

index 0921912cd..16e53abdf 100644
--- a/crypto/test/src/crypto/test/GcmSivTest.cs
+++ b/crypto/test/src/crypto/test/GcmSivTest.cs
@@ -442,11 +442,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new GcmSivTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/HCFamilyTest.cs b/crypto/test/src/crypto/test/HCFamilyTest.cs

index 0904bc9eb..09324e13d 100644
--- a/crypto/test/src/crypto/test/HCFamilyTest.cs
+++ b/crypto/test/src/crypto/test/HCFamilyTest.cs
@@ -183,10 +183,5 @@ namespace Org.BouncyCastle.Crypto.Tests
 				}
 			}
 		}
-
-		public static void Main(string[] args)
-		{
-			RunTest(new HCFamilyTest());
-		}
 	}
 }
diff --git a/crypto/test/src/crypto/test/HCFamilyVecTest.cs b/crypto/test/src/crypto/test/HCFamilyVecTest.cs

index cbac30c4b..f89c0ad37 100644
--- a/crypto/test/src/crypto/test/HCFamilyVecTest.cs
+++ b/crypto/test/src/crypto/test/HCFamilyVecTest.cs
@@ -168,12 +168,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new HCFamilyVecTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/HKDFGeneratorTest.cs b/crypto/test/src/crypto/test/HKDFGeneratorTest.cs

index d6e2149df..fa540e41e 100644
--- a/crypto/test/src/crypto/test/HKDFGeneratorTest.cs
+++ b/crypto/test/src/crypto/test/HKDFGeneratorTest.cs
@@ -294,11 +294,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             get { return "HKDF"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new HkdfGeneratorTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/IDEATest.cs b/crypto/test/src/crypto/test/IDEATest.cs

index fbbd1ae17..0ec846567 100644
--- a/crypto/test/src/crypto/test/IDEATest.cs
+++ b/crypto/test/src/crypto/test/IDEATest.cs
@@ -35,14 +35,6 @@ namespace Org.BouncyCastle.Crypto.Tests
         {
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ITest test = new IdeaTest();
-            ITestResult result = test.Perform();
-            Console.WriteLine(result);
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/ISAACTest.cs b/crypto/test/src/crypto/test/ISAACTest.cs

index 1782bbc98..94cdfa194 100644
--- a/crypto/test/src/crypto/test/ISAACTest.cs
+++ b/crypto/test/src/crypto/test/ISAACTest.cs
@@ -180,12 +180,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new IsaacTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/ISO9796Test.cs b/crypto/test/src/crypto/test/ISO9796Test.cs

index 562238bca..c0cd0582c 100644
--- a/crypto/test/src/crypto/test/ISO9796Test.cs
+++ b/crypto/test/src/crypto/test/ISO9796Test.cs
@@ -951,11 +951,5 @@ namespace Org.BouncyCastle.Crypto.Tests
             DoShortPartialTest();
             DoFullMessageTest();
         }
-
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new ISO9796Test());
-        }
     }
 }
diff --git a/crypto/test/src/crypto/test/ISO9797Alg3MacTest.cs b/crypto/test/src/crypto/test/ISO9797Alg3MacTest.cs

index 9d5d8b6b7..a55037c2a 100644
--- a/crypto/test/src/crypto/test/ISO9797Alg3MacTest.cs
+++ b/crypto/test/src/crypto/test/ISO9797Alg3MacTest.cs
@@ -73,19 +73,7 @@ namespace Org.BouncyCastle.Crypto.Tests
 
 		public override string Name
 		{
-			get
-			{
-				return "ISO9797Alg3Mac";
-			}
-		}
-
-		public static void Main(
-			string[] args)
-		{
-			ISO9797Alg3MacTest test = new ISO9797Alg3MacTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
+			get { return "ISO9797Alg3Mac"; }
 		}
 
 		[Test]
diff --git a/crypto/test/src/crypto/test/KDF1GeneratorTest.cs b/crypto/test/src/crypto/test/KDF1GeneratorTest.cs

index 89c8d5453..540955d9d 100644
--- a/crypto/test/src/crypto/test/KDF1GeneratorTest.cs
+++ b/crypto/test/src/crypto/test/KDF1GeneratorTest.cs
@@ -86,12 +86,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "KDF1"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Kdf1GeneratorTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/KDF2GeneratorTest.cs b/crypto/test/src/crypto/test/KDF2GeneratorTest.cs

index e184e0b40..1d4cdf0ab 100644
--- a/crypto/test/src/crypto/test/KDF2GeneratorTest.cs
+++ b/crypto/test/src/crypto/test/KDF2GeneratorTest.cs
@@ -98,12 +98,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "KDF2"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Kdf2GeneratorTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/KMACTest.cs b/crypto/test/src/crypto/test/KMACTest.cs

index bf9c7d034..b726f37bf 100644
--- a/crypto/test/src/crypto/test/KMACTest.cs
+++ b/crypto/test/src/crypto/test/KMACTest.cs
@@ -249,12 +249,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             Assert.IsTrue(Arrays.AreEqual(res1, res2));
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new KMacTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/KeccakDigestTest.cs b/crypto/test/src/crypto/test/KeccakDigestTest.cs

index 9020d0261..ddabddab4 100644
--- a/crypto/test/src/crypto/test/KeccakDigestTest.cs
+++ b/crypto/test/src/crypto/test/KeccakDigestTest.cs
@@ -357,12 +357,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new KeccakDigest((KeccakDigest)digest);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new KeccakDigestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/MD2DigestTest.cs b/crypto/test/src/crypto/test/MD2DigestTest.cs

index 4f4da516b..68ce4d6d7 100644
--- a/crypto/test/src/crypto/test/MD2DigestTest.cs
+++ b/crypto/test/src/crypto/test/MD2DigestTest.cs
@@ -50,12 +50,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new MD2Digest((MD2Digest)digest);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new MD2DigestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/MD4DigestTest.cs b/crypto/test/src/crypto/test/MD4DigestTest.cs

index 4fd4e0931..8f56862be 100644
--- a/crypto/test/src/crypto/test/MD4DigestTest.cs
+++ b/crypto/test/src/crypto/test/MD4DigestTest.cs
@@ -42,12 +42,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new MD4Digest((MD4Digest)digest);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new MD4DigestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/MD5DigestTest.cs b/crypto/test/src/crypto/test/MD5DigestTest.cs

index cc914165c..893d57305 100644
--- a/crypto/test/src/crypto/test/MD5DigestTest.cs
+++ b/crypto/test/src/crypto/test/MD5DigestTest.cs
@@ -42,12 +42,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new MD5Digest((MD5Digest)digest);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new MD5DigestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/MD5HMacTest.cs b/crypto/test/src/crypto/test/MD5HMacTest.cs

index 101b8be3c..b64e40a48 100644
--- a/crypto/test/src/crypto/test/MD5HMacTest.cs
+++ b/crypto/test/src/crypto/test/MD5HMacTest.cs
@@ -71,15 +71,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new SimpleTestResult(true, Name + ": Okay");
         }
 
-		public static void Main(
-            string[] args)
-        {
-            ITest test = new MD5HMacTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/MGF1GeneratorTest.cs b/crypto/test/src/crypto/test/MGF1GeneratorTest.cs

index ee67ffa1c..52354d3f7 100644
--- a/crypto/test/src/crypto/test/MGF1GeneratorTest.cs
+++ b/crypto/test/src/crypto/test/MGF1GeneratorTest.cs
@@ -86,12 +86,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "MGF1"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Mgf1GeneratorTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/MacTest.cs b/crypto/test/src/crypto/test/MacTest.cs

index 9a58f8a8c..838b58ccf 100644
--- a/crypto/test/src/crypto/test/MacTest.cs
+++ b/crypto/test/src/crypto/test/MacTest.cs
@@ -180,15 +180,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-		public static void Main(
-            string[] args)
-        {
-            MacTest test = new MacTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/ModeTest.cs b/crypto/test/src/crypto/test/ModeTest.cs

index c67dce094..351551f2e 100644
--- a/crypto/test/src/crypto/test/ModeTest.cs
+++ b/crypto/test/src/crypto/test/ModeTest.cs
@@ -88,15 +88,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new SimpleTestResult(true, Name + ": Okay");
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new ModeTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/NaccacheSternTest.cs b/crypto/test/src/crypto/test/NaccacheSternTest.cs

index 3f89768f1..db92770b5 100644
--- a/crypto/test/src/crypto/test/NaccacheSternTest.cs
+++ b/crypto/test/src/crypto/test/NaccacheSternTest.cs
@@ -274,10 +274,5 @@ namespace Org.BouncyCastle.Crypto.Tests
 
 			Assert.AreEqual(Name + ": Okay", resultText);
 		}
-
-		public static void Main(string[] args)
-		{
-			RunTest(new NaccacheSternTest());
-		}
 	}
 }
diff --git a/crypto/test/src/crypto/test/NistEccTest.cs b/crypto/test/src/crypto/test/NistEccTest.cs

index a8e4a6cb2..aaf4f666b 100644
--- a/crypto/test/src/crypto/test/NistEccTest.cs
+++ b/crypto/test/src/crypto/test/NistEccTest.cs
@@ -96,11 +96,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             IsEquals("Unexpected Y Coordinate", expectedY, ecPoint.AffineYCoord.ToBigInteger());
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new NistEccTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/NoekeonTest.cs b/crypto/test/src/crypto/test/NoekeonTest.cs

index b6fff70ce..c1fec9bb7 100644
--- a/crypto/test/src/crypto/test/NoekeonTest.cs
+++ b/crypto/test/src/crypto/test/NoekeonTest.cs
@@ -42,12 +42,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "Noekeon"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new NoekeonTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/NonMemoableDigestTest.cs b/crypto/test/src/crypto/test/NonMemoableDigestTest.cs

index e6b329e88..33e6aefe7 100644
--- a/crypto/test/src/crypto/test/NonMemoableDigestTest.cs
+++ b/crypto/test/src/crypto/test/NonMemoableDigestTest.cs
@@ -102,12 +102,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(
-			string[] args)
-		{
-			RunTest(new NonMemoableDigestTest());
-		}
-
         [Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/NullTest.cs b/crypto/test/src/crypto/test/NullTest.cs

index 16a51808f..0bc9d28cf 100644
--- a/crypto/test/src/crypto/test/NullTest.cs
+++ b/crypto/test/src/crypto/test/NullTest.cs
@@ -71,12 +71,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new NullTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/OAEPTest.cs b/crypto/test/src/crypto/test/OAEPTest.cs

index 3c4373270..37faff740 100644
--- a/crypto/test/src/crypto/test/OAEPTest.cs
+++ b/crypto/test/src/crypto/test/OAEPTest.cs
@@ -927,11 +927,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new OaepTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/OCBTest.cs b/crypto/test/src/crypto/test/OCBTest.cs

index 9f898fbe2..fbbdf8469 100644
--- a/crypto/test/src/crypto/test/OCBTest.cs
+++ b/crypto/test/src/crypto/test/OCBTest.cs
@@ -498,12 +498,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return value;
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new OcbTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/OpenBsdBCryptTest.cs b/crypto/test/src/crypto/test/OpenBsdBCryptTest.cs

index fabe84d6b..920833e3d 100644
--- a/crypto/test/src/crypto/test/OpenBsdBCryptTest.cs
+++ b/crypto/test/src/crypto/test/OpenBsdBCryptTest.cs
@@ -91,11 +91,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             {"ABCDEFGHIJKLMNOPQRSTUVWXYABCDEFGHIJKLMNOPQRSTUVWXYABCDEFGHIJKLMNOPQRSTUVWXYABCDEFGHIJKLMNOPQRSTUVWXY", "$2b$12$QwAt5kuG68nW7v.87q0QPuwdki3romFc/RU/RV3Qqk4FPw6WdbQzu"}
         };
 
-        public static void Main(string[] args)
-        {
-            RunTest(new OpenBsdBCryptTest());
-        }
-
         public override string Name
         {
             get { return "OpenBsdBCrypt"; }
diff --git a/crypto/test/src/crypto/test/PSSBlindTest.cs b/crypto/test/src/crypto/test/PSSBlindTest.cs

index d887a8f08..0abb8d87d 100644
--- a/crypto/test/src/crypto/test/PSSBlindTest.cs
+++ b/crypto/test/src/crypto/test/PSSBlindTest.cs
@@ -382,12 +382,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new PssBlindTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/PSSTest.cs b/crypto/test/src/crypto/test/PSSTest.cs

index 8578d254f..6375269a4 100644
--- a/crypto/test/src/crypto/test/PSSTest.cs
+++ b/crypto/test/src/crypto/test/PSSTest.cs
@@ -357,12 +357,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(
-			string[] args)
-		{
-			RunTest(new PssTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/PaddingTest.cs b/crypto/test/src/crypto/test/PaddingTest.cs

index ed53d9228..d12a1d68c 100644
--- a/crypto/test/src/crypto/test/PaddingTest.cs
+++ b/crypto/test/src/crypto/test/PaddingTest.cs
@@ -152,12 +152,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "PaddingTest"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new PaddingTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/ParallelHashTest.cs b/crypto/test/src/crypto/test/ParallelHashTest.cs

index 3e80b4d5e..536567313 100644
--- a/crypto/test/src/crypto/test/ParallelHashTest.cs
+++ b/crypto/test/src/crypto/test/ParallelHashTest.cs
@@ -136,11 +136,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             IsTrue(Arrays.AreEqual(Hex.Decode("13C4"), res));
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new ParallelHashTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/Pkcs12Test.cs b/crypto/test/src/crypto/test/Pkcs12Test.cs

index 29d5a3942..09f8bcfb2 100644
--- a/crypto/test/src/crypto/test/Pkcs12Test.cs
+++ b/crypto/test/src/crypto/test/Pkcs12Test.cs
@@ -84,12 +84,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			Run3(10, password2, Hex.Decode("263216FCC2FAB31C"), 1000, Hex.Decode("5EC4C7A80DF652294C3925B6489A7AB857C83476"));
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Pkcs12Test());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/Pkcs5Test.cs b/crypto/test/src/crypto/test/Pkcs5Test.cs

index fdf1e7a66..d3d22172f 100644
--- a/crypto/test/src/crypto/test/Pkcs5Test.cs
+++ b/crypto/test/src/crypto/test/Pkcs5Test.cs
@@ -218,12 +218,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new Pkcs5Test());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/Poly1305Test.cs b/crypto/test/src/crypto/test/Poly1305Test.cs

index fd4053cd4..00aecf863 100644
--- a/crypto/test/src/crypto/test/Poly1305Test.cs
+++ b/crypto/test/src/crypto/test/Poly1305Test.cs
@@ -499,13 +499,7 @@ namespace Org.BouncyCastle.Crypto.Tests
             {
                 Fail("rfc7539", Hex.ToHexString(tag), Hex.ToHexString(mac));
             }
-       }
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Poly1305Test());
-		}
+        }
 
 		[Test]
 		public void TestFunction()
@@ -514,6 +508,5 @@ namespace Org.BouncyCastle.Crypto.Tests
 
 			Assert.AreEqual(Name + ": Okay", resultText);
 		}
-
 	}
-}
\ No newline at end of file
+}
diff --git a/crypto/test/src/crypto/test/RC2Test.cs b/crypto/test/src/crypto/test/RC2Test.cs

index 177c1817d..8ff8afaa3 100644
--- a/crypto/test/src/crypto/test/RC2Test.cs
+++ b/crypto/test/src/crypto/test/RC2Test.cs
@@ -38,15 +38,6 @@ namespace Org.BouncyCastle.Crypto.Tests
         {
         }
 
-		public static void Main(
-            string[] args)
-        {
-            ITest test = new RC2Test();
-            ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/RC2WrapTest.cs b/crypto/test/src/crypto/test/RC2WrapTest.cs

index fc27acd2c..9471ba6c9 100644
--- a/crypto/test/src/crypto/test/RC2WrapTest.cs
+++ b/crypto/test/src/crypto/test/RC2WrapTest.cs
@@ -103,15 +103,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "RC2Wrap"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new RC2WrapTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/RC4Test.cs b/crypto/test/src/crypto/test/RC4Test.cs

index 7c1ac9162..65a9d9300 100644
--- a/crypto/test/src/crypto/test/RC4Test.cs
+++ b/crypto/test/src/crypto/test/RC4Test.cs
@@ -39,15 +39,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new SimpleTestResult(true, Name + ": Okay");
         }
 
-		public static void Main(
-            string[] args)
-        {
-            ITest test = new RC4Test();
-            ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/RC5Test.cs b/crypto/test/src/crypto/test/RC5Test.cs

index e50878a0e..16df7c8e2 100644
--- a/crypto/test/src/crypto/test/RC5Test.cs
+++ b/crypto/test/src/crypto/test/RC5Test.cs
@@ -181,15 +181,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RC5Test test = new RC5Test();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/RC6Test.cs b/crypto/test/src/crypto/test/RC6Test.cs

index 4f59ec4e9..75f15b564 100644
--- a/crypto/test/src/crypto/test/RC6Test.cs
+++ b/crypto/test/src/crypto/test/RC6Test.cs
@@ -34,15 +34,6 @@ namespace Org.BouncyCastle.Crypto.Tests
         {
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ITest test = new RC6Test();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/RFC3211WrapTest.cs b/crypto/test/src/crypto/test/RFC3211WrapTest.cs

index 91dea34dd..fb5b8d8eb 100644
--- a/crypto/test/src/crypto/test/RFC3211WrapTest.cs
+++ b/crypto/test/src/crypto/test/RFC3211WrapTest.cs
@@ -199,12 +199,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Rfc3211WrapTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/RSABlindedTest.cs b/crypto/test/src/crypto/test/RSABlindedTest.cs

index 75b9f3a07..b6e8eb0ea 100644
--- a/crypto/test/src/crypto/test/RSABlindedTest.cs
+++ b/crypto/test/src/crypto/test/RSABlindedTest.cs
@@ -429,15 +429,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new RsaBlindedTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/RegressionTest.cs b/crypto/test/src/crypto/test/RegressionTest.cs

index 2827821be..eeb078397 100644
--- a/crypto/test/src/crypto/test/RegressionTest.cs
+++ b/crypto/test/src/crypto/test/RegressionTest.cs
@@ -151,13 +151,5 @@ namespace Org.BouncyCastle.Crypto.Tests
             new SP80038GTest(),
             new TupleHashTest(),
         };
-
-        public static void Main(string[] args)
-        {
-            foreach (ITest test in tests)
-            {
-                SimpleTest.RunTest(test);
-            }
-        }
     }
 }
diff --git a/crypto/test/src/crypto/test/RijndaelTest.cs b/crypto/test/src/crypto/test/RijndaelTest.cs

index f714c83eb..77dd7ec62 100644
--- a/crypto/test/src/crypto/test/RijndaelTest.cs
+++ b/crypto/test/src/crypto/test/RijndaelTest.cs
@@ -114,15 +114,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "Rijndael"; }
         }
 
-        public static void Main(
-			string[] args)
-        {
-            ITest test = new RijndaelTest();
-            ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/RipeMD128DigestTest.cs b/crypto/test/src/crypto/test/RipeMD128DigestTest.cs

index d3b25af66..5b19ea0d2 100644
--- a/crypto/test/src/crypto/test/RipeMD128DigestTest.cs
+++ b/crypto/test/src/crypto/test/RipeMD128DigestTest.cs
@@ -57,12 +57,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new RipeMD128Digest((RipeMD128Digest)digest);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new RipeMD128DigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/RipeMD128HMacTest.cs b/crypto/test/src/crypto/test/RipeMD128HMacTest.cs

index 2f6a2d979..7f10d2293 100644
--- a/crypto/test/src/crypto/test/RipeMD128HMacTest.cs
+++ b/crypto/test/src/crypto/test/RipeMD128HMacTest.cs
@@ -80,15 +80,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ITest test = new RipeMD128HMacTest();
-            ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/RipeMD160DigestTest.cs b/crypto/test/src/crypto/test/RipeMD160DigestTest.cs

index 15e53f2a0..a27316ade 100644
--- a/crypto/test/src/crypto/test/RipeMD160DigestTest.cs
+++ b/crypto/test/src/crypto/test/RipeMD160DigestTest.cs
@@ -57,12 +57,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new RipeMD160Digest((RipeMD160Digest)digest);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new RipeMD160DigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/RipeMD160HMacTest.cs b/crypto/test/src/crypto/test/RipeMD160HMacTest.cs

index cc87a535f..e18f25b3e 100644
--- a/crypto/test/src/crypto/test/RipeMD160HMacTest.cs
+++ b/crypto/test/src/crypto/test/RipeMD160HMacTest.cs
@@ -81,15 +81,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ITest test = new RipeMD160HMacTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/RipeMD256DigestTest.cs b/crypto/test/src/crypto/test/RipeMD256DigestTest.cs

index 5b3e6b10b..1b26c6602 100644
--- a/crypto/test/src/crypto/test/RipeMD256DigestTest.cs
+++ b/crypto/test/src/crypto/test/RipeMD256DigestTest.cs
@@ -57,12 +57,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new RipeMD256Digest((RipeMD256Digest)digest);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new RipeMD256DigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/RipeMD320DigestTest.cs b/crypto/test/src/crypto/test/RipeMD320DigestTest.cs

index 047d68aa7..dc763362e 100644
--- a/crypto/test/src/crypto/test/RipeMD320DigestTest.cs
+++ b/crypto/test/src/crypto/test/RipeMD320DigestTest.cs
@@ -57,12 +57,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new RipeMD320Digest((RipeMD320Digest)digest);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new RipeMD320DigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/RsaTest.cs b/crypto/test/src/crypto/test/RsaTest.cs

index ace60b237..c8945b49f 100644
--- a/crypto/test/src/crypto/test/RsaTest.cs
+++ b/crypto/test/src/crypto/test/RsaTest.cs
@@ -744,15 +744,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new RsaTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/SCryptTest.cs b/crypto/test/src/crypto/test/SCryptTest.cs

index 24ec1dffd..07aacbd7f 100644
--- a/crypto/test/src/crypto/test/SCryptTest.cs
+++ b/crypto/test/src/crypto/test/SCryptTest.cs
@@ -133,11 +133,5 @@ namespace Org.BouncyCastle.Crypto.Tests
 		{
 			return int.Parse(arg.Trim());
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new SCryptTest());
-		}
 	}
 }
diff --git a/crypto/test/src/crypto/test/SEEDTest.cs b/crypto/test/src/crypto/test/SEEDTest.cs

index 2fcb242cc..03b10496f 100644
--- a/crypto/test/src/crypto/test/SEEDTest.cs
+++ b/crypto/test/src/crypto/test/SEEDTest.cs
@@ -48,12 +48,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "SEED"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new SeedTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/SHA1DigestTest.cs b/crypto/test/src/crypto/test/SHA1DigestTest.cs

index 318035b0c..75ccd1b22 100644
--- a/crypto/test/src/crypto/test/SHA1DigestTest.cs
+++ b/crypto/test/src/crypto/test/SHA1DigestTest.cs
@@ -40,12 +40,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new Sha1Digest((Sha1Digest)digest);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Sha1DigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/SHA1HMacTest.cs b/crypto/test/src/crypto/test/SHA1HMacTest.cs

index 865f5b58b..3a0635454 100644
--- a/crypto/test/src/crypto/test/SHA1HMacTest.cs
+++ b/crypto/test/src/crypto/test/SHA1HMacTest.cs
@@ -73,15 +73,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ITest test = new Sha1HMacTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SHA224DigestTest.cs b/crypto/test/src/crypto/test/SHA224DigestTest.cs

index 9469b651b..95c2334cb 100644
--- a/crypto/test/src/crypto/test/SHA224DigestTest.cs
+++ b/crypto/test/src/crypto/test/SHA224DigestTest.cs
@@ -53,12 +53,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new Sha224Digest((Sha224Digest)digest);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Sha224DigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/SHA224HMacTest.cs b/crypto/test/src/crypto/test/SHA224HMacTest.cs

index 06c6ea1cb..e42e2f738 100644
--- a/crypto/test/src/crypto/test/SHA224HMacTest.cs
+++ b/crypto/test/src/crypto/test/SHA224HMacTest.cs
@@ -102,15 +102,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ITest test = new Sha224HMacTest();
-            ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SHA256DigestTest.cs b/crypto/test/src/crypto/test/SHA256DigestTest.cs

index d2ae89e56..74945460d 100644
--- a/crypto/test/src/crypto/test/SHA256DigestTest.cs
+++ b/crypto/test/src/crypto/test/SHA256DigestTest.cs
@@ -54,12 +54,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new Sha256Digest((Sha256Digest)digest);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new Sha256DigestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SHA256HMacTest.cs b/crypto/test/src/crypto/test/SHA256HMacTest.cs

index a9016af21..cc3bf57de 100644
--- a/crypto/test/src/crypto/test/SHA256HMacTest.cs
+++ b/crypto/test/src/crypto/test/SHA256HMacTest.cs
@@ -102,15 +102,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ITest test = new Sha256HMacTest();
-            ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SHA384DigestTest.cs b/crypto/test/src/crypto/test/SHA384DigestTest.cs

index 99363ac5a..897347ba2 100644
--- a/crypto/test/src/crypto/test/SHA384DigestTest.cs
+++ b/crypto/test/src/crypto/test/SHA384DigestTest.cs
@@ -53,12 +53,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new Sha384Digest((Sha384Digest)digest);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new Sha384DigestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SHA384HMacTest.cs b/crypto/test/src/crypto/test/SHA384HMacTest.cs

index 0caba12c4..ab7c65ec4 100644
--- a/crypto/test/src/crypto/test/SHA384HMacTest.cs
+++ b/crypto/test/src/crypto/test/SHA384HMacTest.cs
@@ -102,15 +102,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ITest test = new Sha384HMacTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SHA3DigestTest.cs b/crypto/test/src/crypto/test/SHA3DigestTest.cs

index c905ded72..7b9ab26cf 100644
--- a/crypto/test/src/crypto/test/SHA3DigestTest.cs
+++ b/crypto/test/src/crypto/test/SHA3DigestTest.cs
@@ -229,12 +229,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return s;
         }
 
-        public static void Main(
-            string[]    args)
-        {
-            RunTest(new Sha3DigestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SHA512DigestTest.cs b/crypto/test/src/crypto/test/SHA512DigestTest.cs

index d4f56e15e..a0a09a73d 100644
--- a/crypto/test/src/crypto/test/SHA512DigestTest.cs
+++ b/crypto/test/src/crypto/test/SHA512DigestTest.cs
@@ -53,12 +53,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new Sha512Digest((Sha512Digest)digest);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Sha512DigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/SHA512HMacTest.cs b/crypto/test/src/crypto/test/SHA512HMacTest.cs

index c091a7220..5d25118b9 100644
--- a/crypto/test/src/crypto/test/SHA512HMacTest.cs
+++ b/crypto/test/src/crypto/test/SHA512HMacTest.cs
@@ -103,15 +103,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new SimpleTestResult(true, Name + ": Okay");
         }
 
-		public static void Main(
-            string[] args)
-        {
-            ITest test = new Sha512HMacTest();
-            ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SHA512t224DigestTest.cs b/crypto/test/src/crypto/test/SHA512t224DigestTest.cs

index a3d68e1ab..8bc5bc2fd 100644
--- a/crypto/test/src/crypto/test/SHA512t224DigestTest.cs
+++ b/crypto/test/src/crypto/test/SHA512t224DigestTest.cs
@@ -52,11 +52,5 @@ namespace Org.BouncyCastle.Crypto.Tests
         {
             return new Sha512tDigest((Sha512tDigest)digest);
         }
-
-        public static void Main(
-            string[]    args)
-        {
-            RunTest(new Sha512t224DigestTest());
-        }
     }
 }
diff --git a/crypto/test/src/crypto/test/SHA512t256DigestTest.cs b/crypto/test/src/crypto/test/SHA512t256DigestTest.cs

index c957aa660..19e756754 100644
--- a/crypto/test/src/crypto/test/SHA512t256DigestTest.cs
+++ b/crypto/test/src/crypto/test/SHA512t256DigestTest.cs
@@ -52,11 +52,5 @@ namespace Org.BouncyCastle.Crypto.Tests
         {
             return new Sha512tDigest((Sha512tDigest)digest);
         }
-
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new Sha512t256DigestTest());
-        }
     }
 }
diff --git a/crypto/test/src/crypto/test/SM2EngineTest.cs b/crypto/test/src/crypto/test/SM2EngineTest.cs

index 1a2d1d13e..85fc0dfc3 100644
--- a/crypto/test/src/crypto/test/SM2EngineTest.cs
+++ b/crypto/test/src/crypto/test/SM2EngineTest.cs
@@ -152,11 +152,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             DoEngineTestF2m();
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new SM2EngineTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SM2KeyExchangeTest.cs b/crypto/test/src/crypto/test/SM2KeyExchangeTest.cs

index 39131f163..4614ebac2 100644
--- a/crypto/test/src/crypto/test/SM2KeyExchangeTest.cs
+++ b/crypto/test/src/crypto/test/SM2KeyExchangeTest.cs
@@ -214,11 +214,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             DoKeyExchangeTestF2m();
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new SM2KeyExchangeTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SM2SignerTest.cs b/crypto/test/src/crypto/test/SM2SignerTest.cs

index 67cb1a443..a8cc016fd 100644
--- a/crypto/test/src/crypto/test/SM2SignerTest.cs
+++ b/crypto/test/src/crypto/test/SM2SignerTest.cs
@@ -252,12 +252,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return kpg.GenerateKeyPair();
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new SM2SignerTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SM3DigestTest.cs b/crypto/test/src/crypto/test/SM3DigestTest.cs

index ae29a1581..493a67071 100644
--- a/crypto/test/src/crypto/test/SM3DigestTest.cs
+++ b/crypto/test/src/crypto/test/SM3DigestTest.cs
@@ -190,12 +190,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 	        return new SM3Digest((SM3Digest)digest);
 	    }
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new SM3DigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/SM4Test.cs b/crypto/test/src/crypto/test/SM4Test.cs

index ae2f18b00..042f59fb7 100644
--- a/crypto/test/src/crypto/test/SM4Test.cs
+++ b/crypto/test/src/crypto/test/SM4Test.cs
@@ -77,11 +77,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             get { return "SM4"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new SM4Test());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SP80038GTest.cs b/crypto/test/src/crypto/test/SP80038GTest.cs

index 119813681..05327149e 100644
--- a/crypto/test/src/crypto/test/SP80038GTest.cs
+++ b/crypto/test/src/crypto/test/SP80038GTest.cs
@@ -527,11 +527,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             get { return "SP80038GTest"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new SP80038GTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SRP6Test.cs b/crypto/test/src/crypto/test/SRP6Test.cs

index 6b64df924..a4109aa0a 100644
--- a/crypto/test/src/crypto/test/SRP6Test.cs
+++ b/crypto/test/src/crypto/test/SRP6Test.cs
@@ -242,11 +242,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 	        }
 	    }
 
-	    public static void Main(string[] args)
-	    {
-	        RunTest(new Srp6Test());
-	    }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/Salsa20Test.cs b/crypto/test/src/crypto/test/Salsa20Test.cs

index b4dc1ef2b..0ae3c2023 100644
--- a/crypto/test/src/crypto/test/Salsa20Test.cs
+++ b/crypto/test/src/crypto/test/Salsa20Test.cs
@@ -301,12 +301,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Salsa20Test());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/SerpentTest.cs b/crypto/test/src/crypto/test/SerpentTest.cs

index 08dbda591..a766757f7 100644
--- a/crypto/test/src/crypto/test/SerpentTest.cs
+++ b/crypto/test/src/crypto/test/SerpentTest.cs
@@ -134,11 +134,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "Serpent"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new SerpentTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/ShakeDigestTest.cs b/crypto/test/src/crypto/test/ShakeDigestTest.cs

index 70d7436ec..4b4d0fbd6 100644
--- a/crypto/test/src/crypto/test/ShakeDigestTest.cs
+++ b/crypto/test/src/crypto/test/ShakeDigestTest.cs
@@ -277,12 +277,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return s;
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new ShakeDigestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/ShortenedDigestTest.cs b/crypto/test/src/crypto/test/ShortenedDigestTest.cs

index 4956b5b39..927ffee3a 100644
--- a/crypto/test/src/crypto/test/ShortenedDigestTest.cs
+++ b/crypto/test/src/crypto/test/ShortenedDigestTest.cs
@@ -81,12 +81,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "ShortenedDigest"; }
 		}
 
-		public static void Main(
-			string[]    args)
-		{
-			RunTest(new ShortenedDigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/SipHashTest.cs b/crypto/test/src/crypto/test/SipHashTest.cs

index 82dfce82c..5519f24d7 100644
--- a/crypto/test/src/crypto/test/SipHashTest.cs
+++ b/crypto/test/src/crypto/test/SipHashTest.cs
@@ -140,11 +140,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new SipHashTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/SkeinDigestTest.cs b/crypto/test/src/crypto/test/SkeinDigestTest.cs

index b6f1c542b..50a2d9565 100644
--- a/crypto/test/src/crypto/test/SkeinDigestTest.cs
+++ b/crypto/test/src/crypto/test/SkeinDigestTest.cs
@@ -285,12 +285,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			//	        }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new SkeinDigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/SkeinMacTest.cs b/crypto/test/src/crypto/test/SkeinMacTest.cs

index fcd654233..4ee6ace96 100644
--- a/crypto/test/src/crypto/test/SkeinMacTest.cs
+++ b/crypto/test/src/crypto/test/SkeinMacTest.cs
@@ -155,12 +155,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new SkeinMacTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/SkipjackTest.cs b/crypto/test/src/crypto/test/SkipjackTest.cs

index d9fe6e4b4..5fb872f77 100644
--- a/crypto/test/src/crypto/test/SkipjackTest.cs
+++ b/crypto/test/src/crypto/test/SkipjackTest.cs
@@ -26,15 +26,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 		{
         }
 
-		public static void Main(
-            string[] args)
-        {
-            ITest test = new SkipjackTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/StreamCipherResetTest.cs b/crypto/test/src/crypto/test/StreamCipherResetTest.cs

index 49760a24b..2e48de7c7 100644
--- a/crypto/test/src/crypto/test/StreamCipherResetTest.cs
+++ b/crypto/test/src/crypto/test/StreamCipherResetTest.cs
@@ -118,11 +118,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new StreamCipherResetTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/TEATest.cs b/crypto/test/src/crypto/test/TEATest.cs

index 525941dbf..bf0e781de 100644
--- a/crypto/test/src/crypto/test/TEATest.cs
+++ b/crypto/test/src/crypto/test/TEATest.cs
@@ -42,12 +42,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "TEA"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new TeaTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/Threefish1024Test.cs b/crypto/test/src/crypto/test/Threefish1024Test.cs

index 64f9aa29f..014b6565b 100644
--- a/crypto/test/src/crypto/test/Threefish1024Test.cs
+++ b/crypto/test/src/crypto/test/Threefish1024Test.cs
@@ -57,12 +57,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "Threefish-1024"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Threefish1024Test());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/Threefish256Test.cs b/crypto/test/src/crypto/test/Threefish256Test.cs

index e44299a31..24cfa1129 100644
--- a/crypto/test/src/crypto/test/Threefish256Test.cs
+++ b/crypto/test/src/crypto/test/Threefish256Test.cs
@@ -42,12 +42,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "Threefish-256"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Threefish256Test());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/Threefish512Test.cs b/crypto/test/src/crypto/test/Threefish512Test.cs

index 8f4ec6345..70f830173 100644
--- a/crypto/test/src/crypto/test/Threefish512Test.cs
+++ b/crypto/test/src/crypto/test/Threefish512Test.cs
@@ -47,12 +47,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "Threefish-512"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Threefish512Test());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/TigerDigestTest.cs b/crypto/test/src/crypto/test/TigerDigestTest.cs

index b351c4b5e..1ff53bd82 100644
--- a/crypto/test/src/crypto/test/TigerDigestTest.cs
+++ b/crypto/test/src/crypto/test/TigerDigestTest.cs
@@ -65,12 +65,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             return new TigerDigest((TigerDigest)digest);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new TigerDigestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/TnepresTest.cs b/crypto/test/src/crypto/test/TnepresTest.cs

index 07308dbff..890e2a718 100644
--- a/crypto/test/src/crypto/test/TnepresTest.cs
+++ b/crypto/test/src/crypto/test/TnepresTest.cs
@@ -139,11 +139,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             get { return "Tnepres"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new TnepresTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/TupleHashTest.cs b/crypto/test/src/crypto/test/TupleHashTest.cs

index 2195bb27f..fd1ee001f 100644
--- a/crypto/test/src/crypto/test/TupleHashTest.cs
+++ b/crypto/test/src/crypto/test/TupleHashTest.cs
@@ -105,11 +105,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             IsTrue("oops!", Arrays.AreEqual(Hex.Decode("0c59b11464f2336c34663ed51b2b950bec743610856f36c28d1d088d8a2446284dd09830a6a178dc752376199fae935d86cfdee5913d4922dfd369b66a53c897"), res));
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new TupleHashTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/TwofishTest.cs b/crypto/test/src/crypto/test/TwofishTest.cs

index 9425d2e60..5b268e521 100644
--- a/crypto/test/src/crypto/test/TwofishTest.cs
+++ b/crypto/test/src/crypto/test/TwofishTest.cs
@@ -34,15 +34,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 		{
         }
 
-        public static void Main(
-            string[] args)
-        {
-            ITest test = new TwofishTest();
-            ITestResult result = test.Perform();
-
-            Console.WriteLine(result);
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/VMPCKSA3Test.cs b/crypto/test/src/crypto/test/VMPCKSA3Test.cs

index a25105b77..5bc17dbe0 100644
--- a/crypto/test/src/crypto/test/VMPCKSA3Test.cs
+++ b/crypto/test/src/crypto/test/VMPCKSA3Test.cs
@@ -95,12 +95,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return output;
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new VmpcKsa3Test());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/VMPCMacTest.cs b/crypto/test/src/crypto/test/VMPCMacTest.cs

index b9a5e3a93..082c045e1 100644
--- a/crypto/test/src/crypto/test/VMPCMacTest.cs
+++ b/crypto/test/src/crypto/test/VMPCMacTest.cs
@@ -20,12 +20,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "VMPC-MAC"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new VmpcMacTest());
-		}
-
 		private static byte[] output1 = Hex.Decode("9BDA16E2AD0E284774A3ACBC8835A8326C11FAAD");
 
 		public override void PerformTest()
diff --git a/crypto/test/src/crypto/test/VMPCTest.cs b/crypto/test/src/crypto/test/VMPCTest.cs

index 6186c4733..8b69e6335 100644
--- a/crypto/test/src/crypto/test/VMPCTest.cs
+++ b/crypto/test/src/crypto/test/VMPCTest.cs
@@ -95,12 +95,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return output;
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new VmpcTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/WhirlpoolDigestTest.cs b/crypto/test/src/crypto/test/WhirlpoolDigestTest.cs

index 1445b8977..e28a9dacc 100644
--- a/crypto/test/src/crypto/test/WhirlpoolDigestTest.cs
+++ b/crypto/test/src/crypto/test/WhirlpoolDigestTest.cs
@@ -102,12 +102,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			return new WhirlpoolDigest((WhirlpoolDigest)digest);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new WhirlpoolDigestTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/X25519Test.cs b/crypto/test/src/crypto/test/X25519Test.cs

index 29466e0c6..05a901571 100644
--- a/crypto/test/src/crypto/test/X25519Test.cs
+++ b/crypto/test/src/crypto/test/X25519Test.cs
@@ -21,11 +21,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             get { return "X25519"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new X25519Test());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/X448Test.cs b/crypto/test/src/crypto/test/X448Test.cs

index 5d4b14b63..b037cfbb6 100644
--- a/crypto/test/src/crypto/test/X448Test.cs
+++ b/crypto/test/src/crypto/test/X448Test.cs
@@ -21,11 +21,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             get { return "X448"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new X448Test());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/X931SignerTest.cs b/crypto/test/src/crypto/test/X931SignerTest.cs

index d03cbc8e4..0bbfb8a70 100644
--- a/crypto/test/src/crypto/test/X931SignerTest.cs
+++ b/crypto/test/src/crypto/test/X931SignerTest.cs
@@ -129,11 +129,6 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new X931SignerTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/crypto/test/XSalsa20Test.cs b/crypto/test/src/crypto/test/XSalsa20Test.cs

index 519c5bcb9..b401d1f59 100644
--- a/crypto/test/src/crypto/test/XSalsa20Test.cs
+++ b/crypto/test/src/crypto/test/XSalsa20Test.cs
@@ -166,12 +166,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new XSalsa20Test());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/crypto/test/XTEATest.cs b/crypto/test/src/crypto/test/XTEATest.cs

index a1ea65298..541abc16f 100644
--- a/crypto/test/src/crypto/test/XTEATest.cs
+++ b/crypto/test/src/crypto/test/XTEATest.cs
@@ -42,12 +42,6 @@ namespace Org.BouncyCastle.Crypto.Tests
 			get { return "XTEA"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new XteaTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/math/ec/test/AllTests.cs b/crypto/test/src/math/ec/test/AllTests.cs

index 3d3f3939b..7fdb77d07 100644
--- a/crypto/test/src/math/ec/test/AllTests.cs
+++ b/crypto/test/src/math/ec/test/AllTests.cs
@@ -8,11 +8,6 @@ namespace Org.BouncyCastle.Math.EC.Tests
 {
     public class AllTests
     {
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
         public static TestSuite Suite
         {
diff --git a/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs b/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs

index 2ee16a8d8..6db6c3004 100644
--- a/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs
+++ b/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs
@@ -200,10 +200,5 @@ namespace Org.BouncyCastle.Math.EC.Tests
                 RandMult(name);
             }
         }
-
-        public static void Main(string[] args)
-        {
-            new ECPointPerformanceTest().TestMultiply();
-        }
     }
 }
diff --git a/crypto/test/src/math/ec/test/F2mProofer.cs b/crypto/test/src/math/ec/test/F2mProofer.cs
deleted file mode 100644

index 727d32c55..000000000
--- a/crypto/test/src/math/ec/test/F2mProofer.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-// TODO Need a replacement for the Java properties class to finish this class
-
-//using System;
-//using System.IO;
-//using System.Text;
-//
-//using Org.BouncyCastle.Asn1.Sec;
-//using Org.BouncyCastle.Asn1.X9;
-//using Org.BouncyCastle.Math.EC;
-//using Org.BouncyCastle.Security;
-//
-//namespace Org.BouncyCastle.Math.EC.Tests
-//{
-//	public class F2mProofer
-//	{
-//		private const int NUM_SAMPLES = 1000;
-//
-//		private static readonly string PATH = "crypto/test/src/org/bouncycastle/math/ec/test/samples/";
-//
-//		private static readonly string INPUT_FILE_NAME_PREFIX = "Input_";
-//
-//		private static readonly string RESULT_FILE_NAME_PREFIX = "Output_";
-//
-//		/**
-//		* The standard curves on which the tests are done
-//		*/
-//		public static readonly string[] Curves = { "sect163r2", "sect233r1",
-//			"sect283r1", "sect409r1", "sect571r1" };
-//
-//		private string pointToString(F2mPoint p)
-//		{
-//			F2mFieldElement x = (F2mFieldElement) p.X;
-//			F2mFieldElement y = (F2mFieldElement) p.Y;
-//
-//			int m = x.M;
-//			int len = m / 2 + 5;
-//
-//			StringBuilder sb = new StringBuilder(len);
-//			sb.Append('(');
-//			sb.Append(x.ToBigInteger().ToString(16));
-//			sb.Append(", ");
-//			sb.Append(y.ToBigInteger().ToString(16));
-//			sb.Append(')');
-//
-//			return sb.ToString();
-//		}
-//
-//		private void generateRandomInput(X9ECParameters x9ECParameters)
-//		{
-//			F2mPoint g = (F2mPoint) x9ECParameters.G;
-//			int m = ((F2mFieldElement) g.X).M;
-//
-//			SecureRandom secRand = new SecureRandom(); //SecureRandom.GetInstance("SHA1PRNG");
-//			Properties inputProps = new Properties();
-//			for (int i = 0; i < NUM_SAMPLES; i++)
-//			{
-//				BigInteger rand = new BigInteger(m, secRand);
-//				inputProps.put(i.ToString(), rand.ToString(16));
-//			}
-//			string bits = m.ToString();
-//			FileStream fos = File.Create(PATH
-//				+ INPUT_FILE_NAME_PREFIX + bits + ".properties");
-//			inputProps.store(fos, "Input Samples of length" + bits);
-//			fos.Close();
-//		}
-//
-//		private void multiplyPoints(X9ECParameters x9ECParameters,
-//			string classPrefix)
-//		{
-//			F2mPoint g = (F2mPoint) x9ECParameters.G;
-//			int m = ((F2mFieldElement) g.X).M;
-//
-//			string inputFileName = PATH + INPUT_FILE_NAME_PREFIX + m
-//				+ ".properties";
-//			Properties inputProps = new Properties();
-//			FileStream fis = File.OpenRead(inputFileName); 
-//			inputProps.load(fis);
-//			fis.Close();
-//
-//			Properties outputProps = new Properties();
-//
-//			for (int i = 0; i < NUM_SAMPLES; i++)
-//			{
-//				BigInteger rand = new BigInteger(inputProps.getProperty(Integer
-//					.ToString(i)), 16);
-//				F2mPoint result = (F2mPoint) g.Multiply(rand).normalize();
-//				string resultStr = pointToString(result);
-//				outputProps.setProperty(i.ToString(), resultStr);
-//			}
-//
-//			string outputFileName = PATH + RESULT_FILE_NAME_PREFIX + classPrefix
-//				+ "_" + m + ".properties";
-//			FileStream fos = File.Create(outputFileName);
-//			outputProps.store(fos, "Output Samples of length" + m);
-//			fos.Close();
-//		}
-//
-//		private Properties loadResults(string classPrefix, int m)
-//		{
-//			FileStream fis = File.OpenRead(PATH
-//				+ RESULT_FILE_NAME_PREFIX + classPrefix + "_" + m + ".properties");
-//			Properties res = new Properties();
-//			res.load(fis);
-//			fis.Close();
-//			return res;
-//		}
-//
-//		private void compareResult(X9ECParameters x9ECParameters,
-//			string classPrefix1, string classPrefix2)
-//		{
-//			F2mPoint g = (F2mPoint) x9ECParameters.G;
-//			int m = ((F2mFieldElement) g.X).M;
-//
-//			Properties res1 = loadResults(classPrefix1, m);
-//			Properties res2 = loadResults(classPrefix2, m);
-//
-//			Set keys = res1.keySet();
-//			Iterator iter = keys.iterator();
-//			while (iter.hasNext())
-//			{
-//				string key = (string) iter.next();
-//				string result1 = res1.getProperty(key);
-//				string result2 = res2.getProperty(key);
-//				if (!(result1.Equals(result2)))
-//				{
-//					Console.Error.WriteLine("Difference found: m = " + m + ", "
-//						+ result1 + " does not equal " + result2);
-//				}
-//			}
-//
-//		}
-//
-//		private static void usage()
-//		{
-//			Console.Error.WriteLine("Usage: F2mProofer [-init | -Multiply <className> "
-//				+ "| -compare <className1> <className2>]");
-//		}
-//
-//		public static void Main(string[] args)
-//		{
-//			if (args.Length == 0)
-//			{
-//				usage();
-//				return;
-//			}
-//			F2mProofer proofer = new F2mProofer();
-//			if (args[0].Equals("-init"))
-//			{
-//				Console.WriteLine("Generating random input...");
-//				for (int i = 0; i < Curves.Length; i++)
-//				{
-//					X9ECParameters x9ECParameters = SecNamedCurves
-//						.GetByName(Curves[i]);
-//					proofer.generateRandomInput(x9ECParameters);
-//				}
-//				Console.WriteLine("Successfully generated random input in " + PATH);
-//			}
-//			else if (args[0].Equals("-compare"))
-//			{
-//				if (args.Length < 3)
-//				{
-//					usage();
-//					return;
-//				}
-//				string classPrefix1 = args[1];
-//				string classPrefix2 = args[2];
-//				Console.WriteLine("Comparing results...");
-//				for (int i = 0; i < Curves.Length; i++)
-//				{
-//					X9ECParameters x9ECParameters = SecNamedCurves
-//						.GetByName(Curves[i]);
-//					proofer.compareResult(x9ECParameters, classPrefix1,
-//						classPrefix2);
-//				}
-//				Console.WriteLine("Successfully compared results in " + PATH);
-//			}
-//			else if (args[0].Equals("-Multiply"))
-//			{
-//				if (args.Length < 2)
-//				{
-//					usage();
-//					return;
-//				}
-//				string classPrefix = args[1];
-//				Console.WriteLine("Multiplying points...");
-//				for (int i = 0; i < Curves.Length; i++)
-//				{
-//					X9ECParameters x9ECParameters = SecNamedCurves
-//						.GetByName(Curves[i]);
-//					proofer.multiplyPoints(x9ECParameters, classPrefix);
-//				}
-//				Console.WriteLine("Successfully generated multiplied points in "
-//					+ PATH);
-//			}
-//			else
-//			{
-//				usage();
-//			}
-//		}
-//	}
-//}
diff --git a/crypto/test/src/math/test/AllTests.cs b/crypto/test/src/math/test/AllTests.cs

index 53feff954..087fe0a29 100644
--- a/crypto/test/src/math/test/AllTests.cs
+++ b/crypto/test/src/math/test/AllTests.cs
@@ -8,11 +8,6 @@ namespace Org.BouncyCastle.Math.Tests
 {
     public class AllTests
     {
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
         public static TestSuite Suite
         {
diff --git a/crypto/test/src/ocsp/test/AllTests.cs b/crypto/test/src/ocsp/test/AllTests.cs

index 5e799cd09..05816e481 100644
--- a/crypto/test/src/ocsp/test/AllTests.cs
+++ b/crypto/test/src/ocsp/test/AllTests.cs
@@ -10,11 +10,6 @@ namespace Org.BouncyCastle.Ocsp.Tests
 {
 	public class AllTests
 	{
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
         public static TestSuite Suite
         {
diff --git a/crypto/test/src/ocsp/test/OCSPTest.cs b/crypto/test/src/ocsp/test/OCSPTest.cs

index 823de90f9..1630e29b1 100644
--- a/crypto/test/src/ocsp/test/OCSPTest.cs
+++ b/crypto/test/src/ocsp/test/OCSPTest.cs
@@ -835,12 +835,6 @@ namespace Org.BouncyCastle.Ocsp.Tests
 			doTestIrregularVersionReq();
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new OcspTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/openpgp/examples/test/AllTests.cs b/crypto/test/src/openpgp/examples/test/AllTests.cs

index 3403a4fdc..809870cb5 100644
--- a/crypto/test/src/openpgp/examples/test/AllTests.cs
+++ b/crypto/test/src/openpgp/examples/test/AllTests.cs
@@ -418,11 +418,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Examples.Tests
 			return bRd.ReadLine();
 		}
 
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
         public static TestSuite Suite
         {
diff --git a/crypto/test/src/openpgp/test/ArmoredInputStreamTest.cs b/crypto/test/src/openpgp/test/ArmoredInputStreamTest.cs

index 375d4ef1c..074b655bb 100644
--- a/crypto/test/src/openpgp/test/ArmoredInputStreamTest.cs
+++ b/crypto/test/src/openpgp/test/ArmoredInputStreamTest.cs
@@ -403,11 +403,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new ArmoredInputStreamTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/IgnoreMarkerPacketInCertificatesTest.cs b/crypto/test/src/openpgp/test/IgnoreMarkerPacketInCertificatesTest.cs

index 1de5f8b19..7b845d077 100644
--- a/crypto/test/src/openpgp/test/IgnoreMarkerPacketInCertificatesTest.cs
+++ b/crypto/test/src/openpgp/test/IgnoreMarkerPacketInCertificatesTest.cs
@@ -86,11 +86,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             IsEquals(1, Count(signatures));
         }
 
-		public static void Main(string[] args)
-		{
-			RunTest(new IgnoreMarkerPacketInCertificatesTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/openpgp/test/PGPArmoredTest.cs b/crypto/test/src/openpgp/test/PGPArmoredTest.cs

index 1f1cbf3c3..9fe5da6ed 100644
--- a/crypto/test/src/openpgp/test/PGPArmoredTest.cs
+++ b/crypto/test/src/openpgp/test/PGPArmoredTest.cs
@@ -295,11 +295,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
 			get { return "PgpArmoredTest"; }
 		}
 
-		public static void Main(string[] args)
-		{
-			RunTest(new PgpArmoredTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/openpgp/test/PGPClearSignedSignatureTest.cs b/crypto/test/src/openpgp/test/PGPClearSignedSignatureTest.cs

index 6ed632a00..98762fab1 100644
--- a/crypto/test/src/openpgp/test/PGPClearSignedSignatureTest.cs
+++ b/crypto/test/src/openpgp/test/PGPClearSignedSignatureTest.cs
@@ -428,11 +428,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
 			generateTest(crNlMessage, "\\r\\n");
 		}
 
-		public static void Main(string[] args)
-		{
-			RunTest(new PgpClearSignedSignatureTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/openpgp/test/PGPCompressionTest.cs b/crypto/test/src/openpgp/test/PGPCompressionTest.cs

index 4a8df30e1..456cf1537 100644
--- a/crypto/test/src/openpgp/test/PGPCompressionTest.cs
+++ b/crypto/test/src/openpgp/test/PGPCompressionTest.cs
@@ -118,10 +118,5 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
 		{
 			get { return "PgpCompressionTest"; }
 		}
-
-		public static void Main(string[] args)
-		{
-			RunTest(new PgpCompressionTest());
-		}
 	}
 }
diff --git a/crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs b/crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs

index cd10a3ffe..1b1f5b6db 100644
--- a/crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs
+++ b/crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs
@@ -474,12 +474,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
 			get { return "PgpDsaElGamalTest"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new PgpDsaElGamalTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/openpgp/test/PGPDSATest.cs b/crypto/test/src/openpgp/test/PGPDSATest.cs

index b99fe2354..104f5d494 100644
--- a/crypto/test/src/openpgp/test/PGPDSATest.cs
+++ b/crypto/test/src/openpgp/test/PGPDSATest.cs
@@ -580,11 +580,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
 			get { return "PgpDsaTest"; }
         }
 
-		public static void Main(string[] args)
-        {
-			RunTest(new PgpDsaTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PGPNoPrivateKeyTest.cs b/crypto/test/src/openpgp/test/PGPNoPrivateKeyTest.cs

index 3006aeb3e..be93d3d64 100644
--- a/crypto/test/src/openpgp/test/PGPNoPrivateKeyTest.cs
+++ b/crypto/test/src/openpgp/test/PGPNoPrivateKeyTest.cs
@@ -151,11 +151,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             get { return "PgpNoPrivateKeyTest"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new PgpNoPrivateKeyTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PGPPBETest.cs b/crypto/test/src/openpgp/test/PGPPBETest.cs

index 43016465e..df40e1ef2 100644
--- a/crypto/test/src/openpgp/test/PGPPBETest.cs
+++ b/crypto/test/src/openpgp/test/PGPPBETest.cs
@@ -367,11 +367,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
 			get { return "PgpPbeTest"; }
         }
 
-		public static void Main(string[] args)
-        {
-			RunTest(new PgpPbeTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PGPPacketTest.cs b/crypto/test/src/openpgp/test/PGPPacketTest.cs

index 9c5e8239f..f2b523d04 100644
--- a/crypto/test/src/openpgp/test/PGPPacketTest.cs
+++ b/crypto/test/src/openpgp/test/PGPPacketTest.cs
@@ -63,11 +63,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
 			get { return "PgpPacketTest"; }
         }
 
-		public static void Main(string[] args)
-        {
-			RunTest(new PgpPacketTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PGPRSATest.cs b/crypto/test/src/openpgp/test/PGPRSATest.cs

index 250fe6143..534fb8c5d 100644
--- a/crypto/test/src/openpgp/test/PGPRSATest.cs
+++ b/crypto/test/src/openpgp/test/PGPRSATest.cs
@@ -1215,11 +1215,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             get { return "PgpRsaTest"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new PgpRsaTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PGPSignatureTest.cs b/crypto/test/src/openpgp/test/PGPSignatureTest.cs

index b836fe236..e43eb5d8a 100644
--- a/crypto/test/src/openpgp/test/PGPSignatureTest.cs
+++ b/crypto/test/src/openpgp/test/PGPSignatureTest.cs
@@ -1069,11 +1069,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             get { return "PgpSignatureTest"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new PgpSignatureTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PgpECDHTest.cs b/crypto/test/src/openpgp/test/PgpECDHTest.cs

index 94ab2a755..711d917a7 100644
--- a/crypto/test/src/openpgp/test/PgpECDHTest.cs
+++ b/crypto/test/src/openpgp/test/PgpECDHTest.cs
@@ -261,11 +261,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             get { return "PgpECDHTest"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new PgpECDHTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PgpECDsaTest.cs b/crypto/test/src/openpgp/test/PgpECDsaTest.cs

index c06532080..35e9a2332 100644
--- a/crypto/test/src/openpgp/test/PgpECDsaTest.cs
+++ b/crypto/test/src/openpgp/test/PgpECDsaTest.cs
@@ -188,11 +188,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             get { return "PgpECDsaTest"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new PgpECDsaTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PgpECMessageTest.cs b/crypto/test/src/openpgp/test/PgpECMessageTest.cs

index 8f6111c9b..0d3cb3325 100644
--- a/crypto/test/src/openpgp/test/PgpECMessageTest.cs
+++ b/crypto/test/src/openpgp/test/PgpECMessageTest.cs
@@ -179,11 +179,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             get { return "PgpECMessageTest"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new PgpECMessageTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PgpFeaturesTest.cs b/crypto/test/src/openpgp/test/PgpFeaturesTest.cs

index 162c3f093..57f6052e9 100644
--- a/crypto/test/src/openpgp/test/PgpFeaturesTest.cs
+++ b/crypto/test/src/openpgp/test/PgpFeaturesTest.cs
@@ -43,11 +43,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             get { return "PgpFeaturesTest"; }
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new PgpFeaturesTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PgpKeyRingTest.cs b/crypto/test/src/openpgp/test/PgpKeyRingTest.cs

index 765b54392..efc47f881 100644
--- a/crypto/test/src/openpgp/test/PgpKeyRingTest.cs
+++ b/crypto/test/src/openpgp/test/PgpKeyRingTest.cs
@@ -2643,10 +2643,5 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
         {
             get { return "PgpKeyRingTest"; }
         }
-
-        public static void Main(string[] args)
-        {
-            RunTest(new PgpKeyRingTest());
-        }
     }
 }
diff --git a/crypto/test/src/openpgp/test/PgpMarkerTest.cs b/crypto/test/src/openpgp/test/PgpMarkerTest.cs

index 929be6d73..5a9e5d1cd 100644
--- a/crypto/test/src/openpgp/test/PgpMarkerTest.cs
+++ b/crypto/test/src/openpgp/test/PgpMarkerTest.cs
@@ -84,11 +84,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
 			get { return "PgpMarkerTest"; }
         }
 
-		public static void Main(string[] args)
-        {
-            RunTest(new PgpMarkerTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PgpParsingTest.cs b/crypto/test/src/openpgp/test/PgpParsingTest.cs

index 6a5688484..a9618f659 100644
--- a/crypto/test/src/openpgp/test/PgpParsingTest.cs
+++ b/crypto/test/src/openpgp/test/PgpParsingTest.cs
@@ -23,11 +23,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
 			get { return "PgpParsingTest"; }
 		}
 
-        public static void Main(string[] args)
-		{
-			RunTest(new PgpParsingTest());
-		}
-
         [Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/openpgp/test/PgpSignatureInvalidVersionIgnoredTest.cs b/crypto/test/src/openpgp/test/PgpSignatureInvalidVersionIgnoredTest.cs

index 873ddf147..1cd1385ba 100644
--- a/crypto/test/src/openpgp/test/PgpSignatureInvalidVersionIgnoredTest.cs
+++ b/crypto/test/src/openpgp/test/PgpSignatureInvalidVersionIgnoredTest.cs
@@ -84,11 +84,6 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             AssertInvalidSignatureVersionIsIgnored(SIG23SIG4);
         }
 
-        public static void Main(string[] args)
-        {
-            RunTest(new PgpSignatureInvalidVersionIgnoredTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openpgp/test/PgpUnicodeTest.cs b/crypto/test/src/openpgp/test/PgpUnicodeTest.cs

index afc0d1cbc..c5d983149 100644
--- a/crypto/test/src/openpgp/test/PgpUnicodeTest.cs
+++ b/crypto/test/src/openpgp/test/PgpUnicodeTest.cs
@@ -134,10 +134,5 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             TestCyrillicPassphrase();
             TestUmlautPassphrase();
         }
-
-        public static void Main(string[] args)
-        {
-            RunTest(new PgpUnicodeTest());
-        }
     }
 }
diff --git a/crypto/test/src/openpgp/test/RegressionTest.cs b/crypto/test/src/openpgp/test/RegressionTest.cs

index a6a7edf5f..65c40b3f9 100644
--- a/crypto/test/src/openpgp/test/RegressionTest.cs
+++ b/crypto/test/src/openpgp/test/RegressionTest.cs
@@ -29,13 +29,5 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
             new PgpSignatureInvalidVersionIgnoredTest(),
             new PgpSignatureTest(),
         };
-
-        public static void Main(string[] args)
-        {
-            foreach (ITest test in tests)
-            {
-                SimpleTest.RunTest(test);
-            }
-        }
     }
 }
diff --git a/crypto/test/src/openssl/test/AllTests.cs b/crypto/test/src/openssl/test/AllTests.cs

index 1d528b27b..a4dd890b8 100644
--- a/crypto/test/src/openssl/test/AllTests.cs
+++ b/crypto/test/src/openssl/test/AllTests.cs
@@ -36,11 +36,6 @@ namespace Org.BouncyCastle.OpenSsl.Tests
 		}
 
 #if !LIB
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
         public static TestSuite Suite
         {
diff --git a/crypto/test/src/openssl/test/ReaderTest.cs b/crypto/test/src/openssl/test/ReaderTest.cs

index 6dd78ff93..78b06abc2 100644
--- a/crypto/test/src/openssl/test/ReaderTest.cs
+++ b/crypto/test/src/openssl/test/ReaderTest.cs
@@ -362,12 +362,6 @@ namespace Org.BouncyCastle.OpenSsl.Tests
             return new PemReader(tr, pGet);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new ReaderTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/openssl/test/WriterTest.cs b/crypto/test/src/openssl/test/WriterTest.cs

index 0d7887771..833a3d145 100644
--- a/crypto/test/src/openssl/test/WriterTest.cs
+++ b/crypto/test/src/openssl/test/WriterTest.cs
@@ -168,12 +168,6 @@ namespace Org.BouncyCastle.OpenSsl.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new WriterTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/pkcs/test/EncryptedPrivateKeyInfoTest.cs b/crypto/test/src/pkcs/test/EncryptedPrivateKeyInfoTest.cs

index 23639b112..f3d966ef8 100644
--- a/crypto/test/src/pkcs/test/EncryptedPrivateKeyInfoTest.cs
+++ b/crypto/test/src/pkcs/test/EncryptedPrivateKeyInfoTest.cs
@@ -78,12 +78,6 @@ namespace Org.BouncyCastle.Pkcs.Tests
 			}
 		}
 
-		public static void Main(
-            string[] args)
-        {
-			RunTest(new EncryptedPrivateKeyInfoTest());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/pkcs/test/PKCS10Test.cs b/crypto/test/src/pkcs/test/PKCS10Test.cs

index c3bc4c948..9629bdd81 100644
--- a/crypto/test/src/pkcs/test/PKCS10Test.cs
+++ b/crypto/test/src/pkcs/test/PKCS10Test.cs
@@ -172,12 +172,6 @@ namespace Org.BouncyCastle.Pkcs.Tests
             }
         }
 
-        public static void Main(
-            string[] args)
-        {
-			RunTest(new Pkcs10Test());
-        }
-
 		[Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/pkcs/test/PKCS12StoreTest.cs b/crypto/test/src/pkcs/test/PKCS12StoreTest.cs

index 884fd7449..91233db46 100644
--- a/crypto/test/src/pkcs/test/PKCS12StoreTest.cs
+++ b/crypto/test/src/pkcs/test/PKCS12StoreTest.cs
@@ -1438,12 +1438,6 @@ namespace Org.BouncyCastle.Pkcs.Tests
 			DoTestLoadRepeatedLocalKeyID();
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Pkcs12StoreTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/AESSICTest.cs b/crypto/test/src/test/AESSICTest.cs

index f8de35efd..8558b09cb 100644
--- a/crypto/test/src/test/AESSICTest.cs
+++ b/crypto/test/src/test/AESSICTest.cs
@@ -130,12 +130,6 @@ namespace Org.BouncyCastle.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new AesSicTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/AESTest.cs b/crypto/test/src/test/AESTest.cs

index 5a1ce8046..a0545239e 100644
--- a/crypto/test/src/test/AESTest.cs
+++ b/crypto/test/src/test/AESTest.cs
@@ -353,11 +353,5 @@ namespace Org.BouncyCastle.Tests
 			TestCcm();
 			TestGcm();
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new AesTest());
-		}
 	}
 }
diff --git a/crypto/test/src/test/AttrCertSelectorTest.cs b/crypto/test/src/test/AttrCertSelectorTest.cs

index dfd4295e2..87cb049fc 100644
--- a/crypto/test/src/test/AttrCertSelectorTest.cs
+++ b/crypto/test/src/test/AttrCertSelectorTest.cs
@@ -204,11 +204,5 @@ namespace Org.BouncyCastle.Tests
 		{
 			TestSelector();
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new AttrCertSelectorTest());
-		}
 	}
 }
diff --git a/crypto/test/src/test/AttrCertTest.cs b/crypto/test/src/test/AttrCertTest.cs

index f57f67fad..3f80c3ddf 100644
--- a/crypto/test/src/test/AttrCertTest.cs
+++ b/crypto/test/src/test/AttrCertTest.cs
@@ -603,12 +603,6 @@ namespace Org.BouncyCastle.Tests
 			doTestGenerateWithPrincipal();
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new AttrCertTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/BlockCipherTest.cs b/crypto/test/src/test/BlockCipherTest.cs

index d14988940..ff6f45e74 100644
--- a/crypto/test/src/test/BlockCipherTest.cs
+++ b/crypto/test/src/test/BlockCipherTest.cs
@@ -1084,12 +1084,6 @@ namespace Org.BouncyCastle.Tests
             doTestExceptions();
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new BlockCipherTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/test/CMacTest.cs b/crypto/test/src/test/CMacTest.cs

index f80caca7d..b88b28487 100644
--- a/crypto/test/src/test/CMacTest.cs
+++ b/crypto/test/src/test/CMacTest.cs
@@ -260,11 +260,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "CMac"; }
 		}
 
-		public static void Main(string[] args)
-		{
-			RunTest(new CMacTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/CRL5Test.cs b/crypto/test/src/test/CRL5Test.cs

index ebd74af69..67ef26e72 100644
--- a/crypto/test/src/test/CRL5Test.cs
+++ b/crypto/test/src/test/CRL5Test.cs
@@ -247,11 +247,5 @@ namespace Org.BouncyCastle.Tests
 			TestIndirectCrl();
 			TestDirectCrl();
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Crl5Test());
-		}
 	}
 }
diff --git a/crypto/test/src/test/CamelliaTest.cs b/crypto/test/src/test/CamelliaTest.cs

index f8e3520a3..2a0400bfa 100644
--- a/crypto/test/src/test/CamelliaTest.cs
+++ b/crypto/test/src/test/CamelliaTest.cs
@@ -194,11 +194,5 @@ namespace Org.BouncyCastle.Tests
 			TestOids();
 			TestWrapOids();
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new CamelliaTest());
-		}
 	}
 }
diff --git a/crypto/test/src/test/CertPathBuilderTest.cs b/crypto/test/src/test/CertPathBuilderTest.cs

index e31bde866..8541096f1 100644
--- a/crypto/test/src/test/CertPathBuilderTest.cs
+++ b/crypto/test/src/test/CertPathBuilderTest.cs
@@ -146,12 +146,6 @@ namespace Org.BouncyCastle.Tests
             get { return "CertPathBuilder"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new CertPathBuilderTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/test/CertPathTest.cs b/crypto/test/src/test/CertPathTest.cs

index f1a7c94f6..357014e15 100644
--- a/crypto/test/src/test/CertPathTest.cs
+++ b/crypto/test/src/test/CertPathTest.cs
@@ -244,12 +244,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "CertPath"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new CertPathTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/CertPathValidatorTest.cs b/crypto/test/src/test/CertPathValidatorTest.cs

index 3f9ff57fa..972de6b04 100644
--- a/crypto/test/src/test/CertPathValidatorTest.cs
+++ b/crypto/test/src/test/CertPathValidatorTest.cs
@@ -281,12 +281,6 @@ namespace Org.BouncyCastle.Tests
             get { return "CertPathValidator"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new CertPathValidatorTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/test/CertTest.cs b/crypto/test/src/test/CertTest.cs

index e0f97a61f..eb1c62ae1 100644
--- a/crypto/test/src/test/CertTest.cs
+++ b/crypto/test/src/test/CertTest.cs
@@ -2597,12 +2597,6 @@ namespace Org.BouncyCastle.Tests
             checkCertificate(18, emptyDNCert);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new CertTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/test/CipherStreamTest.cs b/crypto/test/src/test/CipherStreamTest.cs

index 0809dfe80..f7115e254 100644
--- a/crypto/test/src/test/CipherStreamTest.cs
+++ b/crypto/test/src/test/CipherStreamTest.cs
@@ -439,11 +439,5 @@ namespace Org.BouncyCastle.Tests
 		{
 			get { return "CipherStreamTest"; }
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new CipherStreamTest());
-		}
 	}
 }
diff --git a/crypto/test/src/test/DESedeTest.cs b/crypto/test/src/test/DESedeTest.cs

index d84b994f0..04d8725ae 100644
--- a/crypto/test/src/test/DESedeTest.cs
+++ b/crypto/test/src/test/DESedeTest.cs
@@ -281,12 +281,6 @@ namespace Org.BouncyCastle.Tests
             wrapTest("TDEA", 1, kek1, iv1, in1, out1);
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new DesEdeTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/test/DHTest.cs b/crypto/test/src/test/DHTest.cs

index 3ed79ca84..7d36c53b1 100644
--- a/crypto/test/src/test/DHTest.cs
+++ b/crypto/test/src/test/DHTest.cs
@@ -715,11 +715,5 @@ namespace Org.BouncyCastle.Tests
             TestExceptions();
             TestSubgroupConfinement();
         }
-
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new DHTest());
-        }
     }
 }
diff --git a/crypto/test/src/test/DSATest.cs b/crypto/test/src/test/DSATest.cs

index 9ed1109e2..b4868c52f 100644
--- a/crypto/test/src/test/DSATest.cs
+++ b/crypto/test/src/test/DSATest.cs
@@ -819,12 +819,6 @@ namespace Org.BouncyCastle.Tests
             get { return "DSA/ECDSA"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new DsaTest());
-        }
-
         private class DsaTestSecureRandom
             : FixedSecureRandom
         {
diff --git a/crypto/test/src/test/DigestTest.cs b/crypto/test/src/test/DigestTest.cs

index 30834acb6..e2714efd4 100644
--- a/crypto/test/src/test/DigestTest.cs
+++ b/crypto/test/src/test/DigestTest.cs
@@ -216,12 +216,6 @@ namespace Org.BouncyCastle.Tests
             }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new DigestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/test/ECDSA5Test.cs b/crypto/test/src/test/ECDSA5Test.cs

index 3bf746edb..188482333 100644
--- a/crypto/test/src/test/ECDSA5Test.cs
+++ b/crypto/test/src/test/ECDSA5Test.cs
@@ -290,11 +290,5 @@ namespace Org.BouncyCastle.Tests
             TestECDsa239BitBinary();
             TestGeneration();
         }
-
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new ECDsa5Test());
-        }
     }
 }
diff --git a/crypto/test/src/test/ECEncodingTest.cs b/crypto/test/src/test/ECEncodingTest.cs

index ff9fb7aa2..349bf72ea 100644
--- a/crypto/test/src/test/ECEncodingTest.cs
+++ b/crypto/test/src/test/ECEncodingTest.cs
@@ -224,12 +224,6 @@ namespace Org.BouncyCastle.Tests
 				key.Parameters);
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new ECEncodingTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/ECNRTest.cs b/crypto/test/src/test/ECNRTest.cs

index 8a24443c2..12b9f0f66 100644
--- a/crypto/test/src/test/ECNRTest.cs
+++ b/crypto/test/src/test/ECNRTest.cs
@@ -194,11 +194,5 @@ namespace Org.BouncyCastle.Tests
             TestECNR239bitPrime();
             TestECNR521bitPrime();
         }
-
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new ECNRTest());
-        }
     }
 }
diff --git a/crypto/test/src/test/ElGamalTest.cs b/crypto/test/src/test/ElGamalTest.cs

index 9a87ea9b1..293c0c37e 100644
--- a/crypto/test/src/test/ElGamalTest.cs
+++ b/crypto/test/src/test/ElGamalTest.cs
@@ -324,11 +324,5 @@ namespace Org.BouncyCastle.Tests
 			TestGP1024();
 			TestRandom256();
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new ElGamalTest());
-		}
 	}
 }
diff --git a/crypto/test/src/test/EncryptedPrivateKeyInfoTest.cs b/crypto/test/src/test/EncryptedPrivateKeyInfoTest.cs

index baac5ff7f..3e781c417 100644
--- a/crypto/test/src/test/EncryptedPrivateKeyInfoTest.cs
+++ b/crypto/test/src/test/EncryptedPrivateKeyInfoTest.cs
@@ -137,12 +137,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "EncryptedPrivateKeyInfoTest"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new EncryptedPrivateKeyInfoTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/FIPSDESTest.cs b/crypto/test/src/test/FIPSDESTest.cs

index 1f40e1591..5ad220628 100644
--- a/crypto/test/src/test/FIPSDESTest.cs
+++ b/crypto/test/src/test/FIPSDESTest.cs
@@ -185,15 +185,6 @@ namespace Org.BouncyCastle.Tests
 			return new SimpleTestResult(true, Name + ": Okay");
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new FipsDesTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/GOST28147Test.cs b/crypto/test/src/test/GOST28147Test.cs

index 0adfad334..9aad1b48f 100644
--- a/crypto/test/src/test/GOST28147Test.cs
+++ b/crypto/test/src/test/GOST28147Test.cs
@@ -228,12 +228,6 @@ namespace Org.BouncyCastle.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new Gost28147Test());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/GOST3410Test.cs b/crypto/test/src/test/GOST3410Test.cs

index fc439c4ee..3addc22db 100644
--- a/crypto/test/src/test/GOST3410Test.cs
+++ b/crypto/test/src/test/GOST3410Test.cs
@@ -366,12 +366,6 @@ namespace Org.BouncyCastle.Tests
             parametersTest();
         }
 
-        public static void Main(
-            string[]	args)
-        {
-            RunTest(new Gost3410Test());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/test/HMacTest.cs b/crypto/test/src/test/HMacTest.cs

index 4a018ac50..3d6f721ba 100644
--- a/crypto/test/src/test/HMacTest.cs
+++ b/crypto/test/src/test/HMacTest.cs
@@ -244,12 +244,6 @@ namespace Org.BouncyCastle.Tests
             get { return "HMac"; }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new HMacTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/test/IESTest.cs b/crypto/test/src/test/IESTest.cs

index 99aacc66d..50c7f1769 100644
--- a/crypto/test/src/test/IESTest.cs
+++ b/crypto/test/src/test/IESTest.cs
@@ -221,12 +221,6 @@ namespace Org.BouncyCastle.Tests
 //			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new IesTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/MacTest.cs b/crypto/test/src/test/MacTest.cs

index d4b3188bd..c6c5514b3 100644
--- a/crypto/test/src/test/MacTest.cs
+++ b/crypto/test/src/test/MacTest.cs
@@ -199,12 +199,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "Mac"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new MacTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/MqvTest.cs b/crypto/test/src/test/MqvTest.cs

index b26d5619b..73348f3fb 100644
--- a/crypto/test/src/test/MqvTest.cs
+++ b/crypto/test/src/test/MqvTest.cs
@@ -76,11 +76,5 @@ namespace Org.BouncyCastle.Tests
 				Fail("Agreement failed");
 			}
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new MqvTest());
-		}
 	}
 }
diff --git a/crypto/test/src/test/NamedCurveTest.cs b/crypto/test/src/test/NamedCurveTest.cs

index 560af7563..c5c3ca74e 100644
--- a/crypto/test/src/test/NamedCurveTest.cs
+++ b/crypto/test/src/test/NamedCurveTest.cs
@@ -389,12 +389,6 @@ namespace Org.BouncyCastle.Tests
             }
         }
 
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new NamedCurveTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/test/NistCertPathTest.cs b/crypto/test/src/test/NistCertPathTest.cs

index 0f42e24d0..5e68a0dea 100644
--- a/crypto/test/src/test/NistCertPathTest.cs
+++ b/crypto/test/src/test/NistCertPathTest.cs
@@ -5175,12 +5175,6 @@ namespace Org.BouncyCastle.Tests
 			End_Certificate_RL_09_01_crt
 		};
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new NistCertPathTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/NoekeonTest.cs b/crypto/test/src/test/NoekeonTest.cs

index c3745da1c..728ad45df 100644
--- a/crypto/test/src/test/NoekeonTest.cs
+++ b/crypto/test/src/test/NoekeonTest.cs
@@ -140,12 +140,6 @@ namespace Org.BouncyCastle.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new NoekeonTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/PBETest.cs b/crypto/test/src/test/PBETest.cs

index ee61a027c..1bef6d59d 100644
--- a/crypto/test/src/test/PBETest.cs
+++ b/crypto/test/src/test/PBETest.cs
@@ -510,12 +510,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "PbeTest"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new PbeTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/PKCS10CertRequestTest.cs b/crypto/test/src/test/PKCS10CertRequestTest.cs

index 8d040474e..b9ac59e66 100644
--- a/crypto/test/src/test/PKCS10CertRequestTest.cs
+++ b/crypto/test/src/test/PKCS10CertRequestTest.cs
@@ -445,16 +445,6 @@ namespace Org.BouncyCastle.Tests
             nullPointerTest();
         }
 
-
-
-     
-
-        public static void Main(
-            string[] args)
-        {
-            RunTest(new Pkcs10CertRequestTest());
-        }
-
         [Test]
         public void TestFunction()
         {
diff --git a/crypto/test/src/test/PSSTest.cs b/crypto/test/src/test/PSSTest.cs

index 677289e7c..ab8f0f690 100644
--- a/crypto/test/src/test/PSSTest.cs
+++ b/crypto/test/src/test/PSSTest.cs
@@ -236,12 +236,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "PSS"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new PssTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/PkixNameConstraintsTest.cs b/crypto/test/src/test/PkixNameConstraintsTest.cs

index 65f39dcd2..0d229a8cb 100644
--- a/crypto/test/src/test/PkixNameConstraintsTest.cs
+++ b/crypto/test/src/test/PkixNameConstraintsTest.cs
@@ -459,12 +459,6 @@ namespace Org.BouncyCastle.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new PkixNameConstraintsTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/PkixPolicyMappingTest.cs b/crypto/test/src/test/PkixPolicyMappingTest.cs

index 24fe4e006..4ccc008cc 100644
--- a/crypto/test/src/test/PkixPolicyMappingTest.cs
+++ b/crypto/test/src/test/PkixPolicyMappingTest.cs
@@ -397,12 +397,6 @@ namespace Org.BouncyCastle.Tests
 			}
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new PkixPolicyMappingTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/PkixTest.cs b/crypto/test/src/test/PkixTest.cs

index 904f8af0c..554d4c64f 100644
--- a/crypto/test/src/test/PkixTest.cs
+++ b/crypto/test/src/test/PkixTest.cs
@@ -231,12 +231,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "PkixTest"; }
         }
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new PkixTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/RSATest.cs b/crypto/test/src/test/RSATest.cs

index a765ff138..267472d91 100644
--- a/crypto/test/src/test/RSATest.cs
+++ b/crypto/test/src/test/RSATest.cs
@@ -665,15 +665,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "RSATest"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new RsaTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/RegressionTest.cs b/crypto/test/src/test/RegressionTest.cs

index 0629b3864..618f8f483 100644
--- a/crypto/test/src/test/RegressionTest.cs
+++ b/crypto/test/src/test/RegressionTest.cs
@@ -67,16 +67,5 @@ namespace Org.BouncyCastle.Tests
             new SM4Test(),
             new KdfCounterTest()
 		};
-
-		public static void Main(
-            string[] args)
-        {
-            for (int i = 0; i != tests.Length; i++)
-            {
-                ITestResult result = tests[i].Perform();
-
-				Console.WriteLine(result);
-            }
-		}
     }
 }
diff --git a/crypto/test/src/test/SEEDTest.cs b/crypto/test/src/test/SEEDTest.cs

index 2b380d5b7..8faa80e0d 100644
--- a/crypto/test/src/test/SEEDTest.cs
+++ b/crypto/test/src/test/SEEDTest.cs
@@ -180,11 +180,5 @@ namespace Org.BouncyCastle.Tests
 			TestOids();
 			TestWrapOids();
 		}
-
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new SeedTest());
-		}
 	}
 }
diff --git a/crypto/test/src/test/SM4Test.cs b/crypto/test/src/test/SM4Test.cs

index 5d36b3431..c4e1361bb 100644
--- a/crypto/test/src/test/SM4Test.cs
+++ b/crypto/test/src/test/SM4Test.cs
@@ -140,10 +140,5 @@ namespace Org.BouncyCastle.Tests
                     Hex.Decode(cipherTests[i + 3]));
             }
         }
-
-        public static void Main(string[] args)
-        {
-            RunTest(new SM4Test());
-        }
     }
 }
diff --git a/crypto/test/src/test/SigTest.cs b/crypto/test/src/test/SigTest.cs

index 803a24493..cb748e118 100644
--- a/crypto/test/src/test/SigTest.cs
+++ b/crypto/test/src/test/SigTest.cs
@@ -361,12 +361,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "SigTest"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new SigTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/WrapTest.cs b/crypto/test/src/test/WrapTest.cs

index bb49446e7..2222165a7 100644
--- a/crypto/test/src/test/WrapTest.cs
+++ b/crypto/test/src/test/WrapTest.cs
@@ -74,15 +74,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "WrapTest"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			ITest test = new WrapTest();
-			ITestResult result = test.Perform();
-
-			Console.WriteLine(result);
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/X509CertificatePairTest.cs b/crypto/test/src/test/X509CertificatePairTest.cs

index a83de4cf0..ac6966150 100644
--- a/crypto/test/src/test/X509CertificatePairTest.cs
+++ b/crypto/test/src/test/X509CertificatePairTest.cs
@@ -132,12 +132,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "X509CertificatePair"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new X509CertificatePairTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/test/X509StoreTest.cs b/crypto/test/src/test/X509StoreTest.cs

index 37673b8b4..4fa3402ee 100644
--- a/crypto/test/src/test/X509StoreTest.cs
+++ b/crypto/test/src/test/X509StoreTest.cs
@@ -318,12 +318,6 @@ namespace Org.BouncyCastle.Tests
 			get { return "IX509Store"; }
 		}
 
-		public static void Main(
-			string[] args)
-		{
-			RunTest(new X509StoreTest());
-		}
-
 		[Test]
 		public void TestFunction()
 		{
diff --git a/crypto/test/src/tsp/test/AllTests.cs b/crypto/test/src/tsp/test/AllTests.cs

index 58d096d54..3733c3adc 100644
--- a/crypto/test/src/tsp/test/AllTests.cs
+++ b/crypto/test/src/tsp/test/AllTests.cs
@@ -4,17 +4,10 @@ using System;
 using NUnit.Core;
 using NUnit.Framework;
 
-using Org.BouncyCastle.Utilities.Test;
-
 namespace Org.BouncyCastle.Tsp.Tests
 {
     public class AllTests
     {
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
         public static TestSuite Suite
         {
diff --git a/crypto/test/src/util/io/pem/test/AllTests.cs b/crypto/test/src/util/io/pem/test/AllTests.cs

index 2eea7221c..b6d1ef2f3 100644
--- a/crypto/test/src/util/io/pem/test/AllTests.cs
+++ b/crypto/test/src/util/io/pem/test/AllTests.cs
@@ -1,32 +1,18 @@
 using System;
 using System.Collections;
-using System.Collections.Specialized;
 using System.IO;
-using System.Text;
 
 #if !LIB
 using NUnit.Core;
 #endif
 using NUnit.Framework;
 
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Generators;
-using Org.BouncyCastle.Crypto.Parameters;
-using Org.BouncyCastle.Security;
-using Org.BouncyCastle.Utilities.Collections;
-using Org.BouncyCastle.Utilities.Test;
-
 namespace Org.BouncyCastle.Utilities.IO.Pem.Tests
 {
 	[TestFixture]
 	public class AllTests
 	{
 #if !LIB
-        public static void Main(string[] args)
-        {
-            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
-        }
-
         [Suite]
         public static TestSuite Suite
         {
diff --git a/crypto/test/src/x509/test/TestCertificateGen.cs b/crypto/test/src/x509/test/TestCertificateGen.cs

index 33ddc26c0..2a6b91d94 100644
--- a/crypto/test/src/x509/test/TestCertificateGen.cs
+++ b/crypto/test/src/x509/test/TestCertificateGen.cs
@@ -718,11 +718,6 @@ namespace Org.BouncyCastle.X509.Tests
 			}
 		}
 
-        public static void Main(string[] args)
-        {
-            RunTest(new TestCertificateGen());
-        }
-
         public override void PerformTest()
         {
             TestCreationRSA();