diff --git a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/share/TrigInDetTrackTruthMapCnv_p1_test.ref b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/share/TrigInDetTrackTruthMapCnv_p1_test.ref
index 627cb39ff9f6dda53feeb0de19e60c4486d4d16e..ed569d566d2887fdb8e2f35b076cef8319f42787 100644
--- a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/share/TrigInDetTrackTruthMapCnv_p1_test.ref
+++ b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/share/TrigInDetTrackTruthMapCnv_p1_test.ref
@@ -2,3 +2,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
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigIDHitStatsCnv_p1.cxx b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigIDHitStatsCnv_p1.cxx
index 0013b5efde4a56bb92be605acef6a5f1a7038a1d..3918ff592bc19c467b715bafa58104c0361bdc01 100644
--- a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigIDHitStatsCnv_p1.cxx
+++ b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigIDHitStatsCnv_p1.cxx
@@ -11,7 +11,7 @@ void TrigIDHitStatsCnv_p1::persToTrans(const TrigIDHitStats_p1* persObj,
 				          TrigIDHitStats* transObj, 
 				          MsgStream &log)
 {
-   log << MSG::DEBUG << "TrigIDHitStatsCnv_p1::persToTrans called " << endreq;
+   log << MSG::DEBUG << "TrigIDHitStatsCnv_p1::persToTrans called " << endmsg;
 
    for(unsigned i=0; i<3; i++) {
      (*transObj)[static_cast<TrigIDHitStats::IDSubDetType>(i)] = persObj->numHits[i];
@@ -24,7 +24,7 @@ void TrigIDHitStatsCnv_p1::transToPers(const TrigIDHitStats* transObj,
 				          TrigIDHitStats_p1* persObj, 
 				          MsgStream &log)
 {
-   log << MSG::DEBUG << "TrigIDHitStatsCnv_p1::transToPers called " << endreq;
+   log << MSG::DEBUG << "TrigIDHitStatsCnv_p1::transToPers called " << endmsg;
 
    for(unsigned i=0; i<3; i++) {
      persObj->numHits[i] = (*transObj)[static_cast<TrigIDHitStats::IDSubDetType>(i)];
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigInDetTrackTruthCnv_p1.cxx b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigInDetTrackTruthCnv_p1.cxx
index 9464b566792412f21e2a1b5cf314a06a5739cd8e..691c128e18698865e4ed40b385b09af6d47ecc62 100644
--- a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigInDetTrackTruthCnv_p1.cxx
+++ b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigInDetTrackTruthCnv_p1.cxx
@@ -11,7 +11,7 @@ void TrigInDetTrackTruthCnv_p1::persToTrans(const TrigInDetTrackTruth_p1* persOb
 				          TrigInDetTrackTruth* transObj, 
 				          MsgStream &log)
 {
-   log << MSG::DEBUG << "TrigInDetTrackTruthCnv_p1::persToTrans called " << endreq;
+   log << MSG::DEBUG << "TrigInDetTrackTruthCnv_p1::persToTrans called " << endmsg;
 
    transObj->m_best_match_hits     = persObj->best_match_hits    ;
    transObj->m_best_Si_match_hits  = persObj->best_Si_match_hits ;
@@ -52,7 +52,7 @@ void TrigInDetTrackTruthCnv_p1::transToPers(const TrigInDetTrackTruth* transObj,
 				          TrigInDetTrackTruth_p1* persObj, 
 				          MsgStream &log)
 {
-   log << MSG::DEBUG << "TrigInDetTrackTruthCnv_p1::transToPers called " << endreq;
+   log << MSG::DEBUG << "TrigInDetTrackTruthCnv_p1::transToPers called " << endmsg;
 
 
    persObj->best_match_hits     = transObj->m_best_match_hits    ;
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigInDetTrackTruthMapCnv_p1.cxx b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigInDetTrackTruthMapCnv_p1.cxx
index c22db94110903d07ed6fc25ba8cbfb02a8b1d338..f20a73c7eec21452b96b90881ce68f3c45fba7ea 100644
--- a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigInDetTrackTruthMapCnv_p1.cxx
+++ b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/src/TrigInDetTrackTruthMapCnv_p1.cxx
@@ -19,7 +19,7 @@ void TrigInDetTrackTruthMapCnv_p1::persToTrans( const TrigInDetTrackTruthMap_p1
 					     TrigInDetTrackTruthMap    *transObj,
 					     MsgStream       &log )
 {
-  log << MSG::DEBUG << "TrigInDetTrackTruthMapCnv_p1::persToTrans called " << endreq;
+  log << MSG::DEBUG << "TrigInDetTrackTruthMapCnv_p1::persToTrans called " << endmsg;
 
   transObj->m_elink_vec.clear();
   trackVectCnv.persToTrans(&persObj->m_elink_vec, &transObj->m_elink_vec, log);
@@ -44,7 +44,7 @@ void TrigInDetTrackTruthMapCnv_p1::transToPers( const TrigInDetTrackTruthMap
 					     TrigInDetTrackTruthMap_p1 *persObj,
 					     MsgStream       &log )
 {
-  log << MSG::DEBUG << "TrigInDetTrackTruthMapCnv_p1::transToPers called " << endreq;
+  log << MSG::DEBUG << "TrigInDetTrackTruthMapCnv_p1::transToPers called " << endmsg;
 
   trackVectCnv.transToPers(&transObj->m_elink_vec, &persObj->m_elink_vec, log);
 
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigIDHitStatsCnv_p1_test.cxx b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigIDHitStatsCnv_p1_test.cxx
index 1b078b42948b0fc546c7869ac73c67d907e0057d..46c4d2ff239abb36645f0d365d0c25c2d49a03a4 100644
--- a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigIDHitStatsCnv_p1_test.cxx
+++ b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigIDHitStatsCnv_p1_test.cxx
@@ -14,6 +14,7 @@
 #undef NDEBUG
 #include "TrigTruthEventTPCnv/TrigIDHitStatsCnv_p1.h"
 #include "GaudiKernel/MsgStream.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -43,6 +44,7 @@ void testit (const TrigIDHitStats& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   TrigIDHitStats trans1;
   trans1[TrigIDHitStats::PIX] = 12;
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigInDetTrackTruthCnv_p1_test.cxx b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigInDetTrackTruthCnv_p1_test.cxx
index 56742ae8987e1c02852b3cd9259dc51d53f4004a..a3438cd56a34be742f2e3d4505a89c22d2fe3445 100644
--- a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigInDetTrackTruthCnv_p1_test.cxx
+++ b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigInDetTrackTruthCnv_p1_test.cxx
@@ -15,6 +15,7 @@
 #include "TrigTruthEventTPCnv/TrigInDetTrackTruthCnv_p1.h"
 #include "TrigTruthEventTPCnv/TrigInDetTrackTruthMapCnv_tlp2.h"
 #include "GaudiKernel/MsgStream.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -94,6 +95,7 @@ void testit (const TrigInDetTrackTruth& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   TrigInDetTrackTruth trans1;
   TrigInDetTrackTruthCnv_p1_test::set (trans1);
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigInDetTrackTruthMapCnv_p1_test.cxx b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigInDetTrackTruthMapCnv_p1_test.cxx
index aec218b62dbd752192b07c92d2f449b894b86122..6c5a95efc509136f74237b41a4119f232ee9b9bc 100644
--- a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigInDetTrackTruthMapCnv_p1_test.cxx
+++ b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/test/TrigInDetTrackTruthMapCnv_p1_test.cxx
@@ -17,6 +17,7 @@
 #include "SGTools/TestStore.h"
 #include "CxxUtils/make_unique.h"
 #include "GaudiKernel/MsgStream.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -109,9 +110,6 @@ void test1()
 {
   std::cout << "test1\n";
 
-  TrigInDetTrackTruthMap trans1;
-  //TrigInDetTrackTruthMapCnv_p1_test::set (trans1);
-
   auto coll = CxxUtils::make_unique<TrigInDetTrackCollection>();
   for (int i=0; i<10; i++) {
     int o = i*10;
@@ -124,6 +122,11 @@ void test1()
   const TrigInDetTrackCollection* collp = coll.get();
   SGTest::store.record (coll.release(), "coll");
 
+  Athena::getMessageSvc();
+  Athena_test::Leakcheck check;
+  TrigInDetTrackTruthMap trans1;
+  //TrigInDetTrackTruthMapCnv_p1_test::set (trans1);
+
   TrigInDetTrackTruth t1;
   TrigInDetTrackTruthCnv_p1_test::set (t1, 1);
   trans1.addMatch (collp, 1, t1);
@@ -135,7 +138,6 @@ void test1()
   TrigInDetTrackTruth t3;
   TrigInDetTrackTruthCnv_p1_test::set (t3, 3);
   trans1.addMatch (collp, 3, t3);
-  
     
   testit (trans1);
 }