You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2021/12/22 13:54:04 UTC

[lucenenet] 01/02: SWEEP: Removed TESTFRAMEWORK_MSTEST, TESTFRAMEWORK_NUNIT, TESTFRAMEWORK_XUNIT, FEATURE_INSTANCE_TESTDATA_INITIALIZATION, and FEATURE_INSTANCE_CODEC_IMPERSONATION compilation options

This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git

commit d3cf3de078d79f5c8f5669a3115a2e2ca2125697
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Dec 22 18:54:54 2021 +0700

    SWEEP: Removed TESTFRAMEWORK_MSTEST, TESTFRAMEWORK_NUNIT, TESTFRAMEWORK_XUNIT, FEATURE_INSTANCE_TESTDATA_INITIALIZATION, and FEATURE_INSTANCE_CODEC_IMPERSONATION compilation options
---
 .../Analysis/BaseTokenStreamTestCase.cs            |  77 +--
 .../Analysis/CollationTestBase.cs                  |   9 -
 .../BaseCompressingDocValuesFormatTestCase.cs      |  19 +-
 .../Index/BaseDocValuesFormatTestCase.cs           | 101 +---
 .../Index/BaseIndexFileFormatTestCase.cs           |  21 +-
 .../Index/BaseMergePolicyTestCase.cs               |  17 -
 .../Index/BasePostingsFormatTestCase.cs            |  67 +--
 .../Index/BaseStoredFieldsFormatTestCase.cs        |  34 +-
 .../Index/BaseTermVectorsFormatTestCase.cs         |  64 +--
 .../Index/RandomIndexWriter.cs                     |  55 --
 .../Index/ThreadedIndexingAndSearchingTestCase.cs  |  15 +-
 .../Lucene.Net.TestFramework.csproj                |   2 -
 src/Lucene.Net.TestFramework/Search/CheckHits.cs   |  57 +--
 src/Lucene.Net.TestFramework/Search/QueryUtils.cs  | 157 +-----
 .../Search/SearchEquivalenceTestBase.cs            |  58 +--
 .../Search/ShardSearchingTestBase.cs               |  10 -
 .../Store/BaseDirectoryTestCase.cs                 |  24 +-
 .../Support/ApiScanTestBase.cs                     |   9 -
 .../Support/Attributes/DeadlockAttribute.cs        |   6 +-
 .../Attributes/LuceneNetSpecificAttribute.cs       |   6 +-
 .../Configuration/TestConfigurationFactory.cs      |   7 +-
 .../Util/BaseDocIdSetTestCase.cs                   |  23 +-
 .../Util/LuceneTestCase.cs                         | 566 +--------------------
 .../Util/TestRuleSetupAndRestoreClassEnv.cs        |  10 -
 src/Lucene.Net.TestFramework/Util/TestUtil.cs      |  12 -
 .../Collation/TestICUCollationDocValuesField.cs    |  12 +-
 .../ClassificationTestBase.cs                      |   6 +-
 .../Utils/DataSplitterTest.cs                      |   6 +-
 .../TestDemoExpressions.cs                         |   6 +-
 .../TestExpressionRescorer.cs                      |   6 +-
 .../TestExpressionSorts.cs                         |   6 +-
 .../Range/TestRangeFacetCounts.cs                  |  66 +--
 .../SortedSet/TestSortedSetDocValuesFacets.cs      |  36 +-
 .../Taxonomy/TestTaxonomyFacetAssociations.cs      |  24 +-
 .../Taxonomy/TestTaxonomyFacetCounts.cs            |  54 +-
 .../Taxonomy/TestTaxonomyFacetSumValueSource.cs    |  24 +-
 src/Lucene.Net.Tests.Facet/TestDrillSideways.cs    |  24 +-
 .../TestRandomSamplingFacetsCollector.cs           |   6 +-
 .../Highlight/TokenSourcesTest.cs                  |   6 +-
 .../PostingsHighlight/TestPostingsHighlighter.cs   |  24 +-
 .../TestPostingsHighlighterRanking.cs              |   6 +-
 src/Lucene.Net.Tests.Join/Support/TestBlockJoin.cs |  84 +--
 src/Lucene.Net.Tests.Join/TestBlockJoin.cs         |  84 +--
 src/Lucene.Net.Tests.Queries/BooleanFilterTest.cs  |   6 +-
 src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs  |  12 +-
 .../CommonTermsQueryTest.cs                        |  30 +-
 .../Function/TestBoostedQuery.cs                   |   6 +-
 .../Function/TestFieldScoreQuery.cs                |   6 +-
 .../Function/TestLongNormValueSource.cs            |   6 +-
 .../Function/TestOrdValues.cs                      |   6 +-
 .../Function/TestValueSources.cs                   |   6 +-
 .../Mlt/TestMoreLikeThis.cs                        |  12 +-
 src/Lucene.Net.Tests.Queries/TermFilterTest.cs     |  12 +-
 src/Lucene.Net.Tests.Queries/TermsFilterTest.cs    |  36 +-
 .../TestCustomScoreQuery.cs                        |  30 +-
 .../Analyzing/TestAnalyzingQueryParser.cs          |   6 +-
 .../Queries/TestSlowFuzzyQuery.cs                  |  54 +-
 .../Queries/TestSortedSetSortField.cs              |  30 +-
 .../Queries/TestSortedSetSortFieldDocValues.cs     |  30 +-
 .../Queries/TestSortedSetSortFieldSelectors.cs     |  90 +---
 .../Spell/TestDirectSpellChecker.cs                |  36 +-
 .../Spell/TestWordBreakSpellChecker.cs             |  12 +-
 .../Analysis/TestLookaheadTokenFilter.cs           |  25 +-
 .../Analysis/TestMockAnalyzer.cs                   |  27 +-
 .../Analysis/TestMockCharFilter.cs                 |  24 -
 .../Asserting/TestAssertingDocValuesFormat.cs      |  29 --
 .../Codecs/Asserting/TestAssertingNormsFormat.cs   |  27 -
 .../Asserting/TestAssertingPostingsFormat.cs       |  29 --
 .../Asserting/TestAssertingStoredFieldsFormat.cs   |  26 -
 .../Asserting/TestAssertingTermVectorsFormat.cs    |  26 -
 .../TestCompressingStoredFieldsFormat.cs           |   3 -
 .../Store/TestMockDirectoryWrapper.cs              |  41 --
 .../Support/TestApiConsistency.cs                  |   6 +-
 .../Analysis/TestCachingTokenFilter.cs             |   8 +-
 src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs  |   6 +-
 .../TestCompressingTermVectorsFormat.cs            |   6 +-
 .../Document/TestBinaryDocument.cs                 |  14 +-
 src/Lucene.Net.Tests/Document/TestDocument.cs      |  30 +-
 src/Lucene.Net.Tests/Index/TestAddIndexes.cs       |  42 +-
 .../Index/TestBackwardsCompatibility.cs            |   6 +-
 .../Index/TestBackwardsCompatibility3x.cs          |   6 +-
 src/Lucene.Net.Tests/Index/TestBinaryTerms.cs      |   8 +-
 .../Index/TestCodecHoldsOpenFiles.cs               |  12 +-
 src/Lucene.Net.Tests/Index/TestCompoundFile.cs     |   6 +-
 src/Lucene.Net.Tests/Index/TestCrash.cs            |  18 +-
 src/Lucene.Net.Tests/Index/TestDirectoryReader.cs  |   6 +-
 .../Index/TestDirectoryReaderReopen.cs             |   6 +-
 src/Lucene.Net.Tests/Index/TestDocCount.cs         |   6 +-
 .../Index/TestDocValuesIndexing.cs                 |  36 +-
 .../Index/TestDocValuesWithThreads.cs              |   6 +-
 src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs |  12 +-
 src/Lucene.Net.Tests/Index/TestIndexWriter.cs      |  48 +-
 .../Index/TestIndexWriterDelete.cs                 |  12 +-
 .../Index/TestIndexWriterExceptions.cs             |  12 +-
 .../Index/TestIndexWriterReader.cs                 |  12 +-
 .../Index/TestIndexWriterUnicode.cs                |   6 +-
 .../Index/TestIndexWriterWithThreads.cs            |  40 +-
 src/Lucene.Net.Tests/Index/TestIndexableField.cs   |   8 +-
 src/Lucene.Net.Tests/Index/TestIsCurrent.cs        |   8 +-
 src/Lucene.Net.Tests/Index/TestOmitPositions.cs    |  12 +-
 src/Lucene.Net.Tests/Index/TestPayloads.cs         |  18 +-
 .../Index/TestPayloadsOnVectors.cs                 |  12 +-
 src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs  |   6 +-
 src/Lucene.Net.Tests/Index/TestRollback.cs         |   8 +-
 .../Index/TestSameTokenSamePosition.cs             |  14 +-
 src/Lucene.Net.Tests/Index/TestStressAdvance.cs    |   6 +-
 src/Lucene.Net.Tests/Index/TestStressIndexing.cs   |   6 +-
 src/Lucene.Net.Tests/Index/TestStressNRT.cs        |   6 +-
 src/Lucene.Net.Tests/Index/TestSumDocFreq.cs       |   8 +-
 .../Index/TestTermVectorsReader.cs                 |   6 +-
 src/Lucene.Net.Tests/Index/TestTermsEnum.cs        |  18 +-
 src/Lucene.Net.Tests/Index/TestTransactions.cs     |  12 +-
 .../Search/Payloads/PayloadHelper.cs               |   8 +-
 .../Search/Payloads/TestPayloadTermQuery.cs        |   8 +-
 .../Search/Similarities/TestSimilarity2.cs         |  42 +-
 .../Search/Similarities/TestSimilarityBase.cs      |   6 +-
 src/Lucene.Net.Tests/Search/Spans/TestBasics.cs    |   6 +-
 .../Search/Spans/TestFieldMaskingSpanQuery.cs      |   8 +-
 .../Search/Spans/TestNearSpansOrdered.cs           |   8 +-
 .../Search/Spans/TestSpanFirstQuery.cs             |   8 +-
 .../Search/Spans/TestSpanMultiTermQueryWrapper.cs  |   8 +-
 src/Lucene.Net.Tests/Search/Spans/TestSpans.cs     |   8 +-
 .../Search/Spans/TestSpansAdvanced.cs              |   8 +-
 src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs  |   6 +-
 .../Search/TestAutomatonQueryUnicode.cs            |   8 +-
 src/Lucene.Net.Tests/Search/TestBoolean2.cs        |  18 +-
 .../Search/TestBooleanMinShouldMatch.cs            |  24 +-
 src/Lucene.Net.Tests/Search/TestBooleanOr.cs       |  12 +-
 src/Lucene.Net.Tests/Search/TestBooleanQuery.cs    |  30 +-
 src/Lucene.Net.Tests/Search/TestBooleanScorer.cs   |  24 +-
 .../Search/TestCachingWrapperFilter.cs             |  56 +-
 .../Search/TestConstantScoreQuery.cs               |  20 +-
 .../Search/TestControlledRealTimeReopenThread.cs   |  12 +-
 .../Search/TestCustomSearcherSort.cs               |   6 +-
 src/Lucene.Net.Tests/Search/TestDateFilter.cs      |  12 +-
 src/Lucene.Net.Tests/Search/TestDateSort.cs        |   6 +-
 .../Search/TestDisjunctionMaxQuery.cs              |  72 +--
 src/Lucene.Net.Tests/Search/TestDocIdSet.cs        |  12 +-
 .../Search/TestDocValuesScoring.cs                 |  56 +-
 .../Search/TestEarlyTermination.cs                 |   6 +-
 src/Lucene.Net.Tests/Search/TestExplanations.cs    |   8 +-
 src/Lucene.Net.Tests/Search/TestFieldCache.cs      |  12 +-
 .../Search/TestFieldCacheTermsFilter.cs            |   6 +-
 src/Lucene.Net.Tests/Search/TestFilteredQuery.cs   |  66 +--
 src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs      |  42 +-
 src/Lucene.Net.Tests/Search/TestIndexSearcher.cs   |  12 +-
 src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs |   6 +-
 .../Search/TestMultiPhraseQuery.cs                 |  54 +-
 .../Search/TestMultiTermQueryRewrites.cs           |  18 +-
 .../Search/TestNGramPhraseQuery.cs                 |   8 +-
 src/Lucene.Net.Tests/Search/TestNot.cs             |   8 +-
 .../Search/TestPhrasePrefixQuery.cs                |   8 +-
 src/Lucene.Net.Tests/Search/TestPhraseQuery.cs     | 192 ++-----
 .../Search/TestPositionIncrement.cs                |  14 +-
 .../Search/TestPositiveScoresOnlyCollector.cs      |   8 +-
 src/Lucene.Net.Tests/Search/TestPrefixFilter.cs    |   8 +-
 .../Search/TestPrefixInBooleanQuery.cs             |   8 +-
 src/Lucene.Net.Tests/Search/TestPrefixQuery.cs     |   8 +-
 src/Lucene.Net.Tests/Search/TestQueryRescorer.cs   |  30 +-
 .../Search/TestQueryWrapperFilter.cs               |  20 +-
 src/Lucene.Net.Tests/Search/TestRegexpQuery.cs     |   8 +-
 .../Search/TestSameScoresWithThreads.cs            |   6 +-
 .../Search/TestScoreCachingWrappingScorer.cs       |   8 +-
 src/Lucene.Net.Tests/Search/TestSearchAfter.cs     |   6 +-
 .../Search/TestSearchWithThreads.cs                |   6 +-
 src/Lucene.Net.Tests/Search/TestSearcherManager.cs |  18 +-
 .../Search/TestSloppyPhraseQuery.cs                |  32 +-
 src/Lucene.Net.Tests/Search/TestSort.cs            | 300 ++---------
 src/Lucene.Net.Tests/Search/TestSortDocValues.cs   | 168 +-----
 src/Lucene.Net.Tests/Search/TestSortRandom.cs      |  12 +-
 src/Lucene.Net.Tests/Search/TestSortRescorer.cs    |  12 +-
 .../Search/TestTopDocsCollector.cs                 |   8 +-
 src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs    |   6 +-
 .../Search/TestTopFieldCollector.cs                |   8 +-
 .../Search/TestTopScoreDocCollector.cs             |   8 +-
 .../Search/TestTotalHitCountCollector.cs           |   8 +-
 src/Lucene.Net.Tests/Search/TestWildcard.cs        |   8 +-
 src/Lucene.Net.Tests/Store/TestLockFactory.cs      |   6 +-
 src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs      |   2 -
 .../TestICUPostingsHighlighter.cs                  |  24 +-
 .../TestICUPostingsHighlighterRanking.cs           |   6 +-
 181 files changed, 627 insertions(+), 4174 deletions(-)

diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
index 0311b7f..3a7b7ae 100644
--- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
@@ -98,30 +98,7 @@ namespace Lucene.Net.Analysis
     // LUCENENET specific - Specify to unzip the line file docs
     [UseTempLineDocsFile]
     public abstract class BaseTokenStreamTestCase : LuceneTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public BaseTokenStreamTestCase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
-        //#if TESTFRAMEWORK_MSTEST
-        //        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute(Microsoft.VisualStudio.TestTools.UnitTesting.InheritanceBehavior.BeforeEachDerivedClass)]
-        //        new public static void BeforeClass(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext context)
-        //        {
-        //            Lucene.Net.Util.LuceneTestCase.BeforeClass(context);
-        //        }
-
-        //        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute(Microsoft.VisualStudio.TestTools.UnitTesting.InheritanceBehavior.BeforeEachDerivedClass)]
-        //        new public static void AfterClass()
-        //        {
-        //            Lucene.Net.Util.LuceneTestCase.AfterClass();
-        //        }
-        //#endif
-
         // some helpers to test Analyzers and TokenStreams:
 
         // LUCENENET specific - de-nested ICheckClearAttributesAttribute
@@ -606,7 +583,6 @@ namespace Lucene.Net.Analysis
             AssertAnalyzesTo(a, input, new string[] { expected });
         }
 
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         /// <summary>
         /// Utility method for blasting tokenstreams with data to make sure they don't do anything crazy
         /// </summary>
@@ -631,44 +607,6 @@ namespace Lucene.Net.Analysis
         {
             CheckRandomData(random, a, iterations, 20, simple, true);
         }
-#else
-        /// <summary>
-        /// Utility method for blasting tokenstreams with data to make sure they don't do anything crazy
-        /// <para/>
-        /// LUCENENET specific
-        /// Non-static to reduce the inter-class dependencies due to use of
-        /// static variables
-        /// </summary>
-        public void CheckRandomData(Random random, Analyzer a, int iterations)
-        {
-            CheckRandomData(random, a, iterations, 20, false, true);
-        }
-
-        /// <summary>
-        /// Utility method for blasting tokenstreams with data to make sure they don't do anything crazy
-        /// <para/>
-        /// LUCENENET specific:
-        /// Non-static to reduce the inter-class dependencies due to use of
-        /// static variables
-        /// </summary>
-        public void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength)
-        {
-            CheckRandomData(random, a, iterations, maxWordLength, false, true);
-        }
-
-        /// <summary>
-        /// Utility method for blasting tokenstreams with data to make sure they don't do anything crazy
-        /// <para/>
-        /// LUCENENET specific:
-        /// Non-static to reduce the inter-class dependencies due to use of
-        /// static variables
-        /// </summary>
-        /// <param name="simple"> true if only ascii strings will be used (try to avoid)</param>
-        public void CheckRandomData(Random random, Analyzer a, int iterations, bool simple)
-        {
-            CheckRandomData(random, a, iterations, 20, simple, true);
-        }
-#endif
 
         internal class AnalysisThread : ThreadJob
         {
@@ -732,21 +670,12 @@ namespace Lucene.Net.Analysis
             }
         }
 
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         public static void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength, bool simple)
         {
             CheckRandomData(random, a, iterations, maxWordLength, simple, true);
         }
 
         public static void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength, bool simple, bool offsetsAreCorrect)
-#else
-        public void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength, bool simple)
-        {
-            CheckRandomData(random, a, iterations, maxWordLength, simple, true);
-        }
-
-        public void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength, bool simple, bool offsetsAreCorrect)
-#endif
         {
             CheckResetException(a, "best effort");
             long seed = random.NextInt64();
@@ -760,11 +689,7 @@ namespace Lucene.Net.Analysis
             if (Rarely(random) && codecOk)
             {
                 dir = NewFSDirectory(CreateTempDir("bttc"));
-                iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    new J2N.Randomizer(seed), dir, a);
+                iw = new RandomIndexWriter(new J2N.Randomizer(seed), dir, a);
             }
 
             bool success = false;
diff --git a/src/Lucene.Net.TestFramework/Analysis/CollationTestBase.cs b/src/Lucene.Net.TestFramework/Analysis/CollationTestBase.cs
index f3810d9..0754a79 100644
--- a/src/Lucene.Net.TestFramework/Analysis/CollationTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/CollationTestBase.cs
@@ -35,16 +35,7 @@ namespace Lucene.Net.Analysis
     /// Base test class for testing Unicode collation.
     /// </summary>
     public abstract class CollationTestBase : LuceneTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public CollationTestBase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
         protected string m_firstRangeBeginningOriginal = "\u062F";
         protected string m_firstRangeEndOriginal = "\u0698";
 
diff --git a/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs
index 4292f26..21fa754 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs
@@ -6,16 +6,8 @@ using Lucene.Net.Util.Packed;
 using System.Collections.Generic;
 using RandomizedTesting.Generators;
 using JCG = J2N.Collections.Generic;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-#elif TESTFRAMEWORK_NUNIT
-using Test = NUnit.Framework.TestAttribute;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-#endif
-
 using Assert = Lucene.Net.TestFramework.Assert;
+using Test = NUnit.Framework.TestAttribute;
 
 namespace Lucene.Net.Index
 {
@@ -39,16 +31,7 @@ namespace Lucene.Net.Index
     /// <summary>
     /// Extends <see cref="BaseDocValuesFormatTestCase"/> to add compression checks. </summary>
     public abstract class BaseCompressingDocValuesFormatTestCase : BaseDocValuesFormatTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
-    {
-        public BaseCompressingDocValuesFormatTestCase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
     {
-#endif
         internal static long DirSize(Directory d)
         {
             long size = 0;
diff --git a/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
index 67dfac5..c53b517 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
@@ -1,4 +1,5 @@
-using J2N.Threading;
+using J2N.Collections.Generic.Extensions;
+using J2N.Threading;
 using Lucene.Net.Analysis;
 using Lucene.Net.Codecs.Lucene42;
 using Lucene.Net.Diagnostics;
@@ -8,24 +9,15 @@ using Lucene.Net.Search;
 using Lucene.Net.Store;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
+using RandomizedTesting.Generators;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Threading;
-using JCG = J2N.Collections.Generic;
-using Assert = Lucene.Net.TestFramework.Assert;
 using static Lucene.Net.Index.TermsEnum;
-using J2N.Collections.Generic.Extensions;
-using RandomizedTesting.Generators;
-using Lucene.Net.Support.Threading;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-#elif TESTFRAMEWORK_NUNIT
+using Assert = Lucene.Net.TestFramework.Assert;
+using JCG = J2N.Collections.Generic;
 using Test = NUnit.Framework.TestAttribute;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-#endif
 
 namespace Lucene.Net.Index
 {
@@ -56,17 +48,7 @@ namespace Lucene.Net.Index
     /// test fails to catch then this test needs to be improved!
     /// </summary>
     public abstract class BaseDocValuesFormatTestCase : BaseIndexFileFormatTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        
-        public BaseDocValuesFormatTestCase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
         protected override void AddRandomFields(Document doc)
         {
             if (Usually())
@@ -91,11 +73,7 @@ namespace Lucene.Net.Index
             string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
             string text = "this is the text to be indexed. " + longTerm;
             using Directory directory = NewDirectory();
-            using (RandomIndexWriter iwriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, directory))
+            using (RandomIndexWriter iwriter = new RandomIndexWriter(Random, directory))
             {
                 Document doc = new Document();
                 doc.Add(NewTextField("fieldname", text, Field.Store.YES));
@@ -129,11 +107,7 @@ namespace Lucene.Net.Index
             string text = "this is the text to be indexed. " + longTerm;
 
             using Directory directory = NewDirectory();
-            using (RandomIndexWriter iwriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, directory))
+            using (RandomIndexWriter iwriter = new RandomIndexWriter(Random, directory))
             {
                 Document doc = new Document();
                 doc.Add(NewTextField("fieldname", text, Field.Store.YES));
@@ -166,11 +140,7 @@ namespace Lucene.Net.Index
             string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
             string text = "this is the text to be indexed. " + longTerm;
             using Directory directory = NewDirectory();
-            using (RandomIndexWriter iwriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, directory))
+            using (RandomIndexWriter iwriter = new RandomIndexWriter(Random, directory))
             {
                 Document doc = new Document();
                 doc.Add(NewTextField("fieldname", text, Field.Store.YES));
@@ -206,11 +176,7 @@ namespace Lucene.Net.Index
             string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
             string text = "this is the text to be indexed. " + longTerm;
             using Directory directory = NewDirectory();
-            using (RandomIndexWriter iwriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, directory))
+            using (RandomIndexWriter iwriter = new RandomIndexWriter(Random, directory))
             {
                 Document doc = new Document();
 
@@ -250,11 +216,7 @@ namespace Lucene.Net.Index
             string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
             string text = "this is the text to be indexed. " + longTerm;
             using Directory directory = NewDirectory();
-            using (RandomIndexWriter iwriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, directory))
+            using (RandomIndexWriter iwriter = new RandomIndexWriter(Random, directory))
             {
                 Document doc = new Document();
 
@@ -293,11 +255,7 @@ namespace Lucene.Net.Index
             string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
             string text = "this is the text to be indexed. " + longTerm;
             using Directory directory = NewDirectory();
-            using (RandomIndexWriter iwriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, directory))
+            using (RandomIndexWriter iwriter = new RandomIndexWriter(Random, directory))
             {
                 Document doc = new Document();
 
@@ -341,11 +299,7 @@ namespace Lucene.Net.Index
             string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
             string text = "this is the text to be indexed. " + longTerm;
             using Directory directory = NewDirectory();
-            using (RandomIndexWriter iwriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, directory))
+            using (RandomIndexWriter iwriter = new RandomIndexWriter(Random, directory))
             {
                 Document doc = new Document();
 
@@ -1823,13 +1777,8 @@ namespace Lucene.Net.Index
             DirectoryReader ireader = null;
             try
             {
-                using (RandomIndexWriter iwriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, directory))
+                using (RandomIndexWriter iwriter = new RandomIndexWriter(Random, directory))
                 {
-
                     Document doc = new Document();
                     doc.Add(new SortedSetDocValuesField("field", new BytesRef("hello")));
                     iwriter.AddDocument(doc);
@@ -1861,11 +1810,7 @@ namespace Lucene.Net.Index
             DirectoryReader ireader = null;
             try
             {
-                using (RandomIndexWriter iwriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        this,
-#endif
-                        Random, directory))
+                using (RandomIndexWriter iwriter = new RandomIndexWriter(Random, directory))
                 {
 
                     Document doc = new Document();
@@ -1960,11 +1905,7 @@ namespace Lucene.Net.Index
             DirectoryReader ireader = null;
             try
             {
-                using (RandomIndexWriter iwriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        this,
-#endif
-                        Random, directory))
+                using (RandomIndexWriter iwriter = new RandomIndexWriter(Random, directory))
                 {
 
                     Document doc = new Document();
@@ -2003,11 +1944,7 @@ namespace Lucene.Net.Index
             DirectoryReader ireader = null;
             try
             {
-                using (RandomIndexWriter iwriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, directory))
+                using (RandomIndexWriter iwriter = new RandomIndexWriter(Random, directory))
                 {
 
                     Document doc = new Document();
@@ -3568,11 +3505,7 @@ namespace Lucene.Net.Index
                 IndexReader r = null;
                 try
                 {
-                    using (RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                            this,
-#endif
-                            Random, dir))
+                    using (RandomIndexWriter w = new RandomIndexWriter(Random, dir))
                     {
                         BytesRef bytes = new BytesRef();
                         bytes.Bytes = new byte[1 << i];
diff --git a/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
index 83523b0..5efd483 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Analysis;
+using Lucene.Net.Analysis;
 using Lucene.Net.Codecs;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
@@ -8,14 +8,7 @@ using Lucene.Net.Util;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using JCG = J2N.Collections.Generic;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-#elif TESTFRAMEWORK_NUNIT
 using Test = NUnit.Framework.TestAttribute;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-#endif
 
 namespace Lucene.Net.Index
 {
@@ -40,22 +33,10 @@ namespace Lucene.Net.Index
     /// Common tests to all index formats.
     /// </summary>
     public abstract class BaseIndexFileFormatTestCase : LuceneTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
         // LUCENENET specific - this class was internal in Java, but we can't mark it that way
         // because it has public subclasses. So we are creating an internal constructor instead.
-        internal BaseIndexFileFormatTestCase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-
-        // LUCENENET specific - this class was internal in Java, but we can't mark it that way
-        // because it has public subclasses. So we are creating an internal constructor instead.
         internal BaseIndexFileFormatTestCase() { }
-#endif
 
         /// <summary>
         /// Returns the codec to run tests against </summary>
diff --git a/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
index 9491259..4f0750c 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
@@ -1,6 +1,5 @@
 using J2N.Threading.Atomic;
 using Lucene.Net.Analysis;
-using Lucene.Net.Diagnostics;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using Lucene.Net.Store;
@@ -8,14 +7,7 @@ using Lucene.Net.Support.Threading;
 using Lucene.Net.Util;
 using RandomizedTesting.Generators;
 using System;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-#elif TESTFRAMEWORK_NUNIT
 using Test = NUnit.Framework.TestAttribute;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-#endif
 
 namespace Lucene.Net.Index
 {
@@ -40,16 +32,7 @@ namespace Lucene.Net.Index
     /// Base test case for <see cref="Index.MergePolicy"/>.
     /// </summary>
     public abstract class BaseMergePolicyTestCase : LuceneTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
-    {
-        public BaseMergePolicyTestCase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
     {
-#endif
         /// <summary>
         /// Create a new <see cref="Index.MergePolicy"/> instance. </summary>
         new protected abstract MergePolicy NewMergePolicy(); // LUCENENET specific - renamed from MergePolicy() to be consistent
diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
index 1fe19d3..1823075 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -1,27 +1,20 @@
-using J2N.Threading;
+using J2N.Collections.Generic.Extensions;
+using J2N.Threading;
 using Lucene.Net.Codecs;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Documents;
 using Lucene.Net.Store;
 using Lucene.Net.Util;
+using RandomizedTesting.Generators;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using JCG = J2N.Collections.Generic;
-using Console = Lucene.Net.Util.SystemConsole;
 using Assert = Lucene.Net.TestFramework.Assert;
+using Console = Lucene.Net.Util.SystemConsole;
 using Directory = Lucene.Net.Store.Directory;
-using J2N.Collections.Generic.Extensions;
-using RandomizedTesting.Generators;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-#elif TESTFRAMEWORK_NUNIT
+using JCG = J2N.Collections.Generic;
 using Test = NUnit.Framework.TestAttribute;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-#endif
 
 namespace Lucene.Net.Index
 {
@@ -69,19 +62,7 @@ namespace Lucene.Net.Index
 
     //[TestFixture]
     public abstract class BasePostingsFormatTestCase : BaseIndexFileFormatTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public BasePostingsFormatTestCase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-            beforeAfter.SetBeforeAfterClassActions(BeforeClass, AfterClass);
-#endif
-        }
-#else
-    {
-#endif
         private enum Option
         {
             // Sometimes use .Advance():
@@ -365,38 +346,10 @@ namespace Lucene.Net.Index
             return new SeedPostings(seed, minDocFreq, maxDocFreq, withLiveDocs ? globalLiveDocs : null, options);
         }
 
-//#if TESTFRAMEWORK_MSTEST
-//        private static readonly IList<string> initalizationLock = new JCG.List<string>();
-
-//        // LUCENENET TODO: Add support for attribute inheritance when it is released (2.0.0)
-//        //[Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitialize(Microsoft.VisualStudio.TestTools.UnitTesting.InheritanceBehavior.BeforeEachDerivedClass)]
-//        new public static void BeforeClass(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext context)
-//        {
-//            UninterruptableMonitor.Enter(initializationLock);
-//            try
-//            {
-//                if (!initalizationLock.Contains(context.FullyQualifiedTestClassName))
-//                    initalizationLock.Add(context.FullyQualifiedTestClassName);
-//                else
-//                    return; // Only allow this class to initialize once (MSTest bug)
-//            }
-//            finally
-//            {
-//                UninterruptableMonitor.Exit(initializationLock);
-//            }
-//#else
-#if TESTFRAMEWORK_NUNIT
         [NUnit.Framework.OneTimeSetUp]
-#endif
-//        new public static void BeforeClass()
-//        {
-//#endif
-//#else
-        //[OneTimeSetUp]
         public override void BeforeClass() // Renamed from CreatePostings to ensure the base class setup is called before this one
         {
             base.BeforeClass();
-//#endif
 
             totalPostings = 0;
             totalPayloadBytes = 0;
@@ -517,17 +470,7 @@ namespace Lucene.Net.Index
             }
         }
 
-
-//#if TESTFRAMEWORK_MSTEST
-//        // LUCENENET TODO: Add support for attribute inheritance when it is released (2.0.0)
-//        //[Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanup(Microsoft.VisualStudio.TestTools.UnitTesting.InheritanceBehavior.BeforeEachDerivedClass)]
-//# el
-#if TESTFRAMEWORK_NUNIT
         [NUnit.Framework.OneTimeTearDown]
-#endif
-//        new public static void AfterClass()
-//#else
-        //[OneTimeTearDown]
         public override void AfterClass()
         {
             allTerms = null;
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index 99685b3..a94a5d4 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -28,14 +28,7 @@ using Double = J2N.Numerics.Double;
 using Int32 = J2N.Numerics.Int32;
 using Int64 = J2N.Numerics.Int64;
 using Single = J2N.Numerics.Single;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-#elif TESTFRAMEWORK_NUNIT
 using Test = NUnit.Framework.TestAttribute;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-#endif
 
 namespace Lucene.Net.Index
 {
@@ -64,16 +57,7 @@ namespace Lucene.Net.Index
     /// @lucene.experimental
     /// </summary>
     public abstract class BaseStoredFieldsFormatTestCase : BaseIndexFileFormatTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
-    {
-        public BaseStoredFieldsFormatTestCase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
     {
-#endif
         protected override void AddRandomFields(Document d)
         {
             int numValues = Random.Next(3);
@@ -274,11 +258,7 @@ namespace Lucene.Net.Index
             {
                 var numDocs = AtLeast(500);
                 var answers = new Number[numDocs];
-                using (var w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        this,
-#endif
-                        Random, dir))
+                using (var w = new RandomIndexWriter(Random, dir))
                 {
                     NumericType[] typeAnswers = new NumericType[numDocs];
                     for (int id = 0; id < numDocs; id++)
@@ -370,11 +350,7 @@ namespace Lucene.Net.Index
             IndexReader r = null;
             try
             {
-                using (RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        this,
-#endif
-                        Random, dir))
+                using (RandomIndexWriter w = new RandomIndexWriter(Random, dir))
                 {
                     Document doc = new Document();
                     FieldType onlyStored = new FieldType();
@@ -808,11 +784,7 @@ namespace Lucene.Net.Index
                 }
                 w.Commit();
                 w.Dispose();
-                w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        this,
-#endif
-                        Random, dir);
+                w = new RandomIndexWriter(Random, dir);
                 w.ForceMerge(TestUtil.NextInt32(Random, 1, 3));
                 w.Commit();
             }
diff --git a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
index 7bd5613..a47f2aa 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
@@ -8,24 +8,15 @@ using Lucene.Net.Search;
 using Lucene.Net.Store;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
+using RandomizedTesting.Generators;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using JCG = J2N.Collections.Generic;
 using static Lucene.Net.Index.TermsEnum;
 using Assert = Lucene.Net.TestFramework.Assert;
 using Attribute = Lucene.Net.Util.Attribute;
-using System.Diagnostics.CodeAnalysis;
-using RandomizedTesting.Generators;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-#elif TESTFRAMEWORK_NUNIT
+using JCG = J2N.Collections.Generic;
 using Test = NUnit.Framework.TestAttribute;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-#endif
 
 namespace Lucene.Net.Index
 {
@@ -54,16 +45,7 @@ namespace Lucene.Net.Index
     /// @lucene.experimental
     /// </summary>
     public abstract class BaseTermVectorsFormatTestCase : BaseIndexFileFormatTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
-    {
-        public BaseTermVectorsFormatTestCase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
     {
-#endif
         /// <summary>
         /// A combination of term vectors options.
         /// </summary>
@@ -681,11 +663,7 @@ namespace Lucene.Net.Index
                 int docWithVectors = Random.Next(numDocs);
                 Document emptyDoc = new Document();
                 using Directory dir = NewDirectory();
-                using RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, dir);
+                using RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
                 RandomDocument doc = docFactory.NewDocument(TestUtil.NextInt32(Random, 1, 3), 20, options);
                 for (int i = 0; i < numDocs; ++i)
                 {
@@ -729,11 +707,7 @@ namespace Lucene.Net.Index
                     continue;
                 }
                 using Directory dir = NewDirectory();
-                using RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, dir);
+                using RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
                 RandomDocument doc = docFactory.NewDocument(TestUtil.NextInt32(Random, 1, 2), AtLeast(20000),
                     options);
                 writer.AddDocument(doc.ToDocument());
@@ -749,11 +723,7 @@ namespace Lucene.Net.Index
             foreach (Options options in ValidOptions())
             {
                 using Directory dir = NewDirectory();
-                using RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, dir);
+                using RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
                 RandomDocument doc = docFactory.NewDocument(AtLeast(100), 5, options);
                 writer.AddDocument(doc.ToDocument());
                 using IndexReader reader = writer.GetReader();
@@ -776,11 +746,7 @@ namespace Lucene.Net.Index
                         continue;
                     }
                     using Directory dir = NewDirectory();
-                    using var writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        this,
-#endif
-                        Random, dir);
+                    using var writer = new RandomIndexWriter(Random, dir);
                     RandomDocument doc1 = docFactory.NewDocument(numFields, 20, options1);
                     RandomDocument doc2 = docFactory.NewDocument(numFields, 20, options2);
                     writer.AddDocument(AddId(doc1.ToDocument(), "1"));
@@ -805,11 +771,7 @@ namespace Lucene.Net.Index
                 docs[i] = docFactory.NewDocument(TestUtil.NextInt32(Random, 1, 3), TestUtil.NextInt32(Random, 10, 50), RandomOptions());
             }
             using Directory dir = NewDirectory();
-            using RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            using RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             for (int i = 0; i < numDocs; ++i)
             {
                 writer.AddDocument(AddId(docs[i].ToDocument(), "" + i));
@@ -841,11 +803,7 @@ namespace Lucene.Net.Index
                     docs[i] = docFactory.NewDocument(TestUtil.NextInt32(Random, 1, 3), AtLeast(10), options);
                 }
                 using Directory dir = NewDirectory();
-                using RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, dir);
+                using RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
                 for (int i = 0; i < numDocs; ++i)
                 {
                     writer.AddDocument(AddId(docs[i].ToDocument(), "" + i));
@@ -888,11 +846,7 @@ namespace Lucene.Net.Index
                 }
                 AtomicReference<Exception> exception = new AtomicReference<Exception>();
                 using (Directory dir = NewDirectory())
-                using (RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, dir))
+                using (RandomIndexWriter writer = new RandomIndexWriter(Random, dir))
                 {
                     for (int i = 0; i < numDocs; ++i)
                     {
diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
index f9776fc..34f5fd2 100644
--- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
+++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
@@ -78,8 +78,6 @@ namespace Lucene.Net.Index
         }
 
 
-
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         /// <summary>
         /// Create a <see cref="RandomIndexWriter"/> with a random config: Uses <see cref="LuceneTestCase.TEST_VERSION_CURRENT"/> and <see cref="MockAnalyzer"/>.
         /// </summary>
@@ -103,59 +101,6 @@ namespace Lucene.Net.Index
             : this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, v, a))
         {
         }
-#else
-        /// <summary>
-        /// Create a <see cref="RandomIndexWriter"/> with a random config: Uses <see cref="LuceneTestCase.TEST_VERSION_CURRENT"/> and <see cref="MockAnalyzer"/>.
-        /// </summary>
-        /// <param name="luceneTestCase">The current test instance.</param>
-        /// <param name="r"></param>
-        /// <param name="dir"></param>
-        // LUCENENET specific
-        // Similarity and TimeZone parameters allow a RandomIndexWriter to be
-        // created without adding a dependency on 
-        // <see cref="LuceneTestCase.ClassEnv.Similarity"/> and
-        // <see cref="LuceneTestCase.ClassEnv.TimeZone"/>
-        public RandomIndexWriter(LuceneTestCase luceneTestCase, Random r, Directory dir)
-            : this(r, dir, luceneTestCase.NewIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, new MockAnalyzer(r)))
-        {
-        }
-
-        /// <summary>
-        /// Create a <see cref="RandomIndexWriter"/> with a random config: Uses <see cref="LuceneTestCase.TEST_VERSION_CURRENT"/>.
-        /// </summary>
-        /// <param name="luceneTestCase">The current test instance.</param>
-        /// <param name="r"></param>
-        /// <param name="dir"></param>
-        /// <param name="a"></param>
-        // LUCENENET specific
-        // Similarity and TimeZone parameters allow a RandomIndexWriter to be
-        // created without adding a dependency on 
-        // <see cref="LuceneTestCase.ClassEnv.Similarity"/> and
-        // <see cref="LuceneTestCase.ClassEnv.TimeZone"/>
-        public RandomIndexWriter(LuceneTestCase luceneTestCase, Random r, Directory dir, Analyzer a)
-            : this(r, dir, luceneTestCase.NewIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, a))
-        {
-        }
-
-        /// <summary>
-        /// Creates a <see cref="RandomIndexWriter"/> with a random config.
-        /// </summary>
-        /// <param name="luceneTestCase">The current test instance.</param>
-        /// <param name="r"></param>
-        /// <param name="dir"></param>
-        /// <param name="v"></param>
-        /// <param name="a"></param>
-
-        // LUCENENET specific
-        // Similarity and TimeZone parameters allow a RandomIndexWriter to be
-        // created without adding a dependency on 
-        // <see cref="LuceneTestCase.ClassEnv.Similarity"/> and
-        // <see cref="LuceneTestCase.ClassEnv.TimeZone"/>
-        public RandomIndexWriter(LuceneTestCase luceneTestCase, Random r, Directory dir, LuceneVersion v, Analyzer a)
-            : this(r, dir, luceneTestCase.NewIndexWriterConfig(r, v, a))
-        {
-        }
-#endif
 
         /// <summary>
         /// Creates a <see cref="RandomIndexWriter"/> with the provided config </summary>
diff --git a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
index 8fac354..daf3fda 100644
--- a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
@@ -52,16 +52,7 @@ namespace Lucene.Net.Index
     // LUCENENET specific - Specify to unzip the line file docs
     [UseTempLineDocsFile]
     public abstract class ThreadedIndexingAndSearchingTestCase : LuceneTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public ThreadedIndexingAndSearchingTestCase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
         protected readonly AtomicBoolean m_failed = new AtomicBoolean();
         protected readonly AtomicInt32 m_addCount = new AtomicInt32();
         protected readonly AtomicInt32 m_delCount = new AtomicInt32();
@@ -825,11 +816,7 @@ namespace Lucene.Net.Index
                         sum += doc.Fields.Count;
                     }
                 }
-                IndexSearcher searcher = 
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    outerInstance.
-#endif
-                    NewSearcher(reader);
+                IndexSearcher searcher = NewSearcher(reader);
 
                 sum += searcher.Search(new TermQuery(new Term("body", "united")), 10).TotalHits;
 
diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
index fccf5e4..089383a 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
@@ -36,8 +36,6 @@
     
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
     <NoWarn Label="Collection initialization can be simplified">$(NoWarn);IDE0028</NoWarn>
-
-    <DefineConstants>$(DefineConstants);TESTFRAMEWORK_NUNIT</DefineConstants>
   </PropertyGroup>
 
   <Import Project="$(SolutionDir)build/Dependencies.props" />
diff --git a/src/Lucene.Net.TestFramework/Search/CheckHits.cs b/src/Lucene.Net.TestFramework/Search/CheckHits.cs
index cb23651..7e6bdaa 100644
--- a/src/Lucene.Net.TestFramework/Search/CheckHits.cs
+++ b/src/Lucene.Net.TestFramework/Search/CheckHits.cs
@@ -76,7 +76,6 @@ namespace Lucene.Net.Search
             }
         }
 
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         /// <summary>
         /// Tests that a query matches the an expected set of documents using a
         /// HitCollector.
@@ -91,31 +90,8 @@ namespace Lucene.Net.Search
         /// <param name="results"> A list of documentIds that must match the query. </param>
         /// <seealso cref="DoCheckHits(Random, Query, string, IndexSearcher, int[])"/>
         public static void CheckHitCollector(Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results)
-#else
-        /// <summary>
-        /// Tests that a query matches the an expected set of documents using a
-        /// HitCollector.
-        /// <para>
-        /// Note that when using the HitCollector API, documents will be collected
-        /// if they "match" regardless of what their score is.
-        /// </para>
-        /// </summary>
-        /// <param name="luceneTestCase"> The current test instance. </param>
-        /// <param name="query"> The query to test. </param>
-        /// <param name="searcher"> The searcher to test the query against. </param>
-        /// <param name="defaultFieldName"> Used for displaying the query in assertion messages. </param>
-        /// <param name="results"> A list of documentIds that must match the query. </param>
-        /// <seealso cref="DoCheckHits(LuceneTestCase, Random, Query, string, IndexSearcher, int[])"/>
-        // LUCENENET specific
-        // Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
-        public static void CheckHitCollector(LuceneTestCase luceneTestCase, Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results)
-#endif
         {
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                luceneTestCase,
-#endif
-                random, query, searcher);
+            QueryUtils.Check(random, query, searcher);
 
             Trace.TraceInformation("Checked");
 
@@ -130,11 +106,7 @@ namespace Lucene.Net.Search
             for (int i = -1; i < 2; i++)
             {
                 actual.Clear();
-                IndexSearcher s = QueryUtils.WrapUnderlyingReader(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    luceneTestCase,
-#endif
-                    random, searcher, i);
+                IndexSearcher s = QueryUtils.WrapUnderlyingReader(random, searcher, i);
                 s.Search(query, c);
                 Assert.AreEqual(correct, actual, aggressive: false, () => "Wrap Reader " + i + ": " + query.ToString(defaultFieldName));
             }
@@ -142,7 +114,6 @@ namespace Lucene.Net.Search
 
         // LUCENENET specific - de-nested SetCollector
 
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         /// <summary>
         /// Tests that a query matches the an expected set of documents using Hits.
         ///
@@ -156,24 +127,6 @@ namespace Lucene.Net.Search
         /// <param name="results"> a list of documentIds that must match the query </param>
         /// <seealso cref="CheckHitCollector(Random, Query, string, IndexSearcher, int[])"/>
         public static void DoCheckHits(Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results)
-#else
-        /// <summary>
-        /// Tests that a query matches the an expected set of documents using Hits.
-        ///
-        /// <para>Note that when using the Hits API, documents will only be returned
-        /// if they have a positive normalized score.
-        /// </para>
-        /// </summary>
-        /// <param name="luceneTestCase"> The current test instance. </param>
-        /// <param name="query"> the query to test </param>
-        /// <param name="searcher"> the searcher to test the query against </param>
-        /// <param name="defaultFieldName"> used for displaing the query in assertion messages </param>
-        /// <param name="results"> a list of documentIds that must match the query </param>
-        /// <seealso cref="CheckHitCollector(LuceneTestCase, Random, Query, string, IndexSearcher, int[])"/>
-        // LUCENENET specific
-        // Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
-        public static void DoCheckHits(LuceneTestCase luceneTestCase, Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results)
-#endif
         {
             ScoreDoc[] hits = searcher.Search(query, 1000).ScoreDocs;
 
@@ -191,11 +144,7 @@ namespace Lucene.Net.Search
 
             Assert.AreEqual(correct, actual, aggressive: false, () => query.ToString(defaultFieldName));
 
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                luceneTestCase,
-#endif
-                random, query, searcher, LuceneTestCase.Rarely(random));
+            QueryUtils.Check(random, query, searcher, LuceneTestCase.Rarely(random));
         }
 
         /// <summary>
diff --git a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
index 94cc7c7..e46f7c0 100644
--- a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
+++ b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
@@ -118,7 +118,6 @@ namespace Lucene.Net.Search
             CheckHits.CheckExplanations(q, null, s, true);
         }
 
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         /// <summary>
         /// Various query sanity checks on a searcher, some checks are only done for
         /// instance of <see cref="IndexSearcher"/>.
@@ -162,57 +161,6 @@ namespace Lucene.Net.Search
                 throw RuntimeException.Create(e);
             }
         }
-#else
-        /// <summary>
-        /// Various query sanity checks on a searcher, some checks are only done for
-        /// instance of <see cref="IndexSearcher"/>.
-        /// </summary>
-        /// <param name="luceneTestCase"> The current test instance. </param>
-        /// <param name="random">A random instance (usually <see cref="LuceneTestCase.Random"/>).</param>
-        /// <param name="q1">A <see cref="Query"/>.</param>
-        /// <param name="s">An <see cref="IndexSearcher"/>.</param>
-        /// <seealso cref="Check(Query)"/>
-        /// <seealso cref="CheckFirstSkipTo(LuceneTestCase, Query, IndexSearcher)"/>
-        /// <seealso cref="CheckSkipTo(LuceneTestCase, Query, IndexSearcher)"/>
-        /// <seealso cref="CheckExplanations(Query, IndexSearcher)"/>
-        /// <seealso cref="CheckEqual(Query, Query)"/>
-        // LUCENENET specific
-        // Removes static dependency on <see cref="LuceneTestCase.ClassEnvRule.Similarity"/>
-        public static void Check(LuceneTestCase luceneTestCase, Random random, Query q1, IndexSearcher s)
-        {
-            Check(luceneTestCase, random, q1, s, true);
-        }
-
-        /// <param name="luceneTestCase">The current test instance.</param>
-        // LUCENENET specific
-        // Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
-        public static void Check(LuceneTestCase luceneTestCase, Random random, Query q1, IndexSearcher s, bool wrap)
-        {
-            try
-            {
-                Check(q1);
-                if (s != null)
-                {
-                    CheckFirstSkipTo(luceneTestCase, q1, s);
-                    CheckSkipTo(luceneTestCase, q1, s);
-                    if (wrap)
-                    {
-                        Check(luceneTestCase, random, q1, WrapUnderlyingReader(luceneTestCase, random, s, -1), false);
-                        Check(luceneTestCase, random, q1, WrapUnderlyingReader(luceneTestCase, random, s, 0), false);
-                        Check(luceneTestCase, random, q1, WrapUnderlyingReader(luceneTestCase, random, s, +1), false);
-                    }
-                    CheckExplanations(q1, s);
-
-                    Query q2 = (Query)q1.Clone();
-                    CheckEqual(s.Rewrite(q1), s.Rewrite(q2));
-                }
-            }
-            catch (Exception e) when (e.IsIOException())
-            {
-                throw RuntimeException.Create(e);
-            }
-        }
-#endif
 
         public static void PurgeFieldCache(IndexReader r)
         {
@@ -222,7 +170,6 @@ namespace Lucene.Net.Search
 
         // LUCENENET specific - de-nested FCInvisibleMultiReader
 
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         /// <summary>
         /// Given an <see cref="IndexSearcher"/>, returns a new <see cref="IndexSearcher"/> whose <see cref="IndexReader"/>
         /// is a <see cref="MultiReader"/> containing the <see cref="IndexReader"/> of the original <see cref="IndexSearcher"/>,
@@ -232,20 +179,6 @@ namespace Lucene.Net.Search
         /// <param name="s"> The searcher to wrap. </param>
         /// <param name="edge"> If negative, s will be the first sub; if 0, s will be in the middle, if positive s will be the last sub. </param>
         public static IndexSearcher WrapUnderlyingReader(Random random, IndexSearcher s, int edge)
-#else
-        /// <summary>
-        /// Given an <see cref="IndexSearcher"/>, returns a new <see cref="IndexSearcher"/> whose <see cref="IndexReader"/>
-        /// is a <see cref="MultiReader"/> containing the <see cref="IndexReader"/> of the original <see cref="IndexSearcher"/>,
-        /// as well as several "empty" <see cref="IndexReader"/>s -- some of which will have
-        /// deleted documents in them.  This new <see cref="IndexSearcher"/> should
-        /// behave exactly the same as the original <see cref="IndexSearcher"/>. </summary>
-        /// <param name="luceneTestCase">The current test instance.</param>
-        /// <param name="s"> The searcher to wrap. </param>
-        /// <param name="edge"> If negative, s will be the first sub; if 0, s will be in the middle, if positive s will be the last sub. </param>
-        // LUCENENET specific
-        // Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
-        public static IndexSearcher WrapUnderlyingReader(LuceneTestCase luceneTestCase, Random random, IndexSearcher s, int edge)
-#endif
         {
             IndexReader r = s.IndexReader;
 
@@ -264,11 +197,7 @@ namespace Lucene.Net.Search
                     0 < edge ? r : emptyReaders[0])
             };
 
-            IndexSearcher @out = LuceneTestCase.NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                luceneTestCase,
-#endif
-                new FCInvisibleMultiReader(readers));
+            IndexSearcher @out = LuceneTestCase.NewSearcher(new FCInvisibleMultiReader(readers));
             @out.Similarity = s.Similarity;
             return @out;
         }
@@ -308,24 +237,11 @@ namespace Lucene.Net.Search
             return new AllDeletedFilterReader(LuceneTestCase.GetOnlySegmentReader(reader));
         }
 
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         /// <summary>
         /// Alternate scorer skipTo(),skipTo(),next(),next(),skipTo(),skipTo(), etc
         /// and ensure a hitcollector receives same docs and scores.
         /// </summary>
         public static void CheckSkipTo(Query q, IndexSearcher s)
-#else
-        /// <summary>
-        /// Alternate scorer skipTo(),skipTo(),next(),next(),skipTo(),skipTo(), etc
-        /// and ensure a hitcollector receives same docs and scores.
-        /// </summary>
-        /// <param name="luceneTestCase">The current test instance.</param>
-        /// <param name="q"></param>
-        /// <param name="s"></param>
-        // LUCENENET specific
-        // Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
-        public static void CheckSkipTo(LuceneTestCase luceneTestCase, Query q, IndexSearcher s)
-#endif
         {
             //System.out.println("Checking "+q);
             IList<AtomicReaderContext> readerContextArray = s.TopReaderContext.Leaves;
@@ -351,22 +267,14 @@ namespace Lucene.Net.Search
                 const float maxDiff = 1e-5f;
                 AtomicReader[] lastReader = new AtomicReader[] { null };
 
-                s.Search(q, new CollectorAnonymousClass(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    luceneTestCase,
-#endif
-                    q, s, readerContextArray, skip_op, order, opidx, lastDoc, maxDiff, lastReader));
+                s.Search(q, new CollectorAnonymousClass(q, s, readerContextArray, skip_op, order, opidx, lastDoc, maxDiff, lastReader));
 
                 if (lastReader[0] != null)
                 {
                     // confirm that skipping beyond the last doc, on the
                     // previous reader, hits NO_MORE_DOCS
                     AtomicReader previousReader = lastReader[0];
-                    IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        luceneTestCase,
-#endif
-                        previousReader, false);
+                    IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader, false);
                     indexSearcher.Similarity = s.Similarity;
                     Weight w = indexSearcher.CreateNormalizedWeight(q);
                     AtomicReaderContext ctx = (AtomicReaderContext)previousReader.Context;
@@ -382,9 +290,6 @@ namespace Lucene.Net.Search
 
         private class CollectorAnonymousClass : ICollector
         {
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-            private readonly LuceneTestCase luceneTestCase;
-#endif
             private readonly Query q;
             private readonly IndexSearcher s;
             private readonly IList<AtomicReaderContext> readerContextArray;
@@ -395,16 +300,9 @@ namespace Lucene.Net.Search
             private readonly float maxDiff;
             private readonly AtomicReader[] lastReader;
 
-            public CollectorAnonymousClass(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                LuceneTestCase luceneTestCase,
-#endif                
-                Query q, IndexSearcher s, IList<AtomicReaderContext> readerContextArray, 
+            public CollectorAnonymousClass(Query q, IndexSearcher s, IList<AtomicReaderContext> readerContextArray, 
                 int skip_op, int[] order, int[] opidx, int[] lastDoc, float maxDiff, AtomicReader[] lastReader)
             {
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this.luceneTestCase = luceneTestCase;
-#endif
                 this.q = q;
                 this.s = s;
                 this.readerContextArray = readerContextArray;
@@ -470,11 +368,7 @@ namespace Lucene.Net.Search
                 if (lastReader[0] != null)
                 {
                     AtomicReader previousReader = lastReader[0];
-                    IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        luceneTestCase,
-#endif
-                        previousReader);
+                    IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader);
                     indexSearcher.Similarity = s.Similarity;
                     Weight w = indexSearcher.CreateNormalizedWeight(q);
                     AtomicReaderContext ctx = (AtomicReaderContext)indexSearcher.TopReaderContext;
@@ -495,42 +389,23 @@ namespace Lucene.Net.Search
             public virtual bool AcceptsDocsOutOfOrder => false;
         }
 
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         /// <summary>
         /// Check that first skip on just created scorers always goes to the right doc.</summary>
         public static void CheckFirstSkipTo(Query q, IndexSearcher s)
-#else
-        /// <summary>
-        /// Check that first skip on just created scorers always goes to the right doc.</summary>
-        /// <param name="luceneTestCase"> The current test instance. </param>
-        /// <param name="q"></param>
-        /// <param name="s"></param>
-        // LUCENENET specific
-        // Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
-        public static void CheckFirstSkipTo(LuceneTestCase luceneTestCase, Query q, IndexSearcher s)
-#endif
         {
             //System.out.println("checkFirstSkipTo: "+q);
             const float maxDiff = 1e-3f;
             int[] lastDoc = new int[] { -1 };
             AtomicReader[] lastReader = new AtomicReader[] { null };
             IList<AtomicReaderContext> context = s.TopReaderContext.Leaves;
-            s.Search(q, new CollectorAnonymousClass2(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                luceneTestCase,
-#endif
-                q, s, maxDiff, lastDoc, lastReader, context));
+            s.Search(q, new CollectorAnonymousClass2(q, s, maxDiff, lastDoc, lastReader, context));
 
             if (lastReader[0] != null)
             {
                 // confirm that skipping beyond the last doc, on the
                 // previous reader, hits NO_MORE_DOCS
                 AtomicReader previousReader = lastReader[0];
-                IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    luceneTestCase,
-#endif
-                    previousReader);
+                IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader);
                 indexSearcher.Similarity = s.Similarity;
                 Weight w = indexSearcher.CreateNormalizedWeight(q);
                 Scorer scorer = w.GetScorer((AtomicReaderContext)indexSearcher.TopReaderContext, previousReader.LiveDocs);
@@ -544,9 +419,6 @@ namespace Lucene.Net.Search
 
         private class CollectorAnonymousClass2 : ICollector
         {
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-            private readonly LuceneTestCase luceneTestCase;
-#endif
             private readonly Query q;
             private readonly IndexSearcher s;
             private readonly float maxDiff;
@@ -554,15 +426,8 @@ namespace Lucene.Net.Search
             private readonly AtomicReader[] lastReader;
             private readonly IList<AtomicReaderContext> context;
 
-            public CollectorAnonymousClass2(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION                
-                LuceneTestCase luceneTestCase, 
- #endif                
-                Query q, IndexSearcher s, float maxDiff, int[] lastDoc, AtomicReader[] lastReader, IList<AtomicReaderContext> context)
+            public CollectorAnonymousClass2(Query q, IndexSearcher s, float maxDiff, int[] lastDoc, AtomicReader[] lastReader, IList<AtomicReaderContext> context)
             {
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this.luceneTestCase = luceneTestCase;
-#endif
                 this.q = q;
                 this.s = s;
                 this.maxDiff = maxDiff;
@@ -618,11 +483,7 @@ namespace Lucene.Net.Search
                 if (lastReader[0] != null)
                 {
                     AtomicReader previousReader = lastReader[0];
-                    IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        luceneTestCase,
-#endif
-                        previousReader);
+                    IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader);
                     indexSearcher.Similarity = s.Similarity;
                     Weight w = indexSearcher.CreateNormalizedWeight(q);
                     Scorer scorer = w.GetScorer((AtomicReaderContext)indexSearcher.TopReaderContext, previousReader.LiveDocs);
diff --git a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
index c185344..162e8e2 100644
--- a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
@@ -38,56 +38,14 @@ namespace Lucene.Net.Search
     /// <see cref="AssertSubsetOf(Query, Query)"/>.
     /// </summary>
     public abstract class SearchEquivalenceTestBase : LuceneTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public SearchEquivalenceTestBase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-            beforeAfter.SetBeforeAfterClassActions(BeforeClass, AfterClass);
-#endif
-        }
-#else
-    {
-#endif
         protected static IndexSearcher m_s1, m_s2;
         protected static Directory m_directory;
         protected static IndexReader m_reader;
         protected static Analyzer m_analyzer;
         protected static string m_stopword; // we always pick a character as a stopword
 
-//#if TESTFRAMEWORK_MSTEST
-//        private static readonly IList<string> initalizationLock = new JCG.List<string>();
-
-//        // LUCENENET TODO: Add support for attribute inheritance when it is released (2.0.0)
-//        //[Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitialize(Microsoft.VisualStudio.TestTools.UnitTesting.InheritanceBehavior.BeforeEachDerivedClass)]
-//        new public static void BeforeClass(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext context)
-//        {
-//            UninterruptableMonitor.Enter(initializationLock);
-//            try
-//            {
-//                if (!initalizationLock.Contains(context.FullyQualifiedTestClassName))
-//                    initalizationLock.Add(context.FullyQualifiedTestClassName);
-//                else
-//                    return; // Only allow this class to initialize once (MSTest bug)
-//            }
-//            finally
-//            {
-//                UninterruptableMonitor.Exit(initializationLock);
-//            }
-//#else
-#if TESTFRAMEWORK_NUNIT
         [NUnit.Framework.OneTimeSetUp]
-#endif
-//        new public static void BeforeClass()
-//        {
-//#endif
-
-
-        // LUCENENET specific
-        // Is non-static because ClassEnvRule is no longer static.
-        ////[OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
@@ -98,11 +56,7 @@ namespace Lucene.Net.Search
             m_stopword = "" + GetRandomChar();
             CharacterRunAutomaton stopset = new CharacterRunAutomaton(BasicAutomata.MakeString(m_stopword));
             m_analyzer = new MockAnalyzer(random, MockTokenizer.WHITESPACE, false, stopset);
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                random, m_directory, m_analyzer);
+            RandomIndexWriter iw = new RandomIndexWriter(random, m_directory, m_analyzer);
             Document doc = new Document();
             Field id = new StringField("id", "", Field.Store.NO);
             Field field = new TextField("field", "", Field.Store.NO);
@@ -139,17 +93,7 @@ namespace Lucene.Net.Search
             iw.Dispose();
         }
 
-
-//#if TESTFRAMEWORK_MSTEST
-//        // LUCENENET TODO: Add support for attribute inheritance when it is released (2.0.0)
-//        //[Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanup(Microsoft.VisualStudio.TestTools.UnitTesting.InheritanceBehavior.BeforeEachDerivedClass)]
-//# el
-#if TESTFRAMEWORK_NUNIT
         [NUnit.Framework.OneTimeTearDown]
-#endif
-//        new public static void AfterClass()
-//#else
-        //[OneTimeTearDown]
         public override void AfterClass()
         {
             m_reader.Dispose();
diff --git a/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs b/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
index 727ae2c..762132f 100644
--- a/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
@@ -75,17 +75,7 @@ namespace Lucene.Net.Search
     // LUCENENET specific - Specify to unzip the line file docs
     [UseTempLineDocsFile]
     public abstract class ShardSearchingTestBase : LuceneTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public ShardSearchingTestBase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
-
         // LUCENENET specific - de-nested SearcherExpiredException
 
         internal class FieldAndShardVersion
diff --git a/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs b/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs
index 14ec3bd..dd73417 100644
--- a/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs
@@ -2,23 +2,14 @@
 // LUCENENET NOTE: This class now exists both here and in Lucene.Net.Tests
 using J2N.Threading;
 using Lucene.Net.Index;
-using Lucene.Net.MockFile;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
+using RandomizedTesting.Generators;
 using System;
 using System.IO;
 using System.Threading;
-using AssertionError = Lucene.Net.Diagnostics.AssertionException;
 using Assert = Lucene.Net.TestFramework.Assert;
-using RandomizedTesting.Generators;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-#elif TESTFRAMEWORK_NUNIT
 using Test = NUnit.Framework.TestAttribute;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-#endif
 
 namespace Lucene.Net.Store
 {
@@ -42,21 +33,8 @@ namespace Lucene.Net.Store
     /// <summary>
     /// Base class for per-Directory tests.
     /// </summary>
-#if TESTFRAMEWORK_MSTEST
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute]
-#endif
     public abstract class BaseDirectoryTestCase : LuceneTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public BaseDirectoryTestCase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
-
         /// <summary>
         /// A subclass returns the <see cref="Directory"/> to be tested; if it's
         /// an FS-based directory it should point to the specified
diff --git a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
index cdfdb2d..3b7c698 100644
--- a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
@@ -33,17 +33,8 @@ namespace Lucene.Net.Util
     /// by end users.
     /// </summary>
     public abstract class ApiScanTestBase : LuceneTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
-    {
-        internal ApiScanTestBase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
     {
         internal ApiScanTestBase() { } // LUCENENET: Not for use by end users
-#endif
 
         /// <summary>
         /// Private fields must be upper case separated with underscores, 
diff --git a/src/Lucene.Net.TestFramework/Support/Attributes/DeadlockAttribute.cs b/src/Lucene.Net.TestFramework/Support/Attributes/DeadlockAttribute.cs
index 0893326..dc89b8a 100644
--- a/src/Lucene.Net.TestFramework/Support/Attributes/DeadlockAttribute.cs
+++ b/src/Lucene.Net.TestFramework/Support/Attributes/DeadlockAttribute.cs
@@ -1,5 +1,4 @@
-#if TESTFRAMEWORK_NUNIT
-using NUnit.Framework;
+using NUnit.Framework;
 using NUnit.Framework.Interfaces;
 using NUnit.Framework.Internal;
 using System;
@@ -36,5 +35,4 @@ namespace Lucene.Net.Attributes
             test.Properties.Add(PropertyNames.Category, "Deadlock");
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.TestFramework/Support/Attributes/LuceneNetSpecificAttribute.cs b/src/Lucene.Net.TestFramework/Support/Attributes/LuceneNetSpecificAttribute.cs
index dde5f1c..4fdfc3b 100644
--- a/src/Lucene.Net.TestFramework/Support/Attributes/LuceneNetSpecificAttribute.cs
+++ b/src/Lucene.Net.TestFramework/Support/Attributes/LuceneNetSpecificAttribute.cs
@@ -1,5 +1,4 @@
-#if TESTFRAMEWORK_NUNIT
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace Lucene.Net.Attributes
 {
@@ -34,5 +33,4 @@ namespace Lucene.Net.Attributes
             // nothing to do here but invoke the base contsructor.
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.TestFramework/Support/Configuration/TestConfigurationFactory.cs b/src/Lucene.Net.TestFramework/Support/Configuration/TestConfigurationFactory.cs
index dc580d6..f9dc13e 100644
--- a/src/Lucene.Net.TestFramework/Support/Configuration/TestConfigurationFactory.cs
+++ b/src/Lucene.Net.TestFramework/Support/Configuration/TestConfigurationFactory.cs
@@ -49,11 +49,8 @@ namespace Lucene.Net.Configuration
         public IConfiguration GetConfiguration()
         {
             string testDirectory = TestDirectory ?? // For mocking
-#if TESTFRAMEWORK_NUNIT
                 NUnit.Framework.TestContext.CurrentContext.TestDirectory;
-#else
-                AppDomain.CurrentDomain.BaseDirectory;
-#endif
+
             // LUCENENET - use Lazy<T> to make the create operation atomic. See #417.
             return configurationCache.GetOrAdd(testDirectory,
                 (key) => new Lazy<IConfigurationRoot>(() =>
@@ -61,9 +58,7 @@ namespace Lucene.Net.Configuration
                 return new ConfigurationBuilder()
                     .AddEnvironmentVariables(EnvironmentVariablePrefix) // Use a custom prefix to only load Lucene.NET settings
                     .AddJsonFilesFromRootDirectoryTo(currentPath: key, JsonTestSettingsFileName)
-#if TESTFRAMEWORK_NUNIT
                     .AddNUnitTestRunSettings()
-#endif
                     .Build();
             })).Value;
         }
diff --git a/src/Lucene.Net.TestFramework/Util/BaseDocIdSetTestCase.cs b/src/Lucene.Net.TestFramework/Util/BaseDocIdSetTestCase.cs
index 505d9a5..53889a2 100644
--- a/src/Lucene.Net.TestFramework/Util/BaseDocIdSetTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/BaseDocIdSetTestCase.cs
@@ -4,15 +4,7 @@ using RandomizedTesting.Generators;
 using System;
 using Assert = Lucene.Net.TestFramework.Assert;
 using BitSet = J2N.Collections.BitSet;
-
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-#elif TESTFRAMEWORK_NUNIT
 using Test = NUnit.Framework.TestAttribute;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-#endif
 
 namespace Lucene.Net.Util
 {
@@ -36,19 +28,8 @@ namespace Lucene.Net.Util
     /// <summary>
     /// Base test class for <see cref="DocIdSet"/>s. </summary>
     public abstract class BaseDocIdSetTestCase<T> : LuceneTestCase
-        
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
-        where T : Lucene.Net.Search.DocIdSet
-    {
-        public BaseDocIdSetTestCase(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-        where T : Lucene.Net.Search.DocIdSet
+        where T : DocIdSet
     {
-#endif
         /// <summary>
         /// Create a copy of the given <see cref="BitSet"/> which has <paramref name="length"/> bits. </summary>
         public abstract T CopyOf(BitSet bs, int length);
@@ -173,9 +154,7 @@ namespace Lucene.Net.Util
         /// <summary>
         /// Assert that the content of the <see cref="DocIdSet"/> is the same as the content of the <see cref="BitSet"/>.
         /// </summary>
-#pragma warning disable xUnit1013
         public virtual void AssertEquals(int numBits, BitSet ds1, T ds2)
-#pragma warning restore xUnit1013
         {
             // nextDoc
             DocIdSetIterator it2 = ds2.GetIterator();
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index f42baaa..968c1d9 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis;
+using J2N.Collections.Generic.Extensions;
+using Lucene.Net.Analysis;
 using Lucene.Net.Codecs;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Documents;
@@ -10,9 +11,12 @@ using Lucene.Net.Support;
 using Lucene.Net.Support.IO;
 using Lucene.Net.Support.Threading;
 using Lucene.Net.Util.Automaton;
+using NUnit.Framework.Interfaces;
+using NUnit.Framework.Internal;
+using NUnit.Framework.Internal.Commands;
+using RandomizedTesting.Generators;
 using System;
 using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -21,47 +25,21 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Text.RegularExpressions;
-using JCG = J2N.Collections.Generic;
-using Console = Lucene.Net.Util.SystemConsole;
-using Assert = Lucene.Net.TestFramework.Assert;
-using Directory = Lucene.Net.Store.Directory;
-using FieldInfo = Lucene.Net.Index.FieldInfo;
+using System.Threading;
 using static Lucene.Net.Search.FieldCache;
 using static Lucene.Net.Util.FieldCacheSanityChecker;
-using J2N.Collections.Generic.Extensions;
-using RandomizedTesting.Generators;
-
-#if TESTFRAMEWORK_MSTEST
-using Before = Microsoft.VisualStudio.TestTools.UnitTesting.TestInitializeAttribute;
-using After = Microsoft.VisualStudio.TestTools.UnitTesting.TestCleanupAttribute;
-using OneTimeSetUp = Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute;
-using OneTimeTearDown = Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute;
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
-using AssumptionViolatedException = Microsoft.VisualStudio.TestTools.UnitTesting.AssertInconclusiveException;
-#elif TESTFRAMEWORK_NUNIT
-using Before = NUnit.Framework.SetUpAttribute;
 using After = NUnit.Framework.TearDownAttribute;
+using Assert = Lucene.Net.TestFramework.Assert;
+using AssumptionViolatedException = NUnit.Framework.InconclusiveException;
+using Before = NUnit.Framework.SetUpAttribute;
+using Console = Lucene.Net.Util.SystemConsole;
+using Directory = Lucene.Net.Store.Directory;
+using FieldInfo = Lucene.Net.Index.FieldInfo;
+using JCG = J2N.Collections.Generic;
 using OneTimeSetUp = NUnit.Framework.OneTimeSetUpAttribute;
 using OneTimeTearDown = NUnit.Framework.OneTimeTearDownAttribute;
 using Test = NUnit.Framework.TestAttribute;
-//using TestFixture = Lucene.Net.Util.LuceneTestCase.TestFixtureAttribute;
-using AssumptionViolatedException = NUnit.Framework.InconclusiveException;
-using NUnit.Framework.Interfaces;
-using NUnit.Framework.Internal;
-using NUnit.Framework.Internal.Commands;
-#elif TESTFRAMEWORK_XUNIT
-using Before = Lucene.Net.Attributes.NoOpAttribute;
-using After = Lucene.Net.Attributes.NoOpAttribute;
-using OneTimeSetUp = Lucene.Net.Attributes.NoOpAttribute;
-using OneTimeTearDown = Lucene.Net.Attributes.NoOpAttribute;
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-using TestFixture = Lucene.Net.Attributes.NoOpAttribute;
-using AssumptionViolatedException = Lucene.Net.TestFramework.SkipTestException;
-#endif
 
 namespace Lucene.Net.Util
 {
@@ -146,77 +124,8 @@ namespace Lucene.Net.Util
     ///// </para>
     ///// </summary>
     [TestFixture]
-#if TESTFRAMEWORK_XUNIT
-    [Xunit.Collection("NonParallel")]
-#endif
     public abstract partial class LuceneTestCase //: Assert // Wait long for leaked threads to complete before failure. zk needs this. -  See LUCENE-3995 for rationale.
-#if TESTFRAMEWORK_XUNIT
-        : IDisposable, Xunit.IClassFixture<BeforeAfterClass>
-    {
-        private int isDisposed = 0;
-
-        public LuceneTestCase(BeforeAfterClass beforeAfter)
-        {
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-            ClassEnvRule = new TestRuleSetupAndRestoreClassEnv();
-#endif
-            beforeAfter.SetBeforeAfterClassActions(BeforeClass, AfterClass);
-            this.SetUp();
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing && Interlocked.CompareExchange(ref isDisposed, 1, 0) == 0)
-                this.TearDown();
-        }
-#elif TESTFRAMEWORK_MSTEST
     {
-        //private static LuceneTestCase _currentTestInstance;
-        //private static int isInitialized = 0;
-
-
-        public LuceneTestCase()
-        {
-            UninterruptableMonitor.Enter(initializationLock);
-            try
-            {
-                var thisType = this.GetType();
-                if (!initalizationLock.Contains(thisType.FullName))
-                    initalizationLock.Add(thisType.FullName);
-                else
-                    return; // Only allow this class to initialize once
-
-                //if (_currentTestInstance != null)
-                //    _currentTestInstance.AfterClass();
-                //_currentTestInstance = this;
-
-                _testClassName = thisType.FullName;
-                _testName = string.Empty;
-                _testClassType = thisType;
-
-                BeforeClass();
-            }
-            finally
-            {
-                UninterruptableMonitor.Exit(initializationLock);
-            }
-        }
-#else
-    {
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-        public LuceneTestCase()
-        {
-            ClassEnvRule = new TestRuleSetupAndRestoreClassEnv();
-        }
-#endif
-#endif
-
         // --------------------------------------------------------------------
         // Test groups, system properties and other annotations modifying tests
         // --------------------------------------------------------------------
@@ -233,7 +142,6 @@ namespace Lucene.Net.Util
         ///// <seealso cref="IgnoreAfterMaxFailures"/>
         internal const string SYSPROP_FAILFAST = "tests:failfast"; // LUCENENET specific - made internal, because not fully implemented
 
-#if TESTFRAMEWORK_NUNIT
         private class LuceneDelegatingTestCommand : DelegatingTestCommand
         {
             private readonly Func<bool> shouldSkip;
@@ -274,8 +182,6 @@ namespace Lucene.Net.Util
                 return context.CurrentResult;
             }
         }
-#endif
-
 
         /// <summary>
         /// Attribute for tests that should only be run during nightly builds.
@@ -283,7 +189,6 @@ namespace Lucene.Net.Util
         [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
         [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "API looks better with this nested.")]
         public sealed class NightlyAttribute : System.Attribute
-#if TESTFRAMEWORK_NUNIT
             , IApplyToTest, IApplyToContext, IWrapTestMethod
         {
             private const string SKIP_REASON = "This is a nightly test.";
@@ -317,9 +222,6 @@ namespace Lucene.Net.Util
                 return new LuceneDelegatingTestCommand(command, () => !TestNightly, SKIP_REASON);
             }
         }
-#else
-        { }
-#endif
 
         /// <summary>
         /// Attribute for tests that should only be run during weekly builds.
@@ -327,7 +229,6 @@ namespace Lucene.Net.Util
         [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
         [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "API looks better with this nested.")]
         public sealed class WeeklyAttribute : System.Attribute
-#if TESTFRAMEWORK_NUNIT
             , IApplyToTest, IApplyToContext, IWrapTestMethod
         {
             private const string SKIP_REASON = "This is a weekly test.";
@@ -361,9 +262,6 @@ namespace Lucene.Net.Util
                 return new LuceneDelegatingTestCommand(command, () => !TestWeekly, SKIP_REASON);
             }
         }
-#else
-        { }
-#endif
 
         /// <summary>
         /// Attribute for tests which exhibit a known issue and are temporarily disabled.
@@ -371,7 +269,6 @@ namespace Lucene.Net.Util
         [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
         [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "API looks better with this nested.")]
         public sealed class AwaitsFixAttribute : System.Attribute
-#if TESTFRAMEWORK_NUNIT
             , IApplyToTest, IApplyToContext, IWrapTestMethod
         {
             void IApplyToTest.ApplyToTest(NUnit.Framework.Internal.Test test)
@@ -402,9 +299,7 @@ namespace Lucene.Net.Util
                 // directly.
                 return new LuceneDelegatingTestCommand(command, () => !TestAwaitsFix, BugUrl) { RunState = RunState.Ignored };
             }
-#else
-        {
-#endif
+
             /// <summary>
             /// Point to issue tracker entry. </summary>
             public string BugUrl { get; set; } = "A known bug is being investigated regarding this issue.";
@@ -417,7 +312,6 @@ namespace Lucene.Net.Util
         [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false)]
         [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "API looks better with this nested.")]
         public sealed class SlowAttribute : System.Attribute
-#if TESTFRAMEWORK_NUNIT
             , IApplyToTest, IApplyToContext, IWrapTestMethod
         {
             void IApplyToTest.ApplyToTest(NUnit.Framework.Internal.Test test)
@@ -448,9 +342,7 @@ namespace Lucene.Net.Util
                 // directly.
                 return new LuceneDelegatingTestCommand(command, () => !TestSlow, Message);
             }
-#else
-        {
-#endif
+
             public string Message { get; set; } = "This test is slow.";
         }
 
@@ -784,31 +676,7 @@ namespace Lucene.Net.Util
         /// <summary>
         /// Class environment setup rule.
         /// </summary>
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         internal static TestRuleSetupAndRestoreClassEnv ClassEnvRule { get; } = new TestRuleSetupAndRestoreClassEnv();
-#else
-        // LUCENENET specific
-        // Is non-static to remove inter-class dependencies on this variable
-        internal TestRuleSetupAndRestoreClassEnv ClassEnvRule { get; private set; }
-
-        /// <summary>
-        /// Gets the Similarity from the Class Environment setup rule
-        /// 
-        /// LUCENENET specific
-        /// Exposed because <see cref="TestRuleSetupAndRestoreClassEnv"/> is
-        /// internal and this field is needed by other classes.
-        /// </summary>
-        public Similarity Similarity { get { return ClassEnvRule.similarity; } }
-
-        /// <summary>
-        /// Gets the Timezone from the Class Environment setup rule
-        /// 
-        /// LUCENENET specific
-        /// Exposed because <see cref="TestRuleSetupAndRestoreClassEnv"/> is
-        /// internal and this field is needed by other classes.
-        /// </summary>
-        public TimeZoneInfo TimeZone { get { return ClassEnvRule.timeZone; } }
-#endif
 
         // LUCENENET TODO
         /// <summary>
@@ -963,9 +831,7 @@ namespace Lucene.Net.Util
         /// For subclasses to override. Overrides must call <c>base.SetUp()</c>.
         /// </summary>
         [Before]
-#pragma warning disable xUnit1013
         public virtual void SetUp()
-#pragma warning restore xUnit1013
         {
             // LUCENENET TODO: Not sure how to convert these
             //ParentChainCallRule.SetupCalled = true;
@@ -1017,14 +883,12 @@ namespace Lucene.Net.Util
         /// For subclasses to override. Overrides must call <c>base.TearDown()</c>.
         /// </summary>
         [After]
-#pragma warning disable xUnit1013
         public virtual void TearDown()
-#pragma warning restore xUnit1013
         {
             /* LUCENENET TODO: Not sure how to convert these
                 ParentChainCallRule.TeardownCalled = true;
                 */
-#if TESTFRAMEWORK_NUNIT
+
             TestResult result = TestExecutionContext.CurrentContext.CurrentResult;
             string message;
             if (result.ResultState == ResultState.Failure || result.ResultState == ResultState.Error)
@@ -1045,71 +909,8 @@ namespace Lucene.Net.Util
                     $"See the .runsettings documentation at: https://docs.microsoft.com/en-us/visualstudio/test/configure-unit-tests-by-using-a-dot-runsettings-file.";
                 result.SetResult(result.ResultState, message, result.StackTrace);
             }
-#endif
         }
 
-#if TESTFRAMEWORK_MSTEST
-        private static readonly IList<string> initalizationLock = new JCG.List<string>();
-        private static string _testClassName = string.Empty;
-        private static string _testName = string.Empty;
-        private static Type _testClassType;
-#endif
-
-
-#if TESTFRAMEWORK_MSTEST
-        /// <summary>
-        /// Sets up dependency injection of codec factories for running the test class,
-        /// and also picks random defaults for culture, time zone, similarity, and default codec.
-        /// </summary>
-        // LUCENENET TODO: Add support for attribute inheritance when it is released (2.0.0)
-        //[Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitialize(Microsoft.VisualStudio.TestTools.UnitTesting.InheritanceBehavior.BeforeEachDerivedClass)]
-        public static void BeforeClass(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext context)
-        {
-            if (context == null)
-                throw new ArgumentNullException(nameof(context));
-
-            UninterruptableMonitor.Enter(initializationLock);
-            try
-            {
-                if (!initalizationLock.Contains(context.FullyQualifiedTestClassName))
-                    initalizationLock.Add(context.FullyQualifiedTestClassName);
-                else
-                    return; // Only allow this class to initialize once (MSTest bug)
-
-                _testClassName = context.FullyQualifiedTestClassName;
-                _testName = context.TestName;
-
-#if FEATURE_ASSEMBLY_GETCALLINGASSEMBLY
-                var callingAssembly = Assembly.GetCallingAssembly();
-                _testClassType = callingAssembly.GetType(_testClassName);
-#else
-                _testClassType = Type.GetType(_testClassName);
-#endif
-            }
-            finally
-            {
-                UninterruptableMonitor.Exit(initializationLock);
-            }
-
-            try
-            {
-                ClassEnvRule.Before();
-
-                // LUCENENET: Generate the info once so it can be printed out for each test
-                codecType = ClassEnvRule.codec.GetType().Name;
-                similarityName = ClassEnvRule.similarity.ToString();
-
-                // LUCENENET TODO: Scan for a custom attribute and setup ordering to
-                // initialize data from this class to the top class
-            }
-            catch (Exception ex)
-            {
-                // Write the stack trace so we have something to go on if an error occurs here.
-                throw new Exception($"An exception occurred during BeforeClass:\n{ex.ToString()}", ex);
-            }
-        }
-#endif
-
         /// <summary>
         /// Sets up dependency injection of codec factories for running the test class,
         /// and also picks random defaults for culture, time zone, similarity, and default codec.
@@ -1119,9 +920,7 @@ namespace Lucene.Net.Util
         /// </summary>
         // LUCENENET specific method for setting up dependency injection of test classes.
         [OneTimeSetUp]
-#pragma warning disable xUnit1013
         public virtual void BeforeClass()
-#pragma warning restore xUnit1013
         {
             try
             {
@@ -1138,27 +937,6 @@ namespace Lucene.Net.Util
             }
         }
 
-#if TESTFRAMEWORK_MSTEST
-        /// <summary>
-        /// Tears down random defaults and cleans up temporary files.
-        /// </summary>
-        // LUCENENET TODO: Add support for attribute inheritance when it is released (2.0.0)
-        //[Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanup(Microsoft.VisualStudio.TestTools.UnitTesting.InheritanceBehavior.BeforeEachDerivedClass)]
-        public static void ClassCleanup()
-        {
-            try
-            {
-                ClassEnvRule.After();
-                CleanupTemporaryFiles();
-            }
-            catch (Exception ex)
-            {
-                // Write the stack trace so we have something to go on if an error occurs here.
-                throw new Exception($"An exception occurred during AfterClass:\n{ex.ToString()}", ex);
-            }
-        }
-#endif
-
         /// <summary>
         /// Tears down random defaults and cleans up temporary files.
         /// <para/>
@@ -1167,9 +945,7 @@ namespace Lucene.Net.Util
         /// </summary>
         // LUCENENET specific method for setting up dependency injection of test classes.
         [OneTimeTearDown]
-#pragma warning disable xUnit1013
         public virtual void AfterClass()
-#pragma warning restore xUnit1013
         {
             try
             {
@@ -1212,23 +988,13 @@ namespace Lucene.Net.Util
         {
             get
             {
-#if TESTFRAMEWORK_NUNIT
                 var context = RandomizedContext.CurrentContext;
                 if (context is null)
                     Assert.Fail("LuceneTestCase.Random may only be used within tests/setup/teardown context in subclasses of LuceneTestCase or LuceneTestFrameworkInitializer.");
                 return context.RandomGenerator;
-#else
-                return random ?? (random = new J2N.Randomizer(/* LUCENENET TODO seed */));
-                //return RandomizedContext.Current.Random;
-#endif
             }
         }
 
-#if !TESTFRAMEWORK_NUNIT
-        [ThreadStatic]
-        private static Random random;
-#endif
-
         /////// <summary>
         /////// Registers a <see cref="IDisposable"/> resource that should be closed after the test
         /////// completes.
@@ -1253,59 +1019,12 @@ namespace Lucene.Net.Util
         /// Gets the current type being tested.
         /// </summary>
         public static Type TestType
-            => TestExecutionContext.CurrentContext.CurrentTest.Fixture?.GetType();
-
-        /// <summary>
-        /// Return the current type being tested.
-        /// </summary>
-        [Obsolete("Use TestType instead. This method will be removed in 4.8.0 release candidate.")]
-        public static Type GetTestClass()
-        {
-#if !TESTFRAMEWORK_XUNIT
-#if TESTFRAMEWORK_NUNIT || !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-#if TESTFRAMEWORK_NUNIT
-            string testClassName = NUnit.Framework.TestContext.CurrentContext.Test.ClassName;
-#else
-            if (_testClassType != null)
-                return _testClassType;
-            string testClassName = _testClassName;
-#endif
-
-            // 1st attempt - try resolving the type name directly
-            Type testClass = Type.GetType(testClassName);
-            if (testClass != null)
-                return testClass;
-
-            // 2nd attempt - try scanning the referenced assemblies to see if we can find the class by fullname
-            testClass = AssemblyUtils.GetReferencedAssemblies().SelectMany(a => a.GetTypes().Where(t => t.FullName == testClassName)).FirstOrDefault();
-            if (testClass != null)
-                return testClass;
-#endif
-#endif
-            // Default in case none of the above attempts worked.
-            return typeof(LuceneTestCase);
-        }
-
-
+            => TestExecutionContext.CurrentContext.CurrentTest.Fixture?.GetType(); // LUCENENET specific - renamed from testClass()
 
         /// <summary>
         /// Return the name of the currently executing test case.
         /// </summary>
-        [SuppressMessage("Style", "IDE0025:Use expression body for properties", Justification = "Multiple lines")]
-        public virtual string TestName
-        {
-            get
-            {
-#if TESTFRAMEWORK_NUNIT
-                return NUnit.Framework.TestContext.CurrentContext.Test.MethodName;
-#elif TESTFRAMEWORK_MSTEST
-                return _testName;
-#else
-                //return ThreadAndTestNameRule.TestMethodName;
-                return this.GetType().Name; // LUCENENET TODO: return the current test method name if the test framework supports such a thing.
-#endif
-            }
-        }
+        public virtual string TestName => NUnit.Framework.TestContext.CurrentContext.Test.MethodName;
 
         /// <summary>
         /// Some tests expect the directory to contain a single segment, and want to
@@ -1443,15 +1162,7 @@ namespace Lucene.Net.Util
         /// </param>
         public static void AssumeTrue(string msg, bool condition) // LUCENENET: From RandomizedTest
         {
-#if TESTFRAMEWORK_MSTEST
-            if (!condition)
-                Assert.Inconclusive(msg);
-#elif TESTFRAMEWORK_NUNIT
             NUnit.Framework.Assume.That(condition, msg);
-#elif TESTFRAMEWORK_XUNIT
-            if (!condition)
-                throw new SkipTestException(msg);
-#endif
         }
 
         /// <param name="msg">Message to be included in the exception's string.</param>
@@ -1464,15 +1175,7 @@ namespace Lucene.Net.Util
         /// </param>
         public static void AssumeFalse(string msg, bool condition) // LUCENENET: From RandomizedTest
         {
-#if TESTFRAMEWORK_MSTEST
-            if (condition)
-                Assert.Inconclusive(msg);
-#elif TESTFRAMEWORK_NUNIT
             NUnit.Framework.Assume.That(!condition, msg);
-#elif TESTFRAMEWORK_XUNIT
-            if (condition)
-                throw new SkipTestException(msg);
-#endif
         }
 
         /// <summary>
@@ -1532,41 +1235,11 @@ namespace Lucene.Net.Util
         /// <summary>
         /// Create a new <see cref="IndexWriterConfig"/> with random defaults.
         /// </summary>
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-        // LUCENENET specific
-        // Non-static so that we do not depend on any hidden static dependencies
-        public IndexWriterConfig NewIndexWriterConfig(LuceneVersion v, Analyzer a)
-#else
         public static IndexWriterConfig NewIndexWriterConfig(LuceneVersion v, Analyzer a)
-#endif
         {
             return NewIndexWriterConfig(Random, v, a);
         }
 
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-        /// <summary>
-        /// Create a new <see cref="IndexWriterConfig"/> with random defaults.
-        /// </summary>
-        // LUCENENET specific
-        // Pass LuceneTestCase so we can access instance properties similarity and timeZone
-        public static IndexWriterConfig NewIndexWriterConfig(LuceneTestCase luceneTestCase, LuceneVersion v, Analyzer a)
-        {
-            return NewIndexWriterConfig(luceneTestCase, Random, v, a);
-        }
-
-        /// <summary>
-        /// Create a new <see cref="IndexWriterConfig"/> with random defaults using the specified <paramref name="random"/>.
-        /// </summary>
-        // LUCENENET specific - non-static overload so we don't have to explicitly
-        // pass LuceneTestCase
-        public IndexWriterConfig NewIndexWriterConfig(Random random, LuceneVersion v, Analyzer a)
-        {
-            return NewIndexWriterConfig(this, random, v, a);
-
-        }
-#endif
-
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         /// <summary>
         /// Create a new <see cref="IndexWriterConfig"/> with random defaults using the specified <paramref name="random"/>.
         /// </summary>
@@ -1574,26 +1247,10 @@ namespace Lucene.Net.Util
         /// <param name="v"></param>
         /// <param name="a"></param>
         public static IndexWriterConfig NewIndexWriterConfig(Random random, LuceneVersion v, Analyzer a)
-#else
-        /// <summary>
-        /// Create a new <see cref="IndexWriterConfig"/> with random defaults using the specified <paramref name="random"/>.
-        /// </summary>
-        /// <param name="luceneTestCase">The current test instance.</param>
-        /// <param name="random">A random instance (usually <see cref="LuceneTestCase.Random"/>).</param>
-        /// <param name="v"></param>
-        /// <param name="a"></param>
-        // LUCENENET specific
-        // This is the only static ctor for IndexWriterConfig because it removes the dependency
-        // on ClassEnvRule by using parameters Similarity and TimeZone.
-        public static IndexWriterConfig NewIndexWriterConfig(LuceneTestCase luceneTestCase, Random random, LuceneVersion v, Analyzer a)
-#endif
+
         {
             IndexWriterConfig c = new IndexWriterConfig(v, a);
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
             c.SetSimilarity(ClassEnvRule.similarity);
-#else
-            c.SetSimilarity(luceneTestCase.ClassEnvRule.similarity);
-#endif
             if (Verbose)
             {
                 // Even though TestRuleSetupAndRestoreClassEnv calls
@@ -1650,11 +1307,7 @@ namespace Lucene.Net.Util
                 // LUCENENET specific - Removed RandomDocumentsWriterPerThreadPool, as was done in Lucene 4.8.1 (see #208)
                 c.SetMaxThreadStates(maxNumThreadStates);
             }
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
             c.SetMergePolicy(NewMergePolicy(random));
-#else
-            c.SetMergePolicy(NewMergePolicy(random, luceneTestCase.ClassEnvRule.timeZone));
-#endif
             if (Rarely(random))
             {
                 c.SetMergedSegmentWarmer(new SimpleMergedSegmentWarmer(c.InfoStream));
@@ -1666,30 +1319,7 @@ namespace Lucene.Net.Util
             return c;
         }
 
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-        // LUCENENET specific - non-static overload so we don't have to explicitly
-        // pass LuceneTestCase
-        public MergePolicy NewMergePolicy(Random r)
-        {
-            return NewMergePolicy(this, r);
-        }
-
-        // LUCENENET specific - non-static overload so we don't have to explicitly
-        // pass LuceneTestCase
-        public MergePolicy NewMergePolicy()
-        {
-            return NewMergePolicy(this);
-        }
-#endif
-
-
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         public static MergePolicy NewMergePolicy(Random r)
-#else
-        // LUCENENET specific
-        // LuceneTestCase added to remove dependency on the then-static <see cref="ClassEnvRule"/>
-        public static MergePolicy NewMergePolicy(LuceneTestCase luceneTestCase, Random r)
-#endif
         {
             if (Rarely(r))
             {
@@ -1701,30 +1331,15 @@ namespace Lucene.Net.Util
             }
             else if (r.Next(5) == 0)
             {
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
                 return NewAlcoholicMergePolicy(r, ClassEnvRule.timeZone);
-#else
-                return NewAlcoholicMergePolicy(r, luceneTestCase.ClassEnvRule.timeZone);
-#endif
             }
             return NewLogMergePolicy(r);
         }
 
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         public static MergePolicy NewMergePolicy()
         {
             return NewMergePolicy(Random);
         }
-#else
-        /// <param name="luceneTestCase">The current test instance.</param>
-        // LUCENENET specific
-        // Timezone added to remove dependency on the then-static <see cref="ClassEnvRule"/>
-        //
-        public static MergePolicy NewMergePolicy(LuceneTestCase luceneTestCase)
-        {
-            return NewMergePolicy(luceneTestCase, Random);
-        }
-#endif
 
         public static LogMergePolicy NewLogMergePolicy()
         {
@@ -1736,16 +1351,9 @@ namespace Lucene.Net.Util
             return NewTieredMergePolicy(Random);
         }
 
-
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         public static AlcoholicMergePolicy NewAlcoholicMergePolicy()
         {
             return NewAlcoholicMergePolicy(Random, ClassEnvRule.timeZone);
-#else
-        public static AlcoholicMergePolicy NewAlcoholicMergePolicy(TimeZoneInfo timeZone)
-        {
-            return NewAlcoholicMergePolicy(Random, timeZone);
-#endif
         }
 
         public static AlcoholicMergePolicy NewAlcoholicMergePolicy(Random random, TimeZoneInfo timeZone)
@@ -2292,7 +1900,6 @@ namespace Lucene.Net.Util
             }
         }
 
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
         /// <summary>
         /// Create a new searcher over the reader. this searcher might randomly use
         /// threads.
@@ -2310,53 +1917,6 @@ namespace Lucene.Net.Util
         {
             return NewSearcher(r, maybeWrap, true);
         }
-#else
-        /// <summary>
-        /// Create a new searcher over the reader. this searcher might randomly use
-        /// threads.
-        /// </summary>
-        // LUCENENET specific
-        // Is non-static because <see cref="ClassEnvRule"/> is now non-static.
-        public IndexSearcher NewSearcher(IndexReader r)
-        {
-            return NewSearcher(this, r, true);
-        }
-
-        /// <summary>
-        /// Create a new searcher over the reader. This searcher might randomly use
-        /// threads.
-        /// </summary>
-        // LUCENENET specific
-        // Removes dependency on <see cref="LuceneTestCase.ClassEnvRule"/>
-        public static IndexSearcher NewSearcher(LuceneTestCase luceneTestCase, IndexReader r)
-        {
-            return NewSearcher(luceneTestCase, r, true);
-        }
-
-
-        /// <summary>
-        /// Create a new searcher over the reader. this searcher might randomly use
-        /// threads.
-        /// </summary>
-        /// <param name="luceneTestCase">The current test instance.</param>
-        // LUCENENET specific
-        // Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
-
-        public static IndexSearcher NewSearcher(LuceneTestCase luceneTestCase, IndexReader r, bool maybeWrap)
-        {
-            return NewSearcher(luceneTestCase, r, maybeWrap, true);
-        }
-
-        /// <summary>
-        /// Create a new searcher over the reader. This searcher might randomly use
-        /// threads.
-        /// </summary>
-        // LUCENENET specific
-        // Is non-static because <see cref="ClassEnvRule"/> is now non-static.
-        public IndexSearcher NewSearcher(IndexReader r, bool maybeWrap)
-        {
-            return NewSearcher(this, r, maybeWrap, true);
-        }
 
         /// <summary>
         /// Create a new searcher over the reader. This searcher might randomly use
@@ -2365,36 +1925,7 @@ namespace Lucene.Net.Util
         /// <paramref name="wrapWithAssertions"/> is true, this searcher might be an
         /// <see cref="AssertingIndexSearcher"/> instance.
         /// </summary>
-        // LUCENENET specific
-        // Is non-static because <see cref="ClassEnvRule"/> is now non-static.
-        public IndexSearcher NewSearcher(IndexReader r, bool maybeWrap, bool wrapWithAssertions)
-        {
-            return NewSearcher(this, r, maybeWrap, wrapWithAssertions);
-        }
-#endif
-
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-        /// <summary>
-        /// Create a new searcher over the reader. This searcher might randomly use
-        /// threads. If <paramref name="maybeWrap"/> is true, this searcher might wrap the
-        /// reader with one that returns null for <see cref="CompositeReader.GetSequentialSubReaders()"/>. If
-        /// <paramref name="wrapWithAssertions"/> is true, this searcher might be an
-        /// <see cref="AssertingIndexSearcher"/> instance.
-        /// </summary>
         public static IndexSearcher NewSearcher(IndexReader r, bool maybeWrap, bool wrapWithAssertions)
-#else
-        /// <summary>
-        /// Create a new searcher over the reader. This searcher might randomly use
-        /// threads. If <paramref name="maybeWrap"/> is true, this searcher might wrap the
-        /// reader with one that returns null for <see cref="CompositeReader.GetSequentialSubReaders()"/>. If
-        /// <paramref name="wrapWithAssertions"/> is true, this searcher might be an
-        /// <see cref="AssertingIndexSearcher"/> instance.
-        /// </summary>
-        /// <param name="luceneTestCase">The current test instance.</param>
-        // LUCENENET specific
-        // Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
-        public static IndexSearcher NewSearcher(LuceneTestCase luceneTestCase, IndexReader r, bool maybeWrap, bool wrapWithAssertions)
-#endif
         {
             Random random = Random;
             if (Usually())
@@ -2423,11 +1954,7 @@ namespace Lucene.Net.Util
                 {
                     ret = random.NextBoolean() ? new IndexSearcher(r) : new IndexSearcher(r.Context);
                 }
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
                 ret.Similarity = ClassEnvRule.similarity;
-#else
-                ret.Similarity = luceneTestCase?.ClassEnvRule.similarity; // LUCENENET special case: passing null allows us to skip the Similarity
-#endif
                 return ret;
             }
             else
@@ -2463,11 +1990,7 @@ namespace Lucene.Net.Util
                 {
                     ret = random.NextBoolean() ? new IndexSearcher(r, ex) : new IndexSearcher(r.Context, ex);
                 }
-#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
                 ret.Similarity = ClassEnvRule.similarity;
-#else
-                ret.Similarity = luceneTestCase?.ClassEnvRule.similarity; // LUCENENET special case: passing null allows us to skip the Similarity
-#endif
                 return ret;
             }
         }
@@ -3345,54 +2868,7 @@ namespace Lucene.Net.Util
         /// </summary>
         private const int TEMP_NAME_RETRY_THRESHOLD = 9999;
 
-        // LUCENENET: Not Implemented
-        /////// <summary>
-        /////// this method is deprecated for a reason. Do not use it. Call <seealso cref="#createTempDir()"/>
-        /////// or <seealso cref="#createTempDir(String)"/> or <seealso cref="#createTempFile(String, String)"/>.
-        /////// </summary>
-        /////*[Obsolete]
-        ////public static DirectoryInfo GetBaseTempDirForTestClass()
-        ////{
-        ////    lock (typeof(LuceneTestCase))
-        ////    {
-        ////        if (TempDirBase == null)
-        ////        {
-        ////            DirectoryInfo directory = new DirectoryInfo(System.IO.Path.GetTempPath());
-        ////            //if (Debugging.AssertsEnabled) Debugging.Assert(directory.Exists && directory.Directory != null && directory.CanWrite());
-
-        ////            RandomizedContext ctx = RandomizedContext.Current;
-        ////            Type clazz = ctx.GetTargetType;
-        ////            string prefix = clazz.Name;
-        ////            prefix = prefix.replaceFirst("^org.apache.lucene.", "lucene.");
-        ////            prefix = prefix.replaceFirst("^org.apache.solr.", "solr.");
-
-        ////            int attempt = 0;
-        ////            DirectoryInfo f;
-        ////            bool iterate = true;
-        ////            do
-        ////            {
-        ////                if (attempt++ >= TEMP_NAME_RETRY_THRESHOLD)
-        ////                {
-        ////                    throw RuntimeException.Create("Failed to get a temporary name too many times, check your temp directory and consider manually cleaning it: " + directory.FullName);
-        ////                }
-        ////                f = new DirectoryInfo(Path.Combine(directory.FullName, prefix + "-" + ctx.RunnerSeed + "-" + string.Format(CultureInfo.InvariantCulture, "%03d", attempt)));
-
-        ////                try
-        ////                {
-        ////                    f.Create();
-        ////                }
-        ////                catch (Exception ioe) when (ioe.IsIOException())
-        ////                {
-        ////                    iterate = false;
-        ////                }
-        ////            } while (iterate);
-
-        ////            TempDirBase = f;
-        ////            RegisterToRemoveAfterSuite(TempDirBase);
-        ////        }
-        ////    }
-        ////    return TempDirBase;
-        ////}*/
+        // LUCENENET specific - omitted GetBaseTempDirForTestClass() method, since it was already deprecated and not recommended
 
         /// <summary>
         /// Creates an empty, temporary folder (when the name of the folder is of no importance).
diff --git a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
index ac4ea92..23832e7 100644
--- a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
+++ b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
@@ -23,17 +23,7 @@ using System.Threading;
 using JCG = J2N.Collections.Generic;
 using Console = Lucene.Net.Util.SystemConsole;
 using RandomizedTesting.Generators;
-
-// LUCENENET NOTE: These are primarily here because they are referred to
-// in the XML documentation. Be sure to add a new option if a new test framework
-// is being supported.
-#if TESTFRAMEWORK_MSTEST
-using AssumptionViolatedException = Microsoft.VisualStudio.TestTools.UnitTesting.AssertInconclusiveException;
-#elif TESTFRAMEWORK_NUNIT
 using AssumptionViolatedException = NUnit.Framework.InconclusiveException;
-#elif TESTFRAMEWORK_XUNIT
-using AssumptionViolatedException = Lucene.Net.TestFramework.SkipTestException;
-#endif
 
 namespace Lucene.Net.Util
 {
diff --git a/src/Lucene.Net.TestFramework/Util/TestUtil.cs b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
index 1802d1f..0223662 100644
--- a/src/Lucene.Net.TestFramework/Util/TestUtil.cs
+++ b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
@@ -23,18 +23,6 @@ using Directory = Lucene.Net.Store.Directory;
 using JCG = J2N.Collections.Generic;
 using RandomInts = RandomizedTesting.Generators.RandomNumbers;
 
-
-//#if TESTFRAMEWORK_MSTEST
-//using CollectionAssert = Lucene.Net.TestFramework.Assert;
-//using Assert = Lucene.Net.TestFramework.Assert;
-//#elif TESTFRAMEWORK_NUNIT
-//using CollectionAssert = NUnit.Framework.CollectionAssert;
-//using Assert = NUnit.Framework.Assert;
-//#elif TESTFRAMEWORK_XUNIT
-//using CollectionAssert = Lucene.Net.TestFramework.Assert;
-//using Assert = Lucene.Net.TestFramework.Assert;
-//#endif
-
 namespace Lucene.Net.Util
 {
     /*
diff --git a/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationDocValuesField.cs b/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationDocValuesField.cs
index c8982fd..4c82bf9 100644
--- a/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationDocValuesField.cs
+++ b/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationDocValuesField.cs
@@ -37,11 +37,7 @@ namespace Lucene.Net.Collation
         public void TestBasic()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             Field field = NewField("field", "", StringField.TYPE_STORED);
             ICUCollationDocValuesField collationField = new ICUCollationDocValuesField("collated", Collator.GetInstance(new CultureInfo("en")));
@@ -74,11 +70,7 @@ namespace Lucene.Net.Collation
         public void TestRanges()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             Field field = NewField("field", "", StringField.TYPE_STORED);
             Collator collator = Collator.GetInstance(CultureInfo.CurrentCulture); // uses -Dtests.locale
diff --git a/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs b/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs
index 314c79d..5c68896 100644
--- a/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs
+++ b/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs
@@ -57,11 +57,7 @@ namespace Lucene.Net.Classification
         {
             base.SetUp();
             dir = NewDirectory();
-            indexWriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            indexWriter = new RandomIndexWriter(Random, dir);
             textFieldName = "text";
             categoryFieldName = "cat";
             booleanFieldName = "bool";
diff --git a/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs b/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs
index 6960a56..8f32965 100644
--- a/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs
+++ b/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs
@@ -45,11 +45,7 @@ namespace Lucene.Net.Classification
         {
             base.SetUp();
             dir = NewDirectory();
-            indexWriter = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, new MockAnalyzer(Random));
+            indexWriter = new RandomIndexWriter(Random, dir, new MockAnalyzer(Random));
 
             FieldType ft = new FieldType(TextField.TYPE_STORED);
             ft.StoreTermVectors = true;
diff --git a/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs b/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs
index 6bcb755..1af04ea 100644
--- a/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs
+++ b/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs
@@ -43,11 +43,7 @@ namespace Lucene.Net.Expressions
         {
             base.SetUp();
             dir = NewDirectory();
-            var iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            var iw = new RandomIndexWriter(Random, dir);
             var doc = new Document
             {
                 NewStringField("id", "1", Field.Store.YES),
diff --git a/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs b/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs
index 07b66e2..50548af 100644
--- a/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs
+++ b/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs
@@ -40,11 +40,7 @@ namespace Lucene.Net.Expressions
         {
             base.SetUp();
             dir = NewDirectory();
-            var iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            var iw = new RandomIndexWriter(Random, dir);
             var doc = new Document
             {
                 NewStringField("id", "1", Field.Store.YES),
diff --git a/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs b/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs
index 6b64263..dc0d148 100644
--- a/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs
+++ b/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs
@@ -47,11 +47,7 @@ namespace Lucene.Net.Expressions
         {
             base.SetUp();
             dir = NewDirectory();
-            var iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            var iw = new RandomIndexWriter(Random, dir);
             int numDocs = TestUtil.NextInt32(Random, 2049, 4000);
             for (int i = 0; i < numDocs; i++)
             {
diff --git a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
index d0ada3e..0994a91 100644
--- a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
@@ -73,11 +73,7 @@ namespace Lucene.Net.Facet.Range
         public virtual void TestBasicLong()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             NumericDocValuesField field = new NumericDocValuesField("field", 0L);
             doc.Add(field);
@@ -159,11 +155,7 @@ namespace Lucene.Net.Facet.Range
         {
 
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             NumericDocValuesField field = new NumericDocValuesField("field", 0L);
             doc.Add(field);
@@ -200,11 +192,7 @@ namespace Lucene.Net.Facet.Range
         public virtual void TestOverlappedEndStart()
         {
             Directory d = NewDirectory();
-            var w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            var w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             NumericDocValuesField field = new NumericDocValuesField("field", 0L);
             doc.Add(field);
@@ -244,11 +232,7 @@ namespace Lucene.Net.Facet.Range
         public virtual void TestMixedRangeAndNonRangeTaxonomy()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Directory td = NewDirectory();
             DirectoryTaxonomyWriter tw = new DirectoryTaxonomyWriter(td, OpenMode.CREATE);
 
@@ -365,11 +349,7 @@ namespace Lucene.Net.Facet.Range
         public virtual void TestBasicDouble()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             DoubleDocValuesField field = new DoubleDocValuesField("field", 0.0);
             doc.Add(field);
@@ -402,11 +382,7 @@ namespace Lucene.Net.Facet.Range
         public virtual void TestBasicFloat()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             SingleDocValuesField field = new SingleDocValuesField("field", 0.0f);
             doc.Add(field);
@@ -440,11 +416,7 @@ namespace Lucene.Net.Facet.Range
         public virtual void TestRandomLongs()
         {
             Directory dir = NewDirectory();
-            var w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            var w = new RandomIndexWriter(Random, dir);
 
             int numDocs = AtLeast(1000);
             if (Verbose)
@@ -637,11 +609,7 @@ namespace Lucene.Net.Facet.Range
         public virtual void TestRandomFloats()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             int numDocs = AtLeast(1000);
             float[] values = new float[numDocs];
@@ -846,11 +814,7 @@ namespace Lucene.Net.Facet.Range
         public virtual void TestRandomDoubles()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             int numDocs = AtLeast(1000);
             double[] values = new double[numDocs];
@@ -1039,11 +1003,7 @@ namespace Lucene.Net.Facet.Range
         {
             AssumeTrue("codec does not support docsWithField", DefaultCodecSupportsDocsWithField);
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             NumericDocValuesField field = new NumericDocValuesField("field", 0L);
             doc.Add(field);
@@ -1082,11 +1042,7 @@ namespace Lucene.Net.Facet.Range
         public virtual void TestCustomDoublesValueSource()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             writer.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
index 430db02..fac9d4d 100644
--- a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
+++ b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
@@ -56,11 +56,7 @@ namespace Lucene.Net.Facet.SortedSet
 
             FacetsConfig config = new FacetsConfig();
             config.SetMultiValued("a", true);
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesFacetField("a", "foo"));
@@ -109,11 +105,7 @@ namespace Lucene.Net.Facet.SortedSet
             AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet);
             Directory dir = NewDirectory();
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             FacetsConfig config = new FacetsConfig();
 
@@ -161,11 +153,7 @@ namespace Lucene.Net.Facet.SortedSet
             AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet);
             Directory dir = NewDirectory();
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             FacetsConfig config = new FacetsConfig();
 
@@ -223,11 +211,7 @@ namespace Lucene.Net.Facet.SortedSet
             AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet);
             Directory dir = NewDirectory();
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             FacetsConfig config = new FacetsConfig();
 
@@ -269,11 +253,7 @@ namespace Lucene.Net.Facet.SortedSet
             AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet);
             Directory dir = NewDirectory();
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             FacetsConfig config = new FacetsConfig();
 
@@ -312,11 +292,7 @@ namespace Lucene.Net.Facet.SortedSet
             Directory indexDir = NewDirectory();
             Directory taxoDir = NewDirectory();
 
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexDir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, indexDir);
             FacetsConfig config = new FacetsConfig();
             int numDocs = AtLeast(1000);
             int numDims = TestUtil.NextInt32(Random, 1, 7);
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index 1c950ae..c113719 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -70,11 +70,7 @@ namespace Lucene.Net.Facet.Taxonomy
             config.SetIndexFieldName("float", "$facets.float");
             config.SetMultiValued("float", true);
 
-            var writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            var writer = new RandomIndexWriter(Random, dir);
 
             // index documents, 50% have only 'b' and all have 'a'
             for (int i = 0; i < 110; i++)
@@ -205,11 +201,7 @@ namespace Lucene.Net.Facet.Taxonomy
 
             ITaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
             FacetsConfig config = new FacetsConfig();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(new Int32AssociationFacetField(14, "a", "x"));
@@ -235,11 +227,7 @@ namespace Lucene.Net.Facet.Taxonomy
             ITaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
             FacetsConfig config = new FacetsConfig();
             config.SetHierarchical("a", true);
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(new Int32AssociationFacetField(14, "a", "x"));
@@ -264,11 +252,7 @@ namespace Lucene.Net.Facet.Taxonomy
             ITaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
             FacetsConfig config = new FacetsConfig();
             config.SetRequireDimCount("a", true);
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(new Int32AssociationFacetField(14, "a", "x"));
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
index b9caef7..3da70b7 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
@@ -70,11 +70,7 @@ namespace Lucene.Net.Facet.Taxonomy
             FacetsConfig config = new FacetsConfig();
             config.SetHierarchical("Publish Date", true);
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(new FacetField("Author", "Bob"));
@@ -165,11 +161,7 @@ namespace Lucene.Net.Facet.Taxonomy
             // main index:
             var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE);
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             FacetsConfig config = new FacetsConfig();
 
             Document doc = new Document();
@@ -231,11 +223,7 @@ namespace Lucene.Net.Facet.Taxonomy
 
             FacetsConfig config = new FacetsConfig();
             config.SetIndexFieldName("a", "$facets2");
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(new FacetField("a", "foo1"));
@@ -339,11 +327,7 @@ namespace Lucene.Net.Facet.Taxonomy
             FacetsConfig config = new FacetsConfig();
             config.SetHierarchical("a", true);
             config.SetMultiValued("a", true);
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(NewTextField("field", "text", Field.Store.NO));
@@ -389,11 +373,7 @@ namespace Lucene.Net.Facet.Taxonomy
         {
             Store.Directory dir = NewDirectory();
             Store.Directory taxoDir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE);
 
             FacetsConfig config = new FacetsConfig();
@@ -428,11 +408,7 @@ namespace Lucene.Net.Facet.Taxonomy
         {
             Store.Directory dir = NewDirectory();
             Store.Directory taxoDir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE);
 
             FacetsConfig config = new FacetsConfig();
@@ -543,11 +519,7 @@ namespace Lucene.Net.Facet.Taxonomy
             Store.Directory dir = NewDirectory();
             Store.Directory taxoDir = NewDirectory();
             var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE);
-            var writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            var writer = new RandomIndexWriter(Random, dir);
             FacetsConfig config = new FacetsConfig();
 
             Document doc = new Document();
@@ -573,11 +545,7 @@ namespace Lucene.Net.Facet.Taxonomy
             Store.Directory dir = NewDirectory();
             Store.Directory taxoDir = NewDirectory();
             ITaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE);
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             FacetsConfig config = new FacetsConfig();
 
             Document doc = new Document();
@@ -790,11 +758,7 @@ namespace Lucene.Net.Facet.Taxonomy
             Store.Directory indexDir = NewDirectory();
             Store.Directory taxoDir = NewDirectory();
 
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexDir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, indexDir);
             var tw = new DirectoryTaxonomyWriter(taxoDir);
             FacetsConfig config = new FacetsConfig();
             int numDocs = AtLeast(1000);
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
index e0b44a7..7d8b69e 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
@@ -78,11 +78,7 @@ namespace Lucene.Net.Facet.Taxonomy
             // main index:
             DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE);
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             FacetsConfig config = new FacetsConfig();
 
             // Reused across documents, to add the necessary facet
@@ -151,11 +147,7 @@ namespace Lucene.Net.Facet.Taxonomy
             // main index:
             var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE);
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             FacetsConfig config = new FacetsConfig();
 
             Document doc = new Document();
@@ -223,11 +215,7 @@ namespace Lucene.Net.Facet.Taxonomy
             FacetsConfig config = new FacetsConfig();
             config.SetIndexFieldName("a", "$facets2");
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(new Int32Field("num", 10, Field.Store.NO));
@@ -508,11 +496,7 @@ namespace Lucene.Net.Facet.Taxonomy
             Store.Directory indexDir = NewDirectory();
             Store.Directory taxoDir = NewDirectory();
 
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexDir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, indexDir);
             var tw = new DirectoryTaxonomyWriter(taxoDir);
             FacetsConfig config = new FacetsConfig();
             int numDocs = AtLeast(1000);
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
index b9f436b..c9e77e5 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
@@ -88,11 +88,7 @@ namespace Lucene.Net.Facet
             FacetsConfig config = new FacetsConfig();
             config.SetHierarchical("Publish Date", true);
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(new FacetField("Author", "Bob"));
@@ -263,11 +259,7 @@ namespace Lucene.Net.Facet
         {
             Directory dir = NewDirectory();
             Directory taxoDir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             // Writes facet ords to a separate directory from the
             // main index:
@@ -323,11 +315,7 @@ namespace Lucene.Net.Facet
         {
             Directory dir = NewDirectory();
             Directory taxoDir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             // Writes facet ords to a separate directory from the
             // main index:
@@ -1301,11 +1289,7 @@ namespace Lucene.Net.Facet
             // LUCENE-5045: make sure DrillSideways works with an empty index
             Directory dir = NewDirectory();
             Directory taxoDir = NewDirectory();
-            var writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            var writer = new RandomIndexWriter(Random, dir);
             var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE);
             IndexSearcher searcher = NewSearcher(writer.GetReader());
             var taxoReader = new DirectoryTaxonomyReader(taxoWriter);
diff --git a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
index 116d86a..2b3ba92 100644
--- a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
+++ b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
@@ -48,11 +48,7 @@ namespace Lucene.Net.Facet
             Directory taxoDir = NewDirectory();
 
             DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             FacetsConfig config = new FacetsConfig();
 
diff --git a/src/Lucene.Net.Tests.Highlighter/Highlight/TokenSourcesTest.cs b/src/Lucene.Net.Tests.Highlighter/Highlight/TokenSourcesTest.cs
index 5510eae..24b729a 100644
--- a/src/Lucene.Net.Tests.Highlighter/Highlight/TokenSourcesTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Highlight/TokenSourcesTest.cs
@@ -343,11 +343,7 @@ namespace Lucene.Net.Search.Highlight
         public void TestPayloads()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             FieldType myFieldType = new FieldType(TextField.TYPE_NOT_STORED);
             myFieldType.StoreTermVectors = (true);
             myFieldType.StoreTermVectorOffsets = (true);
diff --git a/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighter.cs b/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighter.cs
index 070ddfa..556d044 100644
--- a/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighter.cs
+++ b/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighter.cs
@@ -463,11 +463,7 @@ namespace Lucene.Net.Search.PostingsHighlight
                           "Southeast Asia, and - Buddhism in China, East Asia, and Japan.";
             Directory dir = NewDirectory();
             Analyzer analyzer = new MockAnalyzer(Random, MockTokenizer.SIMPLE, true);
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, analyzer);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir, analyzer);
 
             FieldType positionsType = new FieldType(TextField.TYPE_STORED);
             positionsType.IndexOptions = (IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS);
@@ -500,11 +496,7 @@ namespace Lucene.Net.Search.PostingsHighlight
                           "Firefighters are a famously brave lot, but can they withstand a visit from one curious monkey?";
             Directory dir = NewDirectory();
             Analyzer analyzer = new MockAnalyzer(Random, MockTokenizer.SIMPLE, true);
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, analyzer);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir, analyzer);
             FieldType positionsType = new FieldType(TextField.TYPE_STORED);
             positionsType.IndexOptions = (IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS);
             Field body = new Field("body", text, positionsType);
@@ -538,11 +530,7 @@ namespace Lucene.Net.Search.PostingsHighlight
 
             Store.Directory dir = NewDirectory();
             Analyzer analyzer = new MockAnalyzer(Random, MockTokenizer.SIMPLE, true);
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, analyzer);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir, analyzer);
             FieldType positionsType = new FieldType(TextField.TYPE_STORED);
             positionsType.IndexOptions = (IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS);
             Field body = new Field("body", text, positionsType);
@@ -605,11 +593,7 @@ namespace Lucene.Net.Search.PostingsHighlight
         {
             Directory dir = NewDirectory();
             Analyzer analyzer = new MockAnalyzer(Random, MockTokenizer.SIMPLE, true);
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, analyzer);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir, analyzer);
             FieldType positionsType = new FieldType(TextField.TYPE_STORED);
             positionsType.IndexOptions = (IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS);
             Field body = new Field("body", "This sentence has both terms.  This sentence has only terms.", positionsType);
diff --git a/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighterRanking.cs b/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighterRanking.cs
index 654d2f9..c747564 100644
--- a/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighterRanking.cs
+++ b/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighterRanking.cs
@@ -65,11 +65,7 @@ namespace Lucene.Net.Search.PostingsHighlight
             int maxNumSentences = 20;
 
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, new MockAnalyzer(Random, MockTokenizer.SIMPLE, true));
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir, new MockAnalyzer(Random, MockTokenizer.SIMPLE, true));
             Document document = new Document();
             Field id = new StringField("id", "", Field.Store.NO);
             FieldType offsetsType = new FieldType(TextField.TYPE_STORED);
diff --git a/src/Lucene.Net.Tests.Join/Support/TestBlockJoin.cs b/src/Lucene.Net.Tests.Join/Support/TestBlockJoin.cs
index 5f76f71..d21ea0c 100644
--- a/src/Lucene.Net.Tests.Join/Support/TestBlockJoin.cs
+++ b/src/Lucene.Net.Tests.Join/Support/TestBlockJoin.cs
@@ -136,11 +136,7 @@ namespace Lucene.Net.Tests.Join
         public void TestSimple()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             IList<Document> docs = new List<Document>();
 
@@ -230,11 +226,7 @@ namespace Lucene.Net.Tests.Join
         public void TestBugCausedByRewritingTwice()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             IList<Document> docs = new List<Document>();
 
@@ -291,11 +283,7 @@ namespace Lucene.Net.Tests.Join
         public virtual void TestSimpleFilter()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             IList<Document> docs = new List<Document>();
             docs.Add(MakeJob("java", 2007));
@@ -394,21 +382,13 @@ namespace Lucene.Net.Tests.Join
         public void TestBoostBug()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             IndexReader r = w.GetReader();
             w.Dispose();
             IndexSearcher s = NewSearcher(r);
 
             ToParentBlockJoinQuery q = new ToParentBlockJoinQuery(new MatchAllDocsQuery(), new QueryWrapperFilter(new MatchAllDocsQuery()), ScoreMode.Avg);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
             s.Search(q, 10);
             BooleanQuery bq = new BooleanQuery();
             bq.Boost = 2f; // we boost the BQ
@@ -550,16 +530,8 @@ namespace Lucene.Net.Tests.Join
             IList<int> toDelete = new List<int>();
 
             // TODO: parallel star join, nested join cases too!
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
-            RandomIndexWriter joinW = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, joinDir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
+            RandomIndexWriter joinW = new RandomIndexWriter(Random, joinDir);
             for (int parentDocID = 0; parentDocID < numParentDocs; parentDocID++)
             {
                 Document parentDoc = new Document();
@@ -1166,11 +1138,7 @@ namespace Lucene.Net.Tests.Join
         public void TestMultiChildTypes()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             IList<Document> docs = new List<Document>();
 
@@ -1257,11 +1225,7 @@ namespace Lucene.Net.Tests.Join
         public void TestAdvanceSingleParentSingleChild()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             Document childDoc = new Document();
             childDoc.Add(NewStringField("child", "1", Field.Store.NO));
             Document parentDoc = new Document();
@@ -1319,11 +1283,7 @@ namespace Lucene.Net.Tests.Join
         public void TestGetTopGroups()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             IList<Document> docs = new List<Document>();
             docs.Add(MakeJob("ruby", 2005));
@@ -1417,11 +1377,7 @@ namespace Lucene.Net.Tests.Join
         public void TestSometimesParentOnlyMatches()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document parent = new Document();
             parent.Add(new StoredField("parentID", "0"));
             parent.Add(NewTextField("parentText", "text", Field.Store.NO));
@@ -1486,11 +1442,7 @@ namespace Lucene.Net.Tests.Join
         public void TestChildQueryNeverMatches()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document parent = new Document();
             parent.Add(new StoredField("parentID", "0"));
             parent.Add(NewTextField("parentText", "text", Field.Store.NO));
@@ -1556,11 +1508,7 @@ namespace Lucene.Net.Tests.Join
         public void TestChildQueryMatchesParent()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document parent = new Document();
             parent.Add(new StoredField("parentID", "0"));
             parent.Add(NewTextField("parentText", "text", Field.Store.NO));
@@ -1619,11 +1567,7 @@ namespace Lucene.Net.Tests.Join
         public void TestAdvanceSingleDeletedParentNoChild()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             // First doc with 1 children
             Document parentDoc = new Document();
diff --git a/src/Lucene.Net.Tests.Join/TestBlockJoin.cs b/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
index e18a9b2..8221cb4 100644
--- a/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
+++ b/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
@@ -134,11 +134,7 @@ namespace Lucene.Net.Search.Join
         public void TestSimple()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             IList<Document> docs = new JCG.List<Document>();
 
@@ -228,11 +224,7 @@ namespace Lucene.Net.Search.Join
         public void TestBugCausedByRewritingTwice()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             IList<Document> docs = new JCG.List<Document>();
 
@@ -289,11 +281,7 @@ namespace Lucene.Net.Search.Join
         public virtual void TestSimpleFilter()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             IList<Document> docs = new JCG.List<Document>();
             docs.Add(MakeJob("java", 2007));
@@ -392,21 +380,13 @@ namespace Lucene.Net.Search.Join
         public void TestBoostBug()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             IndexReader r = w.GetReader();
             w.Dispose();
             IndexSearcher s = NewSearcher(r);
 
             ToParentBlockJoinQuery q = new ToParentBlockJoinQuery(new MatchAllDocsQuery(), new QueryWrapperFilter(new MatchAllDocsQuery()), ScoreMode.Avg);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
             s.Search(q, 10);
             BooleanQuery bq = new BooleanQuery();
             bq.Boost = 2f; // we boost the BQ
@@ -548,16 +528,8 @@ namespace Lucene.Net.Search.Join
             IList<int> toDelete = new JCG.List<int>();
 
             // TODO: parallel star join, nested join cases too!
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
-            RandomIndexWriter joinW = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, joinDir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
+            RandomIndexWriter joinW = new RandomIndexWriter(Random, joinDir);
             for (int parentDocID = 0; parentDocID < numParentDocs; parentDocID++)
             {
                 Document parentDoc = new Document();
@@ -1164,11 +1136,7 @@ namespace Lucene.Net.Search.Join
         public void TestMultiChildTypes()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             IList<Document> docs = new JCG.List<Document>();
 
@@ -1255,11 +1223,7 @@ namespace Lucene.Net.Search.Join
         public void TestAdvanceSingleParentSingleChild()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             Document childDoc = new Document();
             childDoc.Add(NewStringField("child", "1", Field.Store.NO));
             Document parentDoc = new Document();
@@ -1317,11 +1281,7 @@ namespace Lucene.Net.Search.Join
         public void TestGetTopGroups()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             IList<Document> docs = new JCG.List<Document>();
             docs.Add(MakeJob("ruby", 2005));
@@ -1415,11 +1375,7 @@ namespace Lucene.Net.Search.Join
         public void TestSometimesParentOnlyMatches()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document parent = new Document();
             parent.Add(new StoredField("parentID", "0"));
             parent.Add(NewTextField("parentText", "text", Field.Store.NO));
@@ -1484,11 +1440,7 @@ namespace Lucene.Net.Search.Join
         public void TestChildQueryNeverMatches()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document parent = new Document();
             parent.Add(new StoredField("parentID", "0"));
             parent.Add(NewTextField("parentText", "text", Field.Store.NO));
@@ -1554,11 +1506,7 @@ namespace Lucene.Net.Search.Join
         public void TestChildQueryMatchesParent()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document parent = new Document();
             parent.Add(new StoredField("parentID", "0"));
             parent.Add(NewTextField("parentText", "text", Field.Store.NO));
@@ -1617,11 +1565,7 @@ namespace Lucene.Net.Search.Join
         public void TestAdvanceSingleDeletedParentNoChild()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             // First doc with 1 children
             Document parentDoc = new Document();
diff --git a/src/Lucene.Net.Tests.Queries/BooleanFilterTest.cs b/src/Lucene.Net.Tests.Queries/BooleanFilterTest.cs
index 6a80a34..f6feb7d 100644
--- a/src/Lucene.Net.Tests.Queries/BooleanFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/BooleanFilterTest.cs
@@ -37,11 +37,7 @@ namespace Lucene.Net.Tests.Queries
         {
             base.SetUp();
             directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory, new MockAnalyzer(Random, MockTokenizer.WHITESPACE, false));
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory, new MockAnalyzer(Random, MockTokenizer.WHITESPACE, false));
 
             //Add series of docs with filterable fields : acces rights, prices, dates and "in-stock" flags
             AddDoc(writer, @"admin guest", @"010", @"20040101", @"Y");
diff --git a/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs b/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs
index 6290fb4..6be7560 100644
--- a/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs
@@ -46,11 +46,7 @@ namespace Lucene.Net.Tests.Queries
         {
             base.SetUp();
             directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             // we use the default Locale/TZ since LuceneTestCase randomizes it
             var cal = new GregorianCalendar().ToDateTime(2003, 1, 1, 0, 0, 0, 0); // 2003 January 01
             cal = TimeZoneInfo.ConvertTime(cal, TimeZoneInfo.Local);
@@ -189,11 +185,7 @@ namespace Lucene.Net.Tests.Queries
         public virtual void TestWithCachingFilter()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             IndexReader reader = writer.GetReader();
             writer.Dispose();
 
diff --git a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
index 4835728..99f2f71 100644
--- a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
+++ b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
@@ -38,11 +38,7 @@ namespace Lucene.Net.Tests.Queries
         {
             Directory dir = NewDirectory();
             MockAnalyzer analyzer = new MockAnalyzer(Random);
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, analyzer);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir, analyzer);
             var docs = new string[]
             {
                 @"this is the end of the world right",
@@ -185,11 +181,7 @@ namespace Lucene.Net.Tests.Queries
         {
             Directory dir = NewDirectory();
             MockAnalyzer analyzer = new MockAnalyzer(Random);
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, analyzer);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir, analyzer);
             string[] docs = new string[]
             {
                 @"this is the end of the world right",
@@ -362,11 +354,7 @@ namespace Lucene.Net.Tests.Queries
         {
             Directory dir = NewDirectory();
             MockAnalyzer analyzer = new MockAnalyzer(Random);
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, analyzer);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir, analyzer);
             var docs = new string[]
             {
                 @"this is the end of the world right",
@@ -428,11 +416,7 @@ namespace Lucene.Net.Tests.Queries
             Directory dir = NewDirectory();
             MockAnalyzer analyzer = new MockAnalyzer(Random);
             analyzer.MaxTokenLength = TestUtil.NextInt32(Random, 1, IndexWriter.MAX_TERM_LENGTH);
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, analyzer);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir, analyzer);
             CreateRandomIndex(AtLeast(50), w, Random.NextInt64());
             DirectoryReader reader = w.GetReader();
             AtomicReader wrapper = SlowCompositeReaderWrapper.Wrap(reader);
@@ -517,11 +501,7 @@ namespace Lucene.Net.Tests.Queries
                  */
                 w.ForceMerge(1);
                 DirectoryReader reader2 = w.GetReader();
-                QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, cq, NewSearcher(reader2));
+                QueryUtils.Check(Random, cq, NewSearcher(reader2));
                 reader2.Dispose();
             }
             finally
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestBoostedQuery.cs b/src/Lucene.Net.Tests.Queries/Function/TestBoostedQuery.cs
index 70caf92..5a9a045 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestBoostedQuery.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestBoostedQuery.cs
@@ -90,11 +90,7 @@ namespace Lucene.Net.Tests.Queries.Function
                 expected[i] = new ScoreDoc(i, scores[i]);
             }
             TopDocs docs = @is.Search(q, 10, new Sort(new SortField("id", SortFieldType.STRING)));
-            CheckHits.DoCheckHits(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, "", @is, expectedDocs);
+            CheckHits.DoCheckHits(Random, q, "", @is, expectedDocs);
             CheckHits.CheckHitsQuery(q, expected, docs.ScoreDocs, expectedDocs);
             CheckHits.CheckExplanations(q, "", @is);
         }
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestFieldScoreQuery.cs b/src/Lucene.Net.Tests.Queries/Function/TestFieldScoreQuery.cs
index 4cb8df9..75a8db1 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestFieldScoreQuery.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestFieldScoreQuery.cs
@@ -95,11 +95,7 @@ namespace Lucene.Net.Tests.Queries.Function
             IndexReader r = DirectoryReader.Open(dir);
             IndexSearcher s = NewSearcher(r);
             Log("test: " + functionQuery);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, functionQuery, s);
+            QueryUtils.Check(Random, functionQuery, s);
             ScoreDoc[] h = s.Search(functionQuery, null, 1000).ScoreDocs;
             assertEquals("All docs should be matched!", N_DOCS, h.Length);
             string prevID = "ID" + (N_DOCS + 1); // greater than all ids of docs in this test
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestLongNormValueSource.cs b/src/Lucene.Net.Tests.Queries/Function/TestLongNormValueSource.cs
index 19ff987..3fa1033 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestLongNormValueSource.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestLongNormValueSource.cs
@@ -109,11 +109,7 @@ namespace Lucene.Net.Tests.Queries.Function
             }
             */
 
-            CheckHits.DoCheckHits(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, "", searcher, expectedDocs);
+            CheckHits.DoCheckHits(Random, q, "", searcher, expectedDocs);
             CheckHits.CheckHitsQuery(q, expected, docs.ScoreDocs, expectedDocs);
             CheckHits.CheckExplanations(q, "", searcher);
         }
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestOrdValues.cs b/src/Lucene.Net.Tests.Queries/Function/TestOrdValues.cs
index baadaa5..967bcea 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestOrdValues.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestOrdValues.cs
@@ -85,11 +85,7 @@ namespace Lucene.Net.Tests.Queries.Function
 
             Query q = new FunctionQuery(vs);
             Log("test: " + q);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
             ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
             assertEquals("All docs should be matched!", N_DOCS, h.Length);
             string prevID = inOrder
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs b/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs
index 07a8fb7..eb618c4 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs
@@ -415,11 +415,7 @@ namespace Lucene.Net.Tests.Queries.Function
             }
             TopDocs docs = searcher.Search(q, null, documents.Count,
                 new Sort(new SortField("id", SortFieldType.STRING)), true, false);
-            CheckHits.DoCheckHits(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, "", searcher, expectedDocs);
+            CheckHits.DoCheckHits(Random, q, "", searcher, expectedDocs);
             CheckHits.CheckHitsQuery(q, expected, docs.ScoreDocs, expectedDocs);
             CheckHits.CheckExplanations(q, "", searcher);
         }
diff --git a/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs b/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
index fcc5482..dd27887 100644
--- a/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
+++ b/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
@@ -40,11 +40,7 @@ namespace Lucene.Net.Tests.Queries.Mlt
         {
             base.SetUp();
             directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
 
             // Add series of docs with specific information for MoreLikeThis
             AddDoc(writer, "lucene");
@@ -146,11 +142,7 @@ namespace Lucene.Net.Tests.Queries.Mlt
         public void TestMoreLikeThisQuery()
         {
             Query query = new MoreLikeThisQuery("this is a test", new[] { "text" }, new MockAnalyzer(Random), "text");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         // TODO: add tests for the MoreLikeThisQuery
diff --git a/src/Lucene.Net.Tests.Queries/TermFilterTest.cs b/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
index d7905d3..553fa1a 100644
--- a/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
@@ -47,11 +47,7 @@ namespace Lucene.Net.Tests.Queries
         {
             string fieldName = @"field1";
             Directory rd = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, rd);
+            RandomIndexWriter w = new RandomIndexWriter(Random, rd);
             Document doc = new Document();
             doc.Add(NewStringField(fieldName, @"value1", Field.Store.NO));
             w.AddDocument(doc);
@@ -80,11 +76,7 @@ namespace Lucene.Net.Tests.Queries
         public void TestRandom()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             int num = AtLeast(100);
             var terms = new JCG.List<Term>();
             for (int i = 0; i < num; i++)
diff --git a/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs b/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs
index 522345a..15b0055 100644
--- a/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs
@@ -54,11 +54,7 @@ namespace Lucene.Net.Tests.Queries
         {
             string fieldName = "field1";
             Directory rd = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, rd);
+            RandomIndexWriter w = new RandomIndexWriter(Random, rd);
             for (int i = 0; i < 100; i++)
             {
                 Document doc = new Document();
@@ -97,11 +93,7 @@ namespace Lucene.Net.Tests.Queries
         {
             string fieldName = "field1";
             Directory rd1 = NewDirectory();
-            RandomIndexWriter w1 = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, rd1);
+            RandomIndexWriter w1 = new RandomIndexWriter(Random, rd1);
             Document doc = new Document();
             doc.Add(NewStringField(fieldName, "content1", Field.Store.YES));
             w1.AddDocument(doc);
@@ -110,11 +102,7 @@ namespace Lucene.Net.Tests.Queries
 
             fieldName = "field2";
             Directory rd2 = NewDirectory();
-            RandomIndexWriter w2 = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, rd2);
+            RandomIndexWriter w2 = new RandomIndexWriter(Random, rd2);
             doc = new Document();
             doc.Add(NewStringField(fieldName, "content2", Field.Store.YES));
             w2.AddDocument(doc);
@@ -147,11 +135,7 @@ namespace Lucene.Net.Tests.Queries
         public void TestFieldNotPresent()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             int num = AtLeast(3);
             int skip = Random.Next(num);
             var terms = new JCG.List<Term>();
@@ -187,11 +171,7 @@ namespace Lucene.Net.Tests.Queries
         public void TestSkipField()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             int num = AtLeast(10);
             var terms = new JCG.HashSet<Term>();
             for (int i = 0; i < num; i++)
@@ -233,11 +213,7 @@ namespace Lucene.Net.Tests.Queries
         public void TestRandom()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             int num = AtLeast(100);
             bool singleField = Random.NextBoolean();
             JCG.List<Term> terms = new JCG.List<Term>();
diff --git a/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs b/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
index c5c4765..ddda5b8 100644
--- a/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
+++ b/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
@@ -339,31 +339,11 @@ namespace Lucene.Net.Tests.Queries
             assertEquals("queries should have same #hits", h1.Count, h4CustomAdd.Count);
             assertEquals("queries should have same #hits", h1.Count, h5CustomMulAdd.Count);
 
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q1, s, Rarely());
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q2, s, Rarely());
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q3, s, Rarely());
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q4, s, Rarely());
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q5, s, Rarely());
+            QueryUtils.Check(Random, q1, s, Rarely());
+            QueryUtils.Check(Random, q2, s, Rarely());
+            QueryUtils.Check(Random, q3, s, Rarely());
+            QueryUtils.Check(Random, q4, s, Rarely());
+            QueryUtils.Check(Random, q5, s, Rarely());
 
             // verify scores ratios
             foreach (int doc in h1.Keys)
diff --git a/src/Lucene.Net.Tests.QueryParser/Analyzing/TestAnalyzingQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Analyzing/TestAnalyzingQueryParser.cs
index 8174b61..1ff1c06 100644
--- a/src/Lucene.Net.Tests.QueryParser/Analyzing/TestAnalyzingQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Analyzing/TestAnalyzingQueryParser.cs
@@ -307,11 +307,7 @@ namespace Lucene.Net.QueryParsers.Analyzing
             int hits;
             using (Directory ramDir = NewDirectory())
             {
-                using (RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, ramDir, analyzer))
+                using (RandomIndexWriter writer = new RandomIndexWriter(Random, ramDir, analyzer))
                 {
                     Document doc = new Document();
                     FieldType fieldType = new FieldType();
diff --git a/src/Lucene.Net.Tests.Sandbox/Queries/TestSlowFuzzyQuery.cs b/src/Lucene.Net.Tests.Sandbox/Queries/TestSlowFuzzyQuery.cs
index cec1ccd..41b9979 100644
--- a/src/Lucene.Net.Tests.Sandbox/Queries/TestSlowFuzzyQuery.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Queries/TestSlowFuzzyQuery.cs
@@ -39,11 +39,7 @@ namespace Lucene.Net.Sandbox.Queries
             //is exercising the Automaton, not the brute force linear method
 
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             addDoc("aaaaa", writer);
             addDoc("aaaab", writer);
             addDoc("aaabb", writer);
@@ -200,11 +196,7 @@ namespace Lucene.Net.Sandbox.Queries
         {
             //Lucene-5033
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             addDoc("abcdef", writer);
             addDoc("segment", writer);
 
@@ -229,11 +221,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestFuzzinessLong()
         {
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             addDoc("aaaaaaa", writer);
             addDoc("segment", writer);
 
@@ -337,22 +325,14 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestTieBreaker()
         {
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             addDoc("a123456", writer);
             addDoc("c123456", writer);
             addDoc("d123456", writer);
             addDoc("e123456", writer);
 
             Directory directory2 = NewDirectory();
-            RandomIndexWriter writer2 = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory2);
+            RandomIndexWriter writer2 = new RandomIndexWriter(Random, directory2);
             addDoc("a123456", writer2);
             addDoc("b123456", writer2);
             addDoc("b123456", writer2);
@@ -381,11 +361,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestTokenLengthOpt()
         {
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             addDoc("12345678911", writer);
             addDoc("segment", writer);
 
@@ -423,11 +399,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestBoostOnlyRewrite()
         {
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             addDoc("Lucene", writer);
             addDoc("Lucene", writer);
             addDoc("Lucenne", writer);
@@ -453,11 +425,7 @@ namespace Lucene.Net.Sandbox.Queries
         {
 
             Directory index = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, index);
+            RandomIndexWriter w = new RandomIndexWriter(Random, index);
 
             addDoc("Lucene in Action", w);
             addDoc("Lucene for Dummies", w);
@@ -494,11 +462,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestDistanceAsEditsSearching()
         {
             Directory index = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, index);
+            RandomIndexWriter w = new RandomIndexWriter(Random, index);
             addDoc("foobar", w);
             addDoc("test", w);
             addDoc("working", w);
diff --git a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortField.cs b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortField.cs
index d648d16..708c723 100644
--- a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortField.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortField.cs
@@ -32,11 +32,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestForward()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "baz", Field.Store.NO));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -66,11 +62,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "foo", Field.Store.NO));
             doc.Add(NewStringField("value", "bar", Field.Store.NO));
@@ -101,11 +93,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMissingFirst()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "baz", Field.Store.NO));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -142,11 +130,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMissingLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "baz", Field.Store.NO));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -183,11 +167,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestSingleton()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "baz", Field.Store.NO));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
diff --git a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldDocValues.cs b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldDocValues.cs
index 5679186..46edaca 100644
--- a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldDocValues.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldDocValues.cs
@@ -45,11 +45,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestForward()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("baz")));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -80,11 +76,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("foo")));
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("bar")));
@@ -116,11 +108,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMissingFirst()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("baz")));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -158,11 +146,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMissingLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("baz")));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -200,11 +184,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestSingleton()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("baz")));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
diff --git a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
index ca57030..d1120cf 100644
--- a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
@@ -77,11 +77,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMax()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("foo")));
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("bar")));
@@ -114,11 +110,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMaxReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("foo")));
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("bar")));
@@ -151,11 +143,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMaxMissingFirst()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("id", "1", Field.Store.YES));
             writer.AddDocument(doc);
@@ -195,11 +183,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMaxMissingLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("id", "1", Field.Store.YES));
             writer.AddDocument(doc);
@@ -239,11 +223,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMaxSingleton()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("baz")));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -274,11 +254,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMiddleMin()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("c")));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -312,11 +288,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMiddleMinReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("a")));
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("b")));
@@ -350,11 +322,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMiddleMinMissingFirst()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("id", "3", Field.Store.YES));
             writer.AddDocument(doc);
@@ -395,11 +363,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMiddleMinMissingLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("id", "3", Field.Store.YES));
             writer.AddDocument(doc);
@@ -440,11 +404,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMiddleMinSingleton()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("baz")));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -475,11 +435,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMiddleMax()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("a")));
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("b")));
@@ -513,11 +469,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMiddleMaxReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("b")));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -551,11 +503,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMiddleMaxMissingFirst()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("id", "3", Field.Store.YES));
             writer.AddDocument(doc);
@@ -596,11 +544,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMiddleMaxMissingLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("id", "3", Field.Store.YES));
             writer.AddDocument(doc);
@@ -641,11 +585,7 @@ namespace Lucene.Net.Sandbox.Queries
         public void TestMiddleMaxSingleton()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedSetDocValuesField("value", new BytesRef("baz")));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
diff --git a/src/Lucene.Net.Tests.Suggest/Spell/TestDirectSpellChecker.cs b/src/Lucene.Net.Tests.Suggest/Spell/TestDirectSpellChecker.cs
index a144d33..50e2396 100644
--- a/src/Lucene.Net.Tests.Suggest/Spell/TestDirectSpellChecker.cs
+++ b/src/Lucene.Net.Tests.Suggest/Spell/TestDirectSpellChecker.cs
@@ -32,11 +32,7 @@ namespace Lucene.Net.Search.Spell
         {
             DirectSpellChecker spellchecker = new DirectSpellChecker();
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir,
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir,
                 new MockAnalyzer(Random, MockTokenizer.KEYWORD, true));
 
             string[] termsToAdd = { "metanoia", "metanoian", "metanoiai", "metanoias", "metanoi𐑍" };
@@ -70,11 +66,7 @@ namespace Lucene.Net.Search.Spell
             DirectSpellChecker spellChecker = new DirectSpellChecker();
             spellChecker.MinQueryLength = (0);
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir,
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir,
                 new MockAnalyzer(Random, MockTokenizer.SIMPLE, true));
 
             for (int i = 0; i < 20; i++)
@@ -144,11 +136,7 @@ namespace Lucene.Net.Search.Spell
         public void TestOptions()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir,
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir,
                 new MockAnalyzer(Random, MockTokenizer.SIMPLE, true));
 
             Document doc = new Document();
@@ -217,11 +205,7 @@ namespace Lucene.Net.Search.Spell
         {
             DirectSpellChecker spellChecker = new DirectSpellChecker();
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir,
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir,
                 new MockAnalyzer(Random, MockTokenizer.SIMPLE, true));
 
             for (int i = 0; i < 20; i++)
@@ -248,11 +232,7 @@ namespace Lucene.Net.Search.Spell
         {
             DirectSpellChecker spellChecker = new DirectSpellChecker();
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir,
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir,
                 new MockAnalyzer(Random, MockTokenizer.SIMPLE, true));
 
             for (int i = 0; i < 20; i++)
@@ -280,11 +260,7 @@ namespace Lucene.Net.Search.Spell
         {
             DirectSpellChecker spellChecker = new DirectSpellChecker();
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir,
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir,
                 new MockAnalyzer(Random, MockTokenizer.SIMPLE, true));
 
             for (int i = 0; i < 20; i++)
diff --git a/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs b/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs
index 03d4c70..45303be 100644
--- a/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs
+++ b/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs
@@ -37,11 +37,7 @@ namespace Lucene.Net.Search.Spell
         {
             base.SetUp();
             dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, new MockAnalyzer(Random, MockTokenizer.WHITESPACE, true));
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir, new MockAnalyzer(Random, MockTokenizer.WHITESPACE, true));
 
             for (int i = 900; i < 1112; i++)
             {
@@ -289,11 +285,7 @@ namespace Lucene.Net.Search.Spell
             try
             {
                 dir = NewDirectory();
-                writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, dir, new MockAnalyzer(Random,
+                writer = new RandomIndexWriter(Random, dir, new MockAnalyzer(Random,
                     MockTokenizer.WHITESPACE, false));
                 int maxLength = TestUtil.NextInt32(Random, 5, 50);
                 IList<string> originals = new JCG.List<string>(numDocs);
diff --git a/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs b/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs
index bcd7e34..a8729dd 100644
--- a/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs
@@ -1,18 +1,7 @@
 // Lucene version compatibility level 8.2.0
-using System;
-using Lucene.Net.TestFramework;
 using RandomizedTesting.Generators;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-using Assert = Lucene.Net.TestFramework.Assert;
-#elif TESTFRAMEWORK_NUNIT
+using System;
 using Test = NUnit.Framework.TestAttribute;
-using Assert = NUnit.Framework.Assert;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-using Assert = Lucene.Net.TestFramework.Assert;
-#endif
 
 namespace Lucene.Net.Analysis
 {
@@ -33,20 +22,8 @@ namespace Lucene.Net.Analysis
     * limitations under the License.
     */
 
-#if TESTFRAMEWORK_MSTEST
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute]
-#endif
     public class TestLookaheadTokenFilter : BaseTokenStreamTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
-    {
-        public TestLookaheadTokenFilter(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
     {
-#endif
         [Test]
         public void TestRandomStrings()
         {
diff --git a/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs
index 0100b26..dfe5c72 100644
--- a/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs
@@ -1,22 +1,10 @@
 // Lucene version compatibility level 8.2.0
-using Lucene.Net.Support;
 using Lucene.Net.Util;
 using Lucene.Net.Util.Automaton;
+using RandomizedTesting.Generators;
 using System;
 using System.IO;
-using Lucene.Net.TestFramework;
-using RandomizedTesting.Generators;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-using Assert = Lucene.Net.TestFramework.Assert;
-#elif TESTFRAMEWORK_NUNIT
 using Test = NUnit.Framework.TestAttribute;
-using Assert = NUnit.Framework.Assert;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-using Assert = Lucene.Net.TestFramework.Assert;
-#endif
 
 namespace Lucene.Net.Analysis
 {
@@ -37,21 +25,8 @@ namespace Lucene.Net.Analysis
     * limitations under the License.
     */
 
-#if TESTFRAMEWORK_MSTEST
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute]
-#endif
     public class TestMockAnalyzer : BaseTokenStreamTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public TestMockAnalyzer(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
-
         /** Test a configuration that behaves a lot like WhitespaceAnalyzer */
         [Test]
         public void TestWhitespace()
diff --git a/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockCharFilter.cs b/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockCharFilter.cs
index 17dfba8..348b1b6 100644
--- a/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockCharFilter.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockCharFilter.cs
@@ -1,17 +1,6 @@
 // Lucene version compatibility level 8.2.0
 using System;
-using Lucene.Net.TestFramework;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
-using Assert = Lucene.Net.TestFramework.Assert;
-#elif TESTFRAMEWORK_NUNIT
 using Test = NUnit.Framework.TestAttribute;
-using Assert = NUnit.Framework.Assert;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-using Assert = Lucene.Net.TestFramework.Assert;
-#endif
 
 namespace Lucene.Net.Analysis
 {
@@ -32,21 +21,8 @@ namespace Lucene.Net.Analysis
     * limitations under the License.
     */
 
-#if TESTFRAMEWORK_MSTEST
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute]
-#endif
     public class TestMockCharFilter : BaseTokenStreamTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public TestMockCharFilter(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
-
         [Test]
         public void Test()
         {
diff --git a/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingDocValuesFormat.cs b/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingDocValuesFormat.cs
index 5359af5..7075834 100644
--- a/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingDocValuesFormat.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingDocValuesFormat.cs
@@ -1,6 +1,5 @@
 // Lucene version compatibility level 8.2.0
 using Lucene.Net.Index;
-using Lucene.Net.TestFramework;
 
 namespace Lucene.Net.Codecs.Asserting
 {
@@ -24,36 +23,8 @@ namespace Lucene.Net.Codecs.Asserting
     /// <summary>
     /// Test <see cref="AssertingDocValuesFormat"/> directly
     /// </summary>
-#if TESTFRAMEWORK_MSTEST
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute]
-#endif
     public class TestAssertingDocValuesFormat : BaseDocValuesFormatTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public TestAssertingDocValuesFormat(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
-        // LUCENENET TODO: MSTest is seemingly being fixed to deal with initialization with inheritance for version 2.0. See: https://github.com/microsoft/testfx/issues/143
-
-//#if TESTFRAMEWORK_MSTEST
-//        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute]
-//        new public static void BeforeClass(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext context)
-//        {
-//            Lucene.Net.Util.LuceneTestCase.BeforeClass(context);
-//        }
-
-//        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute]
-//        new public static void AfterClass()
-//        {
-//            Lucene.Net.Util.LuceneTestCase.AfterClass();
-//        }
-//#endif
-
         private readonly Codec codec = new AssertingCodec();
         protected override Codec GetCodec()
         {
diff --git a/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingNormsFormat.cs b/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingNormsFormat.cs
index 34e2d7b..e8f8c8a 100644
--- a/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingNormsFormat.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingNormsFormat.cs
@@ -1,6 +1,5 @@
 // Lucene version compatibility level 8.2.0
 using Lucene.Net.Index;
-using Lucene.Net.TestFramework;
 
 namespace Lucene.Net.Codecs.Asserting
 {
@@ -24,34 +23,8 @@ namespace Lucene.Net.Codecs.Asserting
     /// <summary>
     /// Test <see cref="AssertingNormsFormat"/> directly
     /// </summary>
-#if TESTFRAMEWORK_MSTEST
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute]
-#endif
     public class TestAssertingNormsFormat : BaseTermVectorsFormatTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public TestAssertingNormsFormat(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
-//#if TESTFRAMEWORK_MSTEST
-//        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute]
-//        new public static void BeforeClass(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext context)
-//        {
-//            Lucene.Net.Util.LuceneTestCase.BeforeClass(context);
-//        }
-
-//        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute]
-//        new public static void AfterClass()
-//        {
-//            Lucene.Net.Util.LuceneTestCase.AfterClass();
-//        }
-//#endif
-
         private readonly Codec codec = new AssertingCodec();
 
         protected override Codec GetCodec()
diff --git a/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingPostingsFormat.cs b/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingPostingsFormat.cs
index fe7ad19..8d4060c 100644
--- a/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingPostingsFormat.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingPostingsFormat.cs
@@ -24,37 +24,8 @@ namespace Lucene.Net.Codecs.Asserting
     /// <summary>
     /// Test <see cref="AssertingPostingsFormat"/> directly
     /// </summary>
-#if TESTFRAMEWORK_MSTEST
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute]
-#endif
     public class TestAssertingPostingsFormat : BasePostingsFormatTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public TestAssertingPostingsFormat(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
-
-//#if TESTFRAMEWORK_MSTEST
-//        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute]
-//        new public static void BeforeClass(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext context)
-//        {
-//            Lucene.Net.Util.LuceneTestCase.BeforeClass(context);
-//            Lucene.Net.Index.BasePostingsFormatTestCase.BeforeClass(context);
-//        }
-
-//        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute]
-//        new public static void AfterClass()
-//        {
-//            Lucene.Net.Index.BasePostingsFormatTestCase.AfterClass();
-//            Lucene.Net.Util.LuceneTestCase.AfterClass();
-//        }
-//#endif
-
         private readonly Codec codec = new AssertingCodec();
         protected override Codec GetCodec()
         {
diff --git a/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingStoredFieldsFormat.cs b/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingStoredFieldsFormat.cs
index 8644543..93a195a 100644
--- a/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingStoredFieldsFormat.cs
@@ -24,34 +24,8 @@ namespace Lucene.Net.Codecs.Asserting
     /// <summary>
     /// Test <see cref="AssertingStoredFieldsFormat"/> directly
     /// </summary>
-#if TESTFRAMEWORK_MSTEST
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute]
-#endif
     public class TestAssertingStoredFieldsFormat : BaseTermVectorsFormatTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public TestAssertingStoredFieldsFormat(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
-//#if TESTFRAMEWORK_MSTEST
-//        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute]
-//        new public static void BeforeClass(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext context)
-//        {
-//            Lucene.Net.Util.LuceneTestCase.BeforeClass(context);
-//        }
-
-//        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute]
-//        new public static void AfterClass()
-//        {
-//            Lucene.Net.Util.LuceneTestCase.AfterClass();
-//        }
-//#endif
-
         private readonly Codec codec = new AssertingCodec();
         protected override Codec GetCodec()
         {
diff --git a/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingTermVectorsFormat.cs b/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingTermVectorsFormat.cs
index 511e024..f89fa7f 100644
--- a/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingTermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Codecs/Asserting/TestAssertingTermVectorsFormat.cs
@@ -24,34 +24,8 @@ namespace Lucene.Net.Codecs.Asserting
     /// <summary>
     /// Test <see cref="AssertingTermVectorsFormat"/> directly
     /// </summary>
-#if TESTFRAMEWORK_MSTEST
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute]
-#endif
     public class TestAssertingTermVectorsFormat : BaseTermVectorsFormatTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public TestAssertingTermVectorsFormat(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
-//#if TESTFRAMEWORK_MSTEST
-//        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute]
-//        new public static void BeforeClass(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext context)
-//        {
-//            Lucene.Net.Util.LuceneTestCase.BeforeClass(context);
-//        }
-
-//        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute]
-//        new public static void AfterClass()
-//        {
-//            Lucene.Net.Util.LuceneTestCase.AfterClass();
-//        }
-//#endif
-
         private readonly Codec codec = new AssertingCodec();
 
         protected override Codec GetCodec()
diff --git a/src/Lucene.Net.Tests.TestFramework/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs b/src/Lucene.Net.Tests.TestFramework/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs
index 765ef22..d0a7585 100644
--- a/src/Lucene.Net.Tests.TestFramework/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs
@@ -30,9 +30,6 @@
 //    * limitations under the License.
 //    */
 
-//#if TESTFRAMEWORK_MSTEST
-//    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute]
-//#endif
 //    public class TestCompressingStoredFieldsFormat : BaseStoredFieldsFormatTestCase
 //    {
 //        const long SECOND = 1000L;
diff --git a/src/Lucene.Net.Tests.TestFramework/Store/TestMockDirectoryWrapper.cs b/src/Lucene.Net.Tests.TestFramework/Store/TestMockDirectoryWrapper.cs
index ee9e1e2..3fa7f18 100644
--- a/src/Lucene.Net.Tests.TestFramework/Store/TestMockDirectoryWrapper.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Store/TestMockDirectoryWrapper.cs
@@ -1,24 +1,10 @@
 // Lucene version compatibility level 8.2.0
 // LUCENENET NOTE: This class now exists both here and in Lucene.Net.Tests
-using Lucene.Net.Support;
 using Lucene.Net.Util;
-using Lucene.Net.Util.Automaton;
 using System;
 using System.IO;
-using Lucene.Net.TestFramework;
-using Lucene.Net.Documents;
-using Lucene.Net.Index;
-
-#if TESTFRAMEWORK_MSTEST
-using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
 using Assert = Lucene.Net.TestFramework.Assert;
-#elif TESTFRAMEWORK_NUNIT
 using Test = NUnit.Framework.TestAttribute;
-using Assert = Lucene.Net.TestFramework.Assert;
-#elif TESTFRAMEWORK_XUNIT
-using Test = Lucene.Net.TestFramework.SkippableFactAttribute;
-using Assert = Lucene.Net.TestFramework.Assert;
-#endif
 
 namespace Lucene.Net.Store
 {
@@ -40,21 +26,8 @@ namespace Lucene.Net.Store
     */
 
     // See: https://issues.apache.org/jira/browse/SOLR-12028 Tests cannot remove files on Windows machines occasionally
-#if TESTFRAMEWORK_MSTEST
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute]
-#endif
     public class TestMockDirectoryWrapper : BaseDirectoryTestCase
-#if TESTFRAMEWORK_XUNIT
-        , Xunit.IClassFixture<BeforeAfterClass>
     {
-        public TestMockDirectoryWrapper(BeforeAfterClass beforeAfter)
-            : base(beforeAfter)
-        {
-        }
-#else
-    {
-#endif
-
         protected override Directory GetDirectory(DirectoryInfo path)
         {
             MockDirectoryWrapper dir;
@@ -142,18 +115,8 @@ namespace Lucene.Net.Store
 //        public void TestMDWinsideOfMDW()
 //        {
 //            // add MDW inside another MDW
-//#if FEATURE_INSTANCE_CODEC_IMPERSONATION
-//            using (Directory dir = new MockDirectoryWrapper(this, Random, NewMockDirectory()))
-//#else
 //            using (Directory dir = new MockDirectoryWrapper(Random, NewMockDirectory()))
-//#endif
-//#if !FEATURE_INSTANCE_TESTDATA_INITIALIZATION
 //            using (RandomIndexWriter iw = new RandomIndexWriter(Random, dir))
-//#elif FEATURE_INSTANCE_CODEC_IMPERSONATION
-//            using (RandomIndexWriter iw = new RandomIndexWriter(this, Random, dir))
-//#else
-//            using (RandomIndexWriter iw = new RandomIndexWriter(Random, dir, ClassEnvRule.similarity, ClassEnvRule.timeZone))
-//#endif
 //            {
 //                for (int i = 0; i < 20; i++)
 //                {
@@ -207,11 +170,7 @@ namespace Lucene.Net.Store
         //                wrapped.AlwaysCorrupt = true;
 
         //                // MDW will only try to corrupt things if it sees an index:
-        //#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-        //                using (RandomIndexWriter iw = new RandomIndexWriter(this, Random, dir))
-        //#else
         //                using (RandomIndexWriter iw = new RandomIndexWriter(Random, dir))
-        //#endif
         //                {
         //                    iw.AddDocument(new Document());
         //                } // iw.close();
diff --git a/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
index 078d665..63d1951 100644
--- a/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
@@ -1,5 +1,4 @@
-#if TESTFRAMEWORK_NUNIT
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
@@ -142,5 +141,4 @@ namespace Lucene.Net.Tests.TestFramework
             base.TestForMembersAcceptingOrReturningListOrDictionary(typeFromTargetAssembly);
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests/Analysis/TestCachingTokenFilter.cs b/src/Lucene.Net.Tests/Analysis/TestCachingTokenFilter.cs
index 87a208c..9952bc7 100644
--- a/src/Lucene.Net.Tests/Analysis/TestCachingTokenFilter.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestCachingTokenFilter.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Analysis.TokenAttributes;
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Documents;
 using Lucene.Net.Store;
 using NUnit.Framework;
@@ -42,11 +42,7 @@ namespace Lucene.Net.Analysis
         public virtual void TestCaching()
         {
             Directory dir = new RAMDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             TokenStream stream = new TokenStreamAnonymousClass(this);
 
diff --git a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
index 87d03e7..783daaa 100644
--- a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
@@ -317,11 +317,7 @@ namespace Lucene.Net.Analysis
             Analyzer @delegate = new MockAnalyzer(Random);
             Analyzer a = new AnalyzerWrapperAnonymousClass2(this, @delegate.Strategy, positionGap, offsetGap, @delegate);
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, NewDirectory());
+            RandomIndexWriter writer = new RandomIndexWriter(Random, NewDirectory());
             Document doc = new Document();
             FieldType ft = new FieldType();
             ft.IsIndexed = true;
diff --git a/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingTermVectorsFormat.cs b/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
index a485b48..10f3289 100644
--- a/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
@@ -47,11 +47,7 @@ namespace Lucene.Net.Codecs.Compressing
         public virtual void TestNoOrds()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
             ft.StoreTermVectors = true;
diff --git a/src/Lucene.Net.Tests/Document/TestBinaryDocument.cs b/src/Lucene.Net.Tests/Document/TestBinaryDocument.cs
index c89337c..9903ed6 100644
--- a/src/Lucene.Net.Tests/Document/TestBinaryDocument.cs
+++ b/src/Lucene.Net.Tests/Document/TestBinaryDocument.cs
@@ -1,4 +1,4 @@
-using J2N.Text;
+using J2N.Text;
 using NUnit.Framework;
 using System;
 using System.Text;
@@ -61,11 +61,7 @@ namespace Lucene.Net.Documents
             /// add the doc to a ram index </summary>
             Directory dir = NewDirectory();
             Random r = Random;
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                r, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(r, dir);
             writer.AddDocument(doc);
 
             /// <summary>
@@ -102,11 +98,7 @@ namespace Lucene.Net.Documents
             var doc = new Documents.Document {binaryFldCompressed, stringFldCompressed};
 
             using Directory dir = NewDirectory();
-            using RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            using RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             writer.AddDocument(doc);
 
             using IndexReader reader = writer.GetReader();
diff --git a/src/Lucene.Net.Tests/Document/TestDocument.cs b/src/Lucene.Net.Tests/Document/TestDocument.cs
index 7f4abad..60a43b4 100644
--- a/src/Lucene.Net.Tests/Document/TestDocument.cs
+++ b/src/Lucene.Net.Tests/Document/TestDocument.cs
@@ -190,11 +190,7 @@ namespace Lucene.Net.Documents
         public virtual void TestGetValuesForIndexedDocument()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             writer.AddDocument(MakeDocumentWithFields());
             IndexReader reader = writer.GetReader();
 
@@ -227,11 +223,7 @@ namespace Lucene.Net.Documents
         public virtual void TestPositionIncrementMultiFields()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             writer.AddDocument(MakeDocumentWithFields());
             IndexReader reader = writer.GetReader();
 
@@ -311,11 +303,7 @@ namespace Lucene.Net.Documents
             doc.Add(new StringField("keyword", "test", Field.Store.YES));
 
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             writer.AddDocument(doc);
             field.SetStringValue("id2");
             writer.AddDocument(doc);
@@ -378,11 +366,7 @@ namespace Lucene.Net.Documents
         public virtual void TestTransitionAPI()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             Documents.Document doc = new Documents.Document();
 #pragma warning disable 612, 618
@@ -463,11 +447,7 @@ namespace Lucene.Net.Documents
             Assert.AreEqual(new string[] { "5", "4" }, doc.GetValues("int"));
 
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             iw.AddDocument(doc);
             DirectoryReader ir = iw.GetReader();
             Documents.Document sdoc = ir.Document(0);
diff --git a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
index 766750b..a101798 100644
--- a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
+++ b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
@@ -1269,11 +1269,7 @@ namespace Lucene.Net.Index
         public virtual void TestFieldNamesChanged()
         {
             Directory d1 = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d1);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d1);
             Document doc = new Document();
             doc.Add(NewStringField("f1", "doc1 field1", Field.Store.YES));
             doc.Add(NewStringField("id", "1", Field.Store.YES));
@@ -1282,11 +1278,7 @@ namespace Lucene.Net.Index
             w.Dispose();
 
             Directory d2 = NewDirectory();
-            w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d2);
+            w = new RandomIndexWriter(Random, d2);
             doc = new Document();
             doc.Add(NewStringField("f2", "doc2 field2", Field.Store.YES));
             doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -1295,11 +1287,7 @@ namespace Lucene.Net.Index
             w.Dispose();
 
             Directory d3 = NewDirectory();
-            w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d3);
+            w = new RandomIndexWriter(Random, d3);
             w.AddIndexes(r1, r2);
             r1.Dispose();
             d1.Dispose();
@@ -1329,11 +1317,7 @@ namespace Lucene.Net.Index
         public virtual void TestAddEmpty()
         {
             Directory d1 = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d1);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d1);
             MultiReader empty = new MultiReader();
             w.AddIndexes(empty);
             w.Dispose();
@@ -1354,20 +1338,12 @@ namespace Lucene.Net.Index
         public virtual void TestFakeAllDeleted()
         {
             Directory src = NewDirectory(), dest = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, src);
+            RandomIndexWriter w = new RandomIndexWriter(Random, src);
             w.AddDocument(new Document());
             IndexReader allDeletedReader = new AllDeletedFilterReader((AtomicReader)w.GetReader().Leaves[0].Reader);
             w.Dispose();
 
-            w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dest);
+            w = new RandomIndexWriter(Random, dest);
             w.AddIndexes(allDeletedReader);
             w.Dispose();
             DirectoryReader dr = DirectoryReader.Open(src);
@@ -1389,11 +1365,7 @@ namespace Lucene.Net.Index
         public virtual void TestLocksBlock()
         {
             Directory src = NewDirectory();
-            RandomIndexWriter w1 = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, src);
+            RandomIndexWriter w1 = new RandomIndexWriter(Random, src);
             w1.AddDocument(new Document());
             w1.Commit();
 
diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
index 2e2ad73..0d84e17 100644
--- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
@@ -823,11 +823,7 @@ namespace Lucene.Net.Index
         {
             // first create a little index with the current code and get the version
             Directory currentDir = NewDirectory();
-            RandomIndexWriter riw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, currentDir);
+            RandomIndexWriter riw = new RandomIndexWriter(Random, currentDir);
             riw.AddDocument(new Document());
             riw.Dispose();
             DirectoryReader ir = DirectoryReader.Open(currentDir);
diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
index a18d5ac..07941b9 100644
--- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
@@ -783,11 +783,7 @@ namespace Lucene.Net.Index
         {
             // first create a little index with the current code and get the version
             Directory currentDir = NewDirectory();
-            RandomIndexWriter riw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, currentDir);
+            RandomIndexWriter riw = new RandomIndexWriter(Random, currentDir);
             riw.AddDocument(new Document());
             riw.Dispose();
             DirectoryReader ir = DirectoryReader.Open(currentDir);
diff --git a/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs b/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs
index 008e08e..2b3ceb6 100644
--- a/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs
+++ b/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
 
@@ -43,11 +43,7 @@ namespace Lucene.Net.Index
         public virtual void TestBinary()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             BytesRef bytes = new BytesRef(2);
             BinaryTokenStream tokenStream = new BinaryTokenStream(bytes);
 
diff --git a/src/Lucene.Net.Tests/Index/TestCodecHoldsOpenFiles.cs b/src/Lucene.Net.Tests/Index/TestCodecHoldsOpenFiles.cs
index 05238df..6fa91bb 100644
--- a/src/Lucene.Net.Tests/Index/TestCodecHoldsOpenFiles.cs
+++ b/src/Lucene.Net.Tests/Index/TestCodecHoldsOpenFiles.cs
@@ -36,11 +36,7 @@ namespace Lucene.Net.Index
         public virtual void Test()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             int numDocs = AtLeast(100);
             for (int i = 0; i < numDocs; i++)
             {
@@ -78,11 +74,7 @@ namespace Lucene.Net.Index
         public virtual void TestExposeUnclosedFiles()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             //int numDocs = AtLeast(100);
             int numDocs = 5;
             for (int i = 0; i < numDocs; i++)
diff --git a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
index 941248a..03d91e3 100644
--- a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
+++ b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
@@ -843,11 +843,7 @@ namespace Lucene.Net.Index
         {
             Directory dir = NewDirectory();
             // riw should sometimes create docvalues fields, etc
-            RandomIndexWriter riw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter riw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             // these fields should sometimes get term vectors, etc
             Field idField = NewStringField("id", "", Field.Store.NO);
diff --git a/src/Lucene.Net.Tests/Index/TestCrash.cs b/src/Lucene.Net.Tests/Index/TestCrash.cs
index e079493..471e80e 100644
--- a/src/Lucene.Net.Tests/Index/TestCrash.cs
+++ b/src/Lucene.Net.Tests/Index/TestCrash.cs
@@ -106,11 +106,7 @@ namespace Lucene.Net.Index
             Directory dir2 = NewDirectory(dir);
             dir.Dispose();
 
-            (new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir2)).Dispose();
+            (new RandomIndexWriter(Random, dir2)).Dispose();
             dir2.Dispose();
         }
 
@@ -145,11 +141,7 @@ namespace Lucene.Net.Index
             Directory dir2 = NewDirectory(dir);
             dir.Dispose();
 
-            (new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir2)).Dispose();
+            (new RandomIndexWriter(Random, dir2)).Dispose();
             dir2.Dispose();
         }
 
@@ -187,11 +179,7 @@ namespace Lucene.Net.Index
             Directory dir2 = NewDirectory(dir);
             dir.Dispose();
 
-            (new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir2)).Dispose();
+            (new RandomIndexWriter(Random, dir2)).Dispose();
             dir2.Dispose();
         }
 
diff --git a/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs
index 42e6626..a90f8d3 100644
--- a/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs
@@ -1232,11 +1232,7 @@ namespace Lucene.Net.Index
         public virtual void TestLoadCertainFields()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("field1", "foobar", Field.Store.YES));
             doc.Add(NewStringField("field2", "foobaz", Field.Store.YES));
diff --git a/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs b/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
index 64ca0c8..ed76334 100644
--- a/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
+++ b/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
@@ -409,11 +409,7 @@ namespace Lucene.Net.Index
                             refreshed = r;
                         }
 
-                        IndexSearcher searcher =
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                            outerInstance.
-#endif
-                            NewSearcher(refreshed);
+                        IndexSearcher searcher = NewSearcher(refreshed);
                         ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("field1", "a" + rnd.Next(refreshed.MaxDoc))), null, 1000).ScoreDocs;
                         if (hits.Length > 0)
                         {
diff --git a/src/Lucene.Net.Tests/Index/TestDocCount.cs b/src/Lucene.Net.Tests/Index/TestDocCount.cs
index 2412bbb..d3dbafb 100644
--- a/src/Lucene.Net.Tests/Index/TestDocCount.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocCount.cs
@@ -41,11 +41,7 @@ namespace Lucene.Net.Index
         public virtual void TestSimple()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             int numDocs = AtLeast(100);
             for (int i = 0; i < numDocs; i++)
             {
diff --git a/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs b/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs
index c271315..d14ae7b 100644
--- a/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs
@@ -60,11 +60,7 @@ namespace Lucene.Net.Index
         public virtual void TestAddIndexes()
         {
             Directory d1 = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d1);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d1);
             Document doc = new Document();
             doc.Add(NewStringField("id", "1", Field.Store.YES));
             doc.Add(new NumericDocValuesField("dv", 1));
@@ -73,11 +69,7 @@ namespace Lucene.Net.Index
             w.Dispose();
 
             Directory d2 = NewDirectory();
-            w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d2);
+            w = new RandomIndexWriter(Random, d2);
             doc = new Document();
             doc.Add(NewStringField("id", "2", Field.Store.YES));
             doc.Add(new NumericDocValuesField("dv", 2));
@@ -86,11 +78,7 @@ namespace Lucene.Net.Index
             w.Dispose();
 
             Directory d3 = NewDirectory();
-            w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d3);
+            w = new RandomIndexWriter(Random, d3);
             w.AddIndexes(SlowCompositeReaderWrapper.Wrap(r1), SlowCompositeReaderWrapper.Wrap(r2));
             r1.Dispose();
             d1.Dispose();
@@ -112,11 +100,7 @@ namespace Lucene.Net.Index
         public virtual void TestMultiValuedDocValuesField()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             Field f = new NumericDocValuesField("field", 17);
             // Index doc values are single-valued so we should not
@@ -148,11 +132,7 @@ namespace Lucene.Net.Index
         public virtual void TestDifferentTypedDocValuesField()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             // Index doc values are single-valued so we should not
             // be able to add same field more than once:
@@ -184,11 +164,7 @@ namespace Lucene.Net.Index
         public virtual void TestDifferentTypedDocValuesField2()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             // Index doc values are single-valued so we should not
             // be able to add same field more than once:
diff --git a/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs b/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
index 587f411..e83ef09 100644
--- a/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
@@ -188,11 +188,7 @@ namespace Lucene.Net.Index
             Random random = Random;
             int NUM_DOCS = AtLeast(100);
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(random, dir);
             bool allowDups = random.NextBoolean();
             ISet<string> seen = new JCG.HashSet<string>();
             if (Verbose)
diff --git a/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs b/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs
index 7ac3501..696ea23 100644
--- a/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs
@@ -378,11 +378,7 @@ namespace Lucene.Net.Index
         public virtual void TestDocsEnumStart()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("foo", "bar", Field.Store.NO));
             writer.AddDocument(doc);
@@ -409,11 +405,7 @@ namespace Lucene.Net.Index
         public virtual void TestDocsAndPositionsEnumStart()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewTextField("foo", "bar", Field.Store.NO));
             writer.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
index a165016..2e98b30 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
@@ -1167,11 +1167,7 @@ namespace Lucene.Net.Index
                 // make a little directory for addIndexes
                 // LUCENE-2239: won't work with NIOFS/MMAP
                 adder = new MockDirectoryWrapper(this.random, new RAMDirectory());
-                IndexWriterConfig conf = NewIndexWriterConfig(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    outerInstance,
-#endif
-                    this.random, TEST_VERSION_CURRENT, new MockAnalyzer(this.random));
+                IndexWriterConfig conf = NewIndexWriterConfig(this.random, TEST_VERSION_CURRENT, new MockAnalyzer(this.random));
                 using IndexWriter w = new IndexWriter(adder, conf);
                 Document doc = new Document();
                 doc.Add(NewStringField(this.random, "id", "500", Field.Store.NO));
@@ -1233,11 +1229,7 @@ namespace Lucene.Net.Index
                                 w.Dispose();
                                 w = null;
                             }
-                            IndexWriterConfig conf = NewIndexWriterConfig(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                                outerInstance,
-#endif
-                                random, TEST_VERSION_CURRENT, new MockAnalyzer(random)).SetMaxBufferedDocs(2);
+                            IndexWriterConfig conf = NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random)).SetMaxBufferedDocs(2);
                             w = new IndexWriter(dir, conf);
 
                             Document doc = new Document();
@@ -2033,11 +2025,7 @@ namespace Lucene.Net.Index
         public virtual void TestWickedLongTerm()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, new StringSplitAnalyzer());
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir, new StringSplitAnalyzer());
 
             char[] chars = new char[DocumentsWriterPerThread.MAX_TERM_LENGTH_UTF8];
             Arrays.Fill(chars, 'x');
@@ -2090,11 +2078,7 @@ namespace Lucene.Net.Index
             Field contentField = new Field("content", "", customType);
             doc.Add(contentField);
 
-            w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            w = new RandomIndexWriter(Random, dir);
 
             contentField.SetStringValue("other");
             w.AddDocument(doc);
@@ -2198,11 +2182,7 @@ namespace Lucene.Net.Index
             // somehow "knows" a lock is held against write.lock
             // even if you remove that file:
             d.SetLockFactory(new SimpleFSLockFactory());
-            RandomIndexWriter w1 = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w1 = new RandomIndexWriter(Random, d);
             w1.DeleteAll();
             try
             {
@@ -2397,11 +2377,7 @@ namespace Lucene.Net.Index
                 TokenStream stream = new MockTokenFilter(tokenizer, MockTokenFilter.ENGLISH_STOPSET);
                 return new TokenStreamComponents(tokenizer, stream);
             });
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, a);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir, a);
             Document doc = new Document();
             doc.Add(new TextField("body", "just a", Field.Store.NO));
             doc.Add(new TextField("body", "test of gaps", Field.Store.NO));
@@ -2432,11 +2408,7 @@ namespace Lucene.Net.Index
                 stream = new MockTokenFilter(stream, new CharacterRunAutomaton(secondSet));
                 return new TokenStreamComponents(tokenizer, stream);
             });
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, a);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir, a);
             Document doc = new Document();
             doc.Add(new TextField("body", "just a foobar", Field.Store.NO));
             doc.Add(new TextField("body", "test of gaps", Field.Store.NO));
@@ -2949,11 +2921,7 @@ namespace Lucene.Net.Index
                 dir.DeleteFile(fileName);
             }
 
-            w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            w = new RandomIndexWriter(Random, dir);
             w.AddDocument(doc);
             w.Dispose();
             r.Dispose();
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
index 3800db1..2be5288 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
@@ -339,11 +339,7 @@ namespace Lucene.Net.Index
         public virtual void TestDeleteAllNoDeadLock()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter modifier = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter modifier = new RandomIndexWriter(Random, dir);
             int numThreads = AtLeast(2);
             ThreadJob[] threads = new ThreadJob[numThreads];
             CountdownEvent latch = new CountdownEvent(1);
@@ -1108,11 +1104,7 @@ namespace Lucene.Net.Index
         public virtual void TestDeleteAllSlowly()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             int NUM_DOCS = AtLeast(1000);
             IList<int> ids = new JCG.List<int>(NUM_DOCS);
             for (int id = 0; id < NUM_DOCS; id++)
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
index 3ca892b..5357a65 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
@@ -1632,11 +1632,7 @@ namespace Lucene.Net.Index
         public virtual void TestAddDocsNonAbortingException()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             int numDocs1 = Random.Next(25);
             for (int docCount = 0; docCount < numDocs1; docCount++)
             {
@@ -1702,11 +1698,7 @@ namespace Lucene.Net.Index
         public virtual void TestUpdateDocsNonAbortingException()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             int numDocs1 = Random.Next(25);
             for (int docCount = 0; docCount < numDocs1; docCount++)
             {
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
index 6d3a73f..471ef86 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
@@ -485,11 +485,7 @@ namespace Lucene.Net.Index
                 this.numDirs = numDirs;
                 this.mainWriter = mainWriter;
                 addDir = NewDirectory();
-                IndexWriter writer = new IndexWriter(addDir, NewIndexWriterConfig(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    outerInstance,
-#endif
-                    TEST_VERSION_CURRENT, new MockAnalyzer(Random)).SetMaxBufferedDocs(2));
+                IndexWriter writer = new IndexWriter(addDir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random)).SetMaxBufferedDocs(2));
                 TestUtil.ReduceOpenFiles(writer);
                 for (int i = 0; i < NUM_INIT_DOCS; i++)
                 {
@@ -1204,11 +1200,7 @@ namespace Lucene.Net.Index
 
             public override void Warm(AtomicReader r)
             {
-                IndexSearcher s = NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    outerInstance,
-#endif
-                    r);
+                IndexSearcher s = NewSearcher(r);
                 TopDocs hits = s.Search(new TermQuery(new Term("foo", "bar")), 10);
                 Assert.AreEqual(20, hits.TotalHits);
                 didWarm.Value = (true);
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
index c284e27..63f4416 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
@@ -314,11 +314,7 @@ namespace Lucene.Net.Index
         {
             Random rnd = Random;
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                rnd, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(rnd, dir);
             Document d = new Document();
             // Single segment
             Field f = NewStringField("f", "", Field.Store.NO);
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
index 65b6416..2f8a75a 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
@@ -563,8 +563,8 @@ namespace Lucene.Net.Index
             Directory dir = NewDirectory();
             CountdownEvent oneIWConstructed = new CountdownEvent(1);
 
-            DelayedIndexAndCloseRunnable thread1 = new DelayedIndexAndCloseRunnable(this, dir, oneIWConstructed);
-            DelayedIndexAndCloseRunnable thread2 = new DelayedIndexAndCloseRunnable(this, dir, oneIWConstructed);
+            DelayedIndexAndCloseRunnable thread1 = new DelayedIndexAndCloseRunnable(dir, oneIWConstructed);
+            DelayedIndexAndCloseRunnable thread2 = new DelayedIndexAndCloseRunnable(dir, oneIWConstructed);
 
 
             thread1.Start();
@@ -605,20 +605,9 @@ namespace Lucene.Net.Index
             internal Exception failure = null;
             internal readonly CountdownEvent startIndexing = new CountdownEvent(1);
             internal CountdownEvent iwConstructed;
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-            private readonly LuceneTestCase outerInstance;
-#endif
 
-            /// <param name="outerInstance">
-            /// LUCENENET specific
-            /// Passed in because this class acceses non-static methods,
-            /// NewTextField and NewIndexWriterConfig
-            /// </param>
-            public DelayedIndexAndCloseRunnable(LuceneTestCase outerInstance, Directory dir, CountdownEvent iwConstructed)
+            public DelayedIndexAndCloseRunnable(Directory dir, CountdownEvent iwConstructed)
             {
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this.outerInstance = outerInstance;
-#endif
                 this.dir = dir;
                 this.iwConstructed = iwConstructed;
             }
@@ -635,11 +624,7 @@ namespace Lucene.Net.Index
                     Document doc = new Document();
                     Field field = NewTextField("field", "testData", Field.Store.YES);
                     doc.Add(field);
-                    using IndexWriter writer = new IndexWriter(dir, NewIndexWriterConfig(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        outerInstance,
-#endif
-                        TEST_VERSION_CURRENT, new MockAnalyzer(Random)));
+                    using IndexWriter writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random)));
                     if (iwConstructed.CurrentCount > 0)
                     {
                         iwConstructed.Signal();
@@ -682,7 +667,7 @@ namespace Lucene.Net.Index
             ReentrantLock commitLock = new ReentrantLock();
             for (int threadID = 0; threadID < threadCount; threadID++)
             {
-                threads[threadID] = new ThreadAnonymousClass(this, d, writerRef, docs, iters, failed, rollbackLock, commitLock);
+                threads[threadID] = new ThreadAnonymousClass(d, writerRef, docs, iters, failed, rollbackLock, commitLock);
                 threads[threadID].Start();
             }
 
@@ -705,10 +690,6 @@ namespace Lucene.Net.Index
 
         private class ThreadAnonymousClass : ThreadJob
         {
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-            private readonly TestIndexWriterWithThreads outerInstance;
-#endif
-
             private readonly BaseDirectoryWrapper d;
             private readonly AtomicReference<IndexWriter> writerRef;
             private readonly LineFileDocs docs;
@@ -717,11 +698,8 @@ namespace Lucene.Net.Index
             private readonly ReentrantLock rollbackLock;
             private readonly ReentrantLock commitLock;
 
-            public ThreadAnonymousClass(TestIndexWriterWithThreads outerInstance, BaseDirectoryWrapper d, AtomicReference<IndexWriter> writerRef, LineFileDocs docs, int iters, AtomicBoolean failed, ReentrantLock rollbackLock, ReentrantLock commitLock)
+            public ThreadAnonymousClass(BaseDirectoryWrapper d, AtomicReference<IndexWriter> writerRef, LineFileDocs docs, int iters, AtomicBoolean failed, ReentrantLock rollbackLock, ReentrantLock commitLock)
             {
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this.outerInstance = outerInstance;
-#endif
                 this.d = d;
                 this.writerRef = writerRef;
                 this.docs = docs;
@@ -755,11 +733,7 @@ namespace Lucene.Net.Index
                                         Console.WriteLine("TEST: " + Thread.CurrentThread.Name + ": rollback done; now open new writer");
                                     }
                                     writerRef.Value = 
-                                        new IndexWriter(d, NewIndexWriterConfig(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                                            outerInstance,
-#endif
-                                            TEST_VERSION_CURRENT, new MockAnalyzer(Random)));
+                                        new IndexWriter(d, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random)));
                                 }
                                 finally
                                 {
diff --git a/src/Lucene.Net.Tests/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/Index/TestIndexableField.cs
index 588c308..9019098 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexableField.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Diagnostics;
+using Lucene.Net.Diagnostics;
 using Lucene.Net.Documents;
 using NUnit.Framework;
 using System;
@@ -233,11 +233,7 @@ namespace Lucene.Net.Index
         public virtual void TestArbitraryFields()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             int NUM_DOCS = AtLeast(27);
             if (Verbose)
diff --git a/src/Lucene.Net.Tests/Index/TestIsCurrent.cs b/src/Lucene.Net.Tests/Index/TestIsCurrent.cs
index 6a67fb8..c7366e9 100644
--- a/src/Lucene.Net.Tests/Index/TestIsCurrent.cs
+++ b/src/Lucene.Net.Tests/Index/TestIsCurrent.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using Lucene.Net.Store;
 using Lucene.Net.Util;
 using NUnit.Framework;
@@ -40,11 +40,7 @@ namespace Lucene.Net.Index
 
             // initialize directory
             directory = NewDirectory();
-            writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            writer = new RandomIndexWriter(Random, directory);
 
             // write document
             Document doc = new Document();
diff --git a/src/Lucene.Net.Tests/Index/TestOmitPositions.cs b/src/Lucene.Net.Tests/Index/TestOmitPositions.cs
index 9834cbe..5e897fd 100644
--- a/src/Lucene.Net.Tests/Index/TestOmitPositions.cs
+++ b/src/Lucene.Net.Tests/Index/TestOmitPositions.cs
@@ -47,11 +47,7 @@ namespace Lucene.Net.Index
         public virtual void TestBasic()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
             ft.IndexOptions = IndexOptions.DOCS_AND_FREQS;
@@ -260,11 +256,7 @@ namespace Lucene.Net.Index
             ft.IndexOptions = IndexOptions.DOCS_AND_FREQS;
 
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
 
             for (int i = 0; i < 20; i++)
             {
diff --git a/src/Lucene.Net.Tests/Index/TestPayloads.cs b/src/Lucene.Net.Tests/Index/TestPayloads.cs
index e9d770d..cbedf99 100644
--- a/src/Lucene.Net.Tests/Index/TestPayloads.cs
+++ b/src/Lucene.Net.Tests/Index/TestPayloads.cs
@@ -666,21 +666,13 @@ namespace Lucene.Net.Index
         public virtual void TestAcrossFields()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, new MockAnalyzer(Random, MockTokenizer.WHITESPACE, true));
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir, new MockAnalyzer(Random, MockTokenizer.WHITESPACE, true));
             Document doc = new Document();
             doc.Add(new TextField("hasMaybepayload", "here we go", Field.Store.YES));
             writer.AddDocument(doc);
             writer.Dispose();
 
-            writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, new MockAnalyzer(Random, MockTokenizer.WHITESPACE, true));
+            writer = new RandomIndexWriter(Random, dir, new MockAnalyzer(Random, MockTokenizer.WHITESPACE, true));
             doc = new Document();
             doc.Add(new TextField("hasMaybepayload2", "here we go", Field.Store.YES));
             writer.AddDocument(doc);
@@ -734,11 +726,7 @@ namespace Lucene.Net.Index
         public virtual void TestMixupMultiValued()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             Field field = new TextField("field", "", Field.Store.NO);
             TokenStream ts = new MockTokenizer(new StringReader("here we go"), MockTokenizer.WHITESPACE, true);
diff --git a/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs b/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs
index 5bc884e..12cae4a 100644
--- a/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs
+++ b/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs
@@ -98,11 +98,7 @@ namespace Lucene.Net.Index
         public virtual void TestMixupMultiValued()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
             customType.StoreTermVectors = true;
@@ -145,11 +141,7 @@ namespace Lucene.Net.Index
         public virtual void TestPayloadsWithoutPositions()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
             customType.StoreTermVectors = true;
diff --git a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
index 6a36639..9949241 100644
--- a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
+++ b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
@@ -441,11 +441,7 @@ namespace Lucene.Net.Index
         public virtual void TestAddFieldTwice()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             FieldType customType3 = new FieldType(TextField.TYPE_STORED);
             customType3.StoreTermVectors = true;
diff --git a/src/Lucene.Net.Tests/Index/TestRollback.cs b/src/Lucene.Net.Tests/Index/TestRollback.cs
index 2c0c4af..1436ed1 100644
--- a/src/Lucene.Net.Tests/Index/TestRollback.cs
+++ b/src/Lucene.Net.Tests/Index/TestRollback.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
@@ -37,11 +37,7 @@ namespace Lucene.Net.Index
         public virtual void TestRollbackIntegrityWithBufferFlush()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter rw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter rw = new RandomIndexWriter(Random, dir);
             for (int i = 0; i < 5; i++)
             {
                 Document doc = new Document();
diff --git a/src/Lucene.Net.Tests/Index/TestSameTokenSamePosition.cs b/src/Lucene.Net.Tests/Index/TestSameTokenSamePosition.cs
index debe56e..ed08cbe 100644
--- a/src/Lucene.Net.Tests/Index/TestSameTokenSamePosition.cs
+++ b/src/Lucene.Net.Tests/Index/TestSameTokenSamePosition.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Analysis.TokenAttributes;
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Documents;
 using NUnit.Framework;
 
@@ -38,11 +38,7 @@ namespace Lucene.Net.Index
         public virtual void Test()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter riw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter riw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new TextField("eng", new BugReproTokenStream()));
             riw.AddDocument(doc);
@@ -57,11 +53,7 @@ namespace Lucene.Net.Index
         public virtual void TestMoreDocs()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter riw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter riw = new RandomIndexWriter(Random, dir);
             for (int i = 0; i < 100; i++)
             {
                 Document doc = new Document();
diff --git a/src/Lucene.Net.Tests/Index/TestStressAdvance.cs b/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
index e4a138a..c61e0de 100644
--- a/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
+++ b/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
@@ -42,11 +42,7 @@ namespace Lucene.Net.Index
                     Console.WriteLine("\nTEST: iter=" + iter);
                 }
                 Directory dir = NewDirectory();
-                RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, dir);
+                RandomIndexWriter w = new RandomIndexWriter(Random, dir);
                 ISet<int> aDocs = new JCG.HashSet<int>();
                 Documents.Document doc = new Documents.Document();
                 Field f = NewStringField("field", "", Field.Store.NO);
diff --git a/src/Lucene.Net.Tests/Index/TestStressIndexing.cs b/src/Lucene.Net.Tests/Index/TestStressIndexing.cs
index 9ddef83..d408756 100644
--- a/src/Lucene.Net.Tests/Index/TestStressIndexing.cs
+++ b/src/Lucene.Net.Tests/Index/TestStressIndexing.cs
@@ -159,11 +159,7 @@ namespace Lucene.Net.Index
                 for (int i = 0; i < 100; i++)
                 {
                     IndexReader ir = DirectoryReader.Open(directory);
-                    IndexSearcher @is =
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        outerInstance.
-#endif
-                        NewSearcher(ir);
+                    IndexSearcher @is = NewSearcher(ir);
                     ir.Dispose();
                 }
                 count += 100;
diff --git a/src/Lucene.Net.Tests/Index/TestStressNRT.cs b/src/Lucene.Net.Tests/Index/TestStressNRT.cs
index cd6521c..afe91f4 100644
--- a/src/Lucene.Net.Tests/Index/TestStressNRT.cs
+++ b/src/Lucene.Net.Tests/Index/TestStressNRT.cs
@@ -489,11 +489,7 @@ namespace Lucene.Net.Index
                         }
                         else
                         {
-                            searcher = NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                                outerInstance,
-#endif
-                                r);
+                            searcher = NewSearcher(r);
                             lastReader = r;
                             lastSearcher = searcher;
                         }
diff --git a/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs b/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs
index 214c020..f887d4a 100644
--- a/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs
+++ b/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Lucene.Net.Documents;
 using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
@@ -42,11 +42,7 @@ namespace Lucene.Net.Index
             int numDocs = AtLeast(500);
 
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             Field id = NewStringField("id", "", Field.Store.NO);
diff --git a/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs b/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs
index 0ce678a..ce55888 100644
--- a/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs
@@ -401,11 +401,7 @@ namespace Lucene.Net.Index
         public virtual void TestIllegalIndexableField()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
             ft.StoreTermVectors = true;
             ft.StoreTermVectorPayloads = true;
diff --git a/src/Lucene.Net.Tests/Index/TestTermsEnum.cs b/src/Lucene.Net.Tests/Index/TestTermsEnum.cs
index 31a9d05..cc5df7a 100644
--- a/src/Lucene.Net.Tests/Index/TestTermsEnum.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermsEnum.cs
@@ -57,11 +57,7 @@ namespace Lucene.Net.Index
             Directory d = NewDirectory();
             MockAnalyzer analyzer = new MockAnalyzer(LuceneTestCase.Random);
             analyzer.MaxTokenLength = TestUtil.NextInt32(LuceneTestCase.Random, 1, IndexWriter.MAX_TERM_LENGTH);
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                LuceneTestCase.Random, d, analyzer);
+            RandomIndexWriter w = new RandomIndexWriter(LuceneTestCase.Random, d, analyzer);
             int numDocs = AtLeast(10);
             for (int docCount = 0; docCount < numDocs; docCount++)
             {
@@ -237,11 +233,7 @@ namespace Lucene.Net.Index
         public virtual void TestIntersectRandom()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             int numTerms = AtLeast(300);
             //final int numTerms = 50;
@@ -589,11 +581,7 @@ namespace Lucene.Net.Index
         public virtual void TestZeroTerms()
         {
             var d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             doc.Add(NewTextField("field", "one two three", Field.Store.NO));
             doc = new Document();
diff --git a/src/Lucene.Net.Tests/Index/TestTransactions.cs b/src/Lucene.Net.Tests/Index/TestTransactions.cs
index eed8a01..6269dc2 100644
--- a/src/Lucene.Net.Tests/Index/TestTransactions.cs
+++ b/src/Lucene.Net.Tests/Index/TestTransactions.cs
@@ -133,11 +133,7 @@ namespace Lucene.Net.Index
 
             public override void DoWork()
             {
-                var config = NewIndexWriterConfig(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    outerInstance,
-#endif
-                    TEST_VERSION_CURRENT, new MockAnalyzer(Random))
+                var config = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random))
                         .SetMaxBufferedDocs(3)
                         .SetMergeScheduler(new ConcurrentMergeScheduler())
                         .SetMergePolicy(NewLogMergePolicy(2));
@@ -146,11 +142,7 @@ namespace Lucene.Net.Index
 
                 // Intentionally use different params so flush/merge
                 // happen @ different times
-                var config2 = NewIndexWriterConfig(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    outerInstance,
-#endif
-                    TEST_VERSION_CURRENT, new MockAnalyzer(Random))
+                var config2 = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random))
                         .SetMaxBufferedDocs(2)
                         .SetMergeScheduler(new ConcurrentMergeScheduler())
                         .SetMergePolicy(NewLogMergePolicy(3));
diff --git a/src/Lucene.Net.Tests/Search/Payloads/PayloadHelper.cs b/src/Lucene.Net.Tests/Search/Payloads/PayloadHelper.cs
index 77bfe27..9034c2c 100644
--- a/src/Lucene.Net.Tests/Search/Payloads/PayloadHelper.cs
+++ b/src/Lucene.Net.Tests/Search/Payloads/PayloadHelper.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Analysis;
+using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
@@ -145,11 +145,7 @@ namespace Lucene.Net.Search.Payloads
             Reader = DirectoryReader.Open(writer, true);
             writer.Dispose();
 
-            IndexSearcher searcher = LuceneTestCase.NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                null, // LUCENENET: Passing null allows us to bypass similarity, which we are setting here, anyway
-#endif
-                Reader);
+            IndexSearcher searcher = LuceneTestCase.NewSearcher(Reader);
             searcher.Similarity = similarity;
             return searcher;
         }
diff --git a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs
index d3a1011..eb3b13f 100644
--- a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Analysis;
+using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
@@ -315,11 +315,7 @@ namespace Lucene.Net.Search.Payloads
             Assert.IsTrue(hits.TotalHits == 1, "hits Size: " + hits.TotalHits + " is not: " + 1);
             int[] results = new int[1];
             results[0] = 0; //hits.ScoreDocs[0].Doc;
-            CheckHits.CheckHitCollector(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, PayloadHelper.NO_PAYLOAD_FIELD, searcher, results);
+            CheckHits.CheckHitCollector(Random, query, PayloadHelper.NO_PAYLOAD_FIELD, searcher, results);
         }
 
         internal class BoostingSimilarity : DefaultSimilarity
diff --git a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs
index 49459c6..fcc2b0e 100644
--- a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs
+++ b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs
@@ -85,11 +85,7 @@ namespace Lucene.Net.Search.Similarities
         public virtual void TestEmptyIndex()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             IndexReader ir = iw.GetReader();
             iw.Dispose();
             IndexSearcher @is = NewSearcher(ir);
@@ -109,11 +105,7 @@ namespace Lucene.Net.Search.Similarities
         public virtual void TestEmptyField()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewTextField("foo", "bar", Field.Store.NO));
             iw.AddDocument(doc);
@@ -139,11 +131,7 @@ namespace Lucene.Net.Search.Similarities
         public virtual void TestEmptyTerm()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewTextField("foo", "bar", Field.Store.NO));
             iw.AddDocument(doc);
@@ -169,11 +157,7 @@ namespace Lucene.Net.Search.Similarities
         public virtual void TestNoNorms()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
             ft.OmitNorms = true;
@@ -201,11 +185,7 @@ namespace Lucene.Net.Search.Similarities
         public virtual void TestOmitTF()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
             ft.IndexOptions = IndexOptions.DOCS_ONLY;
@@ -234,11 +214,7 @@ namespace Lucene.Net.Search.Similarities
         public virtual void TestOmitTFAndNorms()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
             ft.IndexOptions = IndexOptions.DOCS_ONLY;
@@ -272,11 +248,7 @@ namespace Lucene.Net.Search.Similarities
             // however with spans, there is only one scorer for the whole hierarchy:
             // inner queries are not real queries, their boosts are ignored, etc.
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
             doc.Add(NewField("foo", "bar", ft));
diff --git a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs
index 25c386f..1008946 100644
--- a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs
+++ b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs
@@ -107,11 +107,7 @@ namespace Lucene.Net.Search.Similarities
             base.SetUp();
 
             dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             for (int i = 0; i < docs.Length; i++)
             {
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs
index ed831c2..1d5dfdf 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs
@@ -616,11 +616,7 @@ namespace Lucene.Net.Search.Spans
 
         private void CheckHits(Query query, int[] results)
         {
-            Search.CheckHits.DoCheckHits(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, "field", searcher, results);
+            Search.CheckHits.DoCheckHits(Random, query, "field", searcher, results);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs
index 7b37049..f3a31a3 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System.Collections.Generic;
@@ -95,11 +95,7 @@ namespace Lucene.Net.Search.Spans
 
         protected internal virtual void Check(SpanQuery q, int[] docs)
         {
-            CheckHits.CheckHitCollector(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, null, searcher, docs);
+            CheckHits.CheckHitCollector(Random, q, null, searcher, docs);
         }
 
         [Test]
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs b/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs
index f845e99..490ac3c 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using Lucene.Net.Index;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
@@ -84,11 +84,7 @@ namespace Lucene.Net.Search.Spans
         public virtual void TestSpanNearQuery()
         {
             SpanNearQuery q = MakeQuery();
-            CheckHits.DoCheckHits(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, FIELD, searcher, new int[] { 0, 1 });
+            CheckHits.DoCheckHits(Random, q, FIELD, searcher, new int[] { 0, 1 });
         }
 
         public virtual string s(Spans span)
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs
index a8a1da7..cc570fb 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
 
@@ -46,11 +46,7 @@ namespace Lucene.Net.Search.Spans
             CharacterRunAutomaton stopSet = new CharacterRunAutomaton((new RegExp("the|a|of")).ToAutomaton());
             Analyzer analyzer = new MockAnalyzer(Random, MockTokenizer.SIMPLE, true, stopSet);
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, analyzer);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir, analyzer);
             Document doc = new Document();
             doc.Add(NewTextField("field", "the quick brown fox", Field.Store.NO));
             writer.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs
index b7b0253..44c520e 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
 
@@ -44,11 +44,7 @@ namespace Lucene.Net.Search.Spans
         {
             base.SetUp();
             directory = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, directory);
             Document doc = new Document();
             Field field = NewTextField("field", "", Field.Store.NO);
             doc.Add(field);
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs
index 7beb2c2..375806c 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using Lucene.Net.Index;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
@@ -84,11 +84,7 @@ namespace Lucene.Net.Search.Spans
 
         private void CheckHits(Query query, int[] results)
         {
-            Search.CheckHits.DoCheckHits(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, field, searcher, results);
+            Search.CheckHits.DoCheckHits(Random, query, field, searcher, results);
         }
 
         private void OrderedSlopTest3SQ(SpanQuery q1, SpanQuery q2, SpanQuery q3, int slop, int[] expectedDocs)
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs
index 05c9d8f..2526d6f 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
@@ -141,11 +141,7 @@ namespace Lucene.Net.Search.Spans
         /// <param name="expectedScores"> the expected scores of the hits </param>
         protected internal void AssertHits(IndexSearcher s, Query query, string description, string[] expectedIds, float[] expectedScores)
         {
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, s);
+            QueryUtils.Check(Random, query, s);
 
             const float tolerance = 1e-5f;
 
diff --git a/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs b/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs
index 1a3331f..39b80aa 100644
--- a/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs
@@ -55,11 +55,7 @@ namespace Lucene.Net.Search
         {
             base.SetUp();
             directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             Document doc = new Document();
             Field titleField = NewTextField("title", "some title", Field.Store.NO);
             Field field = NewTextField(FN, "this is document one 2345", Field.Store.NO);
diff --git a/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs b/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs
index c6b0acd..a9706a0 100644
--- a/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs
+++ b/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
 
@@ -50,11 +50,7 @@ namespace Lucene.Net.Search
         {
             base.SetUp();
             directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             Document doc = new Document();
             Field titleField = NewTextField("title", "some title", Field.Store.NO);
             Field field = NewTextField(FN, "", Field.Store.NO);
diff --git a/src/Lucene.Net.Tests/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/Search/TestBoolean2.cs
index edfd6be..a7a19d7 100644
--- a/src/Lucene.Net.Tests/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/Search/TestBoolean2.cs
@@ -99,11 +99,7 @@ namespace Lucene.Net.Search
                     Console.WriteLine("\nTEST: cycle...");
                 }
                 Directory copy = new MockDirectoryWrapper(Random, new RAMDirectory(dir2, IOContext.DEFAULT));
-                RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, dir2);
+                RandomIndexWriter w = new RandomIndexWriter(Random, dir2);
                 w.AddIndexes(copy);
                 docCount = w.MaxDoc;
                 w.Dispose();
@@ -314,20 +310,12 @@ namespace Lucene.Net.Search
                     // match up.
                     Sort sort = Sort.INDEXORDER;
 
-                    QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        this,
-#endif
-                        Random, q1, searcher); // baseline sim
+                    QueryUtils.Check(Random, q1, searcher); // baseline sim
                     try
                     {
                         // a little hackish, QueryUtils.check is too costly to do on bigSearcher in this loop.
                         searcher.Similarity = bigSearcher.Similarity; // random sim
-                        QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                            this,
-#endif
-                            Random, q1, searcher);
+                        QueryUtils.Check(Random, q1, searcher);
                     }
                     finally
                     {
diff --git a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs
index 0e240c4..301b948 100644
--- a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs
@@ -57,11 +57,7 @@ namespace Lucene.Net.Search
             string[] data = new string[] { "A 1 2 3 4 5 6", "Z       4 5 6", null, "B   2   4 5 6", "Y     3   5 6", null, "C     3     6", "X       4 5 6" };
 
             index = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, index);
+            RandomIndexWriter w = new RandomIndexWriter(Random, index);
 
             for (int i = 0; i < data.Length; i++)
             {
@@ -112,11 +108,7 @@ namespace Lucene.Net.Search
             }
             Assert.AreEqual(expected, h2.Length, "result count (bs2)");
 
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
         }
 
         [Test]
@@ -368,16 +360,8 @@ namespace Lucene.Net.Search
                 TopDocs top2 = s.Search(q2, null, 100);
                 if (i < 100)
                 {
-                    QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        this,
-#endif
-                        Random, q1, s);
-                    QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                        this,
-#endif
-                        Random, q2, s);
+                    QueryUtils.Check(Random, q1, s);
+                    QueryUtils.Check(Random, q2, s);
                 }
                 AssertSubsetOfSameScores(q2, top1, top2);
             }
diff --git a/src/Lucene.Net.Tests/Search/TestBooleanOr.cs b/src/Lucene.Net.Tests/Search/TestBooleanOr.cs
index 257a6f3..8c400e1 100644
--- a/src/Lucene.Net.Tests/Search/TestBooleanOr.cs
+++ b/src/Lucene.Net.Tests/Search/TestBooleanOr.cs
@@ -51,11 +51,7 @@ namespace Lucene.Net.Search
 
         private int Search(Query q)
         {
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, searcher);
+            QueryUtils.Check(Random, q, searcher);
             return searcher.Search(q, null, 1000).TotalHits;
         }
 
@@ -149,11 +145,7 @@ namespace Lucene.Net.Search
             dir = NewDirectory();
 
             //
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
 
             //
             Document d = new Document();
diff --git a/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs b/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs
index 5d6cef3..02006cd 100644
--- a/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs
@@ -91,11 +91,7 @@ namespace Lucene.Net.Search
         public virtual void TestNullOrSubScorer()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewTextField("field", "a b c d", Field.Store.NO));
             w.AddDocument(doc);
@@ -161,11 +157,7 @@ namespace Lucene.Net.Search
         public virtual void TestDeMorgan()
         {
             Directory dir1 = NewDirectory();
-            RandomIndexWriter iw1 = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir1);
+            RandomIndexWriter iw1 = new RandomIndexWriter(Random, dir1);
             Document doc1 = new Document();
             doc1.Add(NewTextField("field", "foo bar", Field.Store.NO));
             iw1.AddDocument(doc1);
@@ -173,11 +165,7 @@ namespace Lucene.Net.Search
             iw1.Dispose();
 
             Directory dir2 = NewDirectory();
-            RandomIndexWriter iw2 = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir2);
+            RandomIndexWriter iw2 = new RandomIndexWriter(Random, dir2);
             Document doc2 = new Document();
             doc2.Add(NewTextField("field", "foo baz", Field.Store.NO));
             iw2.AddDocument(doc2);
@@ -216,11 +204,7 @@ namespace Lucene.Net.Search
         public virtual void TestBS2DisjunctionNextVsAdvance()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             int numDocs = AtLeast(300);
             for (int docUpto = 0; docUpto < numDocs; docUpto++)
             {
@@ -391,11 +375,7 @@ namespace Lucene.Net.Search
         public virtual void TestInOrderWithMinShouldMatch()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewTextField("field", "some text here", Field.Store.NO));
             w.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs b/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs
index 4bbca9b..ddf99c7 100644
--- a/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs
+++ b/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs
@@ -50,11 +50,7 @@ namespace Lucene.Net.Search
 
             string[] values = new string[] { "1", "2", "3", "4" };
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             for (int i = 0; i < values.Length; i++)
             {
                 Document doc = new Document();
@@ -88,11 +84,7 @@ namespace Lucene.Net.Search
             // changes, we have a test to back it up.
 
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             writer.Commit();
             IndexReader ir = writer.GetReader();
             writer.Dispose();
@@ -166,11 +158,7 @@ namespace Lucene.Net.Search
         public virtual void TestMoreThan32ProhibitedClauses()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             doc.Add(new TextField("field", "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33", Field.Store.NO));
             w.AddDocument(doc);
@@ -307,11 +295,7 @@ namespace Lucene.Net.Search
         public virtual void TestEmbeddedBooleanScorer()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewTextField("field", "doctors are people who prescribe medicines of which they know little, to cure diseases of which they know less, in human beings of whom they know nothing", Field.Store.NO));
             w.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs b/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs
index 12e98eb..15be6ce 100644
--- a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
@@ -53,11 +53,7 @@ namespace Lucene.Net.Search
         {
             base.SetUp();
             dir = NewDirectory();
-            iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             Field idField = new StringField("id", "", Field.Store.NO);
             doc.Add(idField);
@@ -177,11 +173,7 @@ namespace Lucene.Net.Search
         public virtual void TestCachingWorks()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             writer.Dispose();
 
             IndexReader reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
@@ -209,11 +201,7 @@ namespace Lucene.Net.Search
         public virtual void TestNullDocIdSet()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             writer.Dispose();
 
             IndexReader reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
@@ -252,11 +240,7 @@ namespace Lucene.Net.Search
         public virtual void TestNullDocIdSetIterator()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             writer.Dispose();
 
             IndexReader reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
@@ -340,11 +324,7 @@ namespace Lucene.Net.Search
         public virtual void TestIsCacheAble()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             writer.AddDocument(new Document());
             writer.Dispose();
 
@@ -391,11 +371,7 @@ namespace Lucene.Net.Search
             // (must) get an NRT reader:
             DirectoryReader reader = DirectoryReader.Open(writer.IndexWriter, true);
             // same reason we don't wrap?
-            IndexSearcher searcher = NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                reader, false);
+            IndexSearcher searcher = NewSearcher(reader, false);
 
             // add a doc, refresh the reader, and check that it's there
             Document doc = new Document();
@@ -403,11 +379,7 @@ namespace Lucene.Net.Search
             writer.AddDocument(doc);
 
             reader = RefreshReader(reader);
-            searcher = NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                reader, false);
+            searcher = NewSearcher(reader, false);
 
             TopDocs docs = searcher.Search(new MatchAllDocsQuery(), 1);
             Assert.AreEqual(1, docs.TotalHits, "Should find a hit...");
@@ -484,11 +456,7 @@ namespace Lucene.Net.Search
             oldReader = reader;
 
             reader = RefreshReader(reader);
-            searcher = NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                reader, false);
+            searcher = NewSearcher(reader, false);
 
             docs = searcher.Search(new MatchAllDocsQuery(), filter, 1);
             Assert.AreEqual(2, docs.TotalHits, "[query + filter] Should find 2 hits...");
@@ -504,11 +472,7 @@ namespace Lucene.Net.Search
             writer.DeleteDocuments(new Term("id", "1"));
 
             reader = RefreshReader(reader);
-            searcher = NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                reader, false);
+            searcher = NewSearcher(reader, false);
 
             docs = searcher.Search(new MatchAllDocsQuery(), filter, 1);
             Assert.AreEqual(0, docs.TotalHits, "[query + filter] Should *not* find a hit...");
diff --git a/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs b/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs
index 4a4cde6..39d3042 100644
--- a/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Diagnostics;
+using Lucene.Net.Diagnostics;
 using Lucene.Net.Documents;
 using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
@@ -116,11 +116,7 @@ namespace Lucene.Net.Search
             try
             {
                 directory = NewDirectory();
-                RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, directory);
+                RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
 
                 Document doc = new Document();
                 doc.Add(NewStringField("field", "term", Field.Store.NO));
@@ -186,11 +182,7 @@ namespace Lucene.Net.Search
         public virtual void TestConstantScoreQueryAndFilter()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             doc.Add(NewStringField("field", "a", Field.Store.NO));
             w.AddDocument(doc);
@@ -221,11 +213,7 @@ namespace Lucene.Net.Search
         public virtual void TestQueryWrapperFilter()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             Document doc = new Document();
             doc.Add(NewStringField("field", "a", Field.Store.NO));
             w.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
index ac07086..495244b 100644
--- a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
+++ b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
@@ -555,11 +555,7 @@ namespace Lucene.Net.Search
         public virtual void TestEvilSearcherFactory()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             w.Commit();
 
             IndexReader other = DirectoryReader.Open(dir);
@@ -594,11 +590,7 @@ namespace Lucene.Net.Search
 
             public override IndexSearcher NewSearcher(IndexReader ignored)
             {
-                return LuceneTestCase.NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    outerInstance,
-#endif
-                    other);
+                return LuceneTestCase.NewSearcher(other);
             }
         }
 
diff --git a/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs b/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs
index 2661b91..77d7820 100644
--- a/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs
+++ b/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs
@@ -56,11 +56,7 @@ namespace Lucene.Net.Search
             base.SetUp();
             INDEX_SIZE = AtLeast(2000);
             index = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                LuceneTestCase.Random, index);
+            RandomIndexWriter writer = new RandomIndexWriter(LuceneTestCase.Random, index);
             RandomGen random = new RandomGen(this, Random);
             for (int i = 0; i < INDEX_SIZE; ++i) // don't decrease; if to low the
             {
diff --git a/src/Lucene.Net.Tests/Search/TestDateFilter.cs b/src/Lucene.Net.Tests/Search/TestDateFilter.cs
index fd8db61..2d44e6c 100644
--- a/src/Lucene.Net.Tests/Search/TestDateFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestDateFilter.cs
@@ -48,11 +48,7 @@ namespace Lucene.Net.Search
 
             // create an index
             Directory indexStore = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexStore);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, indexStore);
 
             long now = J2N.Time.CurrentTimeMilliseconds();
 
@@ -116,11 +112,7 @@ namespace Lucene.Net.Search
         {
             // create an index
             Directory indexStore = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexStore);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, indexStore);
 
             long now = J2N.Time.CurrentTimeMilliseconds();
 
diff --git a/src/Lucene.Net.Tests/Search/TestDateSort.cs b/src/Lucene.Net.Tests/Search/TestDateSort.cs
index d1cb01c..76f5199 100644
--- a/src/Lucene.Net.Tests/Search/TestDateSort.cs
+++ b/src/Lucene.Net.Tests/Search/TestDateSort.cs
@@ -48,11 +48,7 @@ namespace Lucene.Net.Search
             base.SetUp();
             // Create an index writer.
             directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
 
             // oldest doc:
             // Add the first document.  text = "Document 1"  dateTime = Oct 10 03:25:22 EDT 2007
diff --git a/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs b/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs
index 7760898..b1c6961 100644
--- a/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs
@@ -186,11 +186,7 @@ namespace Lucene.Net.Search
             dq.Add(Tq("id", "d1"));
             dq.Add(Tq("dek", "DOES_NOT_EXIST"));
 
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dq, s);
+            QueryUtils.Check(Random, dq, s);
             Assert.IsTrue(s.TopReaderContext is AtomicReaderContext);
             Weight dw = s.CreateNormalizedWeight(dq);
             AtomicReaderContext context = (AtomicReaderContext)s.TopReaderContext;
@@ -209,11 +205,7 @@ namespace Lucene.Net.Search
             dq.Add(Tq("dek", "albino"));
             dq.Add(Tq("dek", "DOES_NOT_EXIST"));
             Assert.IsTrue(s.TopReaderContext is AtomicReaderContext);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dq, s);
+            QueryUtils.Check(Random, dq, s);
             Weight dw = s.CreateNormalizedWeight(dq);
             AtomicReaderContext context = (AtomicReaderContext)s.TopReaderContext;
             Scorer ds = dw.GetScorer(context, (context.AtomicReader).LiveDocs);
@@ -227,11 +219,7 @@ namespace Lucene.Net.Search
             DisjunctionMaxQuery q = new DisjunctionMaxQuery(0.0f);
             q.Add(Tq("hed", "albino"));
             q.Add(Tq("hed", "elephant"));
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
 
             ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
 
@@ -258,11 +246,7 @@ namespace Lucene.Net.Search
             DisjunctionMaxQuery q = new DisjunctionMaxQuery(0.0f);
             q.Add(Tq("dek", "albino"));
             q.Add(Tq("dek", "elephant"));
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
 
             ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
 
@@ -290,11 +274,7 @@ namespace Lucene.Net.Search
             q.Add(Tq("hed", "elephant"));
             q.Add(Tq("dek", "albino"));
             q.Add(Tq("dek", "elephant"));
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
 
             ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
 
@@ -320,11 +300,7 @@ namespace Lucene.Net.Search
             DisjunctionMaxQuery q = new DisjunctionMaxQuery(0.01f);
             q.Add(Tq("dek", "albino"));
             q.Add(Tq("dek", "elephant"));
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
 
             ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
 
@@ -354,29 +330,17 @@ namespace Lucene.Net.Search
                 q1.Add(Tq("hed", "albino"));
                 q1.Add(Tq("dek", "albino"));
                 q.Add(q1, Occur.MUST); // true,false);
-                QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, q1, s);
+                QueryUtils.Check(Random, q1, s);
             }
             {
                 DisjunctionMaxQuery q2 = new DisjunctionMaxQuery(0.0f);
                 q2.Add(Tq("hed", "elephant"));
                 q2.Add(Tq("dek", "elephant"));
                 q.Add(q2, Occur.MUST); // true,false);
-                QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    this,
-#endif
-                    Random, q2, s);
+                QueryUtils.Check(Random, q2, s);
             }
 
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
 
             ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
 
@@ -412,11 +376,7 @@ namespace Lucene.Net.Search
                 q2.Add(Tq("dek", "elephant"));
                 q.Add(q2, Occur.SHOULD); // false,false);
             }
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
 
             ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
 
@@ -455,11 +415,7 @@ namespace Lucene.Net.Search
                 q2.Add(Tq("dek", "elephant"));
                 q.Add(q2, Occur.SHOULD); // false,false);
             }
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
 
             ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
 
@@ -509,11 +465,7 @@ namespace Lucene.Net.Search
                 q2.Add(Tq("dek", "elephant"));
                 q.Add(q2, Occur.SHOULD); // false,false);
             }
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, s);
+            QueryUtils.Check(Random, q, s);
 
             ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
 
diff --git a/src/Lucene.Net.Tests/Search/TestDocIdSet.cs b/src/Lucene.Net.Tests/Search/TestDocIdSet.cs
index 6b66ebb..7998f96 100644
--- a/src/Lucene.Net.Tests/Search/TestDocIdSet.cs
+++ b/src/Lucene.Net.Tests/Search/TestDocIdSet.cs
@@ -146,11 +146,7 @@ namespace Lucene.Net.Search
             // Tests that if a Filter produces a null DocIdSet, which is given to
             // IndexSearcher, everything works fine. this came up in LUCENE-1754.
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("c", "val", Field.Store.NO));
             writer.AddDocument(doc);
@@ -188,11 +184,7 @@ namespace Lucene.Net.Search
         public virtual void TestNullIteratorFilteredDocIdSet()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("c", "val", Field.Store.NO));
             writer.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs b/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs
index 91491c8..dcf46c7 100644
--- a/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs
+++ b/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using NUnit.Framework;
 using System;
 using Assert = Lucene.Net.TestFramework.Assert;
@@ -52,11 +52,7 @@ namespace Lucene.Net.Search
         public virtual void TestSimple()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             Field field = NewTextField("foo", "", Field.Store.NO);
             doc.Add(field);
@@ -77,32 +73,16 @@ namespace Lucene.Net.Search
             iw.Dispose();
 
             // no boosting
-            IndexSearcher searcher1 = NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                ir, false);
+            IndexSearcher searcher1 = NewSearcher(ir, false);
             Similarity @base = searcher1.Similarity;
             // boosting
-            IndexSearcher searcher2 = NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                ir, false);
+            IndexSearcher searcher2 = NewSearcher(ir, false);
             searcher2.Similarity = new PerFieldSimilarityWrapperAnonymousClass(this, field, @base);
 
             // in this case, we searched on field "foo". first document should have 2x the score.
             TermQuery tq = new TermQuery(new Term("foo", "quick"));
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, tq, searcher1);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, tq, searcher2);
+            QueryUtils.Check(Random, tq, searcher1);
+            QueryUtils.Check(Random, tq, searcher2);
 
             TopDocs noboost = searcher1.Search(tq, 10);
             TopDocs boost = searcher2.Search(tq, 10);
@@ -114,16 +94,8 @@ namespace Lucene.Net.Search
 
             // this query matches only the second document, which should have 4x the score.
             tq = new TermQuery(new Term("foo", "jumps"));
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, tq, searcher1);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, tq, searcher2);
+            QueryUtils.Check(Random, tq, searcher1);
+            QueryUtils.Check(Random, tq, searcher2);
 
             noboost = searcher1.Search(tq, 10);
             boost = searcher2.Search(tq, 10);
@@ -135,16 +107,8 @@ namespace Lucene.Net.Search
             // search on on field bar just for kicks, nothing should happen, since we setup
             // our sim provider to only use foo_boost for field foo.
             tq = new TermQuery(new Term("bar", "quick"));
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, tq, searcher1);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, tq, searcher2);
+            QueryUtils.Check(Random, tq, searcher1);
+            QueryUtils.Check(Random, tq, searcher2);
 
             noboost = searcher1.Search(tq, 10);
             boost = searcher2.Search(tq, 10);
diff --git a/src/Lucene.Net.Tests/Search/TestEarlyTermination.cs b/src/Lucene.Net.Tests/Search/TestEarlyTermination.cs
index 5d1a487..86dc9bb 100644
--- a/src/Lucene.Net.Tests/Search/TestEarlyTermination.cs
+++ b/src/Lucene.Net.Tests/Search/TestEarlyTermination.cs
@@ -39,11 +39,7 @@ namespace Lucene.Net.Search
         {
             base.SetUp();
             dir = NewDirectory();
-            writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            writer = new RandomIndexWriter(Random, dir);
             int numDocs = AtLeast(100);
             for (int i = 0; i < numDocs; i++)
             {
diff --git a/src/Lucene.Net.Tests/Search/TestExplanations.cs b/src/Lucene.Net.Tests/Search/TestExplanations.cs
index 380ad6f..8e0f6f4 100644
--- a/src/Lucene.Net.Tests/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/Search/TestExplanations.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 
@@ -106,11 +106,7 @@ namespace Lucene.Net.Search
         /// check the expDocNrs first, then check the query (and the explanations) </summary>
         public virtual void Qtest(Query q, int[] expDocNrs)
         {
-            CheckHits.CheckHitCollector(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, q, FIELD, searcher, expDocNrs);
+            CheckHits.CheckHitCollector(Random, q, FIELD, searcher, expDocNrs);
         }
 
         /// <summary>
diff --git a/src/Lucene.Net.Tests/Search/TestFieldCache.cs b/src/Lucene.Net.Tests/Search/TestFieldCache.cs
index 9357cf4..2c161fa 100644
--- a/src/Lucene.Net.Tests/Search/TestFieldCache.cs
+++ b/src/Lucene.Net.Tests/Search/TestFieldCache.cs
@@ -802,11 +802,7 @@ namespace Lucene.Net.Search
         public virtual void TestNonexistantFields()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             iw.AddDocument(doc);
             DirectoryReader ir = iw.GetReader();
@@ -865,11 +861,7 @@ namespace Lucene.Net.Search
         public virtual void TestNonIndexedFields()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new StoredField("bogusbytes", "bogus"));
             doc.Add(new StoredField("bogusshorts", "bogus"));
diff --git a/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs b/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs
index b41590b..6c4321e 100644
--- a/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs
@@ -41,11 +41,7 @@ namespace Lucene.Net.Search
         {
             string fieldName = "field1";
             Directory rd = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, rd);
+            RandomIndexWriter w = new RandomIndexWriter(Random, rd);
             for (int i = 0; i < 100; i++)
             {
                 Document doc = new Document();
diff --git a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs
index 8472201..df90643 100644
--- a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs
@@ -155,11 +155,7 @@ namespace Lucene.Net.Search
             ScoreDoc[] hits = searcher.Search(filteredquery, null, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length);
             Assert.AreEqual(1, hits[0].Doc);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, filteredquery, searcher);
+            QueryUtils.Check(Random, filteredquery, searcher);
 
             hits = searcher.Search(filteredquery, null, 1000, new Sort(new SortField("sorter", SortFieldType.STRING))).ScoreDocs;
             Assert.AreEqual(1, hits.Length);
@@ -168,39 +164,23 @@ namespace Lucene.Net.Search
             filteredquery = new FilteredQuery(new TermQuery(new Term("field", "one")), filter, RandomFilterStrategy(Random, useRandomAccess));
             hits = searcher.Search(filteredquery, null, 1000).ScoreDocs;
             Assert.AreEqual(2, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, filteredquery, searcher);
+            QueryUtils.Check(Random, filteredquery, searcher);
 
             filteredquery = new FilteredQuery(new MatchAllDocsQuery(), filter, RandomFilterStrategy(Random, useRandomAccess));
             hits = searcher.Search(filteredquery, null, 1000).ScoreDocs;
             Assert.AreEqual(2, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, filteredquery, searcher);
+            QueryUtils.Check(Random, filteredquery, searcher);
 
             filteredquery = new FilteredQuery(new TermQuery(new Term("field", "x")), filter, RandomFilterStrategy(Random, useRandomAccess));
             hits = searcher.Search(filteredquery, null, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length);
             Assert.AreEqual(3, hits[0].Doc);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, filteredquery, searcher);
+            QueryUtils.Check(Random, filteredquery, searcher);
 
             filteredquery = new FilteredQuery(new TermQuery(new Term("field", "y")), filter, RandomFilterStrategy(Random, useRandomAccess));
             hits = searcher.Search(filteredquery, null, 1000).ScoreDocs;
             Assert.AreEqual(0, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, filteredquery, searcher);
+            QueryUtils.Check(Random, filteredquery, searcher);
 
             // test boost
             Filter f = NewStaticFilterA();
@@ -279,11 +259,7 @@ namespace Lucene.Net.Search
             Query filteredquery = new FilteredQuery(rq, filter, RandomFilterStrategy(Random, useRandomAccess));
             ScoreDoc[] hits = searcher.Search(filteredquery, null, 1000).ScoreDocs;
             Assert.AreEqual(2, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, filteredquery, searcher);
+            QueryUtils.Check(Random, filteredquery, searcher);
         }
 
         [Test]
@@ -304,11 +280,7 @@ namespace Lucene.Net.Search
             bq.Add(query, Occur.MUST);
             ScoreDoc[] hits = searcher.Search(bq, null, 1000).ScoreDocs;
             Assert.AreEqual(0, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         [Test]
@@ -329,11 +301,7 @@ namespace Lucene.Net.Search
             bq.Add(query, Occur.SHOULD);
             ScoreDoc[] hits = searcher.Search(bq, null, 1000).ScoreDocs;
             Assert.AreEqual(2, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         // Make sure BooleanQuery, which does out-of-order
@@ -355,11 +323,7 @@ namespace Lucene.Net.Search
             bq.Add(new TermQuery(new Term("field", "two")), Occur.SHOULD);
             ScoreDoc[] hits = searcher.Search(query, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         [Test]
@@ -376,21 +340,13 @@ namespace Lucene.Net.Search
             Query query = new FilteredQuery(new FilteredQuery(new MatchAllDocsQuery(), new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "three")))), RandomFilterStrategy(Random, useRandomAccess)), new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "four")))), RandomFilterStrategy(Random, useRandomAccess));
             ScoreDoc[] hits = searcher.Search(query, 10).ScoreDocs;
             Assert.AreEqual(2, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             // one more:
             query = new FilteredQuery(query, new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "five")))), RandomFilterStrategy(Random, useRandomAccess));
             hits = searcher.Search(query, 10).ScoreDocs;
             Assert.AreEqual(1, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         [Test]
diff --git a/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs b/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs
index b9fc338..f63aa4b 100644
--- a/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs
@@ -46,11 +46,7 @@ namespace Lucene.Net.Search
         public virtual void TestFuzziness()
         {
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             AddDoc("aaaaa", writer);
             AddDoc("aaaab", writer);
             AddDoc("aaabb", writer);
@@ -204,11 +200,7 @@ namespace Lucene.Net.Search
         public virtual void Test2()
         {
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory, new MockAnalyzer(Random, MockTokenizer.KEYWORD, false));
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory, new MockAnalyzer(Random, MockTokenizer.KEYWORD, false));
             AddDoc("LANGE", writer);
             AddDoc("LUETH", writer);
             AddDoc("PIRSING", writer);
@@ -252,22 +244,14 @@ namespace Lucene.Net.Search
         public virtual void TestTieBreaker()
         {
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             AddDoc("a123456", writer);
             AddDoc("c123456", writer);
             AddDoc("d123456", writer);
             AddDoc("e123456", writer);
 
             Directory directory2 = NewDirectory();
-            RandomIndexWriter writer2 = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory2);
+            RandomIndexWriter writer2 = new RandomIndexWriter(Random, directory2);
             AddDoc("a123456", writer2);
             AddDoc("b123456", writer2);
             AddDoc("b123456", writer2);
@@ -298,11 +282,7 @@ namespace Lucene.Net.Search
         public virtual void TestBoostOnlyRewrite()
         {
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             AddDoc("Lucene", writer);
             AddDoc("Lucene", writer);
             AddDoc("Lucenne", writer);
@@ -328,11 +308,7 @@ namespace Lucene.Net.Search
         {
             MockAnalyzer analyzer = new MockAnalyzer(Random);
             Directory index = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, index);
+            RandomIndexWriter w = new RandomIndexWriter(Random, index);
 
             AddDoc("Lucene in Action", w);
             AddDoc("Lucene for Dummies", w);
@@ -369,11 +345,7 @@ namespace Lucene.Net.Search
         public virtual void TestDistanceAsEditsSearching()
         {
             Directory index = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, index);
+            RandomIndexWriter w = new RandomIndexWriter(Random, index);
             AddDoc("foobar", w);
             AddDoc("test", w);
             AddDoc("working", w);
diff --git a/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs b/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs
index 03a3f5a..d3919c8 100644
--- a/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs
+++ b/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs
@@ -44,11 +44,7 @@ namespace Lucene.Net.Search
         {
             base.SetUp();
             dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             for (int i = 0; i < 100; i++)
             {
                 Document doc = new Document();
@@ -123,11 +119,7 @@ namespace Lucene.Net.Search
         {
             // LUCENE-5128: ensure we get a meaningful message if searchAfter exceeds maxDoc
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             w.AddDocument(new Document());
             IndexReader r = w.GetReader();
             w.Dispose();
diff --git a/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs b/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs
index adc8147..38fcb82 100644
--- a/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs
@@ -74,11 +74,7 @@ namespace Lucene.Net.Search
             base.BeforeClass();
 
             dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             int numDocs = AtLeast(300);
             for (int i = 0; i < numDocs; i++)
             {
diff --git a/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs
index 4600a4f..38ccd1f 100644
--- a/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs
@@ -57,11 +57,7 @@ namespace Lucene.Net.Search
         public virtual void TestPhrasePrefix()
         {
             Directory indexStore = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexStore);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, indexStore);
             Add("blueberry pie", writer);
             Add("blueberry strudel", writer);
             Add("blueberry pizza", writer);
@@ -163,11 +159,7 @@ namespace Lucene.Net.Search
         public virtual void TestTall()
         {
             Directory indexStore = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexStore);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, indexStore);
             Add("blueberry chocolate pie", writer);
             Add("blueberry chocolate tart", writer);
             IndexReader r = writer.GetReader();
@@ -189,11 +181,7 @@ namespace Lucene.Net.Search
         public virtual void TestMultiSloppyWithRepeats() //LUCENE-3821 fixes sloppy phrase scoring, except for this known problem
         {
             Directory indexStore = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexStore);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, indexStore);
             Add("a b c d e f g h i k", writer);
             IndexReader r = writer.GetReader();
             writer.Dispose();
@@ -215,11 +203,7 @@ namespace Lucene.Net.Search
         public virtual void TestMultiExactWithRepeats()
         {
             Directory indexStore = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexStore);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, indexStore);
             Add("a b c d e f g h i k", writer);
             IndexReader r = writer.GetReader();
             writer.Dispose();
@@ -248,11 +232,7 @@ namespace Lucene.Net.Search
             // and all terms required.
             // The contained PhraseMultiQuery must contain exactly one term array.
             Directory indexStore = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexStore);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, indexStore);
             Add("blueberry pie", writer);
             Add("blueberry chewing gum", writer);
             Add("blue raspberry pie", writer);
@@ -284,11 +264,7 @@ namespace Lucene.Net.Search
         public virtual void TestPhrasePrefixWithBooleanQuery()
         {
             Directory indexStore = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexStore);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, indexStore);
             Add("this is a test", "object", writer);
             Add("a note", "note", writer);
 
@@ -316,11 +292,7 @@ namespace Lucene.Net.Search
         public virtual void TestNoDocs()
         {
             Directory indexStore = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexStore);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, indexStore);
             Add("a note", "note", writer);
 
             IndexReader reader = writer.GetReader();
@@ -389,11 +361,7 @@ namespace Lucene.Net.Search
         public virtual void TestCustomIDF()
         {
             Directory indexStore = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexStore);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, indexStore);
             Add("this is a test", "object", writer);
             Add("a note", "note", writer);
 
@@ -442,11 +410,7 @@ namespace Lucene.Net.Search
             tokens[2].Append("c");
             tokens[2].PositionIncrement = 0;
 
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new TextField("field", new CannedTokenStream(tokens)));
             writer.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
index 2b011de..785084a 100644
--- a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
@@ -59,21 +59,9 @@ namespace Lucene.Net.Search
             dir = NewDirectory();
             sdir1 = NewDirectory();
             sdir2 = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, new MockAnalyzer(Random));
-            RandomIndexWriter swriter1 = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, sdir1, new MockAnalyzer(Random));
-            RandomIndexWriter swriter2 = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, sdir2, new MockAnalyzer(Random));
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir, new MockAnalyzer(Random));
+            RandomIndexWriter swriter1 = new RandomIndexWriter(Random, sdir1, new MockAnalyzer(Random));
+            RandomIndexWriter swriter2 = new RandomIndexWriter(Random, sdir2, new MockAnalyzer(Random));
 
             for (int i = 0; i < 10; i++)
             {
diff --git a/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs
index 5d5d034..b2699f8 100644
--- a/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Search
@@ -43,11 +43,7 @@ namespace Lucene.Net.Search
             base.BeforeClass();
 
             directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             writer.Dispose();
             reader = DirectoryReader.Open(directory);
         }
diff --git a/src/Lucene.Net.Tests/Search/TestNot.cs b/src/Lucene.Net.Tests/Search/TestNot.cs
index 6992f7b..0a267ba 100644
--- a/src/Lucene.Net.Tests/Search/TestNot.cs
+++ b/src/Lucene.Net.Tests/Search/TestNot.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
 
@@ -41,11 +41,7 @@ namespace Lucene.Net.Search
         public virtual void TestNot_Mem()
         {
             Directory store = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, store);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, store);
 
             Document d1 = new Document();
             d1.Add(NewTextField("field", "a b", Field.Store.YES));
diff --git a/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs b/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs
index ed5003f..9f3c149 100644
--- a/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs
@@ -1,4 +1,4 @@
-using J2N.Collections.Generic.Extensions;
+using J2N.Collections.Generic.Extensions;
 using Lucene.Net.Documents;
 using NUnit.Framework;
 using System;
@@ -46,11 +46,7 @@ namespace Lucene.Net.Search
         public virtual void TestPhrasePrefix()
         {
             Directory indexStore = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, indexStore);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, indexStore);
             Document doc1 = new Document();
             Document doc2 = new Document();
             Document doc3 = new Document();
diff --git a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
index cbae932..00a7001 100644
--- a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
@@ -64,11 +64,7 @@ namespace Lucene.Net.Search
 
             directory = NewDirectory();
             Analyzer analyzer = new AnalyzerAnonymousClass();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory, analyzer);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory, analyzer);
 
             Documents.Document doc = new Documents.Document();
             doc.Add(NewTextField("field", "one two three four five", Field.Store.YES));
@@ -136,11 +132,7 @@ namespace Lucene.Net.Search
             query.Add(new Term("field", "five"));
             ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(0, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         [Test]
@@ -151,11 +143,7 @@ namespace Lucene.Net.Search
             query.Add(new Term("field", "five"));
             ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         /// <summary>
@@ -169,22 +157,14 @@ namespace Lucene.Net.Search
             query.Add(new Term("field", "five"));
             ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length, "exact match");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             query = new PhraseQuery();
             query.Add(new Term("field", "two"));
             query.Add(new Term("field", "one"));
             hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(0, hits.Length, "reverse not exact");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         [Test]
@@ -196,11 +176,7 @@ namespace Lucene.Net.Search
             query.Add(new Term("field", "two"));
             ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length, "in order");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             // Ensures slop of 1 does not work for phrases out of order;
             // must be at least 2.
@@ -210,11 +186,7 @@ namespace Lucene.Net.Search
             query.Add(new Term("field", "one"));
             hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(0, hits.Length, "reversed, slop not 2 or more");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         /// <summary>
@@ -228,11 +200,7 @@ namespace Lucene.Net.Search
             query.Add(new Term("field", "one"));
             ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length, "just sloppy enough");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             query = new PhraseQuery();
             query.Slop = 2;
@@ -240,11 +208,7 @@ namespace Lucene.Net.Search
             query.Add(new Term("field", "one"));
             hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(0, hits.Length, "not sloppy enough");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         /// <summary>
@@ -260,11 +224,7 @@ namespace Lucene.Net.Search
             query.Add(new Term("field", "five"));
             ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length, "two total moves");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             query = new PhraseQuery();
             query.Slop = 5; // it takes six moves to match this phrase
@@ -273,20 +233,12 @@ namespace Lucene.Net.Search
             query.Add(new Term("field", "one"));
             hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(0, hits.Length, "slop of 5 not close enough");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             query.Slop = 6;
             hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length, "slop of 6 just right");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         [Test]
@@ -309,11 +261,7 @@ namespace Lucene.Net.Search
             query.Add(new Term("field", "words"));
             ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             reader.Dispose();
             directory.Dispose();
@@ -323,11 +271,7 @@ namespace Lucene.Net.Search
         public virtual void TestPhraseQueryInConjunctionScorer()
         {
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
 
             Documents.Document doc = new Documents.Document();
             doc.Add(NewTextField("source", "marketing info", Field.Store.YES));
@@ -348,11 +292,7 @@ namespace Lucene.Net.Search
             phraseQuery.Add(new Term("source", "info"));
             ScoreDoc[] hits = searcher.Search(phraseQuery, null, 1000).ScoreDocs;
             Assert.AreEqual(2, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, phraseQuery, searcher);
+            QueryUtils.Check(Random, phraseQuery, searcher);
 
             TermQuery termQuery = new TermQuery(new Term("contents", "foobar"));
             BooleanQuery booleanQuery = new BooleanQuery();
@@ -360,11 +300,7 @@ namespace Lucene.Net.Search
             booleanQuery.Add(phraseQuery, Occur.MUST);
             hits = searcher.Search(booleanQuery, null, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, termQuery, searcher);
+            QueryUtils.Check(Random, termQuery, searcher);
 
             reader.Dispose();
 
@@ -407,11 +343,7 @@ namespace Lucene.Net.Search
             booleanQuery.Add(termQuery, Occur.MUST);
             hits = searcher.Search(booleanQuery, null, 1000).ScoreDocs;
             Assert.AreEqual(2, hits.Length);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, booleanQuery, searcher);
+            QueryUtils.Check(Random, booleanQuery, searcher);
 
             reader.Dispose();
             directory.Dispose();
@@ -454,11 +386,7 @@ namespace Lucene.Net.Search
             Assert.AreEqual(1, hits[1].Doc);
             Assert.AreEqual(0.31, hits[2].Score, 0.01);
             Assert.AreEqual(2, hits[2].Doc);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
             reader.Dispose();
             directory.Dispose();
         }
@@ -486,21 +414,13 @@ namespace Lucene.Net.Search
 
             ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(1, hits.Length, "slop of 100 just right");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             query.Slop = 99;
 
             hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(0, hits.Length, "slop of 99 not enough");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         // work on two docs like this: "phrase exist notexist exist found"
@@ -515,11 +435,7 @@ namespace Lucene.Net.Search
 
             ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(2, hits.Length, "phrase without repetitions exists in 2 docs");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             // phrase with repetitions that exists in 2 docs
             query = new PhraseQuery();
@@ -530,11 +446,7 @@ namespace Lucene.Net.Search
 
             hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(2, hits.Length, "phrase with repetitions exists in two docs");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             // phrase I with repetitions that does not exist in any doc
             query = new PhraseQuery();
@@ -545,11 +457,7 @@ namespace Lucene.Net.Search
 
             hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(0, hits.Length, "nonexisting phrase with repetitions does not exist in any doc");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             // phrase II with repetitions that does not exist in any doc
             query = new PhraseQuery();
@@ -561,11 +469,7 @@ namespace Lucene.Net.Search
 
             hits = searcher.Search(query, null, 1000).ScoreDocs;
             Assert.AreEqual(0, hits.Length, "nonexisting phrase with repetitions does not exist in any doc");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
         }
 
         /// <summary>
@@ -588,11 +492,7 @@ namespace Lucene.Net.Search
             Assert.AreEqual(1, hits.Length, "phrase found with exact phrase scorer");
             float score0 = hits[0].Score;
             //System.out.println("(exact) field: two three: "+score0);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             // search on non palyndrome, find phrase with slop 2, though no slop required here.
             query.Slop = 2; // to use sloppy scorer
@@ -601,11 +501,7 @@ namespace Lucene.Net.Search
             float score1 = hits[0].Score;
             //System.out.println("(sloppy) field: two three: "+score1);
             Assert.AreEqual(score0, score1, SCORE_COMP_THRESH, "exact scorer and sloppy scorer score the same when slop does not matter");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             // search ordered in palyndrome, find it twice
             query = new PhraseQuery();
@@ -616,11 +512,7 @@ namespace Lucene.Net.Search
             Assert.AreEqual(1, hits.Length, "just sloppy enough");
             //float score2 = hits[0].Score;
             //System.out.println("palindrome: two three: "+score2);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             //commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
             //Assert.IsTrue("ordered scores higher in palindrome",score1+SCORE_COMP_THRESH<score2);
@@ -634,11 +526,7 @@ namespace Lucene.Net.Search
             Assert.AreEqual(1, hits.Length, "just sloppy enough");
             //float score3 = hits[0].Score;
             //System.out.println("palindrome: three two: "+score3);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             //commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
             //Assert.IsTrue("reversed scores higher in palindrome",score1+SCORE_COMP_THRESH<score3);
@@ -666,11 +554,7 @@ namespace Lucene.Net.Search
             Assert.AreEqual(1, hits.Length, "phrase found with exact phrase scorer");
             float score0 = hits[0].Score;
             //System.out.println("(exact) field: one two three: "+score0);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             // just make sure no exc:
             searcher.Explain(query, 0);
@@ -682,11 +566,7 @@ namespace Lucene.Net.Search
             float score1 = hits[0].Score;
             //System.out.println("(sloppy) field: one two three: "+score1);
             Assert.AreEqual(score0, score1, SCORE_COMP_THRESH, "exact scorer and sloppy scorer score the same when slop does not matter");
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             // search ordered in palyndrome, find it twice
             query = new PhraseQuery();
@@ -702,11 +582,7 @@ namespace Lucene.Net.Search
             Assert.AreEqual(1, hits.Length, "just sloppy enough");
             //float score2 = hits[0].Score;
             //System.out.println("palindrome: one two three: "+score2);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             //commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
             //Assert.IsTrue("ordered scores higher in palindrome",score1+SCORE_COMP_THRESH<score2);
@@ -721,11 +597,7 @@ namespace Lucene.Net.Search
             Assert.AreEqual(1, hits.Length, "just sloppy enough");
             //float score3 = hits[0].Score;
             //System.out.println("palindrome: three two one: "+score3);
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, query, searcher);
+            QueryUtils.Check(Random, query, searcher);
 
             //commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
             //Assert.IsTrue("reversed scores higher in palindrome",score1+SCORE_COMP_THRESH<score3);
diff --git a/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs b/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs
index 8af33f1..73adb46 100644
--- a/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs
+++ b/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Analysis;
+using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Documents;
 using NUnit.Framework;
@@ -62,11 +62,7 @@ namespace Lucene.Net.Search
         {
             Analyzer analyzer = new AnalyzerAnonymousClass(this);
             Directory store = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, store, analyzer);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, store, analyzer);
             Document d = new Document();
             d.Add(NewTextField("field", "bogus", Field.Store.YES));
             writer.AddDocument(d);
@@ -233,11 +229,7 @@ namespace Lucene.Net.Search
         public virtual void TestPayloadsPos0()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, new MockPayloadAnalyzer());
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir, new MockPayloadAnalyzer());
             Document doc = new Document();
             doc.Add(new TextField("content", new StringReader("a a b c d e a f g h i j a b k k")));
             writer.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs b/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs
index 2b90e8b..33cb9b7 100644
--- a/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs
+++ b/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Search
@@ -85,11 +85,7 @@ namespace Lucene.Net.Search
             }
 
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             writer.Commit();
             IndexReader ir = writer.GetReader();
             writer.Dispose();
diff --git a/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs b/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs
index 9e3813d..e9c70e4 100644
--- a/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
 
@@ -42,11 +42,7 @@ namespace Lucene.Net.Search
             Directory directory = NewDirectory();
 
             string[] categories = new string[] { "/Computers/Linux", "/Computers/Mac/One", "/Computers/Mac/Two", "/Computers/Windows" };
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             for (int i = 0; i < categories.Length; i++)
             {
                 Document doc = new Document();
diff --git a/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs
index f7c599d..e64bcfc 100644
--- a/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
 
@@ -56,11 +56,7 @@ namespace Lucene.Net.Search
             base.BeforeClass();
 
             directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
 
             Document doc = new Document();
             Field field = NewStringField(FIELD, "meaninglessnames", Field.Store.NO);
diff --git a/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs b/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs
index aaefac8..30ca430 100644
--- a/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
 
@@ -44,11 +44,7 @@ namespace Lucene.Net.Search
             Directory directory = NewDirectory();
 
             string[] categories = new string[] { "/Computers", "/Computers/Mac", "/Computers/Windows" };
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             for (int i = 0; i < categories.Length; i++)
             {
                 Document doc = new Document();
diff --git a/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs b/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs
index 7e27afe..e0c06cb 100644
--- a/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs
+++ b/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs
@@ -60,11 +60,7 @@ namespace Lucene.Net.Search
         public virtual void TestBasic()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -123,11 +119,7 @@ namespace Lucene.Net.Search
         public virtual void TestCustomCombine()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -196,11 +188,7 @@ namespace Lucene.Net.Search
         public virtual void TestExplain()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -288,11 +276,7 @@ namespace Lucene.Net.Search
         public virtual void TestMissingSecondPassScore()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             Document doc = new Document();
             doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -350,11 +334,7 @@ namespace Lucene.Net.Search
         {
             Directory dir = NewDirectory();
             int numDocs = AtLeast(1000);
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             int[] idToNum = new int[numDocs];
             int maxValue = TestUtil.NextInt32(Random, 10, 1000000);
diff --git a/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs b/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs
index 5b8577c..21a2f65 100644
--- a/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
@@ -40,11 +40,7 @@ namespace Lucene.Net.Search
         public virtual void TestBasic()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewTextField("field", "value", Field.Store.NO));
             writer.AddDocument(doc);
@@ -97,11 +93,7 @@ namespace Lucene.Net.Search
         public virtual void TestRandom()
         {
             Directory d = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, d);
+            RandomIndexWriter w = new RandomIndexWriter(Random, d);
             w.IndexWriter.Config.SetMaxBufferedDocs(17);
             int numDocs = AtLeast(100);
             ISet<string> aDocs = new JCG.HashSet<string>();
@@ -148,11 +140,7 @@ namespace Lucene.Net.Search
         public virtual void TestThousandDocuments()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             for (int i = 0; i < 1000; i++)
             {
                 Document doc = new Document();
diff --git a/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs b/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs
index 16954bd..d8275c7 100644
--- a/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Documents;
+using Lucene.Net.Documents;
 using Lucene.Net.Util.Automaton;
 using NUnit.Framework;
 using System;
@@ -51,11 +51,7 @@ namespace Lucene.Net.Search
         {
             base.SetUp();
             directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             Document doc = new Document();
             doc.Add(NewTextField(FN, "the quick brown fox jumps over the lazy ??? dog 493432 49344", Field.Store.NO));
             writer.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs b/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs
index ab4c653..f33fb4f 100644
--- a/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs
+++ b/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs
@@ -50,11 +50,7 @@ namespace Lucene.Net.Search
             Directory dir = NewDirectory();
             MockAnalyzer analyzer = new MockAnalyzer(Random);
             analyzer.MaxTokenLength = TestUtil.NextInt32(Random, 1, IndexWriter.MAX_TERM_LENGTH);
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir, analyzer);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir, analyzer);
             LineFileDocs docs = new LineFileDocs(Random, DefaultCodecSupportsDocValues);
             int charsToIndex = AtLeast(100000);
             int charsIndexed = 0;
diff --git a/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs b/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs
index 13bb99b..5bf8287 100644
--- a/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs
+++ b/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Search
@@ -114,11 +114,7 @@ namespace Lucene.Net.Search
         public virtual void TestGetScores()
         {
             Directory directory = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, directory);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, directory);
             writer.Commit();
             IndexReader ir = writer.GetReader();
             writer.Dispose();
diff --git a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs
index bb91858..32cfe2b 100644
--- a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs
+++ b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs
@@ -163,11 +163,7 @@ namespace Lucene.Net.Search
             }
 
             dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             int numDocs = AtLeast(200);
             for (int i = 0; i < numDocs; i++)
             {
diff --git a/src/Lucene.Net.Tests/Search/TestSearchWithThreads.cs b/src/Lucene.Net.Tests/Search/TestSearchWithThreads.cs
index 888eda0..74293c6 100644
--- a/src/Lucene.Net.Tests/Search/TestSearchWithThreads.cs
+++ b/src/Lucene.Net.Tests/Search/TestSearchWithThreads.cs
@@ -55,11 +55,7 @@ namespace Lucene.Net.Search
         public virtual void Test()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
 
             long startTime = J2N.Time.NanoTime() / J2N.Time.MillisecondsPerNanosecond; // LUCENENET: Use NanoTime() rather than CurrentTimeMilliseconds() for more accurate/reliable results
 
diff --git a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
index 4dc1073..c70130c 100644
--- a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
+++ b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
@@ -545,11 +545,7 @@ namespace Lucene.Net.Search
         {
             Random random = Random;
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(random, dir);
             w.Commit();
 
             IndexReader other = DirectoryReader.Open(dir);
@@ -591,11 +587,7 @@ namespace Lucene.Net.Search
 
             public override IndexSearcher NewSearcher(IndexReader ignored)
             {
-                return LuceneTestCase.NewSearcher(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                    outerInstance,
-#endif
-                    other);
+                return LuceneTestCase.NewSearcher(other);
             }
         }
 
@@ -605,11 +597,7 @@ namespace Lucene.Net.Search
             // make sure that maybeRefreshBlocking releases the lock, otherwise other
             // threads cannot obtain it.
             Directory dir = NewDirectory();
-            RandomIndexWriter w = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter w = new RandomIndexWriter(Random, dir);
             w.Dispose();
 
             SearcherManager sm = new SearcherManager(dir, null);
diff --git a/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs
index f262e34..31ed630 100644
--- a/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs
@@ -1,4 +1,4 @@
-using J2N.Text;
+using J2N.Text;
 using Lucene.Net.Documents;
 using NUnit.Framework;
 using System;
@@ -168,11 +168,7 @@ namespace Lucene.Net.Search
             query.Slop = slop;
 
             Directory ramDir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, ramDir, new MockAnalyzer(Random, MockTokenizer.WHITESPACE, false));
+            RandomIndexWriter writer = new RandomIndexWriter(Random, ramDir, new MockAnalyzer(Random, MockTokenizer.WHITESPACE, false));
             writer.AddDocument(doc);
 
             IndexReader reader = writer.GetReader();
@@ -244,11 +240,7 @@ namespace Lucene.Net.Search
         private void AssertSaneScoring(PhraseQuery pq, IndexSearcher searcher)
         {
             searcher.Search(pq, new CollectorAnonymousClass(this));
-            QueryUtils.Check(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, pq, searcher);
+            QueryUtils.Check(Random, pq, searcher);
         }
 
         private class CollectorAnonymousClass : ICollector
@@ -286,11 +278,7 @@ namespace Lucene.Net.Search
         public virtual void TestSlopWithHoles()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
             customType.OmitNorms = true;
             Field f = new Field("lyrics", "", customType);
@@ -329,11 +317,7 @@ namespace Lucene.Net.Search
             string document = "drug druggy drug drug drug";
 
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewField("lyrics", document, new FieldType(TextField.TYPE_NOT_STORED)));
             iw.AddDocument(doc);
@@ -359,11 +343,7 @@ namespace Lucene.Net.Search
 
             Directory dir = NewDirectory();
 
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewField("lyrics", document, new FieldType(TextField.TYPE_NOT_STORED)));
             iw.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests/Search/TestSort.cs b/src/Lucene.Net.Tests/Search/TestSort.cs
index dec52d6..5a44bd1 100644
--- a/src/Lucene.Net.Tests/Search/TestSort.cs
+++ b/src/Lucene.Net.Tests/Search/TestSort.cs
@@ -96,11 +96,7 @@ namespace Lucene.Net.Search
         public virtual void TestString()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "foo", Field.Store.YES));
             writer.AddDocument(doc);
@@ -129,11 +125,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringMissing()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -165,11 +157,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "bar", Field.Store.YES));
             writer.AddDocument(doc);
@@ -198,11 +186,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringVal()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "foo", Field.Store.YES));
             writer.AddDocument(doc);
@@ -231,11 +215,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringValMissing()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -269,11 +249,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringMissingSortedFirst()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -308,11 +284,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringMissingSortedFirstReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -347,11 +319,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringValMissingSortedLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -387,11 +355,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringValMissingSortedLastReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -425,11 +389,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringValReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "bar", Field.Store.YES));
             writer.AddDocument(doc);
@@ -458,11 +418,7 @@ namespace Lucene.Net.Search
         public virtual void TestFieldDoc()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "foo", Field.Store.NO));
             writer.AddDocument(doc);
@@ -491,11 +447,7 @@ namespace Lucene.Net.Search
         public virtual void TestFieldDocReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "foo", Field.Store.NO));
             writer.AddDocument(doc);
@@ -524,11 +476,7 @@ namespace Lucene.Net.Search
         public virtual void TestFieldScore()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewTextField("value", "foo bar bar bar bar", Field.Store.NO));
             writer.AddDocument(doc);
@@ -562,11 +510,7 @@ namespace Lucene.Net.Search
         public virtual void TestFieldScoreReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewTextField("value", "foo bar bar bar bar", Field.Store.NO));
             writer.AddDocument(doc);
@@ -598,11 +542,7 @@ namespace Lucene.Net.Search
         public virtual void TestByte()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "23", Field.Store.YES));
             writer.AddDocument(doc);
@@ -637,11 +577,7 @@ namespace Lucene.Net.Search
         public virtual void TestByteMissing()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -675,11 +611,7 @@ namespace Lucene.Net.Search
         public virtual void TestByteMissingLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -715,11 +647,7 @@ namespace Lucene.Net.Search
         public virtual void TestByteReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "23", Field.Store.YES));
             writer.AddDocument(doc);
@@ -754,11 +682,7 @@ namespace Lucene.Net.Search
         public virtual void TestShort()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "300", Field.Store.YES));
             writer.AddDocument(doc);
@@ -793,11 +717,7 @@ namespace Lucene.Net.Search
         public virtual void TestShortMissing()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -831,11 +751,7 @@ namespace Lucene.Net.Search
         public virtual void TestShortMissingLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -871,11 +787,7 @@ namespace Lucene.Net.Search
         public virtual void TestShortReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "300", Field.Store.YES));
             writer.AddDocument(doc);
@@ -910,11 +822,7 @@ namespace Lucene.Net.Search
         public virtual void TestInt()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "300000", Field.Store.YES));
             writer.AddDocument(doc);
@@ -947,11 +855,7 @@ namespace Lucene.Net.Search
         public virtual void TestIntMissing()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -983,11 +887,7 @@ namespace Lucene.Net.Search
         public virtual void TestIntMissingLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -1021,11 +921,7 @@ namespace Lucene.Net.Search
         public virtual void TestIntReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "300000", Field.Store.YES));
             writer.AddDocument(doc);
@@ -1058,11 +954,7 @@ namespace Lucene.Net.Search
         public virtual void TestLong()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "3000000000", Field.Store.YES));
             writer.AddDocument(doc);
@@ -1095,11 +987,7 @@ namespace Lucene.Net.Search
         public virtual void TestLongMissing()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -1131,11 +1019,7 @@ namespace Lucene.Net.Search
         public virtual void TestLongMissingLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -1169,11 +1053,7 @@ namespace Lucene.Net.Search
         public virtual void TestLongReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "3000000000", Field.Store.YES));
             writer.AddDocument(doc);
@@ -1206,11 +1086,7 @@ namespace Lucene.Net.Search
         public virtual void TestFloat()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "30.1", Field.Store.YES));
             writer.AddDocument(doc);
@@ -1243,11 +1119,7 @@ namespace Lucene.Net.Search
         public virtual void TestFloatSignedZero()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "+0", Field.Store.YES));
             writer.AddDocument(doc);
@@ -1277,11 +1149,7 @@ namespace Lucene.Net.Search
         public virtual void TestFloatMissing()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -1313,11 +1181,7 @@ namespace Lucene.Net.Search
         public virtual void TestFloatMissingLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -1351,11 +1215,7 @@ namespace Lucene.Net.Search
         public virtual void TestFloatReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "30.1", Field.Store.YES));
             writer.AddDocument(doc);
@@ -1388,11 +1248,7 @@ namespace Lucene.Net.Search
         public virtual void TestDouble()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "30.1", Field.Store.YES));
             writer.AddDocument(doc);
@@ -1429,11 +1285,7 @@ namespace Lucene.Net.Search
         public virtual void TestDoubleSignedZero()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "+0", Field.Store.YES));
             writer.AddDocument(doc);
@@ -1463,11 +1315,7 @@ namespace Lucene.Net.Search
         public virtual void TestDoubleMissing()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -1503,11 +1351,7 @@ namespace Lucene.Net.Search
         public virtual void TestDoubleMissingLast()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             writer.AddDocument(doc);
             doc = new Document();
@@ -1545,11 +1389,7 @@ namespace Lucene.Net.Search
         public virtual void TestDoubleReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "30.1", Field.Store.YES));
             writer.AddDocument(doc);
@@ -1713,11 +1553,7 @@ namespace Lucene.Net.Search
             letters.Shuffle(Random);
 
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             foreach (string letter in letters)
             {
                 Document doc = new Document();
@@ -1778,11 +1614,7 @@ namespace Lucene.Net.Search
             letters.Shuffle(Random);
 
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             foreach (string letter in letters)
             {
                 Document doc = new Document();
@@ -1842,11 +1674,7 @@ namespace Lucene.Net.Search
             letters.Shuffle(Random);
 
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             foreach (string letter in letters)
             {
                 Document doc = new Document();
@@ -1909,11 +1737,7 @@ namespace Lucene.Net.Search
             letters.Shuffle(Random);
 
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             foreach (string letter in letters)
             {
                 Document doc = new Document();
@@ -1974,11 +1798,7 @@ namespace Lucene.Net.Search
             letters.Shuffle(Random);
 
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             foreach (string letter in letters)
             {
                 Document doc = new Document();
@@ -2039,11 +1859,7 @@ namespace Lucene.Net.Search
             letters.Shuffle(Random);
 
             Directory dir = NewDirectory();
-            RandomIndexWriter iw = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
             foreach (string letter in letters)
             {
                 Document doc = new Document();
@@ -2097,11 +1913,7 @@ namespace Lucene.Net.Search
         public virtual void TestSortOneDocument()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "foo", Field.Store.YES));
             writer.AddDocument(doc);
@@ -2125,11 +1937,7 @@ namespace Lucene.Net.Search
         public virtual void TestSortOneDocumentWithScores()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "foo", Field.Store.YES));
             writer.AddDocument(doc);
@@ -2156,11 +1964,7 @@ namespace Lucene.Net.Search
         public virtual void TestSortTwoFields()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("tievalue", "tied", Field.Store.NO));
             doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -2190,11 +1994,7 @@ namespace Lucene.Net.Search
         public virtual void TestScore()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(NewStringField("value", "bar", Field.Store.NO));
             writer.AddDocument(doc);
diff --git a/src/Lucene.Net.Tests/Search/TestSortDocValues.cs b/src/Lucene.Net.Tests/Search/TestSortDocValues.cs
index 6dfd103..061af5b 100644
--- a/src/Lucene.Net.Tests/Search/TestSortDocValues.cs
+++ b/src/Lucene.Net.Tests/Search/TestSortDocValues.cs
@@ -64,11 +64,7 @@ namespace Lucene.Net.Search
         public virtual void TestString()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedDocValuesField("value", new BytesRef("foo")));
             doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -100,11 +96,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedDocValuesField("value", new BytesRef("bar")));
             doc.Add(NewStringField("value", "bar", Field.Store.YES));
@@ -136,11 +128,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringVal()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new BinaryDocValuesField("value", new BytesRef("foo")));
             doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -172,11 +160,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringValReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new BinaryDocValuesField("value", new BytesRef("bar")));
             doc.Add(NewStringField("value", "bar", Field.Store.YES));
@@ -208,11 +192,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringValSorted()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedDocValuesField("value", new BytesRef("foo")));
             doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -244,11 +224,7 @@ namespace Lucene.Net.Search
         public virtual void TestStringValReverseSorted()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new SortedDocValuesField("value", new BytesRef("bar")));
             doc.Add(NewStringField("value", "bar", Field.Store.YES));
@@ -280,11 +256,7 @@ namespace Lucene.Net.Search
         public virtual void TestByte()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new NumericDocValuesField("value", 23));
             doc.Add(NewStringField("value", "23", Field.Store.YES));
@@ -323,11 +295,7 @@ namespace Lucene.Net.Search
         public virtual void TestByteReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new NumericDocValuesField("value", 23));
             doc.Add(NewStringField("value", "23", Field.Store.YES));
@@ -366,11 +334,7 @@ namespace Lucene.Net.Search
         public virtual void TestShort()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new NumericDocValuesField("value", 300));
             doc.Add(NewStringField("value", "300", Field.Store.YES));
@@ -409,11 +373,7 @@ namespace Lucene.Net.Search
         public virtual void TestShortReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new NumericDocValuesField("value", 300));
             doc.Add(NewStringField("value", "300", Field.Store.YES));
@@ -452,11 +412,7 @@ namespace Lucene.Net.Search
         public virtual void TestInt()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new NumericDocValuesField("value", 300000));
             doc.Add(NewStringField("value", "300000", Field.Store.YES));
@@ -493,11 +449,7 @@ namespace Lucene.Net.Search
         public virtual void TestIntReverse()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
             doc.Add(new NumericDocValuesField("value", 300000));
             doc.Add(NewStringField("value", "300000", Field.Store.YES));
@@ -534,11 +486,7 @@ namespace Lucene.Net.Search
         public virtual void TestIntMissing()
         {
             Directory dir = NewDirectory();
-            RandomIndexWriter writer = new RandomIndexWriter(
-#if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
-                this,
-#endif
-                Random, dir);
+            RandomIndexWriter writer = new RandomIndexWriter(Random, dir);
             Document doc = new Document();
... 493 lines suppressed ...