diff --git a/DataFormats/EgammaTrackReco/src/ConversionTrack.cc b/DataFormats/EgammaTrackReco/src/ConversionTrack.cc
deleted file mode 100644
index f1f391a5843d4..0000000000000
--- a/DataFormats/EgammaTrackReco/src/ConversionTrack.cc
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrack.h"
diff --git a/DataFormats/EgammaTrackReco/src/classes.h b/DataFormats/EgammaTrackReco/src/classes.h
deleted file mode 100644
index af32315f4df15..0000000000000
--- a/DataFormats/EgammaTrackReco/src/classes.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
-#include "DataFormats/CLHEP/interface/Migration.h"
-#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
-#include "DataFormats/TrackCandidate/interface/TrackCandidate.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "Rtypes.h"
-#include "Math/Cartesian3D.h"
-#include "Math/Polar3D.h"
-#include "Math/CylindricalEta3D.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
-#include "DataFormats/EgammaTrackReco/interface/TrackCandidateSuperClusterAssociation.h"
-#include "DataFormats/EgammaTrackReco/interface/TrackSuperClusterAssociation.h"
-#include "DataFormats/EgammaTrackReco/interface/TrackCandidateCaloClusterAssociation.h"
-#include "DataFormats/EgammaTrackReco/interface/TrackCaloClusterAssociation.h"
-#include "DataFormats/Common/interface/RefProd.h"
-#include "DataFormats/EgammaReco/interface/SuperCluster.h"
-#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
-#include "DataFormats/CaloRecHit/interface/CaloCluster.h"
-#include "DataFormats/CaloRecHit/interface/CaloClusterFwd.h"
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrack.h"
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrackFwd.h"
-
-#include "DataFormats/Common/interface/Wrapper.h"
diff --git a/DataFormats/EgammaTrackReco/src/classes_def.xml b/DataFormats/EgammaTrackReco/src/classes_def.xml
deleted file mode 100644
index bac2f96f6f94d..0000000000000
--- a/DataFormats/EgammaTrackReco/src/classes_def.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<lcgdict>
-  <class name="reco::ConversionTrack" ClassVersion="3">
-    <version ClassVersion="3" checksum="3168503251"/>
-     <field name="traj_" transient="true" />
-   </class>
-   <class name="reco::ConversionTrackCollection" />
-   <class name="edm::Wrapper<reco::ConversionTrackCollection>" />   
-
-</lcgdict>                                                                                                                                                        
diff --git a/FWCore/Framework/test/BuildFile.xml b/FWCore/Framework/test/BuildFile.xml
index d75828d5d7871..8021f22b97084 100644
--- a/FWCore/Framework/test/BuildFile.xml
+++ b/FWCore/Framework/test/BuildFile.xml
@@ -3,7 +3,7 @@
   <use name="FWCore/Framework"/>
 </library>
 
-<library file="MockEventProcessor.cc,stubs/TestBeginEndJobAnalyzer.cc" name="FWCoreFrameworkTest">
+<library file="stubs/TestBeginEndJobAnalyzer.cc" name="FWCoreFrameworkTest">
   <use name="FWCore/Framework"/>
 </library>
 
@@ -314,14 +314,11 @@
   <use name="catch2"/>
 </bin>
 
-<bin name="TestFWCoreFrameworkStatemachine" file="statemachine_t.cc">
-  <lib name="FWCoreFrameworkTest"/>
+<bin name="TestFWCoreFrameworkStatemachine" file="MockEventProcessor.cc,statemachine_t.cc">
   <use name="FWCore/Framework"/>
-  <use name="boost_program_options"/>
+  <use name="catch2"/>
 </bin>
 
-<test name="TestFWCoreFrameworkStatemachineSH" command="run_statemachine.sh"/>
-
 <test name="TestFWCoreFrameworkInputTagFailure" command="test_InputTag_cache_failure.sh"/>
 
 <test name="TestFWCoreFrameworkDeleteEarly" command="test_deleteEarly.sh"/>
diff --git a/FWCore/Framework/test/run_statemachine.sh b/FWCore/Framework/test/run_statemachine.sh
deleted file mode 100755
index 7ba67452d76f6..0000000000000
--- a/FWCore/Framework/test/run_statemachine.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# I was not successful figuring out how to run this shell script outside
-# of the "scramv1 b runtests" command, but one can run the executable
-# run by this script using the values for the two variables (modified for
-# each test release) along with the commands in the shell script below.
-#LOCAL_TMP_DIR=/uscms_data/d1/wdd/CMSSW_1_8_0_pre2/tmp/slc4_ia32_gcc345
-#LOCAL_TEST_DIR=/uscms_data/d1/wdd/CMSSW_1_8_0_pre2/src/FWCore/Framework/test
-
-LOCAL_TEST_DIR="${CMSSW_BASE}/src/FWCore/Framework/test"
-exe=TestFWCoreFrameworkStatemachine
-input=${LOCAL_TEST_DIR}/unit_test_outputs/statemachine_
-output=statemachine_output_
-reference_output=${LOCAL_TEST_DIR}/unit_test_outputs/statemachine_output_
-
-function die { echo Failure $1: status $2 ; exit $2 ; }
-
-for i in 1 2 5 6 7 8 9 10 11
-do
-
-    ${exe} -i ${input}${i}.txt -o ${output}${i}.txt || die "TestFWCoreFrameworkStatemachine with input ${i}" $?
-    diff ${reference_output}${i}.txt ${output}${i}.txt || die "comparing ${output}${i}.txt" $?  
-
-  done
-
-  for i in 3 4
-  do
-
-    ${exe} -i ${input}${i}.txt -o ${output}${i}.txt || die "TestFWCoreFrameworkStatemachine with input ${i}" $?
-    diff ${reference_output}${i}.txt ${output}${i}.txt || die "comparing ${output}${i}.txt" $?  
-
-  done
-
-  for i in 12
-  do
-
-    ${exe} -i ${input}${i}.txt -o ${output}${i}.txt || die "TestFWCoreFrameworkStatemachine with input ${i}" $?
-    diff ${reference_output}${i}.txt ${output}${i}.txt || die "comparing ${output}${i}.txt" $?  
-
-done
-
-#testing exceptions
-for i in 20 21 22 23
-do
-
-    ${exe} -i ${input}${i}.txt -o ${output}${i}.txt || die "TestFWCoreFrameworkStatemachine with input ${i}" $?
-    diff ${reference_output}${i}.txt ${output}${i}.txt || die "comparing ${output}${i}.txt" $?
-
-done
diff --git a/FWCore/Framework/test/statemachine_t.cc b/FWCore/Framework/test/statemachine_t.cc
index b663541ac4a17..51cfda61b549d 100644
--- a/FWCore/Framework/test/statemachine_t.cc
+++ b/FWCore/Framework/test/statemachine_t.cc
@@ -6,76 +6,2559 @@ Test of the statemachine classes.
 
 #include "FWCore/Framework/test/MockEventProcessor.h"
 
-#include <boost/program_options.hpp>
+#include "catch2/catch_all.hpp"
 
+#include <sstream>
 #include <string>
-#include <iostream>
-#include <fstream>
-
-int main(int argc, char* argv[]) try {
-  std::cout << "Running test in statemachine_t.cc\n";
-
-  // Handle the command line arguments
-  std::string inputFile;
-  std::string outputFile;
-  boost::program_options::options_description desc("Allowed options");
-  desc.add_options()("help,h", "produce help message")(
-      "inputFile,i", boost::program_options::value<std::string>(&inputFile)->default_value(""))(
-      "outputFile,o",
-      boost::program_options::value<std::string>(&outputFile)->default_value("statemachine_test_output.txt"));
-  boost::program_options::variables_map vm;
-  boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);
-  boost::program_options::notify(vm);
-  if (vm.count("help")) {
-    std::cout << desc << "\n";
-    return 1;
-  }
-
-  // Get some fake data from an input file.
-  // The fake data has the format of a series pairs of items.
-  // The first is a letter to indicate the data type
-  // r for run, l for lumi, e for event, f for file, s for stop
-  // The second item is the run number or luminosity block number
-  // for the run and lumi cases.  For the other cases the number
-  // is not not used.  This series of fake data items is terminated
-  // by a period (blank space and newlines are ignored).
-  // Use the trivial default in the next line if no input file
-  // has been specified
-  std::string mockData = "s 1";
-  if (inputFile != "") {
-    std::ifstream input;
-    input.open(inputFile.c_str());
-    if (input.fail()) {
-      std::cerr << "Error, Unable to open mock input file named " << inputFile << "\n";
-      return 1;
+#include <utility>
+#include <vector>
+
+namespace {
+
+  using Transition = std::pair<char, int>;
+
+  std::string toMockData(std::vector<Transition> const& transitions) {
+    std::ostringstream data;
+    bool first = true;
+    for (auto const& transition : transitions) {
+      if (not first) {
+        data << '\n';
+      }
+      first = false;
+      data << transition.first << ' ' << transition.second;
     }
-    std::getline(input, mockData, '.');
+    return data.str();
   }
 
-  std::ofstream output(outputFile.c_str());
+  std::string extractModeOutput(std::string const& expectedCombinedOutput, bool mode) {
+    std::string const nomergeHeader = "\nMachine parameters:  mode = NOMERGE\n";
+    std::string const fullmergeHeader = "\nMachine parameters:  mode = FULLMERGE\n";
 
-  std::vector<bool> fileModes;
-  fileModes.push_back(true);
-  fileModes.push_back(false);
+    auto const start = expectedCombinedOutput.find(mode ? nomergeHeader : fullmergeHeader);
+    REQUIRE(start != std::string::npos);
 
-  for (auto mode : fileModes) {
-    output << "\nMachine parameters:  ";
-    if (mode)
-      output << "mode = NOMERGE";
-    else
-      output << "mode = FULLMERGE";
+    if (mode) {
+      auto const end = expectedCombinedOutput.find(fullmergeHeader, start + nomergeHeader.size());
+      REQUIRE(end != std::string::npos);
+      return expectedCombinedOutput.substr(start, end - start);
+    }
+    return expectedCombinedOutput.substr(start);
+  }
 
+  std::string runStateMachine(std::vector<Transition> const& transitions, bool mode) {
+    std::stringstream output;
+    std::string const mockData = toMockData(transitions);
+
+    output << "\nMachine parameters:  ";
+    output << (mode ? "mode = NOMERGE" : "mode = FULLMERGE");
     output << "\n";
 
     edm::MockEventProcessor mockEventProcessor(mockData, output, mode);
     try {
       mockEventProcessor.runToCompletion();
-    } catch (edm::MockEventProcessor::TestException const& e) {
+    } catch (edm::MockEventProcessor::TestException const&) {
       output << "caught test exception\n";
     }
+    return output.str();
+  }
+
+  void checkCase(std::string const& expectedCombined, std::vector<Transition> const& transitions) {
+    REQUIRE_FALSE(expectedCombined.empty());
+    SECTION("NOMERGE") {
+      auto const expected = extractModeOutput(expectedCombined, true);
+      auto const actual = runStateMachine(transitions, true);
+      CHECK(actual == expected);
+    }
+    SECTION("FULLMERGE") {
+      auto const expected = extractModeOutput(expectedCombined, false);
+      auto const actual = runStateMachine(transitions, false);
+      CHECK(actual == expected);
+    }
+  }
+
+}  // namespace
+
+TEST_CASE("MockEventProcessor statemachine", "[Framework]") {
+  SECTION("case_1") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Run 2 ***
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: Lumi 2 ***
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	readLuminosityBlock 2
+	beginLumi 2/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Lumi 3 ***
+	shouldWeStop
+	endLumi 2/2
+	writeLumi 2/2
+	clearLumiPrincipal 2/2
+	readLuminosityBlock 3
+	beginLumi 2/3
+    *** nextItemType: Run 3 ***
+	endLumi 2/3
+	writeLumi 2/3
+	clearLumiPrincipal 2/3
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	readRun 3
+	beginRun 3
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 3/1
+    *** nextItemType: Stop 1 ***
+	endLumi 3/1
+	writeLumi 3/1
+	clearLumiPrincipal 3/1
+	endRun 3
+	writeRun 3
+	clearRunPrincipal 3
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Run 2 ***
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: Lumi 2 ***
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	readLuminosityBlock 2
+	beginLumi 2/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Lumi 3 ***
+	shouldWeStop
+	endLumi 2/2
+	writeLumi 2/2
+	clearLumiPrincipal 2/2
+	readLuminosityBlock 3
+	beginLumi 2/3
+    *** nextItemType: Run 3 ***
+	endLumi 2/3
+	writeLumi 2/3
+	clearLumiPrincipal 2/3
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	readRun 3
+	beginRun 3
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 3/1
+    *** nextItemType: Stop 1 ***
+	endLumi 3/1
+	writeLumi 3/1
+	clearLumiPrincipal 3/1
+	endRun 3
+	writeRun 3
+	clearRunPrincipal 3
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+)SM",
+              {{'f', 1}, {'r', 1}, {'r', 2}, {'l', 1}, {'l', 2}, {'e', 1}, {'l', 3}, {'r', 3}, {'l', 1}, {'s', 1}});
+  }
+  SECTION("case_2") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 0 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 1 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 1 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 0 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 0 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 1 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: File 0 ***
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 0 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 1 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: File 0 ***
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 0 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 1 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Stop 1 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 0 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 1 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 1 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: File 1 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: File 1 ***
+	shouldWeCloseOutput
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: File 1 ***
+	shouldWeCloseOutput
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Stop 1 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+)SM",
+              {{'f', 0},
+               {'f', 1},
+               {'f', 1},
+               {'f', 0},
+               {'f', 0},
+               {'f', 1},
+               {'r', 1},
+               {'f', 0},
+               {'f', 0},
+               {'f', 1},
+               {'r', 2},
+               {'l', 1},
+               {'f', 0},
+               {'f', 0},
+               {'f', 1},
+               {'s', 1}});
+  }
+  SECTION("case_3") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 2 ***
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 2 ***
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 2 ***
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+)SM",
+              {{'f', 1},
+               {'r', 1},
+               {'l', 1},
+               {'e', 1},
+               {'f', 0},
+               {'r', 2},
+               {'l', 1},
+               {'e', 1},
+               {'f', 0},
+               {'r', 1},
+               {'l', 2},
+               {'e', 2},
+               {'s', 1}});
+  }
+  SECTION("case_4") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Run 2 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 2 ***
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Run 2 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 2 ***
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+)SM",
+              {{'f', 1},
+               {'r', 1},
+               {'l', 1},
+               {'e', 1},
+               {'r', 2},
+               {'l', 1},
+               {'e', 1},
+               {'f', 0},
+               {'r', 1},
+               {'l', 2},
+               {'e', 2},
+               {'s', 1}});
+  }
+  SECTION("case_5") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Lumi 2 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: File 0 ***
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 2 ***
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Lumi 2 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	readAndMergeRun 1
+    *** nextItemType: Lumi 2 ***
+	readAndMergeLumi 2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+)SM",
+              {{'f', 1}, {'r', 1}, {'l', 1}, {'e', 1}, {'l', 2}, {'f', 0}, {'r', 1}, {'l', 2}, {'e', 1}, {'s', 1}});
+  }
+  SECTION("case_6") {
+    checkCase(
+        R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Lumi 2 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 2 ***
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Lumi 2 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	readAndMergeRun 1
+    *** nextItemType: Lumi 2 ***
+	readAndMergeLumi 2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+)SM",
+        {{'f', 1}, {'r', 1}, {'l', 1}, {'e', 1}, {'l', 2}, {'e', 1}, {'f', 0}, {'r', 1}, {'l', 2}, {'e', 2}, {'s', 1}});
+  }
+  SECTION("case_7") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Lumi 2 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 2 ***
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Lumi 3 ***
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	readLuminosityBlock 3
+	beginLumi 1/3
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/3
+	writeLumi 1/3
+	clearLumiPrincipal 1/3
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Lumi 2 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	readAndMergeRun 1
+    *** nextItemType: Lumi 2 ***
+	readAndMergeLumi 2
+    *** nextItemType: Lumi 3 ***
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	readLuminosityBlock 3
+	beginLumi 1/3
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/3
+	writeLumi 1/3
+	clearLumiPrincipal 1/3
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+)SM",
+              {{'f', 1},
+               {'r', 1},
+               {'l', 1},
+               {'e', 1},
+               {'l', 2},
+               {'e', 1},
+               {'f', 0},
+               {'r', 1},
+               {'l', 2},
+               {'l', 3},
+               {'e', 1},
+               {'s', 1}});
+  }
+  SECTION("case_8") {
+    checkCase(
+        R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Lumi 2 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: File 0 ***
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 2 ***
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Lumi 3 ***
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	readLuminosityBlock 3
+	beginLumi 1/3
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/3
+	writeLumi 1/3
+	clearLumiPrincipal 1/3
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Lumi 2 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	readAndMergeRun 1
+    *** nextItemType: Lumi 2 ***
+	readAndMergeLumi 2
+    *** nextItemType: Lumi 3 ***
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	readLuminosityBlock 3
+	beginLumi 1/3
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/3
+	writeLumi 1/3
+	clearLumiPrincipal 1/3
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+)SM",
+        {{'f', 1}, {'r', 1}, {'l', 1}, {'e', 1}, {'l', 2}, {'f', 0}, {'r', 1}, {'l', 2}, {'l', 3}, {'e', 1}, {'s', 1}});
+  }
+  SECTION("case_9") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Event ***
+	shouldWeStop
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Event ***
+	shouldWeStop
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Event ***
+	shouldWeStop
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Event ***
+    *** shouldWeStop will return true this event ***
+	shouldWeStop
+	readEvent
+	processEvent
+	shouldWeStop
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: Event ***
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: Stop 1 ***
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Event ***
+	shouldWeStop
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Event ***
+	shouldWeStop
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	readAndMergeRun 1
+    *** nextItemType: Lumi 1 ***
+	readAndMergeLumi 1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Event ***
+	shouldWeStop
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	readAndMergeRun 1
+    *** nextItemType: Lumi 1 ***
+	readAndMergeLumi 1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Event ***
+    *** shouldWeStop will return true this event ***
+	shouldWeStop
+	readEvent
+	processEvent
+	shouldWeStop
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: Event ***
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: Stop 1 ***
+	endOfLoop
+Left processing loop.
+)SM",
+              {{'f', 1},
+               {'r', 1},
+               {'l', 1},
+               {'e', 1},
+               {'e', 2},
+               {'e', 3},
+               {'f', 0},
+               {'r', 1},
+               {'l', 1},
+               {'e', 4},
+               {'e', 5},
+               {'f', 0},
+               {'r', 1},
+               {'l', 1},
+               {'e', 6},
+               {'e', 7},
+               {'e', 8},
+               {'s', 1}});
+  }
+  SECTION("case_10") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: Restart 0 ***
+	endOfLoop
+	prepareForNextLoop
+	rewind
+	startingNewLoop
+    *** nextItemType: Event ***
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: Lumi 1 ***
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: Run 1 ***
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: Stop 1 ***
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: Restart 0 ***
+	endOfLoop
+	prepareForNextLoop
+	rewind
+	startingNewLoop
+    *** nextItemType: Event ***
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: Lumi 1 ***
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: Run 1 ***
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: Stop 1 ***
+	endOfLoop
+Left processing loop.
+)SM",
+              {{'x', 0}, {'e', 1}, {'l', 1}, {'r', 1}, {'s', 1}});
+  }
+  SECTION("case_11") {
+    checkCase(
+        R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: Restart 0 ***
+	endOfLoop
+	prepareForNextLoop
+	rewind
+	startingNewLoop
+    *** nextItemType: File 0 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Restart 0 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+	prepareForNextLoop
+	rewind
+	startingNewLoop
+    *** nextItemType: File 0 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Lumi 1 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: File 0 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Event ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: File 0 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 0 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 9 ***
+	readRun 9
+	beginRun 9
+    *** nextItemType: File 0 ***
+	endRun 9
+	writeRun 9
+	clearRunPrincipal 9
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: File 0 ***
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Run 2 ***
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	readRun 2
+	beginRun 2
+    *** nextItemType: File 0 ***
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: File 0 ***
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: File 0 ***
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 2 ***
+	readLuminosityBlock 2
+	beginLumi 2/2
+    *** nextItemType: Lumi 3 ***
+	endLumi 2/2
+	writeLumi 2/2
+	clearLumiPrincipal 2/2
+	readLuminosityBlock 3
+	beginLumi 2/3
+    *** nextItemType: File 0 ***
+	endLumi 2/3
+	writeLumi 2/3
+	clearLumiPrincipal 2/3
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: File 0 ***
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 3 ***
+	readLuminosityBlock 3
+	beginLumi 2/3
+    *** nextItemType: File 0 ***
+	endLumi 2/3
+	writeLumi 2/3
+	clearLumiPrincipal 2/3
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Lumi 4 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 5 ***
+	readRun 5
+	beginRun 5
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 5/1
+    *** nextItemType: File 0 ***
+	endLumi 5/1
+	writeLumi 5/1
+	clearLumiPrincipal 5/1
+	endRun 5
+	writeRun 5
+	clearRunPrincipal 5
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Event ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 6 ***
+	readRun 6
+	beginRun 6
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 6/1
+    *** nextItemType: Restart 0 ***
+	endLumi 6/1
+	writeLumi 6/1
+	clearLumiPrincipal 6/1
+	endRun 6
+	writeRun 6
+	clearRunPrincipal 6
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+	prepareForNextLoop
+	rewind
+	startingNewLoop
+    *** nextItemType: Stop 1 ***
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: Restart 0 ***
+	endOfLoop
+	prepareForNextLoop
+	rewind
+	startingNewLoop
+    *** nextItemType: File 0 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Restart 0 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+	prepareForNextLoop
+	rewind
+	startingNewLoop
+    *** nextItemType: File 0 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Lumi 1 ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: File 0 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Event ***
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: File 0 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 9 ***
+	readRun 9
+	beginRun 9
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	endRun 9
+	writeRun 9
+	clearRunPrincipal 9
+	readRun 1
+	beginRun 1
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	readAndMergeRun 1
+    *** nextItemType: Run 2 ***
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	readRun 2
+	beginRun 2
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 2 ***
+	readAndMergeRun 2
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 2 ***
+	readAndMergeRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 2 ***
+	readAndMergeRun 2
+    *** nextItemType: Lumi 2 ***
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	readLuminosityBlock 2
+	beginLumi 2/2
+    *** nextItemType: Lumi 3 ***
+	endLumi 2/2
+	writeLumi 2/2
+	clearLumiPrincipal 2/2
+	readLuminosityBlock 3
+	beginLumi 2/3
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 2 ***
+	readAndMergeRun 2
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 2 ***
+	readAndMergeRun 2
+    *** nextItemType: Lumi 3 ***
+	readAndMergeLumi 3
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Lumi 4 ***
+	endLumi 2/3
+	writeLumi 2/3
+	clearLumiPrincipal 2/3
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 5 ***
+	readRun 5
+	beginRun 5
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 5/1
+    *** nextItemType: File 0 ***
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Event ***
+	endLumi 5/1
+	writeLumi 5/1
+	clearLumiPrincipal 5/1
+	endRun 5
+	writeRun 5
+	clearRunPrincipal 5
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	doErrorStuff
+Left processing loop.
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 6 ***
+	readRun 6
+	beginRun 6
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 6/1
+    *** nextItemType: Restart 0 ***
+	endLumi 6/1
+	writeLumi 6/1
+	clearLumiPrincipal 6/1
+	endRun 6
+	writeRun 6
+	clearRunPrincipal 6
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+	prepareForNextLoop
+	rewind
+	startingNewLoop
+    *** nextItemType: Stop 1 ***
+	endOfLoop
+Left processing loop.
+)SM",
+        {{'x', 0}, {'f', 0}, {'x', 0}, {'f', 0}, {'l', 1}, {'f', 0}, {'e', 1}, {'f', 0}, {'f', 0}, {'r', 9}, {'f', 0},
+         {'r', 1}, {'f', 0}, {'r', 1}, {'r', 2}, {'f', 0}, {'r', 2}, {'f', 0}, {'r', 2}, {'l', 1}, {'f', 0}, {'r', 2},
+         {'l', 2}, {'l', 3}, {'f', 0}, {'r', 2}, {'f', 0}, {'r', 2}, {'l', 3}, {'f', 0}, {'l', 4}, {'f', 1}, {'r', 5},
+         {'l', 1}, {'f', 0}, {'e', 1}, {'f', 1}, {'r', 6}, {'l', 1}, {'x', 0}, {'s', 1}});
+  }
+  SECTION("case_12") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 2 ***
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	readAndMergeRun 1
+    *** nextItemType: Lumi 2 ***
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	readLuminosityBlock 2
+	beginLumi 1/2
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 1 ***
+	readAndMergeRun 1
+    *** nextItemType: Lumi 1 ***
+	endLumi 1/2
+	writeLumi 1/2
+	clearLumiPrincipal 1/2
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Stop 1 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+	endOfLoop
+Left processing loop.
+)SM",
+              {{'f', 1},
+               {'r', 1},
+               {'l', 1},
+               {'e', 1},
+               {'f', 0},
+               {'r', 1},
+               {'l', 2},
+               {'e', 1},
+               {'f', 0},
+               {'r', 1},
+               {'l', 1},
+               {'e', 2},
+               {'s', 1}});
+  }
+  SECTION("case_20") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	throwing
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+caught test exception
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 2 ***
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	throwing
+	endLumi 2/1
+	writeLumi 2/1
+	clearLumiPrincipal 2/1
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+caught test exception
+)SM",
+              {{'f', 1}, {'r', 1}, {'l', 1}, {'e', 1}, {'f', 0}, {'r', 2}, {'l', 1}, {'t', 1}, {'e', 1}});
+  }
+  SECTION("case_21") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+	throwing
+	endLumi 2/1 global failed
+	clearLumiPrincipal 2/1
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+caught test exception
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 2 ***
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	readRun 2
+	beginRun 2
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+	throwing
+	endLumi 2/1 global failed
+	clearLumiPrincipal 2/1
+	endRun 2
+	writeRun 2
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+caught test exception
+)SM",
+              {{'f', 1}, {'r', 1}, {'l', 1}, {'e', 1}, {'f', 0}, {'r', 2}, {'t', 1}, {'l', 1}});
+  }
+  SECTION("case_22") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+	throwing
+	endRun 2 global failed
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+caught test exception
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: Run 2 ***
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	readRun 2
+	beginRun 2
+	throwing
+	endRun 2 global failed
+	clearRunPrincipal 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+caught test exception
+)SM",
+              {{'f', 1}, {'r', 1}, {'l', 1}, {'e', 1}, {'f', 0}, {'t', 1}, {'r', 2}});
+  }
+  SECTION("case_23") {
+    checkCase(R"SM(
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	throwing
+	respondToCloseInputFile
+	closeInputFile
+caught test exception
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	throwing
+	endLumi 1/1
+	writeLumi 1/1
+	clearLumiPrincipal 1/1
+	endRun 1
+	writeRun 1
+	clearRunPrincipal 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+caught test exception
+)SM",
+              {{'f', 1}, {'r', 1}, {'l', 1}, {'e', 1}, {'t', 1}, {'f', 0}});
   }
-  return 0;
-} catch (std::exception const& e) {
-  std::cerr << e.what() << std::endl;
-  return 1;
 }
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_1.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_1.txt
deleted file mode 100644
index 131eebdaf3632..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_1.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-f 1
-r 1
-r 2
-l 1
-l 2
-e 1
-l 3
-r 3
-l 1
-s 1.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_10.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_10.txt
deleted file mode 100644
index 7a9922a877d9c..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_10.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-x 0
-e 1
-l 1
-r 1
-s 1.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_11.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_11.txt
deleted file mode 100644
index 1436787979c9a..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_11.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-x 0
-f 0
-x 0
-f 0
-l 1
-f 0
-e 1
-f 0
-f 0
-r 9
-f 0
-r 1
-f 0
-r 1
-r 2
-f 0
-r 2
-f 0
-r 2
-l 1
-f 0
-r 2
-l 2
-l 3
-f 0
-r 2
-f 0
-r 2
-l 3
-f 0
-l 4
-f 1
-r 5
-l 1
-f 0
-e 1
-f 1
-r 6
-l 1
-x 0
-s 1.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_12.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_12.txt
deleted file mode 100644
index f3764fd5c6217..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_12.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-f 0
-r 1
-l 2
-e 1
-f 0
-r 1
-l 1
-e 2
-s 1.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_2.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_2.txt
deleted file mode 100644
index fac0038aca4cb..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_2.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-f 0
-f 1
-f 1
-f 0
-f 0
-f 1
-r 1
-f 0
-f 0
-f 1
-r 2
-l 1
-f 0
-f 0
-f 1
-s 1.
-
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_20.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_20.txt
deleted file mode 100644
index ce3c66d7222f8..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_20.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-f 0
-r 2
-l 1
-t 1
-e 1
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_21.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_21.txt
deleted file mode 100644
index 5dcc8be0e3d27..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_21.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-f 0
-r 2
-t 1
-l 1
-
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_22.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_22.txt
deleted file mode 100644
index 6dd600beb38a1..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_22.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-f 0
-t 1
-r 2
-
-
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_23.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_23.txt
deleted file mode 100644
index da1f4154cd57e..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_23.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-t 1
-f 0
-
-
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_3.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_3.txt
deleted file mode 100644
index 67aaf65eadc5e..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_3.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-f 0
-r 2
-l 1
-e 1
-f 0
-r 1
-l 2
-e 2
-s 1.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_4.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_4.txt
deleted file mode 100644
index cf764852aecb6..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_4.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-r 2
-l 1
-e 1
-f 0
-r 1
-l 2
-e 2
-s 1.
-
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_5.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_5.txt
deleted file mode 100644
index d4adeceb70e53..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_5.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-l 2
-f 0
-r 1
-l 2
-e 1
-s 1.
-
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_6.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_6.txt
deleted file mode 100644
index a2cf572b80fbc..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_6.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-l 2
-e 1
-f 0
-r 1
-l 2
-e 2
-s 1.
-
-
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_7.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_7.txt
deleted file mode 100644
index 8a3849724b38e..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_7.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-l 2
-e 1
-f 0
-r 1
-l 2
-l 3
-e 1
-s 1.
-
-
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_8.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_8.txt
deleted file mode 100644
index 07ff9c1e68323..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_8.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-l 2
-f 0
-r 1
-l 2
-l 3
-e 1
-s 1.
-
-
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_9.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_9.txt
deleted file mode 100644
index f828adfd0e848..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_9.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-f 1
-r 1
-l 1
-e 1
-e 2
-e 3
-f 0
-r 1
-l 1
-e 4
-e 5
-f 0
-r 1
-l 1
-e 6
-e 7
-e 8
-s 1.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_1.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_1.txt
deleted file mode 100644
index fff4880d9a0af..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_1.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Run 2 ***
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: Lumi 2 ***
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	readLuminosityBlock 2
-	beginLumi 2/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Lumi 3 ***
-	shouldWeStop
-	endLumi 2/2
-	writeLumi 2/2
-	clearLumiPrincipal 2/2
-	readLuminosityBlock 3
-	beginLumi 2/3
-    *** nextItemType: Run 3 ***
-	endLumi 2/3
-	writeLumi 2/3
-	clearLumiPrincipal 2/3
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	readRun 3
-	beginRun 3
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 3/1
-    *** nextItemType: Stop 1 ***
-	endLumi 3/1
-	writeLumi 3/1
-	clearLumiPrincipal 3/1
-	endRun 3
-	writeRun 3
-	clearRunPrincipal 3
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Run 2 ***
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: Lumi 2 ***
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	readLuminosityBlock 2
-	beginLumi 2/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Lumi 3 ***
-	shouldWeStop
-	endLumi 2/2
-	writeLumi 2/2
-	clearLumiPrincipal 2/2
-	readLuminosityBlock 3
-	beginLumi 2/3
-    *** nextItemType: Run 3 ***
-	endLumi 2/3
-	writeLumi 2/3
-	clearLumiPrincipal 2/3
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	readRun 3
-	beginRun 3
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 3/1
-    *** nextItemType: Stop 1 ***
-	endLumi 3/1
-	writeLumi 3/1
-	clearLumiPrincipal 3/1
-	endRun 3
-	writeRun 3
-	clearRunPrincipal 3
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_10.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_10.txt
deleted file mode 100644
index 4959d6076a96e..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_10.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: Restart 0 ***
-	endOfLoop
-	prepareForNextLoop
-	rewind
-	startingNewLoop
-    *** nextItemType: Event ***
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: Lumi 1 ***
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: Run 1 ***
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: Stop 1 ***
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: Restart 0 ***
-	endOfLoop
-	prepareForNextLoop
-	rewind
-	startingNewLoop
-    *** nextItemType: Event ***
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: Lumi 1 ***
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: Run 1 ***
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: Stop 1 ***
-	endOfLoop
-Left processing loop.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_11.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_11.txt
deleted file mode 100644
index b83824b527d15..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_11.txt
+++ /dev/null
@@ -1,464 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: Restart 0 ***
-	endOfLoop
-	prepareForNextLoop
-	rewind
-	startingNewLoop
-    *** nextItemType: File 0 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Restart 0 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-	prepareForNextLoop
-	rewind
-	startingNewLoop
-    *** nextItemType: File 0 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Lumi 1 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: File 0 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Event ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: File 0 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 0 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 9 ***
-	readRun 9
-	beginRun 9
-    *** nextItemType: File 0 ***
-	endRun 9
-	writeRun 9
-	clearRunPrincipal 9
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: File 0 ***
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Run 2 ***
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	readRun 2
-	beginRun 2
-    *** nextItemType: File 0 ***
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 2 ***
-	readRun 2
-	beginRun 2
-    *** nextItemType: File 0 ***
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 2 ***
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: File 0 ***
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 2 ***
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 2 ***
-	readLuminosityBlock 2
-	beginLumi 2/2
-    *** nextItemType: Lumi 3 ***
-	endLumi 2/2
-	writeLumi 2/2
-	clearLumiPrincipal 2/2
-	readLuminosityBlock 3
-	beginLumi 2/3
-    *** nextItemType: File 0 ***
-	endLumi 2/3
-	writeLumi 2/3
-	clearLumiPrincipal 2/3
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 2 ***
-	readRun 2
-	beginRun 2
-    *** nextItemType: File 0 ***
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 2 ***
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 3 ***
-	readLuminosityBlock 3
-	beginLumi 2/3
-    *** nextItemType: File 0 ***
-	endLumi 2/3
-	writeLumi 2/3
-	clearLumiPrincipal 2/3
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Lumi 4 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 5 ***
-	readRun 5
-	beginRun 5
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 5/1
-    *** nextItemType: File 0 ***
-	endLumi 5/1
-	writeLumi 5/1
-	clearLumiPrincipal 5/1
-	endRun 5
-	writeRun 5
-	clearRunPrincipal 5
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Event ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 6 ***
-	readRun 6
-	beginRun 6
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 6/1
-    *** nextItemType: Restart 0 ***
-	endLumi 6/1
-	writeLumi 6/1
-	clearLumiPrincipal 6/1
-	endRun 6
-	writeRun 6
-	clearRunPrincipal 6
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-	prepareForNextLoop
-	rewind
-	startingNewLoop
-    *** nextItemType: Stop 1 ***
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: Restart 0 ***
-	endOfLoop
-	prepareForNextLoop
-	rewind
-	startingNewLoop
-    *** nextItemType: File 0 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Restart 0 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-	prepareForNextLoop
-	rewind
-	startingNewLoop
-    *** nextItemType: File 0 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Lumi 1 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: File 0 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Event ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: File 0 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 9 ***
-	readRun 9
-	beginRun 9
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	endRun 9
-	writeRun 9
-	clearRunPrincipal 9
-	readRun 1
-	beginRun 1
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	readAndMergeRun 1
-    *** nextItemType: Run 2 ***
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	readRun 2
-	beginRun 2
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 2 ***
-	readAndMergeRun 2
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 2 ***
-	readAndMergeRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 2 ***
-	readAndMergeRun 2
-    *** nextItemType: Lumi 2 ***
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	readLuminosityBlock 2
-	beginLumi 2/2
-    *** nextItemType: Lumi 3 ***
-	endLumi 2/2
-	writeLumi 2/2
-	clearLumiPrincipal 2/2
-	readLuminosityBlock 3
-	beginLumi 2/3
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 2 ***
-	readAndMergeRun 2
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 2 ***
-	readAndMergeRun 2
-    *** nextItemType: Lumi 3 ***
-	readAndMergeLumi 3
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Lumi 4 ***
-	endLumi 2/3
-	writeLumi 2/3
-	clearLumiPrincipal 2/3
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 5 ***
-	readRun 5
-	beginRun 5
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 5/1
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Event ***
-	endLumi 5/1
-	writeLumi 5/1
-	clearLumiPrincipal 5/1
-	endRun 5
-	writeRun 5
-	clearRunPrincipal 5
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 6 ***
-	readRun 6
-	beginRun 6
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 6/1
-    *** nextItemType: Restart 0 ***
-	endLumi 6/1
-	writeLumi 6/1
-	clearLumiPrincipal 6/1
-	endRun 6
-	writeRun 6
-	clearRunPrincipal 6
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-	prepareForNextLoop
-	rewind
-	startingNewLoop
-    *** nextItemType: Stop 1 ***
-	endOfLoop
-Left processing loop.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_12.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_12.txt
deleted file mode 100644
index 6297c4f34129f..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_12.txt
+++ /dev/null
@@ -1,146 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 2 ***
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	readAndMergeRun 1
-    *** nextItemType: Lumi 2 ***
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	readAndMergeRun 1
-    *** nextItemType: Lumi 1 ***
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_2.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_2.txt
deleted file mode 100644
index 31c48dcc5f26a..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_2.txt
+++ /dev/null
@@ -1,215 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 0 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 1 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 1 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 0 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 0 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 1 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: File 0 ***
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 0 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 1 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 2 ***
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: File 0 ***
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 0 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 1 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Stop 1 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 0 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 1 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 1 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: File 1 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: File 1 ***
-	shouldWeCloseOutput
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 2 ***
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: File 1 ***
-	shouldWeCloseOutput
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Stop 1 ***
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_20.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_20.txt
deleted file mode 100644
index 0415906c7e0cc..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_20.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 2 ***
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: Throw 1 ***
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	throwing
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-caught test exception
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 2 ***
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: Throw 1 ***
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	throwing
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-caught test exception
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_21.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_21.txt
deleted file mode 100644
index c4a88af8942bc..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_21.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 2 ***
-	readRun 2
-	beginRun 2
-    *** nextItemType: Throw 1 ***
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-	throwing
-	endLumi 2/1 global failed
-	clearLumiPrincipal 2/1
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-caught test exception
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 2 ***
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	readRun 2
-	beginRun 2
-    *** nextItemType: Throw 1 ***
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-	throwing
-	endLumi 2/1 global failed
-	clearLumiPrincipal 2/1
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-caught test exception
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_22.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_22.txt
deleted file mode 100644
index ed4da4b02c88e..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_22.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Throw 1 ***
-    *** nextItemType: Run 2 ***
-	readRun 2
-	beginRun 2
-	throwing
-	endRun 2 global failed
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-caught test exception
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Throw 1 ***
-    *** nextItemType: Run 2 ***
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	readRun 2
-	beginRun 2
-	throwing
-	endRun 2 global failed
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-caught test exception
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_23.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_23.txt
deleted file mode 100644
index e939b0e6da716..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_23.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Throw 1 ***
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	throwing
-	respondToCloseInputFile
-	closeInputFile
-caught test exception
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Throw 1 ***
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	throwing
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-caught test exception
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_3.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_3.txt
deleted file mode 100644
index ee55655884e30..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_3.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 2 ***
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 2 ***
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 2 ***
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 2 ***
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_4.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_4.txt
deleted file mode 100644
index 25760126fe539..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_4.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Run 2 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 2 ***
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Run 2 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	readRun 2
-	beginRun 2
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 2/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	endLumi 2/1
-	writeLumi 2/1
-	clearLumiPrincipal 2/1
-	endRun 2
-	writeRun 2
-	clearRunPrincipal 2
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 2 ***
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_5.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_5.txt
deleted file mode 100644
index 0a03d78e49665..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_5.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Lumi 2 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: File 0 ***
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 2 ***
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Lumi 2 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	readAndMergeRun 1
-    *** nextItemType: Lumi 2 ***
-	readAndMergeLumi 2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_6.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_6.txt
deleted file mode 100644
index 7987cc3b23a3c..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_6.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Lumi 2 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 2 ***
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Lumi 2 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	readAndMergeRun 1
-    *** nextItemType: Lumi 2 ***
-	readAndMergeLumi 2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_7.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_7.txt
deleted file mode 100644
index e9d91d30c803b..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_7.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Lumi 2 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 2 ***
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Lumi 3 ***
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	readLuminosityBlock 3
-	beginLumi 1/3
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/3
-	writeLumi 1/3
-	clearLumiPrincipal 1/3
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Lumi 2 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	readAndMergeRun 1
-    *** nextItemType: Lumi 2 ***
-	readAndMergeLumi 2
-    *** nextItemType: Lumi 3 ***
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	readLuminosityBlock 3
-	beginLumi 1/3
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/3
-	writeLumi 1/3
-	clearLumiPrincipal 1/3
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_8.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_8.txt
deleted file mode 100644
index 973e3fc1e5398..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_8.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Lumi 2 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: File 0 ***
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 2 ***
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: Lumi 3 ***
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	readLuminosityBlock 3
-	beginLumi 1/3
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/3
-	writeLumi 1/3
-	clearLumiPrincipal 1/3
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Lumi 2 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	readLuminosityBlock 2
-	beginLumi 1/2
-    *** nextItemType: File 0 ***
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	readAndMergeRun 1
-    *** nextItemType: Lumi 2 ***
-	readAndMergeLumi 2
-    *** nextItemType: Lumi 3 ***
-	endLumi 1/2
-	writeLumi 1/2
-	clearLumiPrincipal 1/2
-	readLuminosityBlock 3
-	beginLumi 1/3
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Stop 1 ***
-	shouldWeStop
-	endLumi 1/3
-	writeLumi 1/3
-	clearLumiPrincipal 1/3
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_9.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_9.txt
deleted file mode 100644
index 844b2e01ce823..0000000000000
--- a/FWCore/Framework/test/unit_test_outputs/statemachine_output_9.txt
+++ /dev/null
@@ -1,194 +0,0 @@
-
-Machine parameters:  mode = NOMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Event ***
-	shouldWeStop
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Event ***
-	shouldWeStop
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Event ***
-	shouldWeStop
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Event ***
-    *** shouldWeStop will return true this event ***
-	shouldWeStop
-	readEvent
-	processEvent
-	shouldWeStop
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: Event ***
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: Stop 1 ***
-	endOfLoop
-Left processing loop.
-
-Machine parameters:  mode = FULLMERGE
-	startingNewLoop
-    *** nextItemType: File 1 ***
- 	readFile
-	respondToOpenInputFile
-	openOutputFiles
-    *** nextItemType: Run 1 ***
-	readRun 1
-	beginRun 1
-    *** nextItemType: Lumi 1 ***
-	readLuminosityBlock 1
-	beginLumi 1/1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Event ***
-	shouldWeStop
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Event ***
-	shouldWeStop
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	readAndMergeRun 1
-    *** nextItemType: Lumi 1 ***
-	readAndMergeLumi 1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Event ***
-	shouldWeStop
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: File 0 ***
-	shouldWeStop
-	shouldWeCloseOutput
-	respondToCloseInputFile
-	closeInputFile
- 	readFile
-	respondToOpenInputFile
-    *** nextItemType: Run 1 ***
-	readAndMergeRun 1
-    *** nextItemType: Lumi 1 ***
-	readAndMergeLumi 1
-    *** nextItemType: Event ***
-	readEvent
-	processEvent
-	shouldWeStop
-    *** nextItemType: Event ***
-    *** shouldWeStop will return true this event ***
-	shouldWeStop
-	readEvent
-	processEvent
-	shouldWeStop
-	shouldWeStop
-	endLumi 1/1
-	writeLumi 1/1
-	clearLumiPrincipal 1/1
-	endRun 1
-	writeRun 1
-	clearRunPrincipal 1
-	respondToCloseInputFile
-	closeInputFile
-	closeOutputFiles
-	endOfLoop
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: Event ***
-	doErrorStuff
-Left processing loop.
-	startingNewLoop
-    *** nextItemType: Stop 1 ***
-	endOfLoop
-Left processing loop.
diff --git a/FastSimulation/Tracking/plugins/BuildFile.xml b/FastSimulation/Tracking/plugins/BuildFile.xml
index 5edd70a59fbb2..fe53da7fe5329 100644
--- a/FastSimulation/Tracking/plugins/BuildFile.xml
+++ b/FastSimulation/Tracking/plugins/BuildFile.xml
@@ -10,6 +10,7 @@
 <use name="FastSimulation/Tracking"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
+<use name="RecoEgamma/EgammaTools"/>
 <use name="RecoTracker/PixelTrackFitting"/>
 <use name="RecoTracker/TkTrackingRegions"/>
 <use name="RecoTracker/TkSeedGenerator"/>
diff --git a/FastSimulation/Tracking/plugins/ConversionTrackRefFix.cc b/FastSimulation/Tracking/plugins/ConversionTrackRefFix.cc
index b460bebd7bcf9..acbb0f9d47bac 100644
--- a/FastSimulation/Tracking/plugins/ConversionTrackRefFix.cc
+++ b/FastSimulation/Tracking/plugins/ConversionTrackRefFix.cc
@@ -2,7 +2,7 @@
 
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrack.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTrack.h"
 
 using namespace std;
 using namespace reco;
diff --git a/FastSimulation/Tracking/plugins/ConversionTrackRefFix.h b/FastSimulation/Tracking/plugins/ConversionTrackRefFix.h
index d37187b4e8f2b..30c18edf9b9de 100644
--- a/FastSimulation/Tracking/plugins/ConversionTrackRefFix.h
+++ b/FastSimulation/Tracking/plugins/ConversionTrackRefFix.h
@@ -6,7 +6,7 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrackFwd.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTrackFwd.h"
 
 class ConversionTrackRefFix : public edm::stream::EDProducer<> {
 public:
diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
index fe8d60ed4c40c..aaca8a1a7d325 100644
--- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
+++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
@@ -60,7 +60,6 @@ def customizeHLTfor50303(process):
         process.hltParticleFlowRecHitHBHESoA +
         process.hltParticleFlowRecHitHBHE +
         process.hltParticleFlowClusterHBHESoA +
-        process.hltParticleFlowClusterHBHE +
         process.hltPFMultiDepthClusterSoA +
         process.hltParticleFlowClusterHCAL  # This now refers to LegacyMultiDepth producer
     )
@@ -83,7 +82,6 @@ def customizeHLTfor50303(process):
         process.hltParticleFlowRecHitHBHESoASerialSync +
         process.hltParticleFlowRecHitHBHESerialSync +
         process.hltParticleFlowClusterHBHESoASerialSync +
-        process.hltParticleFlowClusterHBHESerialSync +
         process.hltPFMultiDepthClusterSoASerialSync +
         process.hltParticleFlowClusterHCALSerialSync  # This now refers to LegacyMultiDepth producer
     )
@@ -106,8 +104,16 @@ def replaceItemsInSequence(process, itemsToReplace, replacingSequence):
     process = replaceItemsInSequence(process, itemsList, process.HLTPFHcalClustering)
     process = replaceItemsInSequence(process, serialItemsList, process.HLTPFHcalClusteringSerialSync)
 
+    # Completely remove the old HBHE cluster module definitions from the process
+    if hasattr(process, 'hltParticleFlowClusterHBHE'):
+        del process.hltParticleFlowClusterHBHE
+
+    if hasattr(process, 'hltParticleFlowClusterHBHESerialSync'):
+        del process.hltParticleFlowClusterHBHESerialSync
+
     return process
 
+
 def replace_all_pixel_seed_inputtags(process):
     import FWCore.ParameterSet.Config as cms
 
diff --git a/PhysicsTools/NanoAOD/python/autoNANO.py b/PhysicsTools/NanoAOD/python/autoNANO.py
index 5f10b80766340..3f4970b65f0ca 100644
--- a/PhysicsTools/NanoAOD/python/autoNANO.py
+++ b/PhysicsTools/NanoAOD/python/autoNANO.py
@@ -115,6 +115,9 @@ def expandNanoMapping(seqList, mapping, key):
     # NANOGEN (from MiniAOD)
     'GENFromMini': {'sequence': 'PhysicsTools/NanoAOD/nanogen_cff.nanogenSequence',
                     'customize': 'PhysicsTools/NanoAOD/nanogen_cff.customizeNanoGENFromMini'},
+    # NANOGEN as in same GEN content of regular NANOAODSIM
+    'GENMinimal': {'sequence': 'PhysicsTools/NanoAOD/nanogen_cff.nanogenSequence',
+            'customize': 'PhysicsTools/NanoAOD/nanogen_cff.customizeNanoGENMinimal'},
     # Tau embedding NanoAOD (includes Data as well as MC tables with an addition tau embedding table)
     'TauEmbedding': {'sequence': '@PHYS+PhysicsTools/NanoAOD/nano_cff.nanoSequenceFS+TauAnalysis/MCEmbeddingTools/Nano_cff.embeddingTable_seq',
                      'customize': '@PHYS'},
diff --git a/PhysicsTools/NanoAOD/python/nanogen_cff.py b/PhysicsTools/NanoAOD/python/nanogen_cff.py
index ddb6d5477bc30..6d290e592775c 100644
--- a/PhysicsTools/NanoAOD/python/nanogen_cff.py
+++ b/PhysicsTools/NanoAOD/python/nanogen_cff.py
@@ -125,6 +125,14 @@ def customizeNanoGEN(process):
     nanoGenCommonCustomize(process)
     return process
 
+def customizeNanoGENMinimal(process):
+    process.nanogenSequence.insert(0, process.finalGenParticles)
+    for output in ("NANOEDMAODSIMoutput", "NANOAODSIMoutput"):
+        if hasattr(process, output):
+            getattr(process, output).outputCommands.append("drop edmTriggerResults_*_*_*")
+
+    return process
+
 # Prune gen particles with tight conditions applied in usual NanoAOD
 def pruneGenParticlesNano(process):
     process.finalGenParticles.src = process.genParticleTable.src.getModuleLabel()
diff --git a/RecoEgamma/EgammaPhotonProducers/src/ConversionProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/ConversionProducer.cc
index d8940f5110665..d3c00a19d73a8 100644
--- a/RecoEgamma/EgammaPhotonProducers/src/ConversionProducer.cc
+++ b/RecoEgamma/EgammaPhotonProducers/src/ConversionProducer.cc
@@ -21,7 +21,7 @@ Description: Produces converted photon objects using default track collections
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/EgammaCandidates/interface/Conversion.h"
 #include "DataFormats/EgammaCandidates/interface/Photon.h"
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrack.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTrack.h"
 #include "DataFormats/GeometrySurface/interface/BoundCylinder.h"
 #include "DataFormats/GeometrySurface/interface/BoundDisk.h"
 #include "DataFormats/GeometrySurface/interface/ReferenceCounted.h"
diff --git a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc
index e4b21cdb7e084..34302392740d9 100644
--- a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc
+++ b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc
@@ -10,8 +10,8 @@
 
 #include "CommonTools/Statistics/interface/ChiSquaredProbability.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrack.h"
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrackFwd.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTrack.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTrackFwd.h"
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackBase.h"
diff --git a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackProducer.cc
index 21926134df257..b5c141b0cf4bf 100644
--- a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackProducer.cc
+++ b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackProducer.cc
@@ -11,8 +11,8 @@
 
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrack.h"
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrackFwd.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTrack.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTrackFwd.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h"
 #include "DataFormats/TrackReco/interface/Track.h"
diff --git a/DataFormats/EgammaTrackReco/interface/ConversionTrack.h b/RecoEgamma/EgammaTools/interface/ConversionTrack.h
similarity index 95%
rename from DataFormats/EgammaTrackReco/interface/ConversionTrack.h
rename to RecoEgamma/EgammaTools/interface/ConversionTrack.h
index e79811172f6e8..17c808291dbcd 100644
--- a/DataFormats/EgammaTrackReco/interface/ConversionTrack.h
+++ b/RecoEgamma/EgammaTools/interface/ConversionTrack.h
@@ -10,11 +10,11 @@
 // Authors: J.Bendavid
 //--------------------------------------------------------------------------------------------------
 
-#ifndef EgammaReco_ConversionTrack_h
-#define EgammaReco_ConversionTrack_h
+#ifndef EgammaTools_ConversionTrack_h
+#define EgammaTools_ConversionTrack_h
 
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
-class Trajectory;
+#include "TrackingTools/PatternTools/interface/TrajectoryFwd.h"
 namespace reco {
   class ConversionTrack {
   public:
diff --git a/DataFormats/EgammaTrackReco/interface/ConversionTrackFwd.h b/RecoEgamma/EgammaTools/interface/ConversionTrackFwd.h
similarity index 100%
rename from DataFormats/EgammaTrackReco/interface/ConversionTrackFwd.h
rename to RecoEgamma/EgammaTools/interface/ConversionTrackFwd.h
diff --git a/RecoEgamma/EgammaTools/src/classes.h b/RecoEgamma/EgammaTools/src/classes.h
new file mode 100644
index 0000000000000..cd4361db262d6
--- /dev/null
+++ b/RecoEgamma/EgammaTools/src/classes.h
@@ -0,0 +1,4 @@
+#include "RecoEgamma/EgammaTools/interface/ConversionTrack.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTrackFwd.h"
+
+#include "DataFormats/Common/interface/Wrapper.h"
diff --git a/RecoEgamma/EgammaTools/src/classes_def.xml b/RecoEgamma/EgammaTools/src/classes_def.xml
new file mode 100644
index 0000000000000..eacf2fe3f67be
--- /dev/null
+++ b/RecoEgamma/EgammaTools/src/classes_def.xml
@@ -0,0 +1,5 @@
+<lcgdict>
+  <class name="reco::ConversionTrack"/>
+  <class name="reco::ConversionTrackCollection"/>
+  <class name="edm::Wrapper<reco::ConversionTrackCollection>" persistent="false"/>
+</lcgdict>
diff --git a/SimGeneral/CaloAnalysis/plugins/CaloTruthAccumulator.cc b/SimGeneral/CaloAnalysis/plugins/CaloTruthAccumulator.cc
index 1f2c3e32f1f8c..02661769fa415 100644
--- a/SimGeneral/CaloAnalysis/plugins/CaloTruthAccumulator.cc
+++ b/SimGeneral/CaloAnalysis/plugins/CaloTruthAccumulator.cc
@@ -7,6 +7,11 @@
  *   - SimCluster "merged" : takes "boundary" SimClusters and merges them according to some algorithm (to merge SimClusters that are not separable at reconstruction level)
  *  and RefVectors to map back to CaloParticle (and map "boundary" to "merged")
  */
+
+// Switch to true to compile debug printouts and dump the graph to graphviz format
+// should be defined before including DecayGraph.h
+#define DEBUG false
+
 #include <iterator>
 #include <algorithm>
 #include <memory>
diff --git a/TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml b/TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml
index 34a67ea3842f5..f563319b2bb8a 100644
--- a/TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml
+++ b/TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml
@@ -11,5 +11,6 @@
 <use name="CondFormats/JetMETObjects"/>
 <use name="JetMETCorrections/Objects"/>
 <use name="JetMETCorrections/JetCorrector"/>
+<use name="RecoEgamma/EgammaTools"/>
 <use name="RecoMET/METAlgorithms"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc b/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc
index c71e19def4ac1..c1169c2455018 100644
--- a/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc
+++ b/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc
@@ -12,8 +12,8 @@
 #include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
 
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrack.h"
-#include "DataFormats/EgammaTrackReco/interface/ConversionTrackFwd.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTrack.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTrackFwd.h"
 
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 #include "DataFormats/MuonReco/interface/MuonTrackLinks.h"