diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/share/ZDC_SimPixelHit_CollectionCnv_p1_test.ref b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/share/ZDC_SimPixelHit_CollectionCnv_p1_test.ref
index da4d965bcfdbbd243a82f9d678ad5cc537fe75a4..627cb39ff9f6dda53feeb0de19e60c4486d4d16e 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/share/ZDC_SimPixelHit_CollectionCnv_p1_test.ref
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/share/ZDC_SimPixelHit_CollectionCnv_p1_test.ref
@@ -1,3 +1,4 @@
 test1
 Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
 Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/share/ZDC_SimStripHit_CollectionCnv_p1_test.ref b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/share/ZDC_SimStripHit_CollectionCnv_p1_test.ref
index da4d965bcfdbbd243a82f9d678ad5cc537fe75a4..627cb39ff9f6dda53feeb0de19e60c4486d4d16e 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/share/ZDC_SimStripHit_CollectionCnv_p1_test.ref
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/share/ZDC_SimStripHit_CollectionCnv_p1_test.ref
@@ -1,3 +1,4 @@
 test1
 Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
 Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimPixelHitCnv_p1.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimPixelHitCnv_p1.cxx
index 697074a306c45c2977fb0ff396e25e7b018b756d..f7404e5cc1879a8dc4fe8ff84bd8370a0c39cac2 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimPixelHitCnv_p1.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimPixelHitCnv_p1.cxx
@@ -8,7 +8,7 @@
 
 void ZDC_SimPixelHitCnv_p1::persToTrans(const ZDC_SimPixelHit_p1* persObj, ZDC_SimPixelHit* transObj, MsgStream& log) {
 
-  log << MSG::DEBUG << " In ZDC_SimPixelHitCnv_p1::persToTrans " << endreq;
+  log << MSG::DEBUG << " In ZDC_SimPixelHitCnv_p1::persToTrans " << endmsg;
 
   *transObj = ZDC_SimPixelHit (persObj->Side,
                                persObj->ModNo,
@@ -20,7 +20,7 @@ void ZDC_SimPixelHitCnv_p1::persToTrans(const ZDC_SimPixelHit_p1* persObj, ZDC_S
 
 void ZDC_SimPixelHitCnv_p1::transToPers(const ZDC_SimPixelHit* transObj, ZDC_SimPixelHit_p1* persObj, MsgStream& log) {
 
-  log << MSG::DEBUG << " In ZDC_SimPixelHitCnv_p1::transToPers " << endreq;
+  log << MSG::DEBUG << " In ZDC_SimPixelHitCnv_p1::transToPers " << endmsg;
 
   persObj->Side 	   = transObj->GetSide();
   persObj->ModNo	   = transObj->GetMod();
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimPixelHit_CollectionCnv_p1.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimPixelHit_CollectionCnv_p1.cxx
index 8e240d9757e1ca81cc60607f4637413485ca0df0..2370afea326d893151c6c3207bd98d215744572d 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimPixelHit_CollectionCnv_p1.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimPixelHit_CollectionCnv_p1.cxx
@@ -23,15 +23,16 @@ void ZDC_SimPixelHit_CollectionCnv_p1::transToPers(const ZDC_SimPixelHit_Collect
 
 void ZDC_SimPixelHit_CollectionCnv_p1::persToTrans(const ZDC_SimPixelHit_Collection_p1* persObj, ZDC_SimPixelHit_Collection* transObj, MsgStream& log) {
 
-  //log << MSG::INFO << " size = " << persObj->size() << endreq;
+  //log << MSG::INFO << " size = " << persObj->size() << endmsg;
 
   transObj->reserve(persObj->size());
   
   for (unsigned int i=0; i<persObj->size(); ++i) {
     
-    //log << MSG::INFO << " i = " << i << endreq;
+    //log << MSG::INFO << " i = " << i << endmsg;
     const ZDC_SimPixelHit_p1* pixelhit = &((*persObj)[i]);
     
-    transObj->push_back(*ZdcPixelHitConv.createTransient(pixelhit, log));
+    std::unique_ptr<ZDC_SimPixelHit> ptr (ZdcPixelHitConv.createTransient(pixelhit, log));
+    transObj->push_back(*ptr);
   }    
 }
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimStripHitCnv_p1.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimStripHitCnv_p1.cxx
index e5523b744b23b2bd567f6c165607c58914c3fc54..fd35aa41272f199f78e3fe8b9f014ffb5f7aa2ba 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimStripHitCnv_p1.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimStripHitCnv_p1.cxx
@@ -8,7 +8,7 @@
 
 void ZDC_SimStripHitCnv_p1::persToTrans(const ZDC_SimStripHit_p1* persObj, ZDC_SimStripHit* transObj, MsgStream& log) {
 
-  log << MSG::DEBUG << " In ZDC_SimStripHitCnv_p1::persToTrans " << endreq;
+  log << MSG::DEBUG << " In ZDC_SimStripHitCnv_p1::persToTrans " << endmsg;
 
   *transObj = ZDC_SimStripHit (persObj->Side,
                                persObj->ModNo,
@@ -18,7 +18,7 @@ void ZDC_SimStripHitCnv_p1::persToTrans(const ZDC_SimStripHit_p1* persObj, ZDC_S
 
 void ZDC_SimStripHitCnv_p1::transToPers(const ZDC_SimStripHit* transObj, ZDC_SimStripHit_p1* persObj, MsgStream& log) {
 
-  log << MSG::DEBUG << " In ZDC_SimStripHitCnv_p1::transToPers " << endreq;
+  log << MSG::DEBUG << " In ZDC_SimStripHitCnv_p1::transToPers " << endmsg;
 
   persObj->Side 	   = transObj->GetSide();
   persObj->ModNo	   = transObj->GetMod();
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimStripHit_CollectionCnv_p1.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimStripHit_CollectionCnv_p1.cxx
index 8f1b1371f23766f36dd9da77742f61184e7f1229..1a2caeaa3a714ee5933436c05d2f8be0d10d5d13 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimStripHit_CollectionCnv_p1.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZDC_SimStripHit_CollectionCnv_p1.cxx
@@ -23,15 +23,16 @@ void ZDC_SimStripHit_CollectionCnv_p1::transToPers(const ZDC_SimStripHit_Collect
 
 void ZDC_SimStripHit_CollectionCnv_p1::persToTrans(const ZDC_SimStripHit_Collection_p1* persObj, ZDC_SimStripHit_Collection* transObj, MsgStream& log) {
 
-  //log << MSG::INFO << " size = " << persObj->size() << endreq;
+  //log << MSG::INFO << " size = " << persObj->size() << endmsg;
 
   transObj->reserve(persObj->size());
   
   for (unsigned int i=0; i<persObj->size(); ++i) {
     
-    //log << MSG::INFO << " i = " << i << endreq;
+    //log << MSG::INFO << " i = " << i << endmsg;
     const ZDC_SimStripHit_p1* striphit = &((*persObj)[i]);
-    
-    transObj->push_back(*ZdcStripHitConv.createTransient(striphit, log));
+
+    std::unique_ptr<ZDC_SimStripHit> ptr (ZdcStripHitConv.createTransient(striphit, log));
+    transObj->push_back(*ptr);
   }    
 }
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcDigitsCnv_p1.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcDigitsCnv_p1.cxx
index 1e633b72dfa0b825980a30880953ec204b9e5941..1d9d9073f559e9f67b0264e90bf7a4db2ab4eaef 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcDigitsCnv_p1.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcDigitsCnv_p1.cxx
@@ -17,19 +17,19 @@
 void
 ZdcDigitsCnv_p1::persToTrans(const ZdcDigits_p1* persObj, ZdcDigits* transObj, MsgStream &log)
 {
-  //log << MSG::INFO << "ZdcDigitsCnv_p1::persToTrans called " << endreq;
-  log << MSG::VERBOSE << "ZdcDigitsCnv_p1::persToTrans called " << endreq;
+  //log << MSG::INFO << "ZdcDigitsCnv_p1::persToTrans called " << endmsg;
+  log << MSG::VERBOSE << "ZdcDigitsCnv_p1::persToTrans called " << endmsg;
 
   *static_cast<ZdcRawData*>(transObj) =
     ZdcRawData (Identifier(Identifier32(persObj->m_id)));
 
-  //log << MSG::INFO << "ZdcDigitsCnv_p1::reading in... " << endreq;
+  //log << MSG::INFO << "ZdcDigitsCnv_p1::reading in... " << endmsg;
   transObj->set_digits_gain0_delay0 (persObj->m_digits_gain0_delay0);
   transObj->set_digits_gain0_delay1 (persObj->m_digits_gain0_delay1);
   transObj->set_digits_gain1_delay0 (persObj->m_digits_gain1_delay0);
   transObj->set_digits_gain1_delay1 (persObj->m_digits_gain1_delay1);
    
-  //log << MSG::INFO << "ZdcDigitsCnv_p1::finished reading in... " << endreq;
+  //log << MSG::INFO << "ZdcDigitsCnv_p1::finished reading in... " << endmsg;
 
 }
 
@@ -37,7 +37,7 @@ ZdcDigitsCnv_p1::persToTrans(const ZdcDigits_p1* persObj, ZdcDigits* transObj, M
 void
 ZdcDigitsCnv_p1::transToPers(const ZdcDigits* transObj, ZdcDigits_p1* persObj, MsgStream &log)
 {
-  log << MSG::VERBOSE << "ZdcDigitsCnv_p1::transToPers called " << endreq;
+  log << MSG::VERBOSE << "ZdcDigitsCnv_p1::transToPers called " << endmsg;
 
   persObj->m_id = transObj->identify().get_identifier32().get_compact();
 
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcDigitsCollection_p1.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcDigitsCollection_p1.cxx
index 963b4d26e5d0299815413e57a6289fdd2f38d404..f295c6a8b134f2a701d6470d0ca4312e18366f29 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcDigitsCollection_p1.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcDigitsCollection_p1.cxx
@@ -21,13 +21,13 @@ void ZdcDigitsCollectionCnv_p1::transToPers(const ZdcDigitsCollection* transObj,
 
 void ZdcDigitsCollectionCnv_p1::persToTrans(const ZdcDigitsCollection_p1* persObj, ZdcDigitsCollection* transObj, MsgStream& log) {
 
-  //log << MSG::INFO << " size = " << persObj->size() << endreq;
+  //log << MSG::INFO << " size = " << persObj->size() << endmsg;
 
   transObj->reserve(persObj->size());
   
   for (unsigned int i=0; i<persObj->size(); ++i) {
     
-    //log << MSG::INFO << " i = " << i << endreq;
+    //log << MSG::INFO << " i = " << i << endmsg;
     const ZdcDigits_p1* digit = &((*persObj)[i]);
     
     transObj->push_back(digitConv.createTransient(digit, log));
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcRawChannelCnv_p1.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcRawChannelCnv_p1.cxx
index f8397021361078d498e6f1277921be060401bdbc..0656c6463bbb77a66da8509e0ac8b6b9d0c33cdf 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcRawChannelCnv_p1.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcRawChannelCnv_p1.cxx
@@ -17,8 +17,8 @@
 void
 ZdcRawChannelCnv_p1::persToTrans(const ZdcRawChannel_p1* persObj, ZdcRawChannel* transObj, MsgStream &log)
 {
-  //log << MSG::INFO << "ZdcRawChannelCnv_p1::persToTrans called " << endreq;
-  log << MSG::VERBOSE << "ZdcRawChannelCnv_p1::persToTrans called " << endreq;
+  //log << MSG::INFO << "ZdcRawChannelCnv_p1::persToTrans called " << endmsg;
+  log << MSG::VERBOSE << "ZdcRawChannelCnv_p1::persToTrans called " << endmsg;
 
   size_t sz = persObj->m_energy.size();
 
@@ -40,7 +40,7 @@ ZdcRawChannelCnv_p1::persToTrans(const ZdcRawChannel_p1* persObj, ZdcRawChannel*
 void
 ZdcRawChannelCnv_p1::transToPers(const ZdcRawChannel* transObj, ZdcRawChannel_p1* persObj, MsgStream &log)
 {
-  log << MSG::VERBOSE << "ZdcRawChannelCnv_p1::transToPers called " << endreq;
+  log << MSG::VERBOSE << "ZdcRawChannelCnv_p1::transToPers called " << endmsg;
 
   persObj->m_id = transObj->identify().get_identifier32().get_compact();
 
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcRawChannelCollectionCnv_p1.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcRawChannelCollectionCnv_p1.cxx
index 4346587c4cb9575ae9c9a58c5aa1c3087f2cbe89..5c345ebfc6b6e611adc6e8d4a94c93c7867ff828 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcRawChannelCollectionCnv_p1.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/src/ZdcRawChannelCollectionCnv_p1.cxx
@@ -21,13 +21,13 @@ void ZdcRawChannelCollectionCnv_p1::transToPers(const ZdcRawChannelCollection* t
 
 void ZdcRawChannelCollectionCnv_p1::persToTrans(const ZdcRawChannelCollection_p1* persObj, ZdcRawChannelCollection* transObj, MsgStream& log) {
 
-  //log << MSG::INFO << " size = " << persObj->size() << endreq;
+  //log << MSG::INFO << " size = " << persObj->size() << endmsg;
 
   transObj->reserve(persObj->size());
   
   for (unsigned int i=0; i<persObj->size(); ++i) {
     
-    //log << MSG::INFO << " i = " << i << endreq;
+    //log << MSG::INFO << " i = " << i << endmsg;
     const ZdcRawChannel_p1* rawchannel = &((*persObj)[i]);
     
     transObj->push_back(rawchannelConv.createTransient(rawchannel,log));
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimPixelHitCnv_p1_test.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimPixelHitCnv_p1_test.cxx
index 2e060b73b158fc8b75d8a16c97add271321584cf..c6d01ae78ca476453ef8f8f3d79e8d032355aa28 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimPixelHitCnv_p1_test.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimPixelHitCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ZdcEventTPCnv/ZDC_SimPixelHitCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -44,6 +45,7 @@ void testit (const ZDC_SimPixelHit& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ZDC_SimPixelHit trans1 (123, 234, 345, 21, 12345.5);
     
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimPixelHit_CollectionCnv_p1_test.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimPixelHit_CollectionCnv_p1_test.cxx
index e0f5a033dee9b83e6074926ed476183b77ea5db8..dc244ca3e15439953b68f5e230305a626bb6403a 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimPixelHit_CollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimPixelHit_CollectionCnv_p1_test.cxx
@@ -14,6 +14,7 @@
 #undef NDEBUG
 #include "ZdcEventTPCnv/ZDC_SimPixelHit_CollectionCnv_p1.h"
 #include "CxxUtils/make_unique.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -55,6 +56,8 @@ void testit (const ZDC_SimPixelHit_Collection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  ZDC_SimPixelHit_Collection dum1 ("coll");
+  Athena_test::Leakcheck check;
 
   ZDC_SimPixelHit_Collection trans1 ("coll");
   for (int i = 0; i < 10; i++) {
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimStripHitCnv_p1_test.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimStripHitCnv_p1_test.cxx
index 68bec123937e575946b34bdc89c97c2adae6a170..6e6fad45bfba3968a2756f29ecf5aca8a4436ac2 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimStripHitCnv_p1_test.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimStripHitCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ZdcEventTPCnv/ZDC_SimStripHitCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -43,6 +44,7 @@ void testit (const ZDC_SimStripHit& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ZDC_SimStripHit trans1 (123, 234, 21, 12345.5);
     
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimStripHit_CollectionCnv_p1_test.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimStripHit_CollectionCnv_p1_test.cxx
index 8cae3f441f8b7a0d8b26bf0d1a380cfcc5ac7c8e..14a86a13573484b4b213688c76abdcd597690654 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimStripHit_CollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZDC_SimStripHit_CollectionCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ZdcEventTPCnv/ZDC_SimStripHit_CollectionCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -53,6 +54,8 @@ void testit (const ZDC_SimStripHit_Collection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  ZDC_SimStripHit_Collection dum1 ("coll");
+  Athena_test::Leakcheck check;
 
   ZDC_SimStripHit_Collection trans1 ("coll");
   for (int i = 0; i < 10; i++) {
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcDigitsCnv_p1_test.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcDigitsCnv_p1_test.cxx
index 2ed80c397a1c5ba172655cfb615f56e77e547ce7..f783bd21f08e82a244502fb82ea4272d9749c192 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcDigitsCnv_p1_test.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcDigitsCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ZdcEventTPCnv/ZdcDigitsCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -44,6 +45,7 @@ void testit (const ZdcDigits& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ZdcDigits trans1 (Identifier (1234));
   trans1.set_digits_gain0_delay0 (std::vector<int> {1});
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcDigitsCollectionCnv_p1_test.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcDigitsCollectionCnv_p1_test.cxx
index 573769d45779e5e58962edbff12d4561e49782db..7eeafbf39dc32829d86c7379c24ca28073896287 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcDigitsCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcDigitsCollectionCnv_p1_test.cxx
@@ -14,6 +14,7 @@
 #undef NDEBUG
 #include "ZdcEventTPCnv/ZdcDigitsCollectionCnv_p1.h"
 #include "CxxUtils/make_unique.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -54,6 +55,7 @@ void testit (const ZdcDigitsCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ZdcDigitsCollection trans1;
   for (int i = 0; i < 10; i++) {
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcRawChannelCnv_p1_test.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcRawChannelCnv_p1_test.cxx
index 2aad95c086a720c638b49c0cc34d9ca6d450b645..78d70749e7b785418a39c1fd5c96b70d26c2dea1 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcRawChannelCnv_p1_test.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcRawChannelCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ZdcEventTPCnv/ZdcRawChannelCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -46,6 +47,7 @@ void testit (const ZdcRawChannel& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ZdcRawChannel trans1 (Identifier (1234));
   trans1.setSize (3);
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcRawChannelCollectionCnv_p1_test.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcRawChannelCollectionCnv_p1_test.cxx
index a82c74a034bfa1c66b3554f1acec6a330718da41..eabb92e9590f1e3d05ab5ff5eabecee38166ee04 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcRawChannelCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/test/ZdcRawChannelCollectionCnv_p1_test.cxx
@@ -14,6 +14,7 @@
 #undef NDEBUG
 #include "ZdcEventTPCnv/ZdcRawChannelCollectionCnv_p1.h"
 #include "CxxUtils/make_unique.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -56,6 +57,7 @@ void testit (const ZdcRawChannelCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ZdcRawChannelCollection trans1;
   for (int i=0; i < 10; i++) {