diff --git a/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/POOLCollectionToolsTest_TestConfiguration.xml b/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/POOLCollectionToolsTest_TestConfiguration.xml
index b1e4c768dfa2e33faf6eaf1f4323922039f70141..ea1260b8dfe13364b69d3258bb42a7b84876343b 100644
--- a/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/POOLCollectionToolsTest_TestConfiguration.xml
+++ b/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/POOLCollectionToolsTest_TestConfiguration.xml
@@ -78,32 +78,6 @@
</expectations>
</TEST>
-<!-- Now handled by transform group in one of their tests
- <TEST name="tagMergePanda" type="script" suite="POOLCollectionToolsTest-Event">
- <doc>Check script for merging tag files using merge_trf. Straight. Should work.</doc>
- <classification>
- <displayClass>OfflineValidation</displayClass>
- <displayProcess>Database</displayProcess>
- <displayComponent>Atlas-POOL</displayComponent>
- </classification>
- <options_atn>${ATN_PACKAGE}/test/run_tagMerge_Panda</options_atn>
- <timelimit>15</timelimit>
- <author>JackCranshaw</author>
- <mailto>cranshaw@anl.gov</mailto>
- <expectations>
- <errorMessage>Exception: </errorMessage>
- <errorMessage>ERROR </errorMessage>
- <errorMessage>ERROR: </errorMessage>
- <errorMessage>Error </errorMessage>
- <errorMessage>Error: </errorMessage>
- <errorMessage>Exception </errorMessage>
- <successMessage>Writing metadata.xml</successMessage>
- <successMessage>trf finished OK</successMessage>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
--->
-
<TEST name="tagMerge" type="script" suite="POOLCollectionToolsTest-Event">
<doc>Check script for merging tag files 1-1 (Atlas POOL). Straight. Should work.</doc>
<classification>
@@ -128,175 +102,6 @@
</expectations>
</TEST>
-<!--
- <TEST name="tagCopyAtlasPOOL" type="script" suite="POOLCollectionToolsTest-Event">
- <doc>Check script for uploading tags to database (Atlas POOL). Straight. Should work.</doc>
- <classification>
- <displayClass>OfflineValidation</displayClass>
- <displayProcess>Database</displayProcess>
- <displayComponent>Atlas-POOL</displayComponent>
- </classification>
- <options_atn>${ATN_PACKAGE}/test/run_tagCopy_AtlasPOOL</options_atn>
- <timelimit>15</timelimit>
- <author>JackCranshaw</author>
- <mailto>cranshaw@anl.gov</mailto>
- <expectations>
- <errorMessage>FATAL</errorMessage>
- <errorMessage>UNKNOWN</errorMessage>
- <successMessage>atn_ATN_AtlasPOOL_Copy</successMessage>
- <successMessage>112186 total events </successMessage>
- <successMessage>OK</successMessage>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
--->
-
- <TEST name="tagUpload" type="script" suite="POOLCollectionToolsTest-Event">
- <doc>Check script for uploading tags to database (Atlas POOL). Straight. Should work.</doc>
- <classification>
- <displayClass>OfflineValidation</displayClass>
- <displayProcess>Database</displayProcess>
- <displayComponent>Atlas-POOL</displayComponent>
- </classification>
- <options_atn>${ATN_PACKAGE}/test/run_tagUpload</options_atn>
- <timelimit>15</timelimit>
- <author>JackCranshaw</author>
- <mailto>cranshaw@anl.gov</mailto>
- <expectations>
- <errorMessage>FATAL</errorMessage>
- <errorMessage>UNKNOWN</errorMessage>
- <successMessage>atn_test_102268</successMessage>
- <successMessage>4470 total events </successMessage>
- <successMessage>OK</successMessage>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
-
- <TEST name="T0Upload" type="script" suite="POOLCollectionToolsTest-Event">
- <doc>Check script for uploading tags to database (Atlas POOL). Uses T0 pickle input.</doc>
- <classification>
- <displayClass>OfflineValidation</displayClass>
- <displayProcess>Database</displayProcess>
- <displayComponent>Atlas-POOL</displayComponent>
- </classification>
- <options_atn>${ATN_PACKAGE}/test/run_tagUploadT0</options_atn>
- <timelimit>15</timelimit>
- <author>JackCranshaw</author>
- <mailto>cranshaw@anl.gov</mailto>
- <expectations>
- <errorMessage>Exception: </errorMessage>
- <errorMessage>ERROR </errorMessage>
- <errorMessage>ERROR: </errorMessage>
- <errorMessage>Error </errorMessage>
- <errorMessage>Error: </errorMessage>
- <errorMessage>Exception </errorMessage>
- <successMessage>atn_t0test_102268</successMessage>
- <successMessage>13269 events</successMessage>
- <successMessage>4470 events</successMessage>
- <successMessage>17739 total events</successMessage>
- <successMessage>OK</successMessage>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
-
- <TEST name="T0UploadMC" type="script" suite="POOLCollectionToolsTest-Event">
- <doc>Check script for uploading tags to database (Atlas POOL). Uses T0 pickle input.</doc>
- <classification>
- <displayClass>OfflineValidation</displayClass>
- <displayProcess>Database</displayProcess>
- <displayComponent>Atlas-POOL</displayComponent>
- </classification>
- <options_atn>${ATN_PACKAGE}/test/run_tagUploadT0MC</options_atn>
- <timelimit>15</timelimit>
- <author>JackCranshaw</author>
- <mailto>cranshaw@anl.gov</mailto>
- <expectations>
- <errorMessage>Exception: </errorMessage>
- <errorMessage>ERROR </errorMessage>
- <errorMessage>ERROR: </errorMessage>
- <errorMessage>Error </errorMessage>
- <errorMessage>Error: </errorMessage>
- <errorMessage>Exception </errorMessage>
- <successMessage>25000 total events</successMessage>
- <successMessage>OK</successMessage>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
-
- <TEST name="T0UploadChk" type="script" suite="POOLCollectionToolsTest-Event">
- <doc>Attribute check before uploading tags to database (Atlas POOL). Uses T0 pickle input.</doc>
- <classification>
- <displayClass>OfflineValidation</displayClass>
- <displayProcess>Database</displayProcess>
- <displayComponent>Atlas-POOL</displayComponent>
- </classification>
- <options_atn>${ATN_PACKAGE}/test/run_tagUploadT0Chk</options_atn>
- <timelimit>15</timelimit>
- <author>JackCranshaw</author>
- <mailto>cranshaw@anl.gov</mailto>
- <expectations>
- <errorMessage>Exception </errorMessage>
- <errorMessage>Exception: </errorMessage>
- <errorMessage>Error </errorMessage>
- <errorMessage>Error: </errorMessage>
- <successMessage>RUNNING THE CHECK</successMessage>
- <successMessage>ERROR</successMessage>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
-
-<!--
- <TEST name="ExtractAtlas" type="script" suite="POOLCollectionToolsTest-Event">
- <doc>Check script for extracting from database (POOLCollectionTools). Straight. Should work.`</doc>
- <classification>
- <displayClass>OfflineValidation</displayClass>
- <displayProcess>Database</displayProcess>
- <displayComponent>Atlas-POOL</displayComponent>
- </classification>
- <options_atn>${ATN_PACKAGE}/test/run_tagExtract_Atlas</options_atn>
- <timelimit>15</timelimit>
- <author>JackCranshaw</author>
- <mailto>cranshaw@anl.gov</mailto>
- <expectations>
- <errorMessage>Exception: </errorMessage>
- <errorMessage>ERROR </errorMessage>
- <errorMessage>ERROR: </errorMessage>
- <errorMessage>Error </errorMessage>
- <errorMessage>Error: </errorMessage>
- <errorMessage>Exception </errorMessage>
- <successMessage>1429 events</successMessage>
- <successMessage>1430 total events</successMessage>
- <successMessage>OK</successMessage>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
-
- <TEST name="ExtractAtlasPOOL" type="script" suite="POOLCollectionToolsTest-Event">
- <doc>Check script for extracting from database (POOLCollectionTools). Straight. Should work.`</doc>
- <classification>
- <displayClass>OfflineValidation</displayClass>
- <displayProcess>Database</displayProcess>
- <displayComponent>Atlas-POOL</displayComponent>
- </classification>
- <options_atn>${ATN_PACKAGE}/test/run_tagExtract_AtlasPOOL</options_atn>
- <timelimit>15</timelimit>
- <author>JackCranshaw</author>
- <mailto>cranshaw@anl.gov</mailto>
- <expectations>
- <errorMessage>Exception: </errorMessage>
- <errorMessage>ERROR </errorMessage>
- <errorMessage>ERROR: </errorMessage>
- <errorMessage>Error </errorMessage>
- <errorMessage>Error: </errorMessage>
- <errorMessage>Exception </errorMessage>
- <successMessage>1429 events</successMessage>
- <successMessage>1430 total events</successMessage>
- <successMessage>OK</successMessage>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
--->
-
<TEST name="ListFileGUID" type="script" suite="POOLCollectionToolsTest-Event">
<doc>Check POOL tool for dumping GUID's`</doc>
<classification>
@@ -453,32 +258,6 @@
</expectations>
</TEST>
-<!--
- <TEST name="CollSplitRunAtlas" type="script" suite="POOLCollectionToolsTest-Event">
- <doc>Check Atlas tool for splitting collection into subsets at guid boundary</doc>
- <classification>
- <displayClass>OfflineValidation</displayClass>
- <displayProcess>Database</displayProcess>
- <displayComponent>Atlas-POOL</displayComponent>
- </classification>
- <options_atn>${ATN_PACKAGE}/test/run_CollSplitByRun_Atlas</options_atn>
- <timelimit>5</timelimit>
- <author>JackCranshaw</author>
- <mailto>cranshaw@anl.gov</mailto>
- <expectations>
- <errorMessage>ERROR </errorMessage>
- <errorMessage>Error: </errorMessage>
- <errorMessage>Exception </errorMessage>
- <successMessage>Metadata for run 142308</successMessage>
- <successMessage>Metadata for run 142402</successMessage>
- <successMessage>No empty runs</successMessage>
- <successMessage>Metadata entries: 2</successMessage>
- <successMessage>142402/OutputLumirange</successMessage>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
--->
-
<TEST name="AtlCopyBS" type="script" suite="POOLCollectionToolsTest-Event">
<doc>Check Atlas tool for copying bytestream with TAGS</doc>
<classification>