diff --git a/FWCore/Framework/test/BuildFile.xml b/FWCore/Framework/test/BuildFile.xml
index a8632195155d2..38566cd53545b 100644
--- a/FWCore/Framework/test/BuildFile.xml
+++ b/FWCore/Framework/test/BuildFile.xml
@@ -193,6 +193,15 @@
   <use name="FWCore/Utilities"/>
 </library>
 
+<library file="stubs/TriggerResultsTestSource.cc" name="FWCoreFrameworkTriggerResultsTestSource">
+  <flags EDM_PLUGIN="1"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/Utilities"/>
+  <use name="FWCore/Sources"/>
+</library>
+
+
 <bin name="TestFWCoreFramework" file="testRunner.cpp,maker2_t.cppunit.cc,maker_t.cppunit.cc,productregistry.cppunit.cc,edproducer_productregistry_callback.cc,event_getrefbeforeput_t.cppunit.cc,generichandle_t.cppunit.cc,edconsumerbase_t.cppunit.cc,global_producer_t.cppunit.cc,global_filter_t.cppunit.cc,one_outputmodule_t.cppunit.cc,global_outputmodule_t.cppunit.cc,stream_producer_t.cppunit.cc,stream_filter_t.cppunit.cc,limited_producer_t.cppunit.cc,limited_filter_t.cppunit.cc,limited_outputmodule_t.cppunit.cc,checkForModuleDependencyCorrectness_t.cppunit.cc">
   <use name="DataFormats/Common"/>
   <use name="DataFormats/Provenance"/>
@@ -338,16 +347,9 @@
 <test name="testFWCoreFrameworkOutputModuleSelectEventsMissingPathSameProcessAnotherModuleBefore" command="cmsRun ${LOCALTOP}/src/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py --missingPath=sameProcess --anotherModule=before 2>&amp;1 | grep 'to request a trigger name that does not exist'"/>
 <test name="testFWCoreFrameworkOutputModuleSelectEventsMissingPathSameProcessAnotherModuleAfter" command="cmsRun ${LOCALTOP}/src/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py --missingPath=sameProcess --anotherModule=after 2>&amp;1 | grep 'to request a trigger name that does not exist'"/>
 
-<test name="testFWCoreFrameworkOutputModuleSelectEventsMissingPathEarlier" command="cmsRun ${LOCALTOP}/src/FWCore/Framework/test/testOutputModuleSelectEventsMissingPathEarlier_cfg.py"/>
-<test name="testFWCoreFrameworkOutputModuleSelectEventsMissingPathEarlierProcess" command="cmsRun ${LOCALTOP}/src/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py --missingPath=earlierProcess 2>&amp;1 | grep 'to request a trigger name that does not exist'">
-  <flags PRE_TEST="testFWCoreFrameworkOutputModuleSelectEventsMissingPathEarlier"/>
-</test>
-<test name="testFWCoreFrameworkOutputModuleSelectEventsMissingPathEarlierProcessBefore" command="cmsRun ${LOCALTOP}/src/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py --missingPath=earlierProcess --anotherModule=before 2>&amp;1 | grep 'to request a trigger name that does not exist'">
-  <flags PRE_TEST="testFWCoreFrameworkOutputModuleSelectEventsMissingPathEarlier"/>
-</test>
-<test name="testFWCoreFrameworkOutputModuleSelectEventsMissingPathEarlierProcessAfter" command="cmsRun ${LOCALTOP}/src/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py --missingPath=earlierProcess --anotherModule=after 2>&amp;1 | grep 'to request a trigger name that does not exist'">
-  <flags PRE_TEST="testFWCoreFrameworkOutputModuleSelectEventsMissingPathEarlier"/>
-</test>
+<test name="testFWCoreFrameworkOutputModuleSelectEventsMissingPathEarlierProcess" command="cmsRun ${LOCALTOP}/src/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py --missingPath=earlierProcess 2>&amp;1 | grep 'to request a trigger name that does not exist'"/>
+<test name="testFWCoreFrameworkOutputModuleSelectEventsMissingPathEarlierProcessBefore" command="cmsRun ${LOCALTOP}/src/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py --missingPath=earlierProcess --anotherModule=before 2>&amp;1 | grep 'to request a trigger name that does not exist'"/>
+<test name="testFWCoreFrameworkOutputModuleSelectEventsMissingPathEarlierProcessAfter" command="cmsRun ${LOCALTOP}/src/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py --missingPath=earlierProcess --anotherModule=after 2>&amp;1 | grep 'to request a trigger name that does not exist'"/>
 
 <test name="testFWCoreFrameworkOutputModuleSelectEventsMissingPathMissingProcess" command="cmsRun ${LOCALTOP}/src/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py --missingPath=missingProcess 2>&amp;1 | grep 'An exception of category .ProductNotFound'"/>
 <test name="testFWCoreFrameworkOutputModuleSelectEventsMissingPathMissingProcessAnotherModuleBefore" command="cmsRun ${LOCALTOP}/src/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py --missingPath=missingProcess --anotherModule=before 2>&amp;1 | grep 'An exception of category .ProductNotFound'"/>
diff --git a/FWCore/Framework/test/run_cmsRun.sh b/FWCore/Framework/test/run_cmsRun.sh
index 6e167c2e68e68..557b95a4f9aa2 100755
--- a/FWCore/Framework/test/run_cmsRun.sh
+++ b/FWCore/Framework/test/run_cmsRun.sh
@@ -22,10 +22,9 @@ echo $F2 "This test intentionally throws an exception"
 # Test maxEvents output parameter
 F3=${LOCAL_TEST_DIR}/testMaxEventsOutput_cfg.py
 echo $F3
-(cmsRun $F3 ) || die "Failure running cmsRun $F3" $?
+(cmsRun $F3 ) > testMaxEventsOutput.log  2>&1 || die "Failure running cmsRun $F3" $?
 # 6th word on the line containing the string "events"
-# output by edmFileUtil
-nEvents=`edmFileUtil file:testMaxEventsOutput.root | grep events | awk ' {print $6; exit} '`
+nEvents=`grep '>>> processed' testMaxEventsOutput.log | awk ' {print $3; exit} '`
 if [ "$nEvents" -lt 6 ] || [ "$nEvents" -gt 9 ]; then
 echo "maxEvents output test failed, nEvents = " $nEvents
 exit 1
diff --git a/FWCore/Framework/test/stubs/TriggerResultsTestSource.cc b/FWCore/Framework/test/stubs/TriggerResultsTestSource.cc
new file mode 100644
index 0000000000000..5b466d8d681f7
--- /dev/null
+++ b/FWCore/Framework/test/stubs/TriggerResultsTestSource.cc
@@ -0,0 +1,123 @@
+#include "FWCore/Sources/interface/PuttableSourceBase.h"
+#include "FWCore/Sources/interface/IDGeneratorSourceBase.h"
+#include "FWCore/Framework/interface/InputSourceMacros.h"
+
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/Version/interface/GetReleaseVersion.h"
+#include "DataFormats/Common/interface/TriggerResults.h"
+#include "DataFormats/Common/interface/Wrapper.h"
+
+#include <memory>
+namespace edmtest {
+  namespace {
+    edm::ProductDescription makeDesc(std::string const& iProcess) {
+      edm::ProductDescription desc(
+          edm::InEvent, "TriggerResults", iProcess, "", edm::TypeID(typeid(edm::TriggerResults)));
+      desc.setIsProvenanceSetOnRead();
+      desc.setProduced(false);
+      return desc;
+    }
+
+    std::pair<edm::ParameterSetID, edm::ParameterSetID> calcID(edm::ProductDescription const& iDesc,
+                                                               std::vector<std::string> const& iPaths) {
+      edm::ParameterSet pset;
+      std::string const& processName = iDesc.processName();
+      typedef std::vector<std::string> vstring;
+      vstring empty;
+
+      vstring modlbl;
+      pset.addParameter("@all_sources", modlbl);
+
+      edm::ParameterSet triggerPaths;
+      triggerPaths.addParameter<vstring>("@trigger_paths", iPaths);
+      pset.addParameter<edm::ParameterSet>("@trigger_paths", triggerPaths);
+      triggerPaths.registerIt();
+
+      pset.addParameter<vstring>("@all_esmodules", empty);
+      pset.addParameter<vstring>("@all_esprefers", empty);
+      pset.addParameter<vstring>("@all_essources", empty);
+      pset.addParameter<vstring>("@all_loopers", empty);
+      pset.addParameter<vstring>("@all_modules", empty);
+      pset.addParameter<vstring>("@end_paths", empty);
+      pset.addParameter<vstring>("@paths", iPaths);
+      pset.addParameter<std::string>("@process_name", processName);
+      // Now we register the process parameter set.
+      pset.registerIt();
+
+      return std::make_pair(pset.id(), triggerPaths.id());
+    }
+  }  // namespace
+  class TriggerResultsTestSource : public edm::IDGeneratorSourceBase<edm::PuttableSourceBase> {
+  public:
+    TriggerResultsTestSource(edm::ParameterSet const&, edm::InputSourceDescription const&);
+
+    void readEvent_(edm::EventPrincipal& eventPrincipal) final;
+
+    bool setRunAndEventInfo(edm::EventID& id,
+                            edm::TimeValue_t& time,
+                            edm::EventAuxiliary::ExperimentType& etype) override {
+      return true;
+    }
+    static void fillDescriptions(edm::ConfigurationDescriptions&);
+
+  private:
+    const std::string process_;
+    const std::vector<std::string> paths_;
+    const std::vector<unsigned int> states_;
+    const edm::ProductDescription desc_;
+    edm::ParameterSetID processPsetID_;
+    edm::ParameterSetID psetID_;
+  };
+
+  TriggerResultsTestSource::TriggerResultsTestSource(edm::ParameterSet const& iPSet,
+                                                     edm::InputSourceDescription const& iDesc)
+      : edm::IDGeneratorSourceBase<edm::PuttableSourceBase>(iPSet, iDesc, false),
+        process_(iPSet.getUntrackedParameter<std::string>("process")),
+        paths_(iPSet.getUntrackedParameter<std::vector<std::string>>("paths")),
+        states_(iPSet.getUntrackedParameter<std::vector<unsigned int>>("pathStates")),
+        desc_(makeDesc(process_)) {
+    {
+      auto [processPsetID, psetID] = calcID(desc_, paths_);
+      processPsetID_ = std::move(processPsetID);
+      psetID_ = std::move(psetID);
+    }
+    std::vector<edm::BranchDescription> products;
+    products.reserve(1);
+    products.emplace_back(desc_);
+    std::vector<std::string> processOrder(1, process_);
+    productRegistryUpdate().updateFromInput(products, processOrder);
+    assert(paths_.size() == states_.size());
+
+    edm::ProcessHistory ph;
+    ph.emplace_back(process_, processPsetID_, edm::getReleaseVersion(), edm::HardwareResourcesDescription());
+    processHistoryRegistryForUpdate().registerProcessHistory(ph);
+  }
+
+  void TriggerResultsTestSource::fillDescriptions(edm::ConfigurationDescriptions& iConfigs) {
+    edm::ParameterSetDescription desc;
+    edm::IDGeneratorSourceBase<edm::PuttableSourceBase>::fillDescription(desc);
+    desc.addUntracked<std::string>("process", std::string(""));
+    desc.addUntracked<std::vector<std::string>>("paths")->setComment("names of paths");
+    desc.addUntracked<std::vector<unsigned int>>("pathStates")
+        ->setComment(
+            "The state of the path. The number of entires must be the same as in 'paths' and the value must be between "
+            "0-2 inclusive.");
+
+    iConfigs.addDefault(desc);
+  }
+
+  void TriggerResultsTestSource::readEvent_(edm::EventPrincipal& eventPrincipal) {
+    doReadEvent(eventPrincipal, [this](edm::EventPrincipal& eventPrincipal) {
+      edm::HLTGlobalStatus status(paths_.size());
+      for (std::size_t i = 0; i < paths_.size(); ++i) {
+        status.at(i) = edm::HLTPathStatus(static_cast<edm::hlt::HLTState>(states_[i]));
+      }
+
+      auto ptr = std::make_unique<edm::Wrapper<edm::TriggerResults>>(edm::WrapperBase::Emplace(), status, psetID_);
+      eventPrincipal.put(desc_, std::move(ptr), edm::ProductProvenance(desc_.branchID()));
+    });
+  }
+}  // namespace edmtest
+
+using edmtest::TriggerResultsTestSource;
+DEFINE_FWK_INPUT_SOURCE(TriggerResultsTestSource);
diff --git a/FWCore/Framework/test/testMaxEventsOutput_cfg.py b/FWCore/Framework/test/testMaxEventsOutput_cfg.py
index 819863e34d7d5..3f21238c81bc3 100644
--- a/FWCore/Framework/test/testMaxEventsOutput_cfg.py
+++ b/FWCore/Framework/test/testMaxEventsOutput_cfg.py
@@ -33,9 +33,9 @@
 )
 
 process.p1 = cms.Path(process.busy1)
-process.out = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string('testMaxEventsOutput.root')
-)
+
+from FWCore.Modules.modules import AsciiOutputModule
+process.out = AsciiOutputModule(verbosity=0)
 
 process.e = cms.EndPath(process.out)
 
diff --git a/FWCore/Framework/test/testOutputModuleSelectEventsMissingPathEarlier_cfg.py b/FWCore/Framework/test/testOutputModuleSelectEventsMissingPathEarlier_cfg.py
deleted file mode 100644
index 8276b3d8a74ca..0000000000000
--- a/FWCore/Framework/test/testOutputModuleSelectEventsMissingPathEarlier_cfg.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-process = cms.Process("EARLIER")
-
-process.source = cms.Source("EmptySource")
-process.maxEvents.input = 3
-
-process.out = cms.OutputModule("PoolOutputModule",
-                               fileName = cms.untracked.string("testOutputModuleSelectEventsMissingPath.root")
-)
-
-process.intprod = cms.EDProducer("IntProducer", ivalue=cms.int32(3))
-
-process.p = cms.Path(process.intprod)
-
-process.ep3 = cms.EndPath(process.out)
-
diff --git a/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py b/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py
index 68f8281725aa2..7c22c63cdb58b 100644
--- a/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py
+++ b/FWCore/Framework/test/testOutputModuleSelectEventsMissingPath_cfg.py
@@ -11,7 +11,7 @@
 
 process.source = cms.Source("EmptySource")
 if args.missingPath == "earlierProcess":
-    process.source = cms.Source("PoolSource", fileNames=cms.untracked.vstring("file:testOutputModuleSelectEventsMissingPath.root"))
+    process.source = cms.Source("TriggerResultsTestSource", paths = cms.untracked.vstring("p1"), pathStates=cms.untracked.vuint32(2), process=cms.untracked.string("EARLIER"))
 process.maxEvents.input = 3
 
 selectEvents = {
diff --git a/FWCore/Framework/test/testPathStatus_cfg.py b/FWCore/Framework/test/testPathStatus_cfg.py
index 6c49ad0449f56..97f22004b880a 100644
--- a/FWCore/Framework/test/testPathStatus_cfg.py
+++ b/FWCore/Framework/test/testPathStatus_cfg.py
@@ -44,9 +44,7 @@
 
 process.prod1 = cms.EDProducer("IntProducer", ivalue = cms.int32(1))
 
-process.out = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string('testPathStatus.root')
-)
+process.out = cms.OutputModule("AsciiOutputModule", verbosity = cms.untracked.uint32(0))
 
 process.path1 = cms.Path(process.prod1 * process.f1 * process.f2)
 process.path2 = cms.Path()
diff --git a/FWCore/Framework/test/testPrintDependencies.py b/FWCore/Framework/test/testPrintDependencies.py
index 1cdf76e3a0443..a87d20f7e1c9e 100644
--- a/FWCore/Framework/test/testPrintDependencies.py
+++ b/FWCore/Framework/test/testPrintDependencies.py
@@ -13,9 +13,7 @@
 
 process.OtherThing = cms.EDProducer("OtherThingProducer")
 
-process.output = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string('file:PoolOutputTest.root')
-)
+process.output = cms.OutputModule("AsciiOutputModule", verbosity = cms.untracked.uint32(0))
 
 process.source = cms.Source("EmptySource")
 
diff --git a/FWCore/Integration/test/AssociationMapTest_cfg.py b/FWCore/Integration/test/AssociationMapTest_cfg.py
index 010847ac68d3c..94099fa39dea1 100644
--- a/FWCore/Integration/test/AssociationMapTest_cfg.py
+++ b/FWCore/Integration/test/AssociationMapTest_cfg.py
@@ -45,10 +45,4 @@
     associationMapTag8 = cms.InputTag("associationMapProducer", "twoArg")
 )
 
-process.out = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string('AssociationMapTest.root')
-)
-
 process.p = cms.Path(process.intvec1 * process.intvec2 * process.associationMapProducer * process.test)
-
-process.e = cms.EndPath(process.out)
diff --git a/FWCore/Integration/test/BuildFile.xml b/FWCore/Integration/test/BuildFile.xml
index 7cd52f161d90f..6873393bfa569 100644
--- a/FWCore/Integration/test/BuildFile.xml
+++ b/FWCore/Integration/test/BuildFile.xml
@@ -7,7 +7,6 @@
     <use name="FWCore/ParameterSetReader"/>
   </bin>
 
-  <test name="TestIntegrationEventHistory" command="eventHistoryTest.sh"/>
   <test name="TestIntegrationRef" command="refTest.sh"/>
   <test name="TestIntegrationTransRef" command="transRefTest.sh"/>
   <test name="TestIntegrationTableTest" command="testTables.sh"/>
@@ -17,21 +16,14 @@
   <test name="TestIntegrationHierarchyExample" command="hierarchy_example.sh"/>
   <test name="TestIntegrationServiceExample" command="service_example.sh"/>
   <test name="TestIntegrationView" command="ViewTest.sh"/>
-  <test name="TestIntegrationSeriesOfProcesses" command="run_SeriesOfProcesses.sh"/>
-  <test name="TestParentageWithStreamerIO" command="run_ParentageWithStreamerIO.sh"/>
-  <test name="TestIntegrationThinningTests" command="run_ThinningTests.sh"/>
-  <test name="TestIntegrationGetBy" command="run_TestGetBy.sh"/>
-  <test name="TestIntegrationFallback" command="run_TestFallback.sh"/>
+  <test name="TestIntegrationGetByPlaceHolder" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/testGetByPlaceholder_cfg.py"/>
+  <test name="TestIntegrationProducesCollector" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/testProducesCollector_cfg.py"/>
+  <test name="TestIntegrationGetterOfProducts" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/testGetterOfProductsWithOutputModule_cfg.py"/>
+  <test name="TestIntegrationConsumesInfo" command="run_TestConsumesInfo.sh"/>
   <test name="TestIntegrationOutput" command="run_TestOutput.sh"/>
-  <test name="TestIntegrationDropOnInput" command="run_TestDropOnInput.sh"/>
-  <test name="TestIntegrationUnscheduledFailOnOutput" command="run_unscheduledFailOnOutput.sh"/>
   <test name="TestIntegrationGetProductAtEnd" command="run_getProductAtEnd.sh"/>
   <test name="TestIntegrationParentless" command="parentlessTest.sh"/>
   <test name="TestIntegrationWaitingThread" command="waiting_thread_test.sh"/>
-  <test name="TestIntegrationRunMerge" command="run_RunMerge.sh"/>
-  <test name="TestIntegrationRunMerge2" command="run_RunMerge2.sh"/>
-  <test name="TestIntegrationRefMerge" command="run_RefMerge.sh"/>
-  <test name="TestIntegrationRefAlias" command="run_RefAlias.sh"/>
   <test name="TestIntegrationParameterSet" command="run_ParameterSet.sh"/>
   <test name="TestIntegrationSwitchProducer" command="run_TestSwitchProducer.sh"/>
   <test name="TestIntegration_TestEDAlias" command="run_TestEDAlias.sh"/>
@@ -39,11 +31,8 @@
   <test name="TestFWCoreIntegrationModuleTypeResolver" command="run_TestModuleTypeResolver.sh"/>
   <test name="CatchStdExceptiontest" command="CatchStdExceptiontest.sh"/>
   <test name="CatchCmsExceptiontest" command="CatchCmsExceptiontest.sh"/>
-  <test name="TestIntegrationExistingDictionary" command="run_TestExistingDictionary.sh"/>
-  <test name="TestIntegrationEmptyRootFile" command="run_TestEmptyRootFile.sh"/>
   <test name="TestStdProducts" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/testStdProducts_cfg.py"/>
   <test name="TestPostInsertProducer" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/testPostInsertProducer_cfg.py"/>
-  <test name="TestFWCoreIntegrationProvenance" command ="provenance_test.sh"/>
 
   <bin file="ProcessConfiguration_t.cpp,ProcessHistory_t.cpp" name="TestIntegrationDataFormatsProvenance">
     <use name="FWCore/ParameterSet"/>
@@ -112,6 +101,10 @@
     <use name="catch2"/>
   </bin>
 
+  <test name="TestFWCoreIntegrationSlimming" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/SlimmingTestSiblings_cfg.py 2>&amp;1 | fgrep 'more than one thinned children'"/>
+  <test name="TestFWCoreIntegrationSlimmingFarther" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/SlimmingTestFartherSiblings_cfg.py 2>&amp;1 | fgrep 'SlimmingThingSelector::choose'"/>
+
+
   <test name="TestFWCoreIntegrationInterProcess" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/test_TestInterProcessProd_cfg.py"/>
   <test name="TestFWCoreIntegrationPutOrMerge" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/putOrMergeTest_cfg.py"/>
   <test name="TestFWCoreIntegrationInputSourceAlias" command="cmsRun ${LOCALTOP}//src/FWCore/Integration/test/inputSource_alias_Test_cfg.py"/>
@@ -135,84 +128,4 @@
   <test name="TestFWCoreIntegrationTryToContinueExceptionOutput" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/test_shouldTryToContinue_source_cfg.py"/>
   <test name="TestFWCoreIntegrationTryToContinueESProducer" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/test_TryToContinue_ESProducer_cfg.py"/>
   <test name="TestFWCoreIntegrationTryToContinueESProducerContinue" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/test_TryToContinue_ESProducer_cfg.py --continueAnalyzer"/>
-
-  <test name="TestFWCoreIntegrationInconsistentProducts" command="run_inconsistent_products.sh"/>
-
-  <test name="TestIntegrationProcessBlock1" command="run_TestProcessBlock.sh 1"/>
-  <test name="TestIntegrationProcessBlock2" command="run_TestProcessBlock.sh 2"/>
-  <test name="TestIntegrationProcessBlock3" command="run_TestProcessBlock.sh 3"/>
-  <test name="TestIntegrationProcessBlock4" command="run_TestProcessBlock.sh 4"/>
-  <test name="TestIntegrationProcessBlock5" command="run_TestProcessBlock.sh 5">
-    <flags PRE_TEST="TestIntegrationProcessBlock1"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock2"/>
-  </test>
-  <test name="TestIntegrationProcessBlock6" command="run_TestProcessBlock.sh 6">
-    <flags PRE_TEST="TestIntegrationProcessBlock5"/>
-  </test>
-  <test name="TestIntegrationProcessBlock7" command="run_TestProcessBlock.sh 7"/>
-  <test name="TestIntegrationProcessBlock8" command="run_TestProcessBlock.sh 8">
-    <flags PRE_TEST="TestIntegrationProcessBlock1"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock7"/>
-  </test>
-  <test name="TestIntegrationProcessBlock9" command="run_TestProcessBlock.sh 9">
-    <flags PRE_TEST="TestIntegrationProcessBlock3"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock4"/>
-  </test>
-  <test name="TestIntegrationProcessBlock10" command="run_TestProcessBlock.sh 10">
-    <flags PRE_TEST="TestIntegrationProcessBlock5"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock9"/>
-  </test>
-  <test name="TestIntegrationProcessBlock11" command="run_TestProcessBlock.sh 11">
-    <flags PRE_TEST="TestIntegrationProcessBlock5"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock9"/>
-  </test>
-  <test name="TestIntegrationProcessBlock12" command="run_TestProcessBlock.sh 12">
-    <flags PRE_TEST="TestIntegrationProcessBlock10"/>
-  </test>
-  <test name="TestIntegrationProcessBlock17" command="run_TestProcessBlock.sh 17">
-    <flags PRE_TEST="TestIntegrationProcessBlock10"/>
-  </test>
-  <test name="TestIntegrationProcessBlock18" command="run_TestProcessBlock.sh 18"/>
-  <test name="TestIntegrationProcessBlock19" command="run_TestProcessBlock.sh 19">
-    <flags PRE_TEST="TestIntegrationProcessBlock10"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock18"/>
-  </test>
-  <test name="TestIntegrationProcessBlock20" command="run_TestProcessBlock.sh 20">
-    <flags PRE_TEST="TestIntegrationProcessBlock10"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock18"/>
-  </test>
-  <test name="TestIntegrationProcessBlock21" command="run_TestProcessBlock.sh 21">
-    <flags PRE_TEST="TestIntegrationProcessBlock5"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock9"/>
-  </test>
-  <test name="TestIntegrationProcessBlock22" command="run_TestProcessBlock.sh 22">
-    <flags PRE_TEST="TestIntegrationProcessBlock5"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock9"/>
-  </test>
-  <test name="TestIntegrationProcessBlock23" command="run_TestProcessBlock.sh 23">
-    <flags PRE_TEST="TestIntegrationProcessBlock10"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock18"/>
-  </test>
-  <test name="TestIntegrationProcessBlock24" command="run_TestProcessBlock.sh 24">
-    <flags PRE_TEST="TestIntegrationProcessBlock10"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock18"/>
-  </test>
-  <test name="TestIntegrationProcessBlock100" command="run_TestProcessBlock.sh 100">
-    <flags PRE_TEST="TestIntegrationProcessBlock6"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock8"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock11"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock12"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock15"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock16"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock17"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock19"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock20"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock21"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock22"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock23"/>
-    <flags PRE_TEST="TestIntegrationProcessBlock24"/>
-  </test>
-  <test name="TestIntegrationGetByLabel" command="run_TestGetByLabel.sh"/>
-
-  <test name="TestMaybeUninitializedIntProduct" command="cmsRun ${LOCALTOP}/src/FWCore/Integration/test/testMaybeUninitializedIntProductPart1_cfg.py &amp;&amp; cmsRun ${LOCALTOP}/src/FWCore/Integration/test/testMaybeUninitializedIntProductPart2_cfg.py"/>
 </environment>
diff --git a/FWCore/Integration/test/CatchCmsExceptiontest.sh b/FWCore/Integration/test/CatchCmsExceptiontest.sh
index cd09bace0de44..0a4d87c5096a4 100755
--- a/FWCore/Integration/test/CatchCmsExceptiontest.sh
+++ b/FWCore/Integration/test/CatchCmsExceptiontest.sh
@@ -10,16 +10,3 @@ grep -q WhatsItESProducer CatchCmsException.log || die 'Failed to find Producers
 
 #echo running cmsRun testSkipEvent_cfg.py
 #cmsRun ${LOCAL_TEST_DIR}/testSkipEvent_cfg.py &> testSkipEvent.log || die 'Failed in using testSkipEvent_cfg.py' $?
-
-#echo running cmsRun CatchCmsExceptionFromSource_cfg.py
-
-#cmsRun ${LOCAL_TEST_DIR}/CatchCmsExceptionFromSource_cfg.py &> CatchCmsExceptionFromSource.log && \
-#die 'Failed because expected exception was not thrown while running cmsRun CatchCmsExceptionFromSource_cfg.py' 1
-
-#grep -q "Calling Source::beginRun" CatchCmsExceptionFromSource.log || die 'Failed to find string Calling Source::beginRun' $?
-
-# It is intentional that this test throws an exception. The test fails if it does not.
-cmsRun ${LOCAL_TEST_DIR}/testMissingDictionaryChecking_cfg.py &> testMissingDictionaryChecking.log && die 'Failed to get exception running testMissingDictionaryChecking_cfg.py' 1
-grep -q MissingDictionaryTestF testMissingDictionaryChecking.log || die 'Failed to print out exception message with missing dictionary listed' $?
-
-#grep -w ESProducer CatcheStdException.log
diff --git a/FWCore/Integration/test/eventSetupTest.sh b/FWCore/Integration/test/eventSetupTest.sh
index 0b2a1303872ee..d1d7ef208d636 100755
--- a/FWCore/Integration/test/eventSetupTest.sh
+++ b/FWCore/Integration/test/eventSetupTest.sh
@@ -44,9 +44,6 @@ grep "A module declared it consumes an EventSetup product after its constructor"
 echo testConcurrentIOVsAndRuns_cfg.py
 cmsRun ${LOCAL_TEST_DIR}/testConcurrentIOVsAndRuns_cfg.py || die 'Failed in testConcurrentIOVsAndRuns_cfg.py' $?
 
-echo testConcurrentIOVsAndRunsRead_cfg.py
-cmsRun ${LOCAL_TEST_DIR}/testConcurrentIOVsAndRunsRead_cfg.py || die 'Failed in testConcurrentIOVsAndRunsRead_cfg.py' $?
-
 echo testESProducerUsingAcquire_cfg.py
 cmsRun ${LOCAL_TEST_DIR}/testESProducerUsingAcquire_cfg.py || die 'Failed in testESProducerUsingAcquire_cfg.py' $?
 
diff --git a/FWCore/Integration/test/refTest.sh b/FWCore/Integration/test/refTest.sh
index 01afd34785215..288d9164e25e1 100755
--- a/FWCore/Integration/test/refTest.sh
+++ b/FWCore/Integration/test/refTest.sh
@@ -9,6 +9,3 @@ cmsRun ${LOCAL_TEST_DIR}/RefTest_cfg.py || die 'Failed in RefTest_cfg.py' $?
 
 echo  cmsRun AssociationMapTest_cfg.py
 cmsRun ${LOCAL_TEST_DIR}/AssociationMapTest_cfg.py || die 'Failed in AssociationMapTest_cfg.py' $?
-
-echo cmsRun AssociationMapReadTest_cfg.py
-cmsRun ${LOCAL_TEST_DIR}/AssociationMapReadTest_cfg.py || die 'Failed in AssociationMapReadTest_cfg.py' $?
diff --git a/FWCore/Integration/test/run_TestConsumesInfo.sh b/FWCore/Integration/test/run_TestConsumesInfo.sh
new file mode 100755
index 0000000000000..b9d95055da164
--- /dev/null
+++ b/FWCore/Integration/test/run_TestConsumesInfo.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+test=testGetBy
+
+function die { echo Failure $1: status $2 ; exit $2 ; }
+
+LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
+
+  echo "testConsumesInfo"
+  cmsRun ${LOCAL_TEST_DIR}/testConsumesInfo_cfg.py > testConsumesInfo.log 2>/dev/null || die "cmsRun testConsumesInfo_cfg.py" $?
+  grep -v '++\|LegacyModules\|time' testConsumesInfo.log > testConsumesInfo_1.log
+  rm testConsumesInfo.log
+  diff ${LOCAL_TEST_DIR}/unit_test_outputs/testConsumesInfo_1.log testConsumesInfo_1.log || die "comparing testConsumesInfo_1.log" $?
+
+exit 0
diff --git a/FWCore/Integration/test/run_TestEDAlias.sh b/FWCore/Integration/test/run_TestEDAlias.sh
index 3c410cb42aabb..0031eba59e204 100755
--- a/FWCore/Integration/test/run_TestEDAlias.sh
+++ b/FWCore/Integration/test/run_TestEDAlias.sh
@@ -10,18 +10,6 @@ LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
   echo "EDAlias consumer in a Task"
   cmsRun ${LOCAL_TEST_DIR}/${test}Task_cfg.py || die "cmsRun ${test}Task_cfg.py 1" $?
 
-  echo "*************************************************"
-  echo "Test output"
-  cmsRun ${LOCAL_TEST_DIR}/${test}Analyze_cfg.py testEDAliasTask.root || die "cmsRun ${test}Analyze_cfg.py testEDAliasTask.root" $?
-
-  echo "*************************************************"
-  echo "EDAlias consumer in a Path"
-  cmsRun ${LOCAL_TEST_DIR}/${test}Path_cfg.py || die "cmsRun ${test}Path_cfg.py 1" $?
-
-  echo "*************************************************"
-  echo "Test output"
-  cmsRun ${LOCAL_TEST_DIR}/${test}Analyze_cfg.py testEDAliasTask.root || die "cmsRun ${test}Analyze_cfg.py testEDAliasPath.root" $?
-
   echo "*************************************************"
   echo "Test EDAlias aliasing for many modules"
   cmsRun ${LOCAL_TEST_DIR}/${test}ManyModules_cfg.py || die "cmsRun ${test}ManyModules_cfg.py 1" $?
diff --git a/FWCore/Integration/test/run_TestEmptyRootFile.sh b/FWCore/Integration/test/run_TestEmptyRootFile.sh
deleted file mode 100755
index a5c4ec3e9bcdf..0000000000000
--- a/FWCore/Integration/test/run_TestEmptyRootFile.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-function die { echo Failure $1: status $2 ; exit $2 ; }
-
-LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
-
-echo "write empty file"
-cmsRun ${LOCAL_TEST_DIR}/makeEmptyRootFile.py || die "cmsRun makeEmptyRootFile.py" $?
-
-echo "read empty file"
-cmsRun ${LOCAL_TEST_DIR}/useEmptyRootFile.py || die "cmsRun useEmptyRootFile.py" $?
-
-exit 0
diff --git a/FWCore/Integration/test/run_TestOutput.sh b/FWCore/Integration/test/run_TestOutput.sh
index ce1f47af9c212..385e7fea1f9df 100755
--- a/FWCore/Integration/test/run_TestOutput.sh
+++ b/FWCore/Integration/test/run_TestOutput.sh
@@ -38,32 +38,4 @@ LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
   grep "limited globalEndLuminosityBlock" testOutput1.log > /dev/null || die "grep failed to find 'limited globalEndLuminosityBlock'" $?
   grep "limited branchID 3673681161" testOutput1.log > /dev/null || die "grep failed to find 'limited branchID 3673681161'" $?
 
-  # Above we tested using EmptySource. Repeat reading a file using PoolSource
-  echo "testOutput2"
-  cmsRun ${LOCAL_TEST_DIR}/${test}2_cfg.py 2> testOutput2.log || die "cmsRun ${test}2_cfg.py" $?
-
-  grep "global write event" testOutput2.log > /dev/null || die "grep failed to find 'global write event'" $?
-  grep "global writeLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'global writeLuminosityBlock'" $?
-  grep "global writeRun" testOutput2.log > /dev/null || die "grep failed to find 'global writeRun'" $?
-  grep "global writeProcessBlock" testOutput2.log > /dev/null || die "grep failed to find 'global writeProcessBlock'" $?
-  grep "global respondToOpenInputFile" testOutput2.log > /dev/null || die "grep failed to find 'global respondToOpenInputFile'" $?
-  grep "global respondToCloseInputFile" testOutput2.log > /dev/null || die "grep failed to find 'global respondToCloseInputFile'" $?
-  grep "global globalBeginRun" testOutput2.log > /dev/null || die "grep failed to find 'global globalBeginRun'" $?
-  grep "global globalEndRun" testOutput2.log > /dev/null || die "grep failed to find 'global globalEndRun'" $?
-  grep "global globalBeginLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'global globalBeginLuminosityBlock'" $?
-  grep "global globalEndLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'global globalEndLuminosityBlock'" $?
-  grep "global branchID 4057644746" testOutput2.log > /dev/null || die "grep failed to find 'global branchID 4057644746'" $?
-
-  grep "limited write event" testOutput2.log > /dev/null || die "grep failed to find 'limited write event'" $?
-  grep "limited writeLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'limited writeLuminosityBlock'" $?
-  grep "limited writeRun" testOutput2.log > /dev/null || die "grep failed to find 'limited writeRun'" $?
-  grep "limited writeProcessBlock" testOutput2.log > /dev/null || die "grep failed to find 'limited writeProcessBlock'" $?
-  grep "limited respondToOpenInputFile" testOutput2.log > /dev/null || die "grep failed to find 'limited respondToOpenInputFile'" $?
-  grep "limited respondToCloseInputFile" testOutput2.log > /dev/null || die "grep failed to find 'limited respondToCloseInputFile'" $?
-  grep "limited globalBeginRun" testOutput2.log > /dev/null || die "grep failed to find 'limited globalBeginRun'" $?
-  grep "limited globalEndRun" testOutput2.log > /dev/null || die "grep failed to find 'limited globalEndRun'" $?
-  grep "limited globalBeginLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'limited globalBeginLuminosityBlock'" $?
-  grep "limited globalEndLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'limited globalEndLuminosityBlock'" $?
-  grep "limited branchID 4057644746" testOutput2.log > /dev/null || die "grep failed to find 'limited branchID 4057644746'" $?
-
 exit 0
diff --git a/FWCore/Integration/test/run_all_t.sh b/FWCore/Integration/test/run_all_t.sh
deleted file mode 100755
index a9cb62ab9516c..0000000000000
--- a/FWCore/Integration/test/run_all_t.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-
-# Pass in name and status
-function die { echo $1: status $2 ;  exit $2; }
-
-LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
-
-${LOCAL_TEST_DIR}/refTest.sh || die 'Failed in refTest.sh' $?
-
-${LOCAL_TEST_DIR}/transRefTest.sh || die 'Failed in transRefTest.sh' $?
-
-${LOCAL_TEST_DIR}/inputSourceTest.sh || die 'Failed in inputSourceTest.sh' $?
-
-${LOCAL_TEST_DIR}/inputExtSourceTest.sh || die 'Failed in inputExtSourceTest.sh' $?
-
-${LOCAL_TEST_DIR}/eventSetupTest.sh || die 'Failed in eventSetupTest.sh' $?
-
-${LOCAL_TEST_DIR}/hierarchy_example.sh || die 'Failed in hierarchy_example.sh' $?
-
-${LOCAL_TEST_DIR}/service_example.sh || die 'Failed in service_example.sh' $?
-
diff --git a/FWCore/Integration/test/standalone_t.cppunit.cc b/FWCore/Integration/test/standalone_t.cppunit.cc
index c5a9b843fc7e0..3a31663ee4695 100644
--- a/FWCore/Integration/test/standalone_t.cppunit.cc
+++ b/FWCore/Integration/test/standalone_t.cppunit.cc
@@ -62,9 +62,7 @@ void testStandalone::writeAndReadFile() {
         "process.m1 = cms.EDProducer('IntProducer',\n"
         "    ivalue = cms.int32(11)\n"
         ")\n"
-        "process.out = cms.OutputModule('PoolOutputModule',\n"
-        "    fileName = cms.untracked.string('testStandalone.root')\n"
-        ")\n"
+        "process.out = cms.OutputModule('AsciiOutputModule')\n"
         "process.p = cms.Path(process.m1)\n"
         "process.e = cms.EndPath(process.out)\n");
 
@@ -73,21 +71,4 @@ void testStandalone::writeAndReadFile() {
     proc.run();
     proc.endJob();
   }
-
-  {
-    std::string configuration(
-        "import FWCore.ParameterSet.Config as cms\n"
-        "process = cms.Process('TEST1')\n"
-        "process.source = cms.Source('PoolSource',\n"
-        "    fileNames = cms.untracked.vstring('file:testStandalone.root')\n"
-        ")\n"
-        "process.InitRootHandlers = cms.Service('InitRootHandlers')\n"
-        "process.JobReportService = cms.Service('JobReportService')\n"
-        "process.add_(cms.Service('SiteLocalConfigService'))\n");
-
-    edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
-    proc.beginJob();
-    proc.run();
-    proc.endJob();
-  }
 }
diff --git a/FWCore/Integration/test/testConcurrentIOVsAndRuns_cfg.py b/FWCore/Integration/test/testConcurrentIOVsAndRuns_cfg.py
index 04fa4744b7718..2dd00ae1fd668 100644
--- a/FWCore/Integration/test/testConcurrentIOVsAndRuns_cfg.py
+++ b/FWCore/Integration/test/testConcurrentIOVsAndRuns_cfg.py
@@ -45,9 +45,3 @@
 process.busy1 = cms.EDProducer("BusyWaitIntProducer",ivalue = cms.int32(1), iterations = cms.uint32(40*1000*1000))
 
 process.p1 = cms.Path(process.busy1 * process.test)
-
-process.out = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string('testConcurrentIOVsAndRuns.root')
-)
-
-process.e = cms.EndPath(process.out)
diff --git a/FWCore/Integration/test/testConsumesInfo_cfg.py b/FWCore/Integration/test/testConsumesInfo_cfg.py
index 7beeb5edfd22c..ce230a523a462 100644
--- a/FWCore/Integration/test/testConsumesInfo_cfg.py
+++ b/FWCore/Integration/test/testConsumesInfo_cfg.py
@@ -29,8 +29,8 @@
     input = cms.untracked.int32(3)
 )
 
-process.out = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string('testConsumesInfo.root'),
+process.out = cms.OutputModule("AsciiOutputModule",
+                               verbosity = cms.untracked.uint32(0),
     outputCommands = cms.untracked.vstring(
         'keep *',
         'drop *_intProducerA_*_*',
diff --git a/FWCore/Integration/test/testEDAliasPath_cfg.py b/FWCore/Integration/test/testEDAliasPath_cfg.py
index 118388aebcd33..0c384f477e756 100644
--- a/FWCore/Integration/test/testEDAliasPath_cfg.py
+++ b/FWCore/Integration/test/testEDAliasPath_cfg.py
@@ -14,8 +14,7 @@
     input = cms.untracked.int32(3)
 )
 
-process.out = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string('testEDAliasPath.root'),
+process.out = cms.OutputModule("AsciiOutputModule",
     outputCommands = cms.untracked.vstring(
         'keep *_intProducer_*_*',
     )
diff --git a/FWCore/Integration/test/testEDAliasTask_cfg.py b/FWCore/Integration/test/testEDAliasTask_cfg.py
index 9b1bef9cd5fa7..5c4c7e69c38ec 100644
--- a/FWCore/Integration/test/testEDAliasTask_cfg.py
+++ b/FWCore/Integration/test/testEDAliasTask_cfg.py
@@ -14,8 +14,7 @@
     input = cms.untracked.int32(3)
 )
 
-process.out = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string('testEDAliasTask.root'),
+process.out = cms.OutputModule("AsciiOutputModule",
     outputCommands = cms.untracked.vstring(
         'keep *_intProducer_*_*',
     )
diff --git a/FWCore/Integration/test/testIllegalSourceParameter_cfg.py b/FWCore/Integration/test/testIllegalSourceParameter_cfg.py
index a0b16cf51dfab..30e5ae0a14c9b 100644
--- a/FWCore/Integration/test/testIllegalSourceParameter_cfg.py
+++ b/FWCore/Integration/test/testIllegalSourceParameter_cfg.py
@@ -12,7 +12,7 @@
 # Intentionally define a parameter that does not
 # exist in the ParameterSetDescription which
 # should result in an exception.
-process.source = cms.Source("PoolSource",
+process.source = cms.Source("EmptySource",
 			    fileNames = cms.untracked.vstring("file:dummy.root"),
                             doesNotExist = cms.bool(True))
 
diff --git a/FWCore/Integration/test/testOutput1_cfg.py b/FWCore/Integration/test/testOutput1_cfg.py
index bc39d0c017478..10bf38c10fc47 100644
--- a/FWCore/Integration/test/testOutput1_cfg.py
+++ b/FWCore/Integration/test/testOutput1_cfg.py
@@ -30,14 +30,6 @@
     )
 )
 
-process.out = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string('testOutput1.root'),
-    outputCommands = cms.untracked.vstring(
-        'keep *', 
-        'drop *_intProducerA_*_*'
-    )
-)
-
 process.path = cms.Path(process.intProducerA)
 
-process.endpath = cms.EndPath(process.testout + process.testoutlimited + process.out)
+process.endpath = cms.EndPath(process.testout + process.testoutlimited)
diff --git a/FWCore/Integration/test/testProducesCollector_cfg.py b/FWCore/Integration/test/testProducesCollector_cfg.py
index ee78c42e4c528..8be5442049c76 100644
--- a/FWCore/Integration/test/testProducesCollector_cfg.py
+++ b/FWCore/Integration/test/testProducesCollector_cfg.py
@@ -15,9 +15,7 @@
 
 process.producerUsingCollector = cms.EDProducer("ProducerUsingCollector")
 
-process.out = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string('testProducesCollector.root')
-)
+process.out = cms.OutputModule("AsciiOutputModule")
 
 process.test = cms.EDAnalyzer("TestFindProduct",
   inputTags = cms.untracked.VInputTag(cms.InputTag("producerUsingCollector"),
diff --git a/FWCore/Integration/test/testSkipEvent_cfg.py b/FWCore/Integration/test/testSkipEvent_cfg.py
index 725fbfc685387..8f40675905949 100644
--- a/FWCore/Integration/test/testSkipEvent_cfg.py
+++ b/FWCore/Integration/test/testSkipEvent_cfg.py
@@ -81,9 +81,8 @@
     onlyOne = cms.untracked.bool(False)
 )
 
-from IOPool.Output.modules import PoolOutputModule
-process.out = PoolOutputModule(
-    fileName = 'testSkipEvent.root',
+from FWCore.Modules.modules import AsciiOutputModule
+process.out = AsciiOutputModule(
     SelectEvents = dict(SelectEvents = ['p1'])
 )
 
diff --git a/FWCore/Integration/test/unit_test_outputs/testConsumesInfo_1.log b/FWCore/Integration/test/unit_test_outputs/testConsumesInfo_1.log
index f60c5a802b055..9b037f8c55b3b 100644
--- a/FWCore/Integration/test/unit_test_outputs/testConsumesInfo_1.log
+++ b/FWCore/Integration/test/unit_test_outputs/testConsumesInfo_1.log
@@ -85,7 +85,7 @@ All modules and modules in the current process whose products they consume:
   IntProducerEndProcessBlock/'intProducerEndProcessBlock'
   IntProducer/'intProducerU'
   IntVectorProducer/'intVectorProducer'
-  PoolOutputModule/'out'
+  AsciiOutputModule/'out'
     consumes products from these modules:
       TriggerResultInserter/'TriggerResults'
       IntProducer/'intProducerA'
@@ -217,7 +217,7 @@ stating whether it matched the actual module label of the producer.
   IntProducerEndProcessBlock/'intProducerEndProcessBlock'
   IntProducer/'intProducerU'
   IntVectorProducer/'intVectorProducer'
-  PoolOutputModule/'out'
+  AsciiOutputModule/'out'
     consumes:
       edm::TriggerResults 'TriggerResults' '' 'PROD1'
       edmtest::IntProduct 'aliasForInt' '' 'PROD1'
@@ -389,3 +389,4 @@ TestFindProduct sum = 300
 TestFindProduct sum = 300
 TestFindProduct sum = 220000
 TestFindProduct sum = 33
+>>> processed 3 events
diff --git a/FWCore/MessageService/test/bug75836_cfg.py b/FWCore/MessageService/test/bug75836_cfg.py
deleted file mode 100644
index 3c189849a689d..0000000000000
--- a/FWCore/MessageService/test/bug75836_cfg.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-process = cms.Process("MERGE")
-
-process.source = cms.Source("PoolSource",
-                            fileNames =
-cms.untracked.vstring("ref_merge_prod1.root",
-                      "ref_merge_prod2.root")
-                            )
-
-process.out = cms.OutputModule("PoolOutputModule",
-                               fileName =
-cms.untracked.string("ref_merge.root")
-                               )
-
-process.o = cms.EndPath(process.out)
-
diff --git a/FWCore/MessageService/test/bug75836a_cfg.py b/FWCore/MessageService/test/bug75836a_cfg.py
deleted file mode 100644
index ce19d06bd802f..0000000000000
--- a/FWCore/MessageService/test/bug75836a_cfg.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-process = cms.Process("MERGE")
-
-process.source = cms.Source("EmptySource")
-
-process.thing = cms.EDProducer ("IntProducer")
-
-process.o = cms.Path(process.thing)
-
diff --git a/FWCore/MessageService/test/bug75836b_cfg.py b/FWCore/MessageService/test/bug75836b_cfg.py
deleted file mode 100644
index be703d1cdb958..0000000000000
--- a/FWCore/MessageService/test/bug75836b_cfg.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-process = cms.Process("MERGE")
-
-process.source = cms.Source("EmptySource")
-
-process.doit = cms.EDAnalyzer ("IntTestAnalyzer",
-		valueMustMatch = cms.untracked.int32(90),
-		moduleLabel = cms.untracked.InputTag("missing"))
-
-process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(3))
-
-process.o = cms.Path(process.doit)
-
-process.options = cms.untracked.PSet( 
-	StopProcessing = cms.untracked.vstring('ProductNotFound') )
- 
diff --git a/FWCore/Modules/test/testBunchCrossingFilter.py b/FWCore/Modules/test/testBunchCrossingFilter.py
deleted file mode 100644
index c50d2fa360c4c..0000000000000
--- a/FWCore/Modules/test/testBunchCrossingFilter.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# simple test for the BunchCrossingFilter
-
-# colliding bunches in run 317435, fill 6759, scheme 25ns_2556b_2544_2215_2332_144bpi_20injV2:
-#     81-128,   136-183
-#    215-262,   270-317,   325-372,
-#    404-451,   459-506,   514-561,
-#    593-640,   648-695,   703-750,
-#    786-833,   841-888,
-#    920-967,   975-1022, 1030-1077,
-#   1109-1156, 1164-1211, 1219-1266,
-#   1298-1345, 1353-1400, 1408-1455,
-#   1487-1534, 1542-1589, 1597-1644,
-#   1680-1727, 1735-1782,
-#   1814-1861, 1869-1916, 1924-1971,
-#   2003-2050, 2058-2105, 2113-2160,
-#   2192-2239, 2247-2294, 2302-2349,
-#   2381-2428, 2436-2483, 2491-2538,
-#   2574-2621, 2629-2676,
-#   2708-2755, 2763-2810, 2818-2865,
-#   2897-2944, 2952-2999, 3007-3054,
-#   3086-3133, 3141-3188, 3196-3243,
-#   3275-3322, 3330-3377, 3385-3432
-# (see https://lpc.web.cern.ch/fillingSchemes/2018/25ns_2556b_2544_2215_2332_144bpi_20injV2.csv)
-
-from builtins import range
-import FWCore.ParameterSet.Config as cms
-from FWCore.ParameterSet.pfnInPath import *
-
-process = cms.Process('TEST')
-
-process.maxEvents = cms.untracked.PSet(
-    input = cms.untracked.int32(-1)
-)
-
-process.options = cms.untracked.PSet(
-    wantSummary = cms.untracked.bool(True)
-)
-
-process.load('FWCore.MessageService.MessageLogger_cfi')
-
-# input data
-process.source = cms.Source('PoolSource',
-    fileNames = cms.untracked.pfnInPaths('FWCore/Modules/data/rawData_empty_CMSSW_10_2_0.root')
-)
-
-from FWCore.Modules.bunchCrossingFilter_cfi import bunchCrossingFilter as _bunchCrossingFilter
-
-# empty input, do not select any bunch crossings
-process.selectNone = _bunchCrossingFilter.clone(
-   bunches = cms.vuint32(),
-)
-
-# full range of possible bunch crossings [1,3564]
-process.selectAll = _bunchCrossingFilter.clone(
-   bunches = cms.vuint32(list(range(1,3565)))
-)
-
-# select bx 536
-process.selectSingle = _bunchCrossingFilter.clone(
-   bunches = cms.vuint32(536)
-)
-
-# select the whole train 514-561
-process.selectTrain = _bunchCrossingFilter.clone(
-   bunches = cms.vuint32(list(range(514,562)))
-)
-
-# inverted to veto (non-colliding) bx 1
-process.selectEmpty = _bunchCrossingFilter.clone(
-   bunches = cms.vuint32(1)
-)
-
-process.SelectNone        = cms.Path( process.selectNone )
-process.SelectAll         = cms.Path( process.selectAll )
-process.SelectSingle      = cms.Path( process.selectSingle )
-process.SelectTrain       = cms.Path( process.selectTrain )
-process.VetoEmpty         = cms.Path( ~ process.selectEmpty )
-process.VetoSingle        = cms.Path( ~ process.selectSingle )
-process.VetoTrain         = cms.Path( ~ process.selectTrain )
-process.SelectTrainButOne = cms.Path( process.selectTrain * ~ process.selectSingle )
diff --git a/FWCore/Modules/test/testEventAuxiliaryHistory_cfg.py b/FWCore/Modules/test/testEventAuxiliaryHistory_cfg.py
index 8079e0215b5bb..4cfbdcb3e6c15 100644
--- a/FWCore/Modules/test/testEventAuxiliaryHistory_cfg.py
+++ b/FWCore/Modules/test/testEventAuxiliaryHistory_cfg.py
@@ -19,11 +19,5 @@
 )
 
 
-process.out = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string('test.root')
-)
-
 
 process.p1 = cms.Path(process.aux)
-
-process.e1 = cms.EndPath(process.out)
diff --git a/FWCore/ParameterSet/test/cmsconfig.py b/FWCore/ParameterSet/test/cmsconfig.py
deleted file mode 100644
index 193651f3abcfe..0000000000000
--- a/FWCore/ParameterSet/test/cmsconfig.py
+++ /dev/null
@@ -1,432 +0,0 @@
-#------------------------------------------------------------
-#
-#
-# cmsconfig: a class to provide convenient access to the Python form
-# of a parsed CMS configuration file.
-#
-# Note: we have not worried about security. Be careful about strings
-# you put into this; we use a naked 'eval'!
-#
-#------------------------------------------------------------
-#
-# Tests for this class need to be run 'by hand', until we figure out
-# how to make use of the SCRAMV1 tools for running tests on Python
-# code.
-#
-#------------------------------------------------------------
-# TODO: We need some refactoring to handle the writing of module-like
-# objects more gracefully. Right now, we have to pull the classname
-# out of the dictionary in more than one place. Try making a class
-# which represents the module, which contains the dictionary now used,
-# and knows about special features: the class name, now to print the
-# guts without repeating the classname, etc.
-#------------------------------------------------------------
-
-import io
-import types
-
-# TODO: Refactor pset_dict_to_string and class printable_parameter to
-# have a consistent view of the problem. Perhaps have a class
-# representing the configuration data for a PSet object, rather than
-# just using a dictionary instance. See also __write_module_guts,
-# which should be refactored at the same time.
-
-def pset_dict_to_string(psetDict):
-    """Convert dictionary representing a PSet to a string consistent
-    with the configuration grammar."""
-    stream = io.StringIO()
-    stream.write('\n{\n')
-
-    for name, value in psetDict.items():
-        stream.write('%s' % printable_parameter(name, value))
-        stream.write('\n')        
-
-    stream.write('}\n')
-    return stream.getvalue()
-
-
-def secsource_dict_to_string(secSourceDict):
-    """Make a string representing the secsource"""
-    stream = io.StringIO()
-    stream.write("%s\n{\n" %  secSourceDict["@classname"][2])
-    for name, value in secSourceDict.items():
-        if name[0] != '@':
-            stream.write('%s' % printable_parameter(name, value))
-            stream.write('\n')
-
-    stream.write('}\n')
-    return stream.getvalue()
-
-
-class printable_parameter:
-    """A class to provide automatic unpacking of the tuple (triplet)
-    representation of a single parameter, suitable for printing.
-
-    Note that 'value' may in fact be a list."""
-
-    def __init__(self, aName, aValueTuple):
-        self.name = aName
-        self.type, self.trackedCode, self.value = aValueTuple
-        # Because the configuration grammar treats tracked status as
-        # the default, we only have to write 'untracked' as the
-        # tracking code if the parameter is untracked.        
-        if self.trackedCode == "tracked":
-            self.trackedCode = ""
-        else:
-            self.trackedCode = "untracked " # trailing space is needed
-
-        # We need special handling of some of the parameter types.
-        if self.type in ["vbool", "vint32", "vuint32", "vdouble", "vstring", "VInputTag", "VESInputTag"]:   
-            # TODO: Consider using cStringIO, if this is observed
-            # to be a bottleneck. This may happen if many large
-            # vectors are used in parameter sets.
-            temp = '{'
-            # Write out values as a comma-separated list
-            temp += ", ".join(self.value)
-            temp += '}'
-            self.value = temp
-
-        if self.type == "PSet":
-            self.value = pset_dict_to_string(self.value)
-        if self.type == "secsource":
-            self.value = secsource_dict_to_string(self.value)
-        if self.type == "VPSet":
-            temp = '{'
-            tup = [ pset_dict_to_string(x) for x in self.value ]
-            temp += ", ".join( tup )
-            temp += '}'
-            self.value = temp
-
-    def __str__(self):
-        """Print this parameter in the right format for a
-        configuration file."""
-        s = "%(trackedCode)s%(type)s %(name)s = %(value)s" % self.__dict__
-        return s    
-
-# I'm not using new-style classes, because I'm not sure that we can
-# rely on a new enough version of Python to support their use.
-
-class cmsconfig:
-    """A class to provide convenient access to the contents of a
-    parsed CMS configuration file."""
-
-    def __init__(self, stringrep):
-        """Create a cmsconfig object from the contents of the (Python)
-        exchange format for configuration files."""
-        self.psdata = eval(stringrep)
-
-    def numberOfModules(self):
-        return len(self.psdata['modules'])
-
-    def numberOfOutputModules(self):
-        return len(self.outputModuleNames())
-
-    def moduleNames(self):
-        """Return the names of modules. Returns a list."""
-        return self.psdata['modules'].keys()
-
-    def module(self, name):
-        """Get the module with this name. Exception raised if name is
-        not known. Returns a dictionary."""
-        return self.psdata['modules'][name]
-
-    def psetNames(self):
-        """Return the names of psets. Returns a list."""
-        return self.psdata['psets'].keys()
-
-    def pset(self, name):
-        """Get the pset with this name. Exception raised if name is
-        not known. Returns a dictionary."""
-        return self.psdata['psets'][name]
-
-    def outputModuleNames(self):
-        return self.psdata['output_modules']
-
-    def moduleNamesWithSecSources(self):
-        return self.psdata['modules_with_secsources']
-
-    def esSourceNames(self):
-        """Return the names of all ESSources. Names are of the form '<C++ type>@<label>' where
-        label can be empty. Returns a list."""
-        return self.psdata['es_sources'].keys()
-
-    def esSource(self, name):
-        """Get the ESSource with this name. Exception raised if name is
-        not known. Returns a dictionary."""
-        return self.psdata['es_sources'][name]
-
-    def esModuleNames(self):
-        """Return the names of all ESModules. Names are of the form '<C++ type>@<label>' where
-        label can be empty. Returns a list."""
-        return self.psdata['es_modules'].keys()
-
-    def esModule(self, name):
-        """Get the ESModule with this name. Exception raised if name is
-        not known. Returns a dictionary."""
-        return self.psdata['es_modules'][name]
-
-    def esPreferNames(self):
-        """Return the names of all es_prefer statements. Names are of the form 'esprefer_<C++ type>@<label>' where
-        label can be empty. Returns a list."""
-        return self.psdata['es_prefers'].keys()
-
-    def esPrefer(self, name):
-        """Get the es_prefer statement with this name. Exception raised if name is
-        not known. Returns a dictionary."""
-        return self.psdata['es_prefers'][name]
-
-    def serviceNames(self):
-        """Return the names of all Services. Names are actually the C++ class names
-        Returns a list."""
-        return self.psdata['services'].keys()
-
-    def service(self, name):
-        """Get the Service with this name. Exception raised if name is
-        not known. Returns a dictionary."""
-        return self.psdata['services'][name]
-
-    def pathNames(self):
-        return self.psdata['paths'].keys()
-
-    def path(self, name):
-        """Get the path description for the path of the given
-        name. Exception raised if name is not known. Returns a
-        string."""
-        return self.psdata['paths'][name]
-
-    def schedule(self):
-        return self.psdata['schedule']
-
-    def sequenceNames(self):
-        return self.psdata['sequences'].keys()
-
-    def sequence(self, name):
-        """Get the sequence description for the sequence of the given
-        name. Exception raised if name is not known. Returns a
-        string."""
-        return self.psdata['sequences'][name]
-
-    def endpathNames(self):
-        return self.psdata['endpaths'].keys()
-
-    def endpath(self, name):
-        """Return the endpath description, as a string."""
-        return self.psdata['endpaths'][name]
-
-    def mainInputSource(self):
-        """Return the description of the main input source, as a
-        dictionary."""
-        return self.psdata['main_input']
-
-    def looper(self):
-        """Return the description of the looper, as a
-        dictionary."""
-        return self.psdata['looper']
-
-    def procName(self):
-        """Return the process name, a string"""
-        return self.psdata['procname']
-
-    def asConfigurationString(self):
-        """Return a string conforming to the configuration file
-        grammar, encoding this configuration."""
-
-        # Let's try to make sure we lose no resources if something
-        # fails in formatting...
-        result = ""
-
-        try:
-            stream = io.StringIO()
-            self.__write_self_to_stream(stream)
-            result = stream.getvalue()
-
-        finally:
-            stream.close()
-
-        return result
-
-    def asPythonString(self):
-        """Return a string containing the python psdata source of
-        this object to facilitate saving and loading of python format"""
-        result = "#!/usr/bin/env python\n"
-        result += str(self.psdata)
-        return result 
-
-    def __write_self_to_stream(self, fileobj):
-        """Private method.
-        Return None.
-        Write the contents of self to the file-like object fileobj."""
-
-        # Write out the process block
-        fileobj.write('process %s = \n{\n' % self.procName())
-        self.__write_process_block_guts(fileobj)
-        fileobj.write('}\n')
-
-    def __write_process_block_guts(self, fileobj):
-        """Private method.
-        Return None.
-        Write the guts of the process block to the file-like object
-        fileobj."""
-
-        # TODO: introduce, and deal with, top-level PSet objects and
-        # top-level block objects.        
-        self.__write_main_source(fileobj)
-        self.__write_looper(fileobj)
-        self.__write_psets(fileobj)
-        self.__write_es_sources(fileobj)        
-        self.__write_es_modules(fileobj)
-        self.__write_es_prefers(fileobj)
-        self.__write_modules(fileobj)
-        self.__write_services(fileobj)
-        self.__write_sequences(fileobj)
-        self.__write_paths(fileobj)
-        self.__write_endpaths(fileobj)
-        self.__write_schedule(fileobj)
-
-    def __write_psets(self, fileobj):
-        """Private method.
-        Return None
-        Write all the psets to the file-like object fileobj."""
-        for name in self.psetNames():
-            psettuple = self.pset(name)
-            # 8/2006: Wasn't writing trackedness!  Just re-use code
-            # for embedded PSets
-            fileobj.write('%s' % printable_parameter(name, psettuple))
-            #fileobj.write("PSet %s = \n{\n" % (name) )
-            #psetdict = psettuple[2]
-            #self.__write_module_guts(psetdict, fileobj)
-            #fileobj.write('}\n')
-
-    def __write_modules(self, fileobj):
-        """Private method.
-        Return None
-        Write all the modules to the file-like object fileobj."""
-        for name in self.moduleNames():
-            moddict = self.module(name)
-            fileobj.write("module %s = %s\n{\n" % (name, moddict['@classname'][2]))
-            self.__write_module_guts(moddict, fileobj)
-            fileobj.write('}\n')
-
-    def __write_es_sources(self, fileobj):
-        """Private method.
-        Return None
-        Write all ESSources to the file-like object
-        fileobj."""
-        for name in self.esSourceNames():
-            es_source_dict = self.esSource(name)
-            fileobj.write("es_source %s = %s\n{\n" % (es_source_dict['@label'][2], es_source_dict['@classname'][2]))
-            self.__write_module_guts(es_source_dict, fileobj)
-            fileobj.write('}\n')
-
-    def __write_es_modules(self, fileobj):
-        """Private method.
-        Return None
-        Write all ESModules to the file-like object
-        fileobj."""
-        for name in self.esModuleNames():
-            es_mod_dict = self.esModule(name)
-            fileobj.write("es_module %s = %s\n{\n" % (es_mod_dict['@label'][2], es_mod_dict['@classname'][2]))
-            self.__write_module_guts(es_mod_dict, fileobj)
-            fileobj.write('}\n')
-
-    def __write_es_prefers(self, fileobj):
-        """Private method.
-        Return None
-        Write all es_prefer statements to the file-like object
-        fileobj."""
-        for name in self.esPreferNames():
-            es_mod_dict = self.esPrefer(name)
-            fileobj.write("es_prefer %s = %s\n{\n" % (es_mod_dict['@label'][2], es_mod_dict['@classname'][2]))
-            self.__write_module_guts(es_mod_dict, fileobj)
-            fileobj.write('}\n')
-
-    def __write_services(self, fileobj):
-        """Private method.
-        Return None
-        Write all Services to the file-like object
-        fileobj."""
-        for name in self.serviceNames():
-            es_mod_dict = self.service(name)
-            fileobj.write("service = %s\n{\n" % (es_mod_dict['@classname'][2]))
-            self.__write_module_guts(es_mod_dict, fileobj)
-            fileobj.write('}\n')
-
-    def __write_sequences(self, fileobj):
-        """Private method.
-        Return None
-        Write all the sequences to the file-like object fileobj."""
-        for name in self.sequenceNames():
-            fileobj.write("sequence %s = {%s}\n"  % (name, self.sequence(name)))
-
-
-    def __write_paths(self, fileobj):
-        """Private method.
-        Return None
-        Write all the paths to the file-like object fileobj."""
-        for name in self.pathNames():
-            fileobj.write("path %s = {%s}\n" % (name, self.path(name)))
-
-
-    def __write_endpaths(self, fileobj):
-        """Private method.
-        Return None
-        Write all the endpaths to the file-like object
-        fileobj."""
-        for name in self.endpathNames():
-            fileobj.write("endpath %s = {%s}\n" % (name, self.endpath(name)))
-
-    def __write_schedule(self, fileobj):
-        fileobj.write("schedule = {%s}\n" % self.schedule())
-
-    def __write_main_source(self, fileobj):
-        """Private method.
-        Return None
-        Write the (main) source block to the file-like object
-        fileobj."""
-        mis = self.mainInputSource()  # this is a dictionary
-        if mis:
-            fileobj.write('source = %s\n{\n' % mis['@classname'][2])
-            self.__write_module_guts(mis, fileobj)
-            fileobj.write('}\n')
-
-    def __write_looper(self, fileobj):
-        """Private method.
-        Return None
-        Write the looper block to the file-like object
-        fileobj."""
-        mis = self.looper()  # this is a dictionary
-        if mis:
-            fileobj.write('looper = %s\n{\n' % mis['@classname'][2])
-            self.__write_module_guts(mis, fileobj)
-            fileobj.write('}\n')
-
-
-    def __write_module_guts(self, moddict, fileobj):
-        """Private method.
-        Return None
-        Print the body of the block for this 'module'. This includes
-        all the dictionary contents except for the classname (because
-        the classname does not appear within the block).
-
-        NOTE: This should probably be a static method, because it doesn't
-        use any member data of the object, but I'm not sure we can
-        rely on a new-enough version of Python to make use of static
-        methods."""
-        for name, value in moddict.items():
-            if name[0] != '@':
-                fileobj.write('%s' % printable_parameter(name, value))
-                fileobj.write('\n')
-
-
-
-if __name__ == "__main__":
-    from sys import argv
-    filename = "complete.pycfg"
-    if len(argv) > 1:
-        filename = argv[1]
-
-    txt = file(filename).read()
-    cfg = cmsconfig(txt)
-    print(cfg.asConfigurationString())
-
-
diff --git a/FWCore/ParameterSet/test/complete.py b/FWCore/ParameterSet/test/complete.py
deleted file mode 100644
index 0b54a6d79b39e..0000000000000
--- a/FWCore/ParameterSet/test/complete.py
+++ /dev/null
@@ -1,157 +0,0 @@
-#------------------------------------------------------------
-#
-# This is an annotated example of a configuration file.
-# It is intended to illustrate the mapping between the configuration
-# language and the Python representation of the configuration
-# description that is used by the Data Management tools.
-#
-#
-#------------------------------------------------------------
-
-
-# The configuration grammar accepts documents which have the general
-# form of a nested collection of 'blocks' of various kinds. These
-# blocks are delimted by braces: '{' and '}'.
-
-# Newlines are meaningless in the configuration langauge.
-
-# Comments (obviously!) are introduced by a sharp ('#'), and continue
-# to the end of line.
-
-# C++-style comments (beginning with a cms.double(d forward slash: '//')
-# are also accepted.
-
-# Each configuration must have exactly one process block.
-
-# Eventually, the software may restrict the process name to being one
-# of a recognized set (such as HLT, PROD, TEST, USER). This is not yet
-# implemented.
-import FWCore.ParameterSet.Config as cms
-
-process = cms.Process("PROCESSNAME")
-
-process.source = cms.Source("PoolSource",
-    fileNames = cms.untracked.vstring("file:no_real_file_here"),
-    debugFlag = cms.untracked.bool(False),
-    maxEvents = cms.untracked.int32(-1),
-    debugVebosity = cms.untracked.uint32(10)
-  )
-
-process.a = cms.EDProducer("AProducer",
-    a = cms.int32(32),
-    h1 = cms.uint32(0xCFDFEFFF),
-    b = cms.vdouble(1.1, 2.2),
-    c = cms.vstring(),
-    d = cms.vstring('boo', "yah" ),
-    nothing =cms.string(""),
-    moreNothing = cms.string(''),
-    absolutelyNothing = cms.string('\0'),
-    justATick = cms.string('\'')
-  )
-
-process.b = cms.EDProducer("BProducer",
-   a = cms.untracked.int32(14),
-   b= cms.string("sillyness ensues"),
-   c = cms.PSet
-   (
-     a = cms.string('nested'),
-     b = cms.string("more")
-   ),
-   d = cms.VPSet(cms.PSet(i=cms.int32(10101),
-                  b = cms.bool(False) ), cms.PSet() ),
-   e = cms.VPSet(),
-   f = cms.VPSet(cms.PSet(inner = cms.VPSet()), cms.PSet() ),
-   tag = cms.InputTag("y","z"),
-   tags = cms.VInputTag(cms.InputTag("a","b"), cms.InputTag("c"), cms.InputTag("d","e"))
-  )
-
-
-process.c = cms.EDProducer("CProducer")
-
-process.y = cms.EDProducer("PoolOutputModule",
-  fileName = cms.untracked.string("file:myfile_y.root"),
-  maxEvents = cms.untracked.int32(2112)
- )
-
-
-process.z = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string("file:myfile_z.root"),
-    maxEvents = cms.untracked.int32(91624)
-  )
-
-process.vp = cms.EDProducer("VPProducer",
-    c = cms.PSet(
-      d = cms.VPSet(
-          cms.PSet(
-            a = cms.int32(32),
-            d = cms.PSet(
-              e = cms.VPSet()
-            )
-          ),
-          cms.PSet(b=cms.int32(12))
-      )
-    )
-  )
-
-process.s1 = cms.Sequence(process.a+process.b)
-process.s2 = cms.Sequence(process.b)
-process.s3 = cms.Sequence(process.a)
-  # It is not an error for two sequences (here, s3 and s4) to be identical.
-process.s4 = cms.Sequence(process.a)
-
-process.p1 = cms.Path((process.a+process.b)* process.c )
-process.p2 = cms.Path(process.s1+ (process.s3*process.s2) )
-  
-process.ep1 = cms.EndPath(process.y*process.z)
-
-process.schedule = cms.Schedule(process.p1, process.p2, process.ep1)
-
-process.ess1 = cms.ESSource("ESSType1",
-    b=cms.int32(2)
-  )
-
-ESSType1 = cms.ESSource("ESSType1",
-    b=cms.int32(0)
-  )
-process.add_(ESSType1)
-
-ESSType2 = cms.ESSource("ESSType2",
-   x = cms.double(1.5)
-  )
-process.add_(ESSType2)
-
-process.esm1 = cms.ESProducer("ESMType1",
-    s= cms.string("hi")
-  )
-
-ESMType2 = cms.ESProducer("ESMType2", 
-    a=cms.int32(3)
-  )
-process.add_(ESMType2)
-
-s1 = cms.Service("ServiceType1", 
-  b=cms.double(2)
-)
-
-s2 = cms.Service("ServiceType2", 
-  x=cms.double(1.5)
-)
-
-process.add_(s1)
-process.add_(s2)
-
-process.looper = cms.Looper("ALooper",
-  nLoops = cms.uint32(10)
-)
-
-process.mix = cms.EDProducer("MixingModule",
-    input = cms.SecSource("EmbeddedRootSource",
-      fileNames = cms.untracked.vstring("file:pileup.root")
-    ),
-    mixtype = cms.string("fixed"),
-    average_number = cms.double(14.3),
-    min_bunch = cms.int32(-5),
-    max_bunch = cms.int32(3)
-  )
-
-
diff --git a/FWCore/PythonParameterSet/test/makepset_t.cppunit.cc b/FWCore/PythonParameterSet/test/makepset_t.cppunit.cc
index c51dacdef4e43..7fa970f4c6137 100644
--- a/FWCore/PythonParameterSet/test/makepset_t.cppunit.cc
+++ b/FWCore/PythonParameterSet/test/makepset_t.cppunit.cc
@@ -72,14 +72,14 @@ void testmakepset::secsourceAux() {
       "process.maxEvents = cms.untracked.PSet(\n"
       "    input = cms.untracked.int32(2)\n"
       ")\n"
-      "process.source = cms.Source('PoolSource',\n"
+      "process.source = cms.Source('FileBasedSource',\n"
       "    fileNames = cms.untracked.vstring('file:main.root')\n"
       ")\n"
-      "process.out = cms.OutputModule('PoolOutputModule',\n"
+      "process.out = cms.OutputModule('FileBasedOutputModule',\n"
       "    fileName = cms.string('file:CumHits.root')\n"
       ")\n"
       "process.mix = cms.EDFilter('MixingModule',\n"
-      "    input = cms.SecSource('EmbeddedRootSource',\n"
+      "    input = cms.SecSource('EmbeddedFileBasedSource',\n"
       "        fileNames = cms.untracked.vstring('file:pileup.root')\n"
       "    ),\n"
       "    max_bunch = cms.int32(3),\n"
@@ -101,7 +101,7 @@ void testmakepset::secsourceAux() {
   // Make sure this ParameterSet object has the right contents
   edm::ParameterSet const& mixingModuleParams = ps->getParameterSet("mix");
   edm::ParameterSet const& secondarySourceParams = mixingModuleParams.getParameterSet("input");
-  CPPUNIT_ASSERT(secondarySourceParams.getParameter<std::string>("@module_type") == "EmbeddedRootSource");
+  CPPUNIT_ASSERT(secondarySourceParams.getParameter<std::string>("@module_type") == "EmbeddedFileBasedSource");
   CPPUNIT_ASSERT(secondarySourceParams.getParameter<std::string>("@module_label") == "input");
   CPPUNIT_ASSERT(secondarySourceParams.getUntrackedParameter<std::vector<std::string> >("fileNames")[0] ==
                  "file:pileup.root");
@@ -127,7 +127,7 @@ void testmakepset::usingBlockAux() {
       "process.maxEvents = cms.untracked.PSet(\n"
       "    input = cms.untracked.int32(2)\n"
       ")\n"
-      "process.source = cms.Source('PoolSource',\n"
+      "process.source = cms.Source('FileBasedSource',\n"
       "    fileNames = cms.untracked.vstring('file:main.root')\n"
       ")\n"
       "process.b = cms.PSet(\n"
diff --git a/FWCore/Integration/test/AssociationMapReadTest_cfg.py b/IOPool/Tests/test/AssociationMapReadTest_cfg.py
similarity index 100%
rename from FWCore/Integration/test/AssociationMapReadTest_cfg.py
rename to IOPool/Tests/test/AssociationMapReadTest_cfg.py
diff --git a/IOPool/Tests/test/AssociationMapTest_cfg.py b/IOPool/Tests/test/AssociationMapTest_cfg.py
new file mode 100644
index 0000000000000..010847ac68d3c
--- /dev/null
+++ b/IOPool/Tests/test/AssociationMapTest_cfg.py
@@ -0,0 +1,54 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("PROD")
+
+process.load("FWCore.MessageLogger.MessageLogger_cfi")
+
+process.MessageLogger.cerr.enableStatistics = False
+
+
+process.load("FWCore.Framework.test.cmsExceptionsFatal_cff")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(3)
+)
+
+process.source = cms.Source("EmptySource")
+
+process.intvec1 = cms.EDProducer("IntVectorProducer",
+    count = cms.int32(9),
+    ivalue = cms.int32(11),
+    delta = cms.int32(1)
+)
+
+process.intvec2 = cms.EDProducer("IntVectorProducer",
+    count = cms.int32(9),
+    ivalue = cms.int32(21),
+    delta = cms.int32(1)
+)
+
+process.associationMapProducer = cms.EDProducer("AssociationMapProducer",
+    inputTag1 = cms.InputTag("intvec1"),
+    inputTag2 = cms.InputTag("intvec2")
+)
+
+process.test = cms.EDAnalyzer("AssociationMapAnalyzer",
+    inputTag1 = cms.InputTag("intvec1"),
+    inputTag2 = cms.InputTag("intvec2"),
+    associationMapTag1 = cms.InputTag("associationMapProducer"),
+    associationMapTag2 = cms.InputTag("associationMapProducer", "twoArg"),
+    associationMapTag3 = cms.InputTag("associationMapProducer"),
+    associationMapTag4 = cms.InputTag("associationMapProducer", "handleArg"),
+    associationMapTag5 = cms.InputTag("associationMapProducer"),
+    associationMapTag6 = cms.InputTag("associationMapProducer"),
+    associationMapTag7 = cms.InputTag("associationMapProducer"),
+    associationMapTag8 = cms.InputTag("associationMapProducer", "twoArg")
+)
+
+process.out = cms.OutputModule("PoolOutputModule",
+    fileName = cms.untracked.string('AssociationMapTest.root')
+)
+
+process.p = cms.Path(process.intvec1 * process.intvec2 * process.associationMapProducer * process.test)
+
+process.e = cms.EndPath(process.out)
diff --git a/IOPool/Tests/test/BuildFile.xml b/IOPool/Tests/test/BuildFile.xml
new file mode 100644
index 0000000000000..84acfd3cb7d39
--- /dev/null
+++ b/IOPool/Tests/test/BuildFile.xml
@@ -0,0 +1,120 @@
+<test name="IOPoolTestsMaxEventsOutput" command="run_testMaxEventsOutput.sh"/>
+<test name="TestIOPoolRunMerge" command="run_RunMerge.sh"/>
+<test name="TestIOPoolRunMerge2" command="run_RunMerge2.sh"/>
+<test name="TestIOPoolConcurrentIOVsAndRuns" command="concurrentIOVsAndRuns.sh"/>
+<test name="TestIOPool_TestEDAlias" command="run_TestEDAlias.sh"/>
+
+<test name="TestIOPoolEventHistory" command="eventHistoryTest.sh"/>
+
+<test name="TestIOPoolDropOnInput" command="run_TestDropOnInput.sh"/>
+<test name="TestIOPoolThinningTests" command="run_ThinningTests.sh"/>
+
+<test name="TestIOPoolSeriesOfProcesses" command="run_SeriesOfProcesses.sh"/>
+
+<test name="TestIOPoolGetBy" command="run_TestGetBy.sh"/>
+<test name="TestIOPoolGetByLabel" command="run_TestGetByLabel.sh"/>
+
+<test name="TestIOPoolProcessBlock1" command="run_TestProcessBlock.sh 1"/>
+<test name="TestIOPoolProcessBlock2" command="run_TestProcessBlock.sh 2"/>
+<test name="TestIOPoolProcessBlock3" command="run_TestProcessBlock.sh 3"/>
+<test name="TestIOPoolProcessBlock4" command="run_TestProcessBlock.sh 4"/>
+<test name="TestIOPoolProcessBlock5" command="run_TestProcessBlock.sh 5">
+  <flags PRE_TEST="TestIOPoolProcessBlock1"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock2"/>
+</test>
+<test name="TestIOPoolProcessBlock6" command="run_TestProcessBlock.sh 6">
+  <flags PRE_TEST="TestIOPoolProcessBlock5"/>
+</test>
+<test name="TestIOPoolProcessBlock7" command="run_TestProcessBlock.sh 7"/>
+<test name="TestIOPoolProcessBlock8" command="run_TestProcessBlock.sh 8">
+  <flags PRE_TEST="TestIOPoolProcessBlock1"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock7"/>
+</test>
+<test name="TestIOPoolProcessBlock9" command="run_TestProcessBlock.sh 9">
+  <flags PRE_TEST="TestIOPoolProcessBlock3"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock4"/>
+</test>
+<test name="TestIOPoolProcessBlock10" command="run_TestProcessBlock.sh 10">
+  <flags PRE_TEST="TestIOPoolProcessBlock5"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock9"/>
+</test>
+<test name="TestIOPoolProcessBlock11" command="run_TestProcessBlock.sh 11">
+  <flags PRE_TEST="TestIOPoolProcessBlock5"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock9"/>
+</test>
+<test name="TestIOPoolProcessBlock12" command="run_TestProcessBlock.sh 12">
+  <flags PRE_TEST="TestIOPoolProcessBlock10"/>
+</test>
+<test name="TestIOPoolProcessBlock17" command="run_TestProcessBlock.sh 17">
+  <flags PRE_TEST="TestIOPoolProcessBlock10"/>
+</test>
+<test name="TestIOPoolProcessBlock18" command="run_TestProcessBlock.sh 18"/>
+<test name="TestIOPoolProcessBlock19" command="run_TestProcessBlock.sh 19">
+  <flags PRE_TEST="TestIOPoolProcessBlock10"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock18"/>
+</test>
+<test name="TestIOPoolProcessBlock20" command="run_TestProcessBlock.sh 20">
+  <flags PRE_TEST="TestIOPoolProcessBlock10"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock18"/>
+</test>
+<test name="TestIOPoolProcessBlock21" command="run_TestProcessBlock.sh 21">
+  <flags PRE_TEST="TestIOPoolProcessBlock5"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock9"/>
+</test>
+<test name="TestIOPoolProcessBlock22" command="run_TestProcessBlock.sh 22">
+  <flags PRE_TEST="TestIOPoolProcessBlock5"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock9"/>
+</test>
+<test name="TestIOPoolProcessBlock23" command="run_TestProcessBlock.sh 23">
+  <flags PRE_TEST="TestIOPoolProcessBlock10"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock18"/>
+</test>
+<test name="TestIOPoolProcessBlock24" command="run_TestProcessBlock.sh 24">
+  <flags PRE_TEST="TestIOPoolProcessBlock10"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock18"/>
+</test>
+<test name="TestIOPoolProcessBlock100" command="run_TestProcessBlock.sh 100">
+  <flags PRE_TEST="TestIOPoolProcessBlock6"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock8"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock11"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock12"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock15"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock16"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock17"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock19"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock20"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock21"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock22"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock23"/>
+  <flags PRE_TEST="TestIOPoolProcessBlock24"/>
+</test>
+
+<test name="TestIOPoolAssociationMapWrite" command="cmsRun ${LOCALTOP}/src/IOPool/Tests/test/AssociationMapTest_cfg.py"/>
+
+<test name="TestIOPoolAssociationMapTest" command="cmsRun ${LOCALTOP}/src/IOPool/Tests/test/AssociationMapReadTest_cfg.py">
+ <flags PRE_TEST="TestIOPoolAssociationMapWrite"/>
+</test>
+
+<test name="TestIOPoolInconsistentProducts" command="run_inconsistent_products.sh"/>
+
+<test name="TestIOPoolEmptyRootFileWrite" command="cmsRun ${LOCALTOP}/src/IOPool/Tests/test/makeEmptyRootFile.py"/>
+
+<test name="TestIOPoolEmptyRootFileRead" command="cmsRun ${LOCALTOP}/src/IOPool/Tests/test/useEmptyRootFile.py">
+ <flags PRE_TEST="TestIOPoolEmptyRootFileWrite"/>
+</test>
+
+<test name="TestIOPoolOutputSignals" command="run_TestOutput.sh"/>
+
+<test name="TestIOPoolRefMerge" command="run_RefMerge.sh"/>
+<test name="TestIOPoolRefAlias" command="run_RefAlias.sh"/>
+
+<test name="TestIOPoolFallback" command="run_TestFallback.sh"/>
+
+<test name="TestIOPoolExistingDictionary" command="run_TestExistingDictionary.sh"/>
+<test name="TestIOPoolMissingDictionary" command="Run_MissingDictionary.sh"/>
+
+<test name="TestIOPoolProvenance" command ="provenance_test.sh"/>
+<test name="TestMaybeUninitializedIntProduct" command="cmsRun ${LOCALTOP}/src/IOPool/Tests/test/testMaybeUninitializedIntProductPart1_cfg.py &amp;&amp; cmsRun ${LOCALTOP}/src/IOPool/Tests/test/testMaybeUninitializedIntProductPart2_cfg.py"/>
+<test name="TestParentageWithStreamerIO" command="run_ParentageWithStreamerIO.sh"/>
+
+<test name="TestIOPoolUnscheduledFailOnOutput" command="run_unscheduledFailOnOutput.sh"/>
diff --git a/FWCore/Integration/test/DetSetVectorThinningTest1_cfg.py b/IOPool/Tests/test/DetSetVectorThinningTest1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/DetSetVectorThinningTest1_cfg.py
rename to IOPool/Tests/test/DetSetVectorThinningTest1_cfg.py
diff --git a/FWCore/Integration/test/DetSetVectorThinningTest2_cfg.py b/IOPool/Tests/test/DetSetVectorThinningTest2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/DetSetVectorThinningTest2_cfg.py
rename to IOPool/Tests/test/DetSetVectorThinningTest2_cfg.py
diff --git a/FWCore/Integration/test/EventHistory_1_cfg.py b/IOPool/Tests/test/EventHistory_1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/EventHistory_1_cfg.py
rename to IOPool/Tests/test/EventHistory_1_cfg.py
diff --git a/FWCore/Integration/test/EventHistory_2_cfg.py b/IOPool/Tests/test/EventHistory_2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/EventHistory_2_cfg.py
rename to IOPool/Tests/test/EventHistory_2_cfg.py
diff --git a/FWCore/Integration/test/EventHistory_3_cfg.py b/IOPool/Tests/test/EventHistory_3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/EventHistory_3_cfg.py
rename to IOPool/Tests/test/EventHistory_3_cfg.py
diff --git a/FWCore/Integration/test/EventHistory_4_cfg.py b/IOPool/Tests/test/EventHistory_4_cfg.py
similarity index 100%
rename from FWCore/Integration/test/EventHistory_4_cfg.py
rename to IOPool/Tests/test/EventHistory_4_cfg.py
diff --git a/FWCore/Integration/test/EventHistory_5_cfg.py b/IOPool/Tests/test/EventHistory_5_cfg.py
similarity index 100%
rename from FWCore/Integration/test/EventHistory_5_cfg.py
rename to IOPool/Tests/test/EventHistory_5_cfg.py
diff --git a/FWCore/Integration/test/EventHistory_6_cfg.py b/IOPool/Tests/test/EventHistory_6_cfg.py
similarity index 100%
rename from FWCore/Integration/test/EventHistory_6_cfg.py
rename to IOPool/Tests/test/EventHistory_6_cfg.py
diff --git a/IOPool/Tests/test/Run_MissingDictionary.sh b/IOPool/Tests/test/Run_MissingDictionary.sh
new file mode 100755
index 0000000000000..16f749f9dcb6b
--- /dev/null
+++ b/IOPool/Tests/test/Run_MissingDictionary.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -x
+LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
+# Pass in name and status
+function die { echo $1: status $2 ;  exit $2; }
+
+# It is intentional that this test throws an exception. The test fails if it does not.
+cmsRun ${LOCAL_TEST_DIR}/testMissingDictionaryChecking_cfg.py &> testMissingDictionaryChecking.log && die 'Failed to get exception running testMissingDictionaryChecking_cfg.py' 1
+grep -q MissingDictionaryTestF testMissingDictionaryChecking.log || die 'Failed to print out exception message with missing dictionary listed' $?
+
+#grep -w ESProducer CatcheStdException.log
diff --git a/FWCore/Integration/test/SlimmingTest1_cfg.py b/IOPool/Tests/test/SlimmingTest1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest1_cfg.py
rename to IOPool/Tests/test/SlimmingTest1_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest2A_cfg.py b/IOPool/Tests/test/SlimmingTest2A_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest2A_cfg.py
rename to IOPool/Tests/test/SlimmingTest2A_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest2B_cfg.py b/IOPool/Tests/test/SlimmingTest2B_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest2B_cfg.py
rename to IOPool/Tests/test/SlimmingTest2B_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest2C_cfg.py b/IOPool/Tests/test/SlimmingTest2C_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest2C_cfg.py
rename to IOPool/Tests/test/SlimmingTest2C_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest2D_cfg.py b/IOPool/Tests/test/SlimmingTest2D_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest2D_cfg.py
rename to IOPool/Tests/test/SlimmingTest2D_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest2E_cfg.py b/IOPool/Tests/test/SlimmingTest2E_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest2E_cfg.py
rename to IOPool/Tests/test/SlimmingTest2E_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest2F_cfg.py b/IOPool/Tests/test/SlimmingTest2F_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest2F_cfg.py
rename to IOPool/Tests/test/SlimmingTest2F_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest2G_cfg.py b/IOPool/Tests/test/SlimmingTest2G_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest2G_cfg.py
rename to IOPool/Tests/test/SlimmingTest2G_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest2H_cfg.py b/IOPool/Tests/test/SlimmingTest2H_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest2H_cfg.py
rename to IOPool/Tests/test/SlimmingTest2H_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest2I_cfg.py b/IOPool/Tests/test/SlimmingTest2I_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest2I_cfg.py
rename to IOPool/Tests/test/SlimmingTest2I_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest3B_cfg.py b/IOPool/Tests/test/SlimmingTest3B_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest3B_cfg.py
rename to IOPool/Tests/test/SlimmingTest3B_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest3C_cfg.py b/IOPool/Tests/test/SlimmingTest3C_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest3C_cfg.py
rename to IOPool/Tests/test/SlimmingTest3C_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest3D_cfg.py b/IOPool/Tests/test/SlimmingTest3D_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest3D_cfg.py
rename to IOPool/Tests/test/SlimmingTest3D_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest3E_cfg.py b/IOPool/Tests/test/SlimmingTest3E_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest3E_cfg.py
rename to IOPool/Tests/test/SlimmingTest3E_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest3F_cfg.py b/IOPool/Tests/test/SlimmingTest3F_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest3F_cfg.py
rename to IOPool/Tests/test/SlimmingTest3F_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest3I_cfg.py b/IOPool/Tests/test/SlimmingTest3I_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest3I_cfg.py
rename to IOPool/Tests/test/SlimmingTest3I_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest4B_cfg.py b/IOPool/Tests/test/SlimmingTest4B_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest4B_cfg.py
rename to IOPool/Tests/test/SlimmingTest4B_cfg.py
diff --git a/FWCore/Integration/test/SlimmingTest4F_cfg.py b/IOPool/Tests/test/SlimmingTest4F_cfg.py
similarity index 100%
rename from FWCore/Integration/test/SlimmingTest4F_cfg.py
rename to IOPool/Tests/test/SlimmingTest4F_cfg.py
diff --git a/FWCore/Integration/test/ThinningTest1_cfg.py b/IOPool/Tests/test/ThinningTest1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ThinningTest1_cfg.py
rename to IOPool/Tests/test/ThinningTest1_cfg.py
diff --git a/FWCore/Integration/test/ThinningTest2_cfg.py b/IOPool/Tests/test/ThinningTest2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ThinningTest2_cfg.py
rename to IOPool/Tests/test/ThinningTest2_cfg.py
diff --git a/FWCore/Integration/test/ThinningTest3_cfg.py b/IOPool/Tests/test/ThinningTest3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ThinningTest3_cfg.py
rename to IOPool/Tests/test/ThinningTest3_cfg.py
diff --git a/FWCore/Integration/test/ThinningTest4Slimming_cfg.py b/IOPool/Tests/test/ThinningTest4Slimming_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ThinningTest4Slimming_cfg.py
rename to IOPool/Tests/test/ThinningTest4Slimming_cfg.py
diff --git a/FWCore/Integration/test/ThinningTest4_cfg.py b/IOPool/Tests/test/ThinningTest4_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ThinningTest4_cfg.py
rename to IOPool/Tests/test/ThinningTest4_cfg.py
diff --git a/FWCore/Integration/test/ThinningTestStreamerIn_cfg.py b/IOPool/Tests/test/ThinningTestStreamerIn_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ThinningTestStreamerIn_cfg.py
rename to IOPool/Tests/test/ThinningTestStreamerIn_cfg.py
diff --git a/FWCore/Integration/test/ThinningTest_dropOnInput_cfg.py b/IOPool/Tests/test/ThinningTest_dropOnInput_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ThinningTest_dropOnInput_cfg.py
rename to IOPool/Tests/test/ThinningTest_dropOnInput_cfg.py
diff --git a/IOPool/Tests/test/concurrentIOVsAndRuns.sh b/IOPool/Tests/test/concurrentIOVsAndRuns.sh
new file mode 100755
index 0000000000000..fed3716625b99
--- /dev/null
+++ b/IOPool/Tests/test/concurrentIOVsAndRuns.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+function die { echo $1: status $2 ;  exit $2; }
+function diecat { echo "$1: status $2, log" ;  cat $3; exit $2; }
+
+LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
+
+echo testConcurrentIOVsAndRuns_cfg.py
+cmsRun ${LOCAL_TEST_DIR}/testConcurrentIOVsAndRuns_cfg.py || die 'Failed in testConcurrentIOVsAndRuns_cfg.py' $?
+
+echo testConcurrentIOVsAndRunsRead_cfg.py
+cmsRun ${LOCAL_TEST_DIR}/testConcurrentIOVsAndRunsRead_cfg.py || die 'Failed in testConcurrentIOVsAndRunsRead_cfg.py' $?
+
diff --git a/FWCore/Integration/test/eventHistoryTest.sh b/IOPool/Tests/test/eventHistoryTest.sh
similarity index 100%
rename from FWCore/Integration/test/eventHistoryTest.sh
rename to IOPool/Tests/test/eventHistoryTest.sh
diff --git a/FWCore/Integration/test/inconsistent_products_prod_cfg.py b/IOPool/Tests/test/inconsistent_products_prod_cfg.py
similarity index 100%
rename from FWCore/Integration/test/inconsistent_products_prod_cfg.py
rename to IOPool/Tests/test/inconsistent_products_prod_cfg.py
diff --git a/FWCore/Integration/test/inconsistent_products_test_cfg.py b/IOPool/Tests/test/inconsistent_products_test_cfg.py
similarity index 100%
rename from FWCore/Integration/test/inconsistent_products_test_cfg.py
rename to IOPool/Tests/test/inconsistent_products_test_cfg.py
diff --git a/FWCore/Integration/test/makeEmptyRootFile.py b/IOPool/Tests/test/makeEmptyRootFile.py
similarity index 100%
rename from FWCore/Integration/test/makeEmptyRootFile.py
rename to IOPool/Tests/test/makeEmptyRootFile.py
diff --git a/FWCore/Integration/test/provenance_check_cfg.py b/IOPool/Tests/test/provenance_check_cfg.py
similarity index 100%
rename from FWCore/Integration/test/provenance_check_cfg.py
rename to IOPool/Tests/test/provenance_check_cfg.py
diff --git a/FWCore/Integration/test/provenance_prod_cfg.py b/IOPool/Tests/test/provenance_prod_cfg.py
similarity index 100%
rename from FWCore/Integration/test/provenance_prod_cfg.py
rename to IOPool/Tests/test/provenance_prod_cfg.py
diff --git a/FWCore/Integration/test/provenance_test.sh b/IOPool/Tests/test/provenance_test.sh
similarity index 100%
rename from FWCore/Integration/test/provenance_test.sh
rename to IOPool/Tests/test/provenance_test.sh
diff --git a/FWCore/Integration/test/ref_alias_compare_drop_alias_cfg.py b/IOPool/Tests/test/ref_alias_compare_drop_alias_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ref_alias_compare_drop_alias_cfg.py
rename to IOPool/Tests/test/ref_alias_compare_drop_alias_cfg.py
diff --git a/FWCore/Integration/test/ref_alias_compare_drop_original_cfg.py b/IOPool/Tests/test/ref_alias_compare_drop_original_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ref_alias_compare_drop_original_cfg.py
rename to IOPool/Tests/test/ref_alias_compare_drop_original_cfg.py
diff --git a/FWCore/Integration/test/ref_alias_compare_read_alias_cfg.py b/IOPool/Tests/test/ref_alias_compare_read_alias_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ref_alias_compare_read_alias_cfg.py
rename to IOPool/Tests/test/ref_alias_compare_read_alias_cfg.py
diff --git a/FWCore/Integration/test/ref_alias_compare_read_original_cfg.py b/IOPool/Tests/test/ref_alias_compare_read_original_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ref_alias_compare_read_original_cfg.py
rename to IOPool/Tests/test/ref_alias_compare_read_original_cfg.py
diff --git a/FWCore/Integration/test/ref_merge_cfg.py b/IOPool/Tests/test/ref_merge_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ref_merge_cfg.py
rename to IOPool/Tests/test/ref_merge_cfg.py
diff --git a/FWCore/Integration/test/ref_merge_prod_cfg.py b/IOPool/Tests/test/ref_merge_prod_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ref_merge_prod_cfg.py
rename to IOPool/Tests/test/ref_merge_prod_cfg.py
diff --git a/FWCore/Integration/test/ref_merge_test_cfg.py b/IOPool/Tests/test/ref_merge_test_cfg.py
similarity index 100%
rename from FWCore/Integration/test/ref_merge_test_cfg.py
rename to IOPool/Tests/test/ref_merge_test_cfg.py
diff --git a/FWCore/Integration/test/run_ParentageWithStreamerIO.sh b/IOPool/Tests/test/run_ParentageWithStreamerIO.sh
similarity index 100%
rename from FWCore/Integration/test/run_ParentageWithStreamerIO.sh
rename to IOPool/Tests/test/run_ParentageWithStreamerIO.sh
diff --git a/FWCore/Integration/test/run_RefAlias.sh b/IOPool/Tests/test/run_RefAlias.sh
similarity index 100%
rename from FWCore/Integration/test/run_RefAlias.sh
rename to IOPool/Tests/test/run_RefAlias.sh
diff --git a/FWCore/Integration/test/run_RefMerge.sh b/IOPool/Tests/test/run_RefMerge.sh
similarity index 100%
rename from FWCore/Integration/test/run_RefMerge.sh
rename to IOPool/Tests/test/run_RefMerge.sh
diff --git a/FWCore/Integration/test/run_RunMerge.sh b/IOPool/Tests/test/run_RunMerge.sh
similarity index 100%
rename from FWCore/Integration/test/run_RunMerge.sh
rename to IOPool/Tests/test/run_RunMerge.sh
diff --git a/FWCore/Integration/test/run_RunMerge2.sh b/IOPool/Tests/test/run_RunMerge2.sh
similarity index 100%
rename from FWCore/Integration/test/run_RunMerge2.sh
rename to IOPool/Tests/test/run_RunMerge2.sh
diff --git a/FWCore/Integration/test/run_SeriesOfProcesses.sh b/IOPool/Tests/test/run_SeriesOfProcesses.sh
similarity index 100%
rename from FWCore/Integration/test/run_SeriesOfProcesses.sh
rename to IOPool/Tests/test/run_SeriesOfProcesses.sh
diff --git a/FWCore/Integration/test/run_TestDropOnInput.sh b/IOPool/Tests/test/run_TestDropOnInput.sh
similarity index 100%
rename from FWCore/Integration/test/run_TestDropOnInput.sh
rename to IOPool/Tests/test/run_TestDropOnInput.sh
diff --git a/IOPool/Tests/test/run_TestEDAlias.sh b/IOPool/Tests/test/run_TestEDAlias.sh
new file mode 100755
index 0000000000000..032d1e127d4e6
--- /dev/null
+++ b/IOPool/Tests/test/run_TestEDAlias.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+test=testEDAlias
+
+function die { echo Failure $1: status $2 ; exit $2 ; }
+
+LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
+
+  echo "*************************************************"
+  echo "EDAlias consumer in a Task"
+  cmsRun ${LOCAL_TEST_DIR}/${test}Task_cfg.py || die "cmsRun ${test}Task_cfg.py 1" $?
+
+  echo "*************************************************"
+  echo "Test output"
+  cmsRun ${LOCAL_TEST_DIR}/${test}Analyze_cfg.py testEDAliasTask.root || die "cmsRun ${test}Analyze_cfg.py testEDAliasTask.root" $?
+
+exit 0
diff --git a/FWCore/Integration/test/run_TestExistingDictionary.sh b/IOPool/Tests/test/run_TestExistingDictionary.sh
similarity index 100%
rename from FWCore/Integration/test/run_TestExistingDictionary.sh
rename to IOPool/Tests/test/run_TestExistingDictionary.sh
diff --git a/FWCore/Integration/test/run_TestFallback.sh b/IOPool/Tests/test/run_TestFallback.sh
similarity index 100%
rename from FWCore/Integration/test/run_TestFallback.sh
rename to IOPool/Tests/test/run_TestFallback.sh
diff --git a/FWCore/Integration/test/run_TestGetBy.sh b/IOPool/Tests/test/run_TestGetBy.sh
similarity index 68%
rename from FWCore/Integration/test/run_TestGetBy.sh
rename to IOPool/Tests/test/run_TestGetBy.sh
index e3290f3e33b81..c3db4e7f4091e 100755
--- a/FWCore/Integration/test/run_TestGetBy.sh
+++ b/IOPool/Tests/test/run_TestGetBy.sh
@@ -18,13 +18,6 @@ LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
   echo "testGetBy3"
   cmsRun ${LOCAL_TEST_DIR}/${test}3_cfg.py || die "cmsRun ${test}3_cfg.py" $?
 
-  echo "testConsumesInfo"
-  cmsRun ${LOCAL_TEST_DIR}/testConsumesInfo_cfg.py > testConsumesInfo.log 2>/dev/null || die "cmsRun testConsumesInfo_cfg.py" $?
-  grep -v '++\|LegacyModules\|time' testConsumesInfo.log > testConsumesInfo_1.log
-  rm testConsumesInfo.log
-  rm testConsumesInfo.root
-  diff ${LOCAL_TEST_DIR}/unit_test_outputs/testConsumesInfo_1.log testConsumesInfo_1.log || die "comparing testConsumesInfo_1.log" $?
-
   #It is intentional that this cmsRun process throws an exception
   echo "testDuplicateProcess"
   cmsRun ${LOCAL_TEST_DIR}/testDuplicateProcess_cfg.py &> testDuplicateProcess.log && die 'Failed to get exception running testDuplicateProcess_cfg.py' 1
@@ -36,12 +29,6 @@ LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
   echo "testGetByMerge"
   cmsRun ${LOCAL_TEST_DIR}/${test}Merge_cfg.py > testGetByMerge.log 2>/dev/null || die "cmsRun ${test}Merge_cfg.py" $?
 
-  echo "testGetByPlaceholder"
-  cmsRun ${LOCAL_TEST_DIR}/${test}Placeholder_cfg.py || die "cmsRun ${test}Placeholder_cfg.py" $?
-
-  echo "testProducesCollector"
-  cmsRun ${LOCAL_TEST_DIR}/testProducesCollector_cfg.py || die "cmsRun testProducesCollector_cfg.py" $?
-
   echo "testGetByRunsMode_cfg.py"
   cmsRun ${LOCAL_TEST_DIR}/testGetByRunsMode_cfg.py || die "cmsRun testGetByRunsMode_cfg.py" $?
 
@@ -51,7 +38,4 @@ LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
   echo "testGetByWithEmptyRun_cfg.py"
   cmsRun ${LOCAL_TEST_DIR}/testGetByWithEmptyRun_cfg.py || die "cmsRun testGetByWithEmptyRun_cfg.py" $?
 
-  echo "testGetterOfProductsWithOutputModule_cfg.py"
-  cmsRun ${LOCAL_TEST_DIR}/testGetterOfProductsWithOutputModule_cfg.py || die "cmsRun testGetterOfProductsWithOutputModule_cfg.py" $?
-
 exit 0
diff --git a/FWCore/Integration/test/run_TestGetByLabel.sh b/IOPool/Tests/test/run_TestGetByLabel.sh
similarity index 95%
rename from FWCore/Integration/test/run_TestGetByLabel.sh
rename to IOPool/Tests/test/run_TestGetByLabel.sh
index a5ff20c655e7d..e253d84769458 100755
--- a/FWCore/Integration/test/run_TestGetByLabel.sh
+++ b/IOPool/Tests/test/run_TestGetByLabel.sh
@@ -10,7 +10,7 @@ mkdir ${TEST_NAME}
 
 pushd ${TEST_NAME}
 
-TEST_PATH=${LOCALTOP}/src/FWCore/Integration/test
+TEST_PATH=${LOCALTOP}/src/IOPool/Tests/test
 
 cmsRun ${TEST_PATH}/testGetByLabelStep1_cfg.py || die "Failed cmsRun testGetByLabel_step1_cfg.py" $1
 
diff --git a/IOPool/Tests/test/run_TestOutput.sh b/IOPool/Tests/test/run_TestOutput.sh
new file mode 100755
index 0000000000000..ce1f47af9c212
--- /dev/null
+++ b/IOPool/Tests/test/run_TestOutput.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+test=testOutput
+
+function die { echo Failure $1: status $2 ; exit $2 ; }
+
+LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
+
+  echo "testOutput1"
+  cmsRun ${LOCAL_TEST_DIR}/${test}1_cfg.py 2> testOutput1.log || die "cmsRun ${test}1_cfg.py" $?
+
+  # Check that all the transitions that were supposed to occur
+  # in a global output module actually did occur
+  grep "global write event" testOutput1.log > /dev/null || die "grep failed to find 'global write event'" $?
+  grep "global writeLuminosityBlock" testOutput1.log > /dev/null || die "grep failed to find 'global writeLuminosityBlock'" $?
+  grep "global writeRun" testOutput1.log > /dev/null || die "grep failed to find 'global writeRun'" $?
+  grep "global writeProcessBlock" testOutput1.log > /dev/null || die "grep failed to find 'global writeProcessBlock'" $?
+  grep "global respondToOpenInputFile" testOutput1.log > /dev/null || die "grep failed to find 'global respondToOpenInputFile'" $?
+  grep "global respondToCloseInputFile" testOutput1.log > /dev/null || die "grep failed to find 'global respondToCloseInputFile'" $?
+  grep "global globalBeginRun" testOutput1.log > /dev/null || die "grep failed to find 'global globalBeginRun'" $?
+  grep "global globalEndRun" testOutput1.log > /dev/null || die "grep failed to find 'global globalEndRun'" $?
+  grep "global globalBeginLuminosityBlock" testOutput1.log > /dev/null || die "grep failed to find 'global globalBeginLuminosityBlock'" $?
+  grep "global globalEndLuminosityBlock" testOutput1.log > /dev/null || die "grep failed to find 'global globalEndLuminosityBlock'" $?
+
+  # Check the branch ID for the EDAliases was placed correctly in the BranchIDLists
+  grep "global branchID 3673681161" testOutput1.log > /dev/null || die "grep failed to find 'global branchID 3673681161'" $?
+
+  # Repeat checks for the limited module
+  grep "limited write event" testOutput1.log > /dev/null || die "grep failed to find 'limited write event'" $?
+  grep "limited writeLuminosityBlock" testOutput1.log > /dev/null || die "grep failed to find 'limited writeLuminosityBlock'" $?
+  grep "limited writeRun" testOutput1.log > /dev/null || die "grep failed to find 'limited writeRun'" $?
+  grep "limited writeProcessBlock" testOutput1.log > /dev/null || die "grep failed to find 'limited writeProcessBlock'" $?
+  grep "limited respondToOpenInputFile" testOutput1.log > /dev/null || die "grep failed to find 'limited respondToOpenInputFile'" $?
+  grep "limited respondToCloseInputFile" testOutput1.log > /dev/null || die "grep failed to find 'limited respondToCloseInputFile'" $?
+  grep "limited globalBeginRun" testOutput1.log > /dev/null || die "grep failed to find 'limited globalBeginRun'" $?
+  grep "limited globalEndRun" testOutput1.log > /dev/null || die "grep failed to find 'limited globalEndRun'" $?
+  grep "limited globalBeginLuminosityBlock" testOutput1.log > /dev/null || die "grep failed to find 'limited globalBeginLuminosityBlock'" $?
+  grep "limited globalEndLuminosityBlock" testOutput1.log > /dev/null || die "grep failed to find 'limited globalEndLuminosityBlock'" $?
+  grep "limited branchID 3673681161" testOutput1.log > /dev/null || die "grep failed to find 'limited branchID 3673681161'" $?
+
+  # Above we tested using EmptySource. Repeat reading a file using PoolSource
+  echo "testOutput2"
+  cmsRun ${LOCAL_TEST_DIR}/${test}2_cfg.py 2> testOutput2.log || die "cmsRun ${test}2_cfg.py" $?
+
+  grep "global write event" testOutput2.log > /dev/null || die "grep failed to find 'global write event'" $?
+  grep "global writeLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'global writeLuminosityBlock'" $?
+  grep "global writeRun" testOutput2.log > /dev/null || die "grep failed to find 'global writeRun'" $?
+  grep "global writeProcessBlock" testOutput2.log > /dev/null || die "grep failed to find 'global writeProcessBlock'" $?
+  grep "global respondToOpenInputFile" testOutput2.log > /dev/null || die "grep failed to find 'global respondToOpenInputFile'" $?
+  grep "global respondToCloseInputFile" testOutput2.log > /dev/null || die "grep failed to find 'global respondToCloseInputFile'" $?
+  grep "global globalBeginRun" testOutput2.log > /dev/null || die "grep failed to find 'global globalBeginRun'" $?
+  grep "global globalEndRun" testOutput2.log > /dev/null || die "grep failed to find 'global globalEndRun'" $?
+  grep "global globalBeginLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'global globalBeginLuminosityBlock'" $?
+  grep "global globalEndLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'global globalEndLuminosityBlock'" $?
+  grep "global branchID 4057644746" testOutput2.log > /dev/null || die "grep failed to find 'global branchID 4057644746'" $?
+
+  grep "limited write event" testOutput2.log > /dev/null || die "grep failed to find 'limited write event'" $?
+  grep "limited writeLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'limited writeLuminosityBlock'" $?
+  grep "limited writeRun" testOutput2.log > /dev/null || die "grep failed to find 'limited writeRun'" $?
+  grep "limited writeProcessBlock" testOutput2.log > /dev/null || die "grep failed to find 'limited writeProcessBlock'" $?
+  grep "limited respondToOpenInputFile" testOutput2.log > /dev/null || die "grep failed to find 'limited respondToOpenInputFile'" $?
+  grep "limited respondToCloseInputFile" testOutput2.log > /dev/null || die "grep failed to find 'limited respondToCloseInputFile'" $?
+  grep "limited globalBeginRun" testOutput2.log > /dev/null || die "grep failed to find 'limited globalBeginRun'" $?
+  grep "limited globalEndRun" testOutput2.log > /dev/null || die "grep failed to find 'limited globalEndRun'" $?
+  grep "limited globalBeginLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'limited globalBeginLuminosityBlock'" $?
+  grep "limited globalEndLuminosityBlock" testOutput2.log > /dev/null || die "grep failed to find 'limited globalEndLuminosityBlock'" $?
+  grep "limited branchID 4057644746" testOutput2.log > /dev/null || die "grep failed to find 'limited branchID 4057644746'" $?
+
+exit 0
diff --git a/IOPool/Tests/test/run_TestProcessBlock.sh b/IOPool/Tests/test/run_TestProcessBlock.sh
new file mode 100755
index 0000000000000..e2f856baa07ea
--- /dev/null
+++ b/IOPool/Tests/test/run_TestProcessBlock.sh
@@ -0,0 +1,292 @@
+#!/bin/bash
+set -x
+LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
+
+function die { echo Failure $1: status $2 ; exit $2 ; }
+
+# The tests executed by this bash script are all related and
+# it seemed clearest to include them all in the same file.
+# These tests are divided into distinct groups. Each time
+# the script runs, it will execute only one group of tests.
+# The script requires that its first command line argument
+# specifies the group to be run. The "if" conditional statements
+# below implement this. The BuildFile directs scram to run
+# this script once for each group when unit tests are run.
+# The BuildFile also specifies the dependencies between the
+# groups. In some cases, one group cannot run until another
+# group of tests has finished. The purpose of this is to
+# allow maximum concurrency while running the tests so the
+# tests can run faster.
+
+if [ $1 -eq 1 ]
+then
+  echo "testProcessBlock1"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlock1_cfg.py &> testProcessBlock1.log || die "cmsRun testProcessBlock1_cfg.py" $?
+
+  # The MetaData ProcessBlock branch and the TTree should exist to hold the ProcessBlock
+  # data. The Events branch should not exist because there were not any ProcessBlock branches
+  # saved from an input file. Test that here:
+  edmFileUtil -l -t MetaData -P file:testProcessBlock1.root > testProcessBlock1ContentsM.txt
+  grep "Branch.* ProcessBlockHelper " testProcessBlock1ContentsM.txt || die "Check for existence of ProcessBlockHelper branch" $?
+  grep "TTree.*ProcessBlocksPROD1" testProcessBlock1ContentsM.txt || die "Check for existence of ProcessBlocksPROD1 TTree" $?
+  edmFileUtil -t Events -P file:testProcessBlock1.root > testProcessBlock1ContentsE.txt
+  grep "Branch.* EventToProcessBlockIndexes " testProcessBlock1ContentsE.txt && die "Check for non-existence of eventToProcessBlockIndexes branch" 1
+fi
+
+if [ $1 -eq 2 ]
+then
+  echo "testProcessBlock2"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlock2_cfg.py &> testProcessBlock2.log || die "cmsRun testProcessBlock2_cfg.py" $?
+fi
+
+if [ $1 -eq 3 ]
+then
+  echo "testProcessBlock3"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlock3_cfg.py &> testProcessBlock3.log || die "cmsRun testProcessBlock3_cfg.py" $?
+fi
+
+if [ $1 -eq 4 ]
+then
+  echo "testProcessBlock4"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlock4_cfg.py &> testProcessBlock4.log || die "cmsRun testProcessBlock4_cfg.py" $?
+fi
+
+if [ $1 -eq 5 ]
+then
+  echo "testProcessBlockMerge"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockMerge_cfg.py &> testProcessBlockMerge.log || die "cmsRun testProcessBlockMerge_cfg.py" $?
+
+  # The ProcessBlock Branches and TTrees should exist in this case. Test that here:
+  edmFileUtil -l -t MetaData -P file:testProcessBlockMerge.root > testProcessBlockMContentsM.txt
+  grep "Branch.* ProcessBlockHelper " testProcessBlockMContentsM.txt || die "Check for existence of ProcessBlockHelper branch" $?
+  grep "TTree.*ProcessBlocksPROD1" testProcessBlockMContentsM.txt || die "Check for existence of ProcessBlocksPROD1 TTree" $?
+  grep "TTree.*ProcessBlocksMERGE" testProcessBlockMContentsM.txt || die "Check for existence of ProcessBlocksMERGE TTree" $?
+  edmFileUtil -t Events -P file:testProcessBlockMerge.root > testProcessBlockMContentsE.txt
+  grep "Branch.* EventToProcessBlockIndexes " testProcessBlockMContentsE.txt || die "Check for existence of eventToProcessBlockIndexes branch" $?
+fi
+
+if [ $1 -eq 6 ]
+then
+  echo "testProcessBlockTEST"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockTEST_cfg.py &> testProcessBlockTEST.log || die "cmsRun testProcessBlockTEST_cfg.py" $?
+
+  echo "testProcessBlockRead"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockRead_cfg.py &> testProcessBlockRead.log || die "cmsRun testProcessBlockRead_cfg.py" $?
+  grep "InputProcessBlockIntAnalyzer::accessInputProcessBlock" testProcessBlockRead.log || die "Check that InputProcessBlockIntAnalyzer::accessInputProcessBlock was called" $?
+  grep "InputProcessBlockIntFilter::accessInputProcessBlock" testProcessBlockRead.log || die "Check that InputProcessBlockIntFilter::accessInputProcessBlock was called" $?
+  grep "InputProcessBlockIntProducer::accessInputProcessBlock" testProcessBlockRead.log || die "Check that InputProcessBlockIntProducer::accessInputProcessBlock was called" $?
+fi
+
+if [ $1 -eq 7 ]
+then
+  echo "testProcessBlock2Dropped"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlock2Dropped_cfg.py &> testProcessBlock2Dropped.log || die "cmsRun testProcessBlock2Dropped_cfg.py" $?
+
+  # The ProcessBlock Branches and TTrees should not exist in this case because
+  # all the ProcessBlock products are dropped. Test that here:
+  edmFileUtil -l -t MetaData -P file:testProcessBlock2Dropped.root > testProcessBlock2DroppedContentsM.txt
+  grep "Branch.* ProcessBlockHelper " testProcessBlock2DroppedContentsM.txt && die "Check for non-existence of ProcessBlockHelper branch" 1
+  grep "TTree.*ProcessBlocksPROD1" testProcessBlock2DroppedContentsM.txt && die "Check for non-existence of ProcessBlocksPROD1 TTree" 1
+  edmFileUtil -t Events -P file:testProcessBlock2Dropped.root > testProcessBlock2DroppedContentsE.txt
+  grep "Branch.* EventToProcessBlockIndexes " testProcessBlock2DroppedContentsE.txt && die "Check for non-existence of eventToProcessBlockIndexes branch" 1
+fi
+
+if [ $1 -eq 8 ]
+then
+  # This one intentionally fails because the product content of the
+  # files does not match (strict merging requirements for ProcessBlocks)
+  echo "testProcessBlockFailMerge"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockFailMerge_cfg.py &> testProcessBlockFailMerge.log && die "cmsRun testProcessBlockFailMerge_cfg.py" 1
+fi
+
+if [ $1 -eq 9 ]
+then
+  echo "testProcessBlockMerge2"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockMerge2_cfg.py &> testProcessBlockMerge2.log || die "cmsRun testProcessBlockMerge2_cfg.py" $?
+fi
+
+if [ $1 -eq 10 ]
+then
+  echo "testProcessBlockMergeOfMergedFiles"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockMergeOfMergedFiles_cfg.py &> testProcessBlockMergeOfMergedFiles.log || die "cmsRun testProcessBlockMergeOfMergedFiles_cfg.py" $?
+fi
+
+if [ $1 -eq 11 ]
+then
+  echo "testProcessBlockNOMergeOfMergedFiles"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockNOMergeOfMergedFiles_cfg.py &> testProcessBlockNOMergeOfMergedFiles.log || die "cmsRun testProcessBlockNOMergeOfMergedFiles_cfg.py" $?
+fi
+
+if [ $1 -eq 12 ]
+then
+  echo "testProcessBlockRead2"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockRead2_cfg.py &> testProcessBlockRead2.log || die "cmsRun testProcessBlockRead2_cfg.py" $?
+fi
+
+if [ $1 -eq 17 ]
+then
+  echo "testProcessBlockLooper"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockLooper_cfg.py &> testProcessBlockLooper.log || die "cmsRun testProcessBlockLooper_cfg.py" $?
+fi
+
+if [ $1 -eq 18 ]
+then
+  echo "testProcessBlock5"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlock5_cfg.py &> testProcessBlock5.log || die "cmsRun testProcessBlock5_cfg.py" $?
+
+  echo "testProcessBlockDummy"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockDummy_cfg.py &> testProcessBlockDummy.log || die "cmsRun testProcessBlockDummy_cfg.py" $?
+
+  echo "testProcessBlockMerge3"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockMerge3_cfg.py &> testProcessBlockMerge3.log || die "cmsRun testProcessBlockMerge3_cfg.py" $?
+
+  echo "testProcessBlockMergeOfMergedFiles2"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockMergeOfMergedFiles2_cfg.py &> testProcessBlockMergeOfMergedFiles2.log || die "cmsRun testProcessBlockMergeOfMergedFiles2_cfg.py" $?
+fi
+
+if [ $1 -eq 19 ]
+then
+  echo "testProcessBlockDropOnInput"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockDropOnInput_cfg.py &> testProcessBlockDropOnInput.log || die "cmsRun testProcessBlockDropOnInput_cfg.py" $?
+fi
+
+if [ $1 -eq 20 ]
+then
+  echo "testProcessBlockThreeFileInput"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockThreeFileInput_cfg.py &> testProcessBlockThreeFileInput.log || die "cmsRun testProcessBlockThreeFileInput_cfg.py" $?
+
+  echo "testProcessBlockReadThreeFileInput"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockReadThreeFileInput_cfg.py &> testProcessBlockReadThreeFileInput.log || die "cmsRun testProcessBlockReadThreeFileInput_cfg.py" $?
+fi
+
+if [ $1 -eq 21 ]
+then
+  echo "testLooperEventNavigation2"
+  cmsRun ${LOCAL_TEST_DIR}/testLooperEventNavigation2_cfg.py < ${LOCAL_TEST_DIR}/testLooperEventNavigation2.txt &> testLooperEventNavigation2.log || die "cmsRun testLooperEventNavigation2_cfg.py" $?
+fi
+
+if [ $1 -eq 22 ]
+then
+  echo "testLooperEventNavigation3"
+  cmsRun ${LOCAL_TEST_DIR}/testLooperEventNavigation3_cfg.py < ${LOCAL_TEST_DIR}/testLooperEventNavigation3.txt &> testLooperEventNavigation3.log || die "cmsRun testLooperEventNavigation3_cfg.py" $?
+fi
+
+if [ $1 -eq 23 ]
+then
+  echo "testProcessBlockDropOnOutput"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockDropOnOutput_cfg.py &> testProcessBlockDropOnOutput.log || die "cmsRun testProcessBlockDropOnOutput_cfg.py" $?
+
+  echo "testProcessBlockReadDropOnOutput"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockReadDropOnOutput_cfg.py &> testProcessBlockReadDropOnOutput.log || die "cmsRun testProcessBlockReadDropOnOutput_cfg.py" $?
+fi
+
+if [ $1 -eq 24 ]
+then
+  echo "testProcessBlockDropOnOutput2"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockDropOnOutput2_cfg.py &> testProcessBlockDropOnOutput2.log || die "cmsRun testProcessBlockDropOnOutput2_cfg.py" $?
+
+  echo "testProcessBlockReadDropOnOutput2"
+  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockReadDropOnOutput2_cfg.py &> testProcessBlockReadDropOnOutput2.log || die "cmsRun testProcessBlockReadDropOnOutput2_cfg.py" $?
+fi
+
+# The next three tests would be relevant if we disabled the strict merging requirement
+# in ProductRegistry.cc for ProcessBlock products (a one line code change). As long
+# as we always enforce the strict merging requirement these tests will fail, but they
+# would be useful if we decide to allow that requirement to be disabled in the future.
+# I ran them manually with the ProductRegistry.cc modified  to disable the requirement
+# and in May 2021 these tests passed. In addition to uncommenting the tests here, they
+# would also need to be added in the BuildFile with the proper dependency (both 25
+# and 26 depend on 19 at the moment)
+
+#if [ $1 -eq 25 ]
+#then
+#  echo "testProcessBlockNonStrict"
+#  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockNonStrict_cfg.py &> testProcessBlockNonStrict.log || die "cmsRun testProcessBlockNonStrict_cfg.py" $?
+#
+#  echo "testProcessBlockNonStrict2"
+#  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockNonStrict2_cfg.py &> testProcessBlockNonStrict2.log || die "cmsRun testProcessBlockNonStrict2_cfg.py" $?
+#fi
+
+#if [ $1 -eq 26 ]
+#then
+#  echo "testProcessBlockNonStrict3"
+#  cmsRun ${LOCAL_TEST_DIR}/testProcessBlockNonStrict3_cfg.py &> testProcessBlockNonStrict3.log || die "cmsRun testProcessBlockNonStrict3_cfg.py" $?
+#fi
+
+if [ $1 -eq 100 ]
+then
+  rm testProcessBlock1ContentsM.txt
+  rm testProcessBlock1ContentsE.txt
+  rm testProcessBlockMContentsM.txt
+  rm testProcessBlockMContentsE.txt
+  rm testProcessBlock2DroppedContentsM.txt
+  rm testProcessBlock2DroppedContentsE.txt
+
+  rm testProcessBlock1.log
+  rm testProcessBlock2.log
+  rm testProcessBlock3.log
+  rm testProcessBlock4.log
+  rm testProcessBlockMerge.log
+  rm testProcessBlockTEST.log
+  rm testProcessBlockRead.log
+  rm testProcessBlock2Dropped.log
+  rm testProcessBlockFailMerge.log
+  rm testProcessBlockMerge2.log
+  rm testProcessBlockMergeOfMergedFiles.log
+  rm testProcessBlockNOMergeOfMergedFiles.log
+  rm testProcessBlockRead2.log
+  rm testProcessBlockLooper.log
+  rm testProcessBlock5.log
+  rm testProcessBlockDummy.log
+  rm testProcessBlockMerge3.log
+  rm testProcessBlockMergeOfMergedFiles2.log
+  rm testProcessBlockDropOnInput.log
+  rm testProcessBlockThreeFileInput.log
+  rm testProcessBlockReadThreeFileInput.log
+  rm testLooperEventNavigation2.log
+  rm testLooperEventNavigation3.log
+  rm testProcessBlockDropOnOutput.log
+  rm testProcessBlockReadDropOnOutput.log
+  rm testProcessBlockDropOnOutput2.log
+  rm testProcessBlockReadDropOnOutput2.log
+
+  rm testProcessBlock1.root
+  rm testProcessBlock2.root
+  rm testProcessBlock3.root
+  rm testProcessBlock4.root
+  rm testProcessBlockMerge.root
+  rm testProcessBlockTest.root
+  rm testProcessBlockRead.root
+  rm testProcessBlock2Dropped.root
+  rm testProcessBlockFailMerge.root
+  rm testProcessBlockMerge2.root
+  rm testProcessBlockMergeOfMergedFiles.root
+  rm testProcessBlockNOMergeOfMergedFiles.root
+  rm testProcessBlockRead2.root
+  rm testProcessBlockLooperTest.root
+  rm testProcessBlock5.root
+  rm testProcessBlockDummy.root
+  rm testProcessBlockMerge3.root
+  rm testProcessBlockMergeOfMergedFiles2.root
+  rm testProcessBlockDropOnInput.root
+  rm testProcessBlockThreeFileInput.root
+  rm testProcessBlockReadThreeFileInput.root
+  rm testProcessBlockDropOnOutput.root
+  rm testProcessBlockDropOnOutput2.root
+  rm testProcessBlockDropOnOutput2_2.root
+  rm testProcessBlockReadDropOnOutput.root
+  rm testProcessBlockReadDropOnOutput2.root
+  rm testProcessBlockNOMergeOfMergedFiles001.root
+  rm testProcessBlockLooperTest001.root
+  rm testProcessBlockLooperTest002.root
+
+  #rm testProcessBlockNonStrict.log
+  #rm testProcessBlockNonStrict2.log
+  #rm testProcessBlockNonStrict3.log
+  #rm testProcessBlockNonStrict.root
+  #rm testProcessBlockNonStrict2.root
+  #rm testProcessBlockNonStrict3.root
+
+fi
+
+exit 0
diff --git a/FWCore/Integration/test/run_ThinningTests.sh b/IOPool/Tests/test/run_ThinningTests.sh
similarity index 92%
rename from FWCore/Integration/test/run_ThinningTests.sh
rename to IOPool/Tests/test/run_ThinningTests.sh
index ff81e963c106c..ecb800c65451d 100755
--- a/FWCore/Integration/test/run_ThinningTests.sh
+++ b/IOPool/Tests/test/run_ThinningTests.sh
@@ -21,10 +21,6 @@ LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
   cmsRun ${LOCAL_TEST_DIR}/DetSetVectorThinningTest1_cfg.py || die "cmsRun DetSetVectorThinningTest1_cfg.py" $?
   cmsRun ${LOCAL_TEST_DIR}/DetSetVectorThinningTest2_cfg.py || die "cmsRun DetSetVectorThinningTest2_cfg.py" $?
 
-  cmsRun ${LOCAL_TEST_DIR}/SlimmingTestSiblings_cfg.py && die "cmsRun SlimmingTestSiblings_cfg.py"1
-
-  cmsRun ${LOCAL_TEST_DIR}/SlimmingTestFartherSiblings_cfg.py && die "cmsRun SlimmingTestFartherSiblings_cfg.py" 1
-
   cmsRun ${LOCAL_TEST_DIR}/SlimmingTest1_cfg.py || die "cmsRun SlimmingTest1_cfg.py" $?
 
   cmsRun ${LOCAL_TEST_DIR}/SlimmingTest2A_cfg.py || die "cmsRun SlimmingTest2A_cfg.py" $?
diff --git a/FWCore/Integration/test/run_inconsistent_products.sh b/IOPool/Tests/test/run_inconsistent_products.sh
similarity index 100%
rename from FWCore/Integration/test/run_inconsistent_products.sh
rename to IOPool/Tests/test/run_inconsistent_products.sh
diff --git a/IOPool/Tests/test/run_testMaxEventsOutput.sh b/IOPool/Tests/test/run_testMaxEventsOutput.sh
new file mode 100755
index 0000000000000..a2e7fcf49b064
--- /dev/null
+++ b/IOPool/Tests/test/run_testMaxEventsOutput.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Pass in name and status
+function die { echo $1: status $2 ;  exit $2; }
+
+LOCAL_TEST_DIR="${SCRAM_TEST_PATH}"
+
+# Test maxEvents output parameter
+F3=${LOCAL_TEST_DIR}/testMaxEventsOutput_cfg.py
+echo $F3
+(cmsRun $F3 ) || die "Failure running cmsRun $F3" $?
+# 6th word on the line containing the string "events"
+# output by edmFileUtil
+nEvents=`edmFileUtil file:testMaxEventsOutput.root | grep events | awk ' {print $6; exit} '`
+if [ "$nEvents" -lt 6 ] || [ "$nEvents" -gt 9 ]; then
+echo "maxEvents output test failed, nEvents = " $nEvents
+exit 1
+fi
+echo "number of events written = " $nEvents
+
+exit 0
diff --git a/FWCore/Integration/test/run_unscheduledFailOnOutput.sh b/IOPool/Tests/test/run_unscheduledFailOnOutput.sh
similarity index 95%
rename from FWCore/Integration/test/run_unscheduledFailOnOutput.sh
rename to IOPool/Tests/test/run_unscheduledFailOnOutput.sh
index 9c52874f9113a..490c71584e6a4 100755
--- a/FWCore/Integration/test/run_unscheduledFailOnOutput.sh
+++ b/IOPool/Tests/test/run_unscheduledFailOnOutput.sh
@@ -2,7 +2,7 @@
 
 test=unscheduled_fail_on_output_
 LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
-CFG_DIR=${LOCAL_TEST_DIR}/../python/test
+CFG_DIR=${LOCAL_TEST_DIR}
 
 function die { echo Failure $1: status $2 ; exit $2 ; }
 
diff --git a/FWCore/Integration/test/testConcurrentIOVsAndRunsRead_cfg.py b/IOPool/Tests/test/testConcurrentIOVsAndRunsRead_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testConcurrentIOVsAndRunsRead_cfg.py
rename to IOPool/Tests/test/testConcurrentIOVsAndRunsRead_cfg.py
diff --git a/IOPool/Tests/test/testConcurrentIOVsAndRuns_cfg.py b/IOPool/Tests/test/testConcurrentIOVsAndRuns_cfg.py
new file mode 100644
index 0000000000000..04fa4744b7718
--- /dev/null
+++ b/IOPool/Tests/test/testConcurrentIOVsAndRuns_cfg.py
@@ -0,0 +1,53 @@
+# Tests concurrent runs along with concurrent IOVs
+# Note that 3 concurrent runs implies at least 7
+# concurrent IOVs are needed and we configure
+# 8 concurrent IOVs so that concurrent runs are
+# really the limiting factor for the test.
+# Note 7 includes 1 for the first run and then 3
+# for each subsequent concurrent run which includes
+# an IOV for end run, begin run, and begin lumi necessary
+# to get to the next event. In this test every lumi is
+# only valid for one transition (see internals of
+# RunLumiESSource). This test checks that correct
+# EventSetup info is retrieved in all the transitions.
+# Manual examination of the times in the log output should
+# show 3 events in 3 different runs being processed
+# concurrently.
+
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("TEST")
+
+process.source = cms.Source("EmptySource",
+    firstRun = cms.untracked.uint32(1),
+    firstLuminosityBlock = cms.untracked.uint32(1),
+    firstEvent = cms.untracked.uint32(1),
+    numberEventsInLuminosityBlock = cms.untracked.uint32(1),
+    numberEventsInRun = cms.untracked.uint32(1)
+)
+
+process.maxEvents.input = 30
+
+process.options = dict(
+    numberOfThreads = 8,
+    numberOfStreams = 8,
+    numberOfConcurrentRuns = 3,
+    numberOfConcurrentLuminosityBlocks = 8,
+    eventSetup = dict(
+        numberOfConcurrentIOVs = 8
+    )
+)
+
+process.runLumiESSource = cms.ESSource("RunLumiESSource")
+
+process.test = cms.EDAnalyzer("RunLumiESAnalyzer")
+
+process.busy1 = cms.EDProducer("BusyWaitIntProducer",ivalue = cms.int32(1), iterations = cms.uint32(40*1000*1000))
+
+process.p1 = cms.Path(process.busy1 * process.test)
+
+process.out = cms.OutputModule("PoolOutputModule",
+    fileName = cms.untracked.string('testConcurrentIOVsAndRuns.root')
+)
+
+process.e = cms.EndPath(process.out)
diff --git a/FWCore/Integration/test/testDropOnInput1_1_cfg.py b/IOPool/Tests/test/testDropOnInput1_1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testDropOnInput1_1_cfg.py
rename to IOPool/Tests/test/testDropOnInput1_1_cfg.py
diff --git a/FWCore/Integration/test/testDropOnInput1_2_cfg.py b/IOPool/Tests/test/testDropOnInput1_2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testDropOnInput1_2_cfg.py
rename to IOPool/Tests/test/testDropOnInput1_2_cfg.py
diff --git a/FWCore/Integration/test/testDropOnInput2_cfg.py b/IOPool/Tests/test/testDropOnInput2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testDropOnInput2_cfg.py
rename to IOPool/Tests/test/testDropOnInput2_cfg.py
diff --git a/FWCore/Integration/test/testDropOnInput3_cfg.py b/IOPool/Tests/test/testDropOnInput3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testDropOnInput3_cfg.py
rename to IOPool/Tests/test/testDropOnInput3_cfg.py
diff --git a/FWCore/Integration/test/testDropOnInputRead2001_cfg.py b/IOPool/Tests/test/testDropOnInputRead2001_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testDropOnInputRead2001_cfg.py
rename to IOPool/Tests/test/testDropOnInputRead2001_cfg.py
diff --git a/FWCore/Integration/test/testDropOnInputRead2_cfg.py b/IOPool/Tests/test/testDropOnInputRead2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testDropOnInputRead2_cfg.py
rename to IOPool/Tests/test/testDropOnInputRead2_cfg.py
diff --git a/FWCore/Integration/test/testDropOnInputRead3_cfg.py b/IOPool/Tests/test/testDropOnInputRead3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testDropOnInputRead3_cfg.py
rename to IOPool/Tests/test/testDropOnInputRead3_cfg.py
diff --git a/FWCore/Integration/test/testDuplicateProcess_cfg.py b/IOPool/Tests/test/testDuplicateProcess_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testDuplicateProcess_cfg.py
rename to IOPool/Tests/test/testDuplicateProcess_cfg.py
diff --git a/FWCore/Integration/test/testEDAliasAnalyze_cfg.py b/IOPool/Tests/test/testEDAliasAnalyze_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testEDAliasAnalyze_cfg.py
rename to IOPool/Tests/test/testEDAliasAnalyze_cfg.py
diff --git a/IOPool/Tests/test/testEDAliasTask_cfg.py b/IOPool/Tests/test/testEDAliasTask_cfg.py
new file mode 100644
index 0000000000000..9b1bef9cd5fa7
--- /dev/null
+++ b/IOPool/Tests/test/testEDAliasTask_cfg.py
@@ -0,0 +1,35 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("PROD1")
+
+process.options = cms.untracked.PSet(
+    numberOfStreams = cms.untracked.uint32(1),
+    numberOfConcurrentRuns = cms.untracked.uint32(1),
+    numberOfConcurrentLuminosityBlocks = cms.untracked.uint32(1)
+)
+
+process.source = cms.Source("EmptySource")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(3)
+)
+
+process.out = cms.OutputModule("PoolOutputModule",
+    fileName = cms.untracked.string('testEDAliasTask.root'),
+    outputCommands = cms.untracked.vstring(
+        'keep *_intProducer_*_*',
+    )
+)
+
+process.intProducerOrig = cms.EDProducer("ManyIntProducer", ivalue = cms.int32(1))
+
+process.intAlias = cms.EDAlias(
+    intProducerOrig = cms.VPSet(cms.PSet(type = cms.string("edmtestIntProduct")))
+)
+
+process.intProducer = cms.EDProducer("ManyIntWhenRegisteredProducer", src = cms.string("intAlias"))
+
+process.t = cms.Task(process.intProducer, process.intProducerOrig)
+process.p = cms.Path(process.t)
+
+process.e = cms.EndPath(process.out)
diff --git a/FWCore/Integration/test/testExistingDictionaryCheckingRead_cfg.py b/IOPool/Tests/test/testExistingDictionaryCheckingRead_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testExistingDictionaryCheckingRead_cfg.py
rename to IOPool/Tests/test/testExistingDictionaryCheckingRead_cfg.py
diff --git a/FWCore/Integration/test/testExistingDictionaryChecking_cfg.py b/IOPool/Tests/test/testExistingDictionaryChecking_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testExistingDictionaryChecking_cfg.py
rename to IOPool/Tests/test/testExistingDictionaryChecking_cfg.py
diff --git a/FWCore/Integration/test/testGetBy1Mod_cfg.py b/IOPool/Tests/test/testGetBy1Mod_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testGetBy1Mod_cfg.py
rename to IOPool/Tests/test/testGetBy1Mod_cfg.py
diff --git a/FWCore/Integration/test/testGetBy1_cfg.py b/IOPool/Tests/test/testGetBy1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testGetBy1_cfg.py
rename to IOPool/Tests/test/testGetBy1_cfg.py
diff --git a/FWCore/Integration/test/testGetBy2_cfg.py b/IOPool/Tests/test/testGetBy2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testGetBy2_cfg.py
rename to IOPool/Tests/test/testGetBy2_cfg.py
diff --git a/FWCore/Integration/test/testGetBy3_cfg.py b/IOPool/Tests/test/testGetBy3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testGetBy3_cfg.py
rename to IOPool/Tests/test/testGetBy3_cfg.py
diff --git a/FWCore/Integration/test/testGetByLabelStep1_cfg.py b/IOPool/Tests/test/testGetByLabelStep1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testGetByLabelStep1_cfg.py
rename to IOPool/Tests/test/testGetByLabelStep1_cfg.py
diff --git a/FWCore/Integration/test/testGetByLabelStep2_cfg.py b/IOPool/Tests/test/testGetByLabelStep2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testGetByLabelStep2_cfg.py
rename to IOPool/Tests/test/testGetByLabelStep2_cfg.py
diff --git a/FWCore/Integration/test/testGetByMerge_cfg.py b/IOPool/Tests/test/testGetByMerge_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testGetByMerge_cfg.py
rename to IOPool/Tests/test/testGetByMerge_cfg.py
diff --git a/FWCore/Integration/test/testGetByRunsLumisMode_cfg.py b/IOPool/Tests/test/testGetByRunsLumisMode_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testGetByRunsLumisMode_cfg.py
rename to IOPool/Tests/test/testGetByRunsLumisMode_cfg.py
diff --git a/FWCore/Integration/test/testGetByRunsMode_cfg.py b/IOPool/Tests/test/testGetByRunsMode_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testGetByRunsMode_cfg.py
rename to IOPool/Tests/test/testGetByRunsMode_cfg.py
diff --git a/FWCore/Integration/test/testGetByWithEmptyRun_cfg.py b/IOPool/Tests/test/testGetByWithEmptyRun_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testGetByWithEmptyRun_cfg.py
rename to IOPool/Tests/test/testGetByWithEmptyRun_cfg.py
diff --git a/FWCore/Integration/test/testLooperEventNavigation.txt b/IOPool/Tests/test/testLooperEventNavigation.txt
similarity index 100%
rename from FWCore/Integration/test/testLooperEventNavigation.txt
rename to IOPool/Tests/test/testLooperEventNavigation.txt
diff --git a/FWCore/Integration/test/testLooperEventNavigation1_cfg.py b/IOPool/Tests/test/testLooperEventNavigation1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testLooperEventNavigation1_cfg.py
rename to IOPool/Tests/test/testLooperEventNavigation1_cfg.py
diff --git a/FWCore/Integration/test/testLooperEventNavigation2.txt b/IOPool/Tests/test/testLooperEventNavigation2.txt
similarity index 100%
rename from FWCore/Integration/test/testLooperEventNavigation2.txt
rename to IOPool/Tests/test/testLooperEventNavigation2.txt
diff --git a/FWCore/Integration/test/testLooperEventNavigation2_cfg.py b/IOPool/Tests/test/testLooperEventNavigation2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testLooperEventNavigation2_cfg.py
rename to IOPool/Tests/test/testLooperEventNavigation2_cfg.py
diff --git a/FWCore/Integration/test/testLooperEventNavigation3.txt b/IOPool/Tests/test/testLooperEventNavigation3.txt
similarity index 100%
rename from FWCore/Integration/test/testLooperEventNavigation3.txt
rename to IOPool/Tests/test/testLooperEventNavigation3.txt
diff --git a/FWCore/Integration/test/testLooperEventNavigation3_cfg.py b/IOPool/Tests/test/testLooperEventNavigation3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testLooperEventNavigation3_cfg.py
rename to IOPool/Tests/test/testLooperEventNavigation3_cfg.py
diff --git a/FWCore/Integration/test/testLooperEventNavigation_cfg.py b/IOPool/Tests/test/testLooperEventNavigation_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testLooperEventNavigation_cfg.py
rename to IOPool/Tests/test/testLooperEventNavigation_cfg.py
diff --git a/IOPool/Tests/test/testMaxEventsOutput_cfg.py b/IOPool/Tests/test/testMaxEventsOutput_cfg.py
new file mode 100644
index 0000000000000..819863e34d7d5
--- /dev/null
+++ b/IOPool/Tests/test/testMaxEventsOutput_cfg.py
@@ -0,0 +1,41 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("TEST")
+
+process.source = cms.Source("EmptySource",
+    firstRun = cms.untracked.uint32(1),
+    firstLuminosityBlock = cms.untracked.uint32(1),
+    firstEvent = cms.untracked.uint32(1),
+    numberEventsInLuminosityBlock = cms.untracked.uint32(1),
+    numberEventsInRun = cms.untracked.uint32(100)
+)
+
+# set to 6 output events. Actual number could be
+# anywhere from 6 to 9 because after 6 events written
+# it will finish the other events already running concurrently.
+# In this config there are 3 other streams possible.
+process.maxEvents = cms.untracked.PSet(
+  input = cms.untracked.int32(20),
+  output = cms.untracked.int32(6)
+)
+
+process.options = cms.untracked.PSet(
+    numberOfThreads = cms.untracked.uint32(4),
+    numberOfStreams = cms.untracked.uint32(4),
+    numberOfConcurrentRuns = cms.untracked.uint32(1),
+    numberOfConcurrentLuminosityBlocks = cms.untracked.uint32(4)
+)
+
+process.busy1 = cms.EDProducer("BusyWaitIntProducer",
+                               ivalue = cms.int32(1),
+                               iterations = cms.uint32(10*1000*1000),
+                               lumiNumberToThrow = cms.uint32(0)
+)
+
+process.p1 = cms.Path(process.busy1)
+process.out = cms.OutputModule("PoolOutputModule",
+    fileName = cms.untracked.string('testMaxEventsOutput.root')
+)
+
+process.e = cms.EndPath(process.out)
+
diff --git a/FWCore/Integration/test/testMaybeUninitializedIntProductPart1_cfg.py b/IOPool/Tests/test/testMaybeUninitializedIntProductPart1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testMaybeUninitializedIntProductPart1_cfg.py
rename to IOPool/Tests/test/testMaybeUninitializedIntProductPart1_cfg.py
diff --git a/FWCore/Integration/test/testMaybeUninitializedIntProductPart2_cfg.py b/IOPool/Tests/test/testMaybeUninitializedIntProductPart2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testMaybeUninitializedIntProductPart2_cfg.py
rename to IOPool/Tests/test/testMaybeUninitializedIntProductPart2_cfg.py
diff --git a/FWCore/Integration/test/testMissingDictionaryChecking_cfg.py b/IOPool/Tests/test/testMissingDictionaryChecking_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testMissingDictionaryChecking_cfg.py
rename to IOPool/Tests/test/testMissingDictionaryChecking_cfg.py
diff --git a/FWCore/Integration/test/testNoProcessFallback1_cfg.py b/IOPool/Tests/test/testNoProcessFallback1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testNoProcessFallback1_cfg.py
rename to IOPool/Tests/test/testNoProcessFallback1_cfg.py
diff --git a/FWCore/Integration/test/testNoProcessFallback2_cfg.py b/IOPool/Tests/test/testNoProcessFallback2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testNoProcessFallback2_cfg.py
rename to IOPool/Tests/test/testNoProcessFallback2_cfg.py
diff --git a/FWCore/Integration/test/testNoProcessFallback3_cfg.py b/IOPool/Tests/test/testNoProcessFallback3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testNoProcessFallback3_cfg.py
rename to IOPool/Tests/test/testNoProcessFallback3_cfg.py
diff --git a/FWCore/Integration/test/testNoProcessFallbackNoCurrent_cfg.py b/IOPool/Tests/test/testNoProcessFallbackNoCurrent_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testNoProcessFallbackNoCurrent_cfg.py
rename to IOPool/Tests/test/testNoProcessFallbackNoCurrent_cfg.py
diff --git a/IOPool/Tests/test/testOutput1_cfg.py b/IOPool/Tests/test/testOutput1_cfg.py
new file mode 100644
index 0000000000000..bc39d0c017478
--- /dev/null
+++ b/IOPool/Tests/test/testOutput1_cfg.py
@@ -0,0 +1,43 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("PROD1")
+
+process.source = cms.Source("EmptySource")
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(3)
+)
+
+process.intProducerA = cms.EDProducer("IntProducer", ivalue = cms.int32(100))
+
+process.aliasForInt = cms.EDAlias(
+    intProducerA  = cms.VPSet(
+        cms.PSet(type = cms.string('edmtestIntProduct')
+        )
+    )
+)
+
+process.testout = cms.OutputModule("TestGlobalOutput",
+    outputCommands = cms.untracked.vstring(
+        "keep *",
+        "drop *_intProducerA_*_*"
+    )
+)
+
+process.testoutlimited = cms.OutputModule("TestLimitedOutput",
+    outputCommands = cms.untracked.vstring(
+        "keep *",
+        "drop *_intProducerA_*_*"
+    )
+)
+
+process.out = cms.OutputModule("PoolOutputModule",
+    fileName = cms.untracked.string('testOutput1.root'),
+    outputCommands = cms.untracked.vstring(
+        'keep *', 
+        'drop *_intProducerA_*_*'
+    )
+)
+
+process.path = cms.Path(process.intProducerA)
+
+process.endpath = cms.EndPath(process.testout + process.testoutlimited + process.out)
diff --git a/FWCore/Integration/test/testOutput2_cfg.py b/IOPool/Tests/test/testOutput2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testOutput2_cfg.py
rename to IOPool/Tests/test/testOutput2_cfg.py
diff --git a/FWCore/Integration/test/testParentageWithStreamerIO_1_cfg.py b/IOPool/Tests/test/testParentageWithStreamerIO_1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testParentageWithStreamerIO_1_cfg.py
rename to IOPool/Tests/test/testParentageWithStreamerIO_1_cfg.py
diff --git a/FWCore/Integration/test/testParentageWithStreamerIO_2_cfg.py b/IOPool/Tests/test/testParentageWithStreamerIO_2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testParentageWithStreamerIO_2_cfg.py
rename to IOPool/Tests/test/testParentageWithStreamerIO_2_cfg.py
diff --git a/FWCore/Integration/test/testParentageWithStreamerIO_3_cfg.py b/IOPool/Tests/test/testParentageWithStreamerIO_3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testParentageWithStreamerIO_3_cfg.py
rename to IOPool/Tests/test/testParentageWithStreamerIO_3_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlock1_cfg.py b/IOPool/Tests/test/testProcessBlock1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlock1_cfg.py
rename to IOPool/Tests/test/testProcessBlock1_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlock2Dropped_cfg.py b/IOPool/Tests/test/testProcessBlock2Dropped_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlock2Dropped_cfg.py
rename to IOPool/Tests/test/testProcessBlock2Dropped_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlock2_cfg.py b/IOPool/Tests/test/testProcessBlock2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlock2_cfg.py
rename to IOPool/Tests/test/testProcessBlock2_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlock3_cfg.py b/IOPool/Tests/test/testProcessBlock3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlock3_cfg.py
rename to IOPool/Tests/test/testProcessBlock3_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlock4_cfg.py b/IOPool/Tests/test/testProcessBlock4_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlock4_cfg.py
rename to IOPool/Tests/test/testProcessBlock4_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlock5_cfg.py b/IOPool/Tests/test/testProcessBlock5_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlock5_cfg.py
rename to IOPool/Tests/test/testProcessBlock5_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockDropOnInput_cfg.py b/IOPool/Tests/test/testProcessBlockDropOnInput_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockDropOnInput_cfg.py
rename to IOPool/Tests/test/testProcessBlockDropOnInput_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockDropOnOutput2_cfg.py b/IOPool/Tests/test/testProcessBlockDropOnOutput2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockDropOnOutput2_cfg.py
rename to IOPool/Tests/test/testProcessBlockDropOnOutput2_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockDropOnOutput_cfg.py b/IOPool/Tests/test/testProcessBlockDropOnOutput_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockDropOnOutput_cfg.py
rename to IOPool/Tests/test/testProcessBlockDropOnOutput_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockDummy_cfg.py b/IOPool/Tests/test/testProcessBlockDummy_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockDummy_cfg.py
rename to IOPool/Tests/test/testProcessBlockDummy_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockFailMerge_cfg.py b/IOPool/Tests/test/testProcessBlockFailMerge_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockFailMerge_cfg.py
rename to IOPool/Tests/test/testProcessBlockFailMerge_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockLooper_cfg.py b/IOPool/Tests/test/testProcessBlockLooper_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockLooper_cfg.py
rename to IOPool/Tests/test/testProcessBlockLooper_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockMerge2_cfg.py b/IOPool/Tests/test/testProcessBlockMerge2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockMerge2_cfg.py
rename to IOPool/Tests/test/testProcessBlockMerge2_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockMerge3_cfg.py b/IOPool/Tests/test/testProcessBlockMerge3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockMerge3_cfg.py
rename to IOPool/Tests/test/testProcessBlockMerge3_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockMergeOfMergedFiles2_cfg.py b/IOPool/Tests/test/testProcessBlockMergeOfMergedFiles2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockMergeOfMergedFiles2_cfg.py
rename to IOPool/Tests/test/testProcessBlockMergeOfMergedFiles2_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockMergeOfMergedFiles_cfg.py b/IOPool/Tests/test/testProcessBlockMergeOfMergedFiles_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockMergeOfMergedFiles_cfg.py
rename to IOPool/Tests/test/testProcessBlockMergeOfMergedFiles_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockMerge_cfg.py b/IOPool/Tests/test/testProcessBlockMerge_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockMerge_cfg.py
rename to IOPool/Tests/test/testProcessBlockMerge_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockNOMergeOfMergedFiles_cfg.py b/IOPool/Tests/test/testProcessBlockNOMergeOfMergedFiles_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockNOMergeOfMergedFiles_cfg.py
rename to IOPool/Tests/test/testProcessBlockNOMergeOfMergedFiles_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockNonStrict2_cfg.py b/IOPool/Tests/test/testProcessBlockNonStrict2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockNonStrict2_cfg.py
rename to IOPool/Tests/test/testProcessBlockNonStrict2_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockNonStrict3_cfg.py b/IOPool/Tests/test/testProcessBlockNonStrict3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockNonStrict3_cfg.py
rename to IOPool/Tests/test/testProcessBlockNonStrict3_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockNonStrict_cfg.py b/IOPool/Tests/test/testProcessBlockNonStrict_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockNonStrict_cfg.py
rename to IOPool/Tests/test/testProcessBlockNonStrict_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockRead2_cfg.py b/IOPool/Tests/test/testProcessBlockRead2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockRead2_cfg.py
rename to IOPool/Tests/test/testProcessBlockRead2_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockReadDropOnOutput2_cfg.py b/IOPool/Tests/test/testProcessBlockReadDropOnOutput2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockReadDropOnOutput2_cfg.py
rename to IOPool/Tests/test/testProcessBlockReadDropOnOutput2_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockReadDropOnOutput_cfg.py b/IOPool/Tests/test/testProcessBlockReadDropOnOutput_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockReadDropOnOutput_cfg.py
rename to IOPool/Tests/test/testProcessBlockReadDropOnOutput_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockReadThreeFileInput_cfg.py b/IOPool/Tests/test/testProcessBlockReadThreeFileInput_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockReadThreeFileInput_cfg.py
rename to IOPool/Tests/test/testProcessBlockReadThreeFileInput_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockRead_cfg.py b/IOPool/Tests/test/testProcessBlockRead_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockRead_cfg.py
rename to IOPool/Tests/test/testProcessBlockRead_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockTEST_cfg.py b/IOPool/Tests/test/testProcessBlockTEST_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockTEST_cfg.py
rename to IOPool/Tests/test/testProcessBlockTEST_cfg.py
diff --git a/FWCore/Integration/test/testProcessBlockThreeFileInput_cfg.py b/IOPool/Tests/test/testProcessBlockThreeFileInput_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testProcessBlockThreeFileInput_cfg.py
rename to IOPool/Tests/test/testProcessBlockThreeFileInput_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeCOPY100_cfg.py b/IOPool/Tests/test/testRunMergeCOPY100_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeCOPY100_cfg.py
rename to IOPool/Tests/test/testRunMergeCOPY100_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeCOPY101_cfg.py b/IOPool/Tests/test/testRunMergeCOPY101_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeCOPY101_cfg.py
rename to IOPool/Tests/test/testRunMergeCOPY101_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeCOPY1_cfg.py b/IOPool/Tests/test/testRunMergeCOPY1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeCOPY1_cfg.py
rename to IOPool/Tests/test/testRunMergeCOPY1_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeCOPY_cfg.py b/IOPool/Tests/test/testRunMergeCOPY_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeCOPY_cfg.py
rename to IOPool/Tests/test/testRunMergeCOPY_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeFastCloning_cfg.py b/IOPool/Tests/test/testRunMergeFastCloning_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeFastCloning_cfg.py
rename to IOPool/Tests/test/testRunMergeFastCloning_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeMERGE100_cfg.py b/IOPool/Tests/test/testRunMergeMERGE100_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeMERGE100_cfg.py
rename to IOPool/Tests/test/testRunMergeMERGE100_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeMERGE101_cfg.py b/IOPool/Tests/test/testRunMergeMERGE101_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeMERGE101_cfg.py
rename to IOPool/Tests/test/testRunMergeMERGE101_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeMERGE102_cfg.py b/IOPool/Tests/test/testRunMergeMERGE102_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeMERGE102_cfg.py
rename to IOPool/Tests/test/testRunMergeMERGE102_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeMERGE1_cfg.py b/IOPool/Tests/test/testRunMergeMERGE1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeMERGE1_cfg.py
rename to IOPool/Tests/test/testRunMergeMERGE1_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeMERGE2_cfg.py b/IOPool/Tests/test/testRunMergeMERGE2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeMERGE2_cfg.py
rename to IOPool/Tests/test/testRunMergeMERGE2_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeMERGE3_cfg.py b/IOPool/Tests/test/testRunMergeMERGE3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeMERGE3_cfg.py
rename to IOPool/Tests/test/testRunMergeMERGE3_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeMERGE3x_cfg.py b/IOPool/Tests/test/testRunMergeMERGE3x_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeMERGE3x_cfg.py
rename to IOPool/Tests/test/testRunMergeMERGE3x_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeMERGE4_cfg.py b/IOPool/Tests/test/testRunMergeMERGE4_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeMERGE4_cfg.py
rename to IOPool/Tests/test/testRunMergeMERGE4_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeMERGE5_cfg.py b/IOPool/Tests/test/testRunMergeMERGE5_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeMERGE5_cfg.py
rename to IOPool/Tests/test/testRunMergeMERGE5_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeMERGE6_cfg.py b/IOPool/Tests/test/testRunMergeMERGE6_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeMERGE6_cfg.py
rename to IOPool/Tests/test/testRunMergeMERGE6_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeMERGE_cfg.py b/IOPool/Tests/test/testRunMergeMERGE_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeMERGE_cfg.py
rename to IOPool/Tests/test/testRunMergeMERGE_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeNoRunLumiSort_cfg.py b/IOPool/Tests/test/testRunMergeNoRunLumiSort_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeNoRunLumiSort_cfg.py
rename to IOPool/Tests/test/testRunMergeNoRunLumiSort_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD0_cfg.py b/IOPool/Tests/test/testRunMergePROD0_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD0_cfg.py
rename to IOPool/Tests/test/testRunMergePROD0_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD100_cfg.py b/IOPool/Tests/test/testRunMergePROD100_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD100_cfg.py
rename to IOPool/Tests/test/testRunMergePROD100_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD101_cfg.py b/IOPool/Tests/test/testRunMergePROD101_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD101_cfg.py
rename to IOPool/Tests/test/testRunMergePROD101_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD102_cfg.py b/IOPool/Tests/test/testRunMergePROD102_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD102_cfg.py
rename to IOPool/Tests/test/testRunMergePROD102_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD11_cfg.py b/IOPool/Tests/test/testRunMergePROD11_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD11_cfg.py
rename to IOPool/Tests/test/testRunMergePROD11_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD1_cfg.py b/IOPool/Tests/test/testRunMergePROD1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD1_cfg.py
rename to IOPool/Tests/test/testRunMergePROD1_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD2EXTRA_cfg.py b/IOPool/Tests/test/testRunMergePROD2EXTRA_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD2EXTRA_cfg.py
rename to IOPool/Tests/test/testRunMergePROD2EXTRA_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD2_cfg.py b/IOPool/Tests/test/testRunMergePROD2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD2_cfg.py
rename to IOPool/Tests/test/testRunMergePROD2_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD3EXTRA_cfg.py b/IOPool/Tests/test/testRunMergePROD3EXTRA_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD3EXTRA_cfg.py
rename to IOPool/Tests/test/testRunMergePROD3EXTRA_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD3_cfg.py b/IOPool/Tests/test/testRunMergePROD3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD3_cfg.py
rename to IOPool/Tests/test/testRunMergePROD3_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD4_cfg.py b/IOPool/Tests/test/testRunMergePROD4_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD4_cfg.py
rename to IOPool/Tests/test/testRunMergePROD4_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD5_cfg.py b/IOPool/Tests/test/testRunMergePROD5_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD5_cfg.py
rename to IOPool/Tests/test/testRunMergePROD5_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD6_cfg.py b/IOPool/Tests/test/testRunMergePROD6_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD6_cfg.py
rename to IOPool/Tests/test/testRunMergePROD6_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePROD7_cfg.py b/IOPool/Tests/test/testRunMergePROD7_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePROD7_cfg.py
rename to IOPool/Tests/test/testRunMergePROD7_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePickEvents_cfg.py b/IOPool/Tests/test/testRunMergePickEvents_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePickEvents_cfg.py
rename to IOPool/Tests/test/testRunMergePickEvents_cfg.py
diff --git a/FWCore/Integration/test/testRunMergePickEventsx_cfg.py b/IOPool/Tests/test/testRunMergePickEventsx_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergePickEventsx_cfg.py
rename to IOPool/Tests/test/testRunMergePickEventsx_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeSPLIT100_cfg.py b/IOPool/Tests/test/testRunMergeSPLIT100_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeSPLIT100_cfg.py
rename to IOPool/Tests/test/testRunMergeSPLIT100_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeSPLIT101_cfg.py b/IOPool/Tests/test/testRunMergeSPLIT101_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeSPLIT101_cfg.py
rename to IOPool/Tests/test/testRunMergeSPLIT101_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeSPLIT102_cfg.py b/IOPool/Tests/test/testRunMergeSPLIT102_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeSPLIT102_cfg.py
rename to IOPool/Tests/test/testRunMergeSPLIT102_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeSPLIT103_cfg.py b/IOPool/Tests/test/testRunMergeSPLIT103_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeSPLIT103_cfg.py
rename to IOPool/Tests/test/testRunMergeSPLIT103_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeTEST100_cfg.py b/IOPool/Tests/test/testRunMergeTEST100_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeTEST100_cfg.py
rename to IOPool/Tests/test/testRunMergeTEST100_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeTEST101_cfg.py b/IOPool/Tests/test/testRunMergeTEST101_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeTEST101_cfg.py
rename to IOPool/Tests/test/testRunMergeTEST101_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeTEST11_cfg.py b/IOPool/Tests/test/testRunMergeTEST11_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeTEST11_cfg.py
rename to IOPool/Tests/test/testRunMergeTEST11_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeTEST1_cfg.py b/IOPool/Tests/test/testRunMergeTEST1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeTEST1_cfg.py
rename to IOPool/Tests/test/testRunMergeTEST1_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeTEST2_cfg.py b/IOPool/Tests/test/testRunMergeTEST2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeTEST2_cfg.py
rename to IOPool/Tests/test/testRunMergeTEST2_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeTEST3_cfg.py b/IOPool/Tests/test/testRunMergeTEST3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeTEST3_cfg.py
rename to IOPool/Tests/test/testRunMergeTEST3_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeTEST4_cfg.py b/IOPool/Tests/test/testRunMergeTEST4_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeTEST4_cfg.py
rename to IOPool/Tests/test/testRunMergeTEST4_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeTEST5_cfg.py b/IOPool/Tests/test/testRunMergeTEST5_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeTEST5_cfg.py
rename to IOPool/Tests/test/testRunMergeTEST5_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeTEST6_cfg.py b/IOPool/Tests/test/testRunMergeTEST6_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeTEST6_cfg.py
rename to IOPool/Tests/test/testRunMergeTEST6_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeTESTFAIL_cfg.py b/IOPool/Tests/test/testRunMergeTESTFAIL_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeTESTFAIL_cfg.py
rename to IOPool/Tests/test/testRunMergeTESTFAIL_cfg.py
diff --git a/FWCore/Integration/test/testRunMergeTEST_cfg.py b/IOPool/Tests/test/testRunMergeTEST_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testRunMergeTEST_cfg.py
rename to IOPool/Tests/test/testRunMergeTEST_cfg.py
diff --git a/FWCore/Integration/test/testSeriesOfProcessesHLT_cfg.py b/IOPool/Tests/test/testSeriesOfProcessesHLT_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testSeriesOfProcessesHLT_cfg.py
rename to IOPool/Tests/test/testSeriesOfProcessesHLT_cfg.py
diff --git a/FWCore/Integration/test/testSeriesOfProcessesPROD2TEST_cfg.py b/IOPool/Tests/test/testSeriesOfProcessesPROD2TEST_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testSeriesOfProcessesPROD2TEST_cfg.py
rename to IOPool/Tests/test/testSeriesOfProcessesPROD2TEST_cfg.py
diff --git a/FWCore/Integration/test/testSeriesOfProcessesPROD2TEST_unscheduled_cfg.py b/IOPool/Tests/test/testSeriesOfProcessesPROD2TEST_unscheduled_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testSeriesOfProcessesPROD2TEST_unscheduled_cfg.py
rename to IOPool/Tests/test/testSeriesOfProcessesPROD2TEST_unscheduled_cfg.py
diff --git a/FWCore/Integration/test/testSeriesOfProcessesPROD3TEST_cfg.py b/IOPool/Tests/test/testSeriesOfProcessesPROD3TEST_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testSeriesOfProcessesPROD3TEST_cfg.py
rename to IOPool/Tests/test/testSeriesOfProcessesPROD3TEST_cfg.py
diff --git a/FWCore/Integration/test/testSeriesOfProcessesPROD_cfg.py b/IOPool/Tests/test/testSeriesOfProcessesPROD_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testSeriesOfProcessesPROD_cfg.py
rename to IOPool/Tests/test/testSeriesOfProcessesPROD_cfg.py
diff --git a/FWCore/Integration/test/testSeriesOfProcessesTEST1_cfg.py b/IOPool/Tests/test/testSeriesOfProcessesTEST1_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testSeriesOfProcessesTEST1_cfg.py
rename to IOPool/Tests/test/testSeriesOfProcessesTEST1_cfg.py
diff --git a/FWCore/Integration/test/testSeriesOfProcessesTEST2_cfg.py b/IOPool/Tests/test/testSeriesOfProcessesTEST2_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testSeriesOfProcessesTEST2_cfg.py
rename to IOPool/Tests/test/testSeriesOfProcessesTEST2_cfg.py
diff --git a/FWCore/Integration/test/testSeriesOfProcessesTEST3_cfg.py b/IOPool/Tests/test/testSeriesOfProcessesTEST3_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testSeriesOfProcessesTEST3_cfg.py
rename to IOPool/Tests/test/testSeriesOfProcessesTEST3_cfg.py
diff --git a/FWCore/Integration/test/testSeriesOfProcessesTEST_cfg.py b/IOPool/Tests/test/testSeriesOfProcessesTEST_cfg.py
similarity index 100%
rename from FWCore/Integration/test/testSeriesOfProcessesTEST_cfg.py
rename to IOPool/Tests/test/testSeriesOfProcessesTEST_cfg.py
diff --git a/FWCore/Integration/test/unit_test_outputs/testGetBy1.log b/IOPool/Tests/test/unit_test_outputs/testGetBy1.log
similarity index 100%
rename from FWCore/Integration/test/unit_test_outputs/testGetBy1.log
rename to IOPool/Tests/test/unit_test_outputs/testGetBy1.log
diff --git a/FWCore/Integration/test/unit_test_outputs/testGetBy2.log b/IOPool/Tests/test/unit_test_outputs/testGetBy2.log
similarity index 100%
rename from FWCore/Integration/test/unit_test_outputs/testGetBy2.log
rename to IOPool/Tests/test/unit_test_outputs/testGetBy2.log
diff --git a/FWCore/Integration/test/unit_test_outputs/testLooperEventNavigationOutput.txt b/IOPool/Tests/test/unit_test_outputs/testLooperEventNavigationOutput.txt
similarity index 100%
rename from FWCore/Integration/test/unit_test_outputs/testLooperEventNavigationOutput.txt
rename to IOPool/Tests/test/unit_test_outputs/testLooperEventNavigationOutput.txt
diff --git a/FWCore/Integration/python/test/unscheduled_fail_on_output_IgnoreCompletely_cfg.py b/IOPool/Tests/test/unscheduled_fail_on_output_IgnoreCompletely_cfg.py
similarity index 59%
rename from FWCore/Integration/python/test/unscheduled_fail_on_output_IgnoreCompletely_cfg.py
rename to IOPool/Tests/test/unscheduled_fail_on_output_IgnoreCompletely_cfg.py
index 0bb003a84f3fc..7b75190ae3caf 100644
--- a/FWCore/Integration/python/test/unscheduled_fail_on_output_IgnoreCompletely_cfg.py
+++ b/IOPool/Tests/test/unscheduled_fail_on_output_IgnoreCompletely_cfg.py
@@ -1,4 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-from FWCore.Integration.test.unscheduled_fail_on_output_cfg import process
+from unscheduled_fail_on_output_cfg import process
 process.options.IgnoreCompletely = cms.untracked.vstring('NotFound')
diff --git a/FWCore/Integration/python/test/unscheduled_fail_on_output_Rethrow_cfg.py b/IOPool/Tests/test/unscheduled_fail_on_output_Rethrow_cfg.py
similarity index 57%
rename from FWCore/Integration/python/test/unscheduled_fail_on_output_Rethrow_cfg.py
rename to IOPool/Tests/test/unscheduled_fail_on_output_Rethrow_cfg.py
index 140dd3656cadc..72663bca503e3 100644
--- a/FWCore/Integration/python/test/unscheduled_fail_on_output_Rethrow_cfg.py
+++ b/IOPool/Tests/test/unscheduled_fail_on_output_Rethrow_cfg.py
@@ -1,4 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-from FWCore.Integration.test.unscheduled_fail_on_output_cfg import process
+from unscheduled_fail_on_output_cfg import process
 process.options.Rethrow = cms.untracked.vstring('NotFound')
diff --git a/FWCore/Integration/python/test/unscheduled_fail_on_output_TryToContinue_cfg.py b/IOPool/Tests/test/unscheduled_fail_on_output_TryToContinue_cfg.py
similarity index 59%
rename from FWCore/Integration/python/test/unscheduled_fail_on_output_TryToContinue_cfg.py
rename to IOPool/Tests/test/unscheduled_fail_on_output_TryToContinue_cfg.py
index a9f1c021d936c..988a863093f81 100644
--- a/FWCore/Integration/python/test/unscheduled_fail_on_output_TryToContinue_cfg.py
+++ b/IOPool/Tests/test/unscheduled_fail_on_output_TryToContinue_cfg.py
@@ -1,4 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-from FWCore.Integration.test.unscheduled_fail_on_output_cfg import process
+from unscheduled_fail_on_output_cfg import process
 process.options.TryToContinue = cms.untracked.vstring('NotFound')
diff --git a/FWCore/Integration/python/test/unscheduled_fail_on_output_cfg.py b/IOPool/Tests/test/unscheduled_fail_on_output_cfg.py
similarity index 100%
rename from FWCore/Integration/python/test/unscheduled_fail_on_output_cfg.py
rename to IOPool/Tests/test/unscheduled_fail_on_output_cfg.py
diff --git a/FWCore/Integration/python/test/unscheduled_fail_on_output_no_dependency_TryToContinue_cfg.py b/IOPool/Tests/test/unscheduled_fail_on_output_no_dependency_TryToContinue_cfg.py
similarity index 82%
rename from FWCore/Integration/python/test/unscheduled_fail_on_output_no_dependency_TryToContinue_cfg.py
rename to IOPool/Tests/test/unscheduled_fail_on_output_no_dependency_TryToContinue_cfg.py
index a2606d5b8e8be..c7e60192662fd 100644
--- a/FWCore/Integration/python/test/unscheduled_fail_on_output_no_dependency_TryToContinue_cfg.py
+++ b/IOPool/Tests/test/unscheduled_fail_on_output_no_dependency_TryToContinue_cfg.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from FWCore.Integration.test.unscheduled_fail_on_output_cfg import process
+from unscheduled_fail_on_output_cfg import process
 process.options.TryToContinue = ['NotFound']
 
 process.out.outputCommands = cms.untracked.vstring('keep *', 'drop *_failing_*_*')
diff --git a/FWCore/Integration/python/test/unscheduled_fail_on_output_read_found_events.py b/IOPool/Tests/test/unscheduled_fail_on_output_read_found_events.py
similarity index 100%
rename from FWCore/Integration/python/test/unscheduled_fail_on_output_read_found_events.py
rename to IOPool/Tests/test/unscheduled_fail_on_output_read_found_events.py
diff --git a/FWCore/Integration/python/test/unscheduled_fail_on_output_read_no_events.py b/IOPool/Tests/test/unscheduled_fail_on_output_read_no_events.py
similarity index 100%
rename from FWCore/Integration/python/test/unscheduled_fail_on_output_read_no_events.py
rename to IOPool/Tests/test/unscheduled_fail_on_output_read_no_events.py
diff --git a/FWCore/Integration/test/useEmptyRootFile.py b/IOPool/Tests/test/useEmptyRootFile.py
similarity index 100%
rename from FWCore/Integration/test/useEmptyRootFile.py
rename to IOPool/Tests/test/useEmptyRootFile.py