diff --git a/[refs] b/[refs]
index e965b5c56ba3d..e917219327556 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/l1tmuon-upgrade-dev: 10dffaae74c858986cfab4efb961ad4e4501ae2e
+refs/heads/l1tmuon-upgrade-dev: 4467af8311c37c4897d8dc06cddc1eba22e4c481
diff --git a/trunk/Geometry/HcalCommonData/test/python/runCheck_cfg.py b/trunk/Geometry/HcalCommonData/test/python/runCheck_cfg.py
index 3806176a1092a..bb59bbb591e9c 100644
--- a/trunk/Geometry/HcalCommonData/test/python/runCheck_cfg.py
+++ b/trunk/Geometry/HcalCommonData/test/python/runCheck_cfg.py
@@ -44,7 +44,9 @@
         MinPhi = cms.untracked.double(-0.1309),
         MaxE = cms.untracked.double(10.01)
     ),
-    Verbosity = cms.untracked.int32(0)
+    Verbosity = cms.untracked.int32(0),
+    AddAntiParticle = cms.untracked.bool(False),
+    firstRun = cms.untracked.uint32(1)
 )
 
 process.maxEvents = cms.untracked.PSet(
diff --git a/trunk/Geometry/HcalCommonData/test/python/runOverlap_cfg.py b/trunk/Geometry/HcalCommonData/test/python/runOverlap_cfg.py
index 3806176a1092a..b7de5b3b16b59 100644
--- a/trunk/Geometry/HcalCommonData/test/python/runOverlap_cfg.py
+++ b/trunk/Geometry/HcalCommonData/test/python/runOverlap_cfg.py
@@ -44,7 +44,9 @@
         MinPhi = cms.untracked.double(-0.1309),
         MaxE = cms.untracked.double(10.01)
     ),
-    Verbosity = cms.untracked.int32(0)
+    Verbosity = cms.untracked.int32(0),
+    AddAntiParticle = cms.untracked.bool(False),
+    firstRun = cms.untracked.uint32(1)
 )
 
 process.maxEvents = cms.untracked.PSet(
@@ -56,7 +58,7 @@
 process.g4SimHits.Generator.HepMCProductLabel = 'source'
 process.g4SimHits.Watchers = cms.VPSet(cms.PSet(
     Resolution = cms.untracked.int32(1000),
-    type = cms.string('CheckOverlap'),
-    NodeName = cms.untracked.string('CMSE')
+    type       = cms.string('CheckOverlap'),
+    NodeNames  = cms.untracked.vstring('CMSE')
 ))
 
diff --git a/trunk/Geometry/HcalTestBeamData/test/python/runI_cfg.py b/trunk/Geometry/HcalTestBeamData/test/python/runI_cfg.py
index eb1ad94536579..59cdcd5dfab31 100644
--- a/trunk/Geometry/HcalTestBeamData/test/python/runI_cfg.py
+++ b/trunk/Geometry/HcalTestBeamData/test/python/runI_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("GEOM")
-process.load("Geometry.HcalTestBeamData.TB2007TestGeometryXML_cfi")
+process.load("Geometry.HcalTestBeamData.TB2007GeometryXML_cfi")
 
 process.MessageLogger = cms.Service("MessageLogger",
     debugModules = cms.untracked.vstring('*'),
diff --git a/trunk/Geometry/HcalTestBeamData/test/python/runOverlap_cfg.py b/trunk/Geometry/HcalTestBeamData/test/python/runOverlap_cfg.py
index 1a556559e9499..f64819b1e6c0a 100644
--- a/trunk/Geometry/HcalTestBeamData/test/python/runOverlap_cfg.py
+++ b/trunk/Geometry/HcalTestBeamData/test/python/runOverlap_cfg.py
@@ -54,7 +54,9 @@
         MinE = cms.untracked.double(9.99),
         PartID = cms.untracked.vint32(211)
     ),
-    Verbosity = cms.untracked.int32(0)
+    Verbosity = cms.untracked.int32(0),
+    AddAntiParticle = cms.untracked.bool(False),
+    firstRun = cms.untracked.uint32(1)
 )
 
 process.maxEvents = cms.untracked.PSet(
@@ -116,7 +118,7 @@
 process.g4SimHits.CaloTrkProcessing.TestBeam = True
 process.g4SimHits.Watchers = cms.VPSet(cms.PSet(
     Resolution = cms.untracked.int32(1000),
-    type = cms.string('CheckOverlap'),
-    NodeName = cms.untracked.string('')
+    type       = cms.string('CheckOverlap'),
+    NodeNames  = cms.untracked.vstring('TBHCal')
 ))
 
diff --git a/trunk/Geometry/TrackerCommonData/test/python/runValid_cfg.py b/trunk/Geometry/TrackerCommonData/test/python/runValid_cfg.py
index c877db6199de9..83e33fe74f988 100644
--- a/trunk/Geometry/TrackerCommonData/test/python/runValid_cfg.py
+++ b/trunk/Geometry/TrackerCommonData/test/python/runValid_cfg.py
@@ -49,7 +49,9 @@
         MinPhi = cms.untracked.double(-3.14159265359),
         MaxE = cms.untracked.double(10.01)
     ),
-    Verbosity = cms.untracked.int32(0)
+    Verbosity = cms.untracked.int32(0),
+    AddAntiParticle = cms.untracked.bool(False),
+    firstRun = cms.untracked.uint32(1)
 )
 
 process.o1 = cms.OutputModule("PoolOutputModule",
diff --git a/trunk/SimG4CMS/Calo/test/python/minbias_cfg.py b/trunk/SimG4CMS/Calo/test/python/minbias_cfg.py
index 0a16764f601f4..a3e4687c49751 100644
--- a/trunk/SimG4CMS/Calo/test/python/minbias_cfg.py
+++ b/trunk/SimG4CMS/Calo/test/python/minbias_cfg.py
@@ -71,6 +71,9 @@
     fileName = cms.string('minbias_QGSP_EMV.root')
 )
 
+# Event output
+process.load("Configuration.EventContent.EventContent_cff")
+
 process.o1 = cms.OutputModule("PoolOutputModule",
     process.FEVTSIMEventContent,
     fileName = cms.untracked.string('simevent_minbias_QGSP_EMV.root')
diff --git a/trunk/SimG4CMS/Calo/test/python/ttbar_cfg.py b/trunk/SimG4CMS/Calo/test/python/ttbar_cfg.py
index 221db0c093e9f..10a69fab5f736 100644
--- a/trunk/SimG4CMS/Calo/test/python/ttbar_cfg.py
+++ b/trunk/SimG4CMS/Calo/test/python/ttbar_cfg.py
@@ -75,6 +75,9 @@
     fileName = cms.string('ttbar_QGSP_EMV.root')
 )
 
+# Event output
+process.load("Configuration.EventContent.EventContent_cff")
+
 process.o1 = cms.OutputModule("PoolOutputModule",
     process.FEVTSIMEventContent,
     fileName = cms.untracked.string('simevent_ttbar_QGSP_EMV.root')
diff --git a/trunk/SimG4CMS/Calo/test/python/zee_cfg.py b/trunk/SimG4CMS/Calo/test/python/zee_cfg.py
index 63576694a3c9e..7dd6b50fe1b5e 100644
--- a/trunk/SimG4CMS/Calo/test/python/zee_cfg.py
+++ b/trunk/SimG4CMS/Calo/test/python/zee_cfg.py
@@ -75,6 +75,9 @@
     fileName = cms.string('zee_QGSP_EMV.root')
 )
 
+# Event output
+process.load("Configuration.EventContent.EventContent_cff")
+
 process.o1 = cms.OutputModule("PoolOutputModule",
     process.FEVTSIMEventContent,
     fileName = cms.untracked.string('simevent_zee_QGSP_EMV.root')