diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p1.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p1.cxx
index 48df46e330f186149cec2df3d26b9846d3e1ac8b..f265c03105529127622402c5aa996e3f6e64ac34 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p1.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p1.cxx
@@ -8,7 +8,7 @@
 
 void LUCID_DigitCnv_p1::persToTrans(const LUCID_Digit_p1* persObj, LUCID_Digit* transObj, MsgStream &log) {
 
-  log << MSG::DEBUG << " In LUCID_DigitCnv_p1::persToTrans " << endreq;
+  log << MSG::DEBUG << " In LUCID_DigitCnv_p1::persToTrans " << endmsg;
   
   *transObj = LUCID_Digit (persObj->m_tubeID,
                            persObj->m_npe,
@@ -21,7 +21,7 @@ void LUCID_DigitCnv_p1::persToTrans(const LUCID_Digit_p1* persObj, LUCID_Digit*
 
 void LUCID_DigitCnv_p1::transToPers(const LUCID_Digit* transObj, LUCID_Digit_p1* persObj, MsgStream& log) {
 
-  log << MSG::DEBUG << " In LUCID_DigitCnv_p1::transToPers " << endreq;
+  log << MSG::DEBUG << " In LUCID_DigitCnv_p1::transToPers " << endmsg;
   
   persObj->m_tubeID = transObj->getTubeID();
   persObj->m_npe    = transObj->getNpe();
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p2.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p2.cxx
index aae9cce11cb5e37a3343397f268602c15ba36efc..e8d1e0be52b319c89af7e90a17ded2c7c882a044 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p2.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p2.cxx
@@ -8,7 +8,7 @@
 
 void LUCID_DigitCnv_p2::persToTrans(const LUCID_Digit_p2* persObj, LUCID_Digit* transObj, MsgStream &log) {
 
-  log << MSG::DEBUG << " In LUCID_DigitCnv_p2::persToTrans " << endreq;
+  log << MSG::DEBUG << " In LUCID_DigitCnv_p2::persToTrans " << endmsg;
 
   *transObj = LUCID_Digit (persObj->m_tubeID,
                            persObj->m_npe,
@@ -21,7 +21,7 @@ void LUCID_DigitCnv_p2::persToTrans(const LUCID_Digit_p2* persObj, LUCID_Digit*
 
 void LUCID_DigitCnv_p2::transToPers(const LUCID_Digit* transObj, LUCID_Digit_p2* persObj, MsgStream& log) {
 
-  log << MSG::DEBUG << " In LUCID_DigitCnv_p2::transToPers " << endreq;
+  log << MSG::DEBUG << " In LUCID_DigitCnv_p2::transToPers " << endmsg;
   
   persObj->m_tubeID = transObj->getTubeID();
   persObj->m_npe    = transObj->getNpe();
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p1.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p1.cxx
index 5109dcbc7b24873869b331928f6bf8462db14aa2..774e1bf2fa51e66ef0cd7c145fe2da9dc3d523f4 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p1.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p1.cxx
@@ -9,7 +9,7 @@ static LUCID_DigitCnv_p1 digitConv;
 
 void LUCID_DigitContainerCnv_p1::transToPers(const LUCID_DigitContainer* transObj, LUCID_DigitContainer_p1* persObj, MsgStream& log) {
 
-  log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p1::transToPers" << endreq;
+  log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p1::transToPers" << endmsg;
   
   persObj->resize(transObj->size());
   
@@ -23,7 +23,7 @@ void LUCID_DigitContainerCnv_p1::transToPers(const LUCID_DigitContainer* transOb
 
 void LUCID_DigitContainerCnv_p1::persToTrans(const LUCID_DigitContainer_p1* persObj, LUCID_DigitContainer* transObj, MsgStream& log) {
 
-  log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p1::persToTrans" << endreq;
+  log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p1::persToTrans" << endmsg;
 
   transObj->reserve(persObj->size());
   
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p2.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p2.cxx
index 9542087033597eff3810f9869cbd938e8b1e0b2c..d0e407276e4490f9e482b5d163cbc76557928b9b 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p2.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p2.cxx
@@ -9,7 +9,7 @@ static LUCID_DigitCnv_p2 digitConv_p2;
 
 void LUCID_DigitContainerCnv_p2::transToPers(const LUCID_DigitContainer* transObj, LUCID_DigitContainer_p2* persObj, MsgStream& log) {
 
-  log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p2::transToPers" << endreq;
+  log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p2::transToPers" << endmsg;
   
   persObj->resize(transObj->size());
   
@@ -23,7 +23,7 @@ void LUCID_DigitContainerCnv_p2::transToPers(const LUCID_DigitContainer* transOb
 
 void LUCID_DigitContainerCnv_p2::persToTrans(const LUCID_DigitContainer_p2* persObj, LUCID_DigitContainer* transObj, MsgStream& log) {
 
-  log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p2::persToTrans" << endreq;
+  log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p2::persToTrans" << endmsg;
 
   transObj->reserve(persObj->size());
   
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataCnv_p1.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataCnv_p1.cxx
index 4dbea949f4359a1ecba32ec5f063eb2cb27f7c19..d1016547c26dc0057450acf77f9dda0e8aa0134a 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataCnv_p1.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataCnv_p1.cxx
@@ -9,7 +9,7 @@
 
 void LUCID_RawDataCnv_p1::persToTrans(const LUCID_RawData_p1* persObj, LUCID_RawData* transObj, MsgStream &log) {
 
-  log << MSG::DEBUG << "In LUCID_RawDataCnv_p1:persToTrans" << endreq;
+  log << MSG::DEBUG << "In LUCID_RawDataCnv_p1:persToTrans" << endmsg;
   
   transObj->setWord0  (persObj->m_word0);
   transObj->setWord1  (persObj->m_word1);
@@ -31,7 +31,7 @@ void LUCID_RawDataCnv_p1::persToTrans(const LUCID_RawData_p1* persObj, LUCID_Raw
 
 void LUCID_RawDataCnv_p1::transToPers(const LUCID_RawData* transObj, LUCID_RawData_p1* persObj, MsgStream &log) {
   
-  log << MSG::DEBUG << "In LUCID_RawDataCnv_p1:transToPers" << endreq;
+  log << MSG::DEBUG << "In LUCID_RawDataCnv_p1:transToPers" << endmsg;
   
   persObj->m_word0  = transObj->getWord0();
   persObj->m_word1  = transObj->getWord1();
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataContainerCnv_p1.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataContainerCnv_p1.cxx
index dce648a2d8b7cebd7c28e1f29b8d19015f7f1054..652b21bebed5eff1287c3d94e77d0046e9963949 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataContainerCnv_p1.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataContainerCnv_p1.cxx
@@ -9,7 +9,7 @@ static LUCID_RawDataCnv_p1 rawDataConv;
 
 void LUCID_RawDataContainerCnv_p1::transToPers(const LUCID_RawDataContainer* transObj, LUCID_RawDataContainer_p1* persObj, MsgStream& log) {
 
-  log << MSG::DEBUG << "In LUCID_RawDataContainerCnv_p1::transToPers" << endreq;
+  log << MSG::DEBUG << "In LUCID_RawDataContainerCnv_p1::transToPers" << endmsg;
   
   persObj->resize(transObj->size());
   
@@ -23,7 +23,7 @@ void LUCID_RawDataContainerCnv_p1::transToPers(const LUCID_RawDataContainer* tra
 
 void LUCID_RawDataContainerCnv_p1::persToTrans(const LUCID_RawDataContainer_p1* persObj, LUCID_RawDataContainer* transObj, MsgStream& log) {
 
-  log << MSG::DEBUG << "In LUCID_RawDataContainerCnv_p1::persToTrans" << endreq;
+  log << MSG::DEBUG << "In LUCID_RawDataContainerCnv_p1::persToTrans" << endmsg;
 
   transObj->reserve(persObj->size());
   
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_SimHitCnv_p1.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_SimHitCnv_p1.cxx
index 80ce0ce8dbf50fccc3a1d3c8c92d5d80d22d2111..f0d0eafba6f27abfa5e1be635b0ae192f2789d0b 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_SimHitCnv_p1.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_SimHitCnv_p1.cxx
@@ -9,7 +9,7 @@
 
 void LUCID_SimHitCnv_p1::persToTrans(const LUCID_SimHit_p1* persObj, LUCID_SimHit* transObj, MsgStream& log) {
 
-  log << MSG::DEBUG << "LUCID_SimHitCnv_p1::persToTrans called " << endreq;
+  log << MSG::DEBUG << "LUCID_SimHitCnv_p1::persToTrans called " << endmsg;
   
   // redundant with m_track.
   //HepMcParticleLinkCnv_p1 HepMcPLCnv;
@@ -32,7 +32,7 @@ void LUCID_SimHitCnv_p1::persToTrans(const LUCID_SimHit_p1* persObj, LUCID_SimHi
 
 void LUCID_SimHitCnv_p1::transToPers(const LUCID_SimHit* transObj, LUCID_SimHit_p1* persObj, MsgStream& log) {
 
-  log << MSG::DEBUG << "LUCID_SimHitCnv_p1::transToPers called " << endreq;
+  log << MSG::DEBUG << "LUCID_SimHitCnv_p1::transToPers called " << endmsg;
   
   HepMcParticleLinkCnv_p1 HepMcPLCnv;
   
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p1_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p1_test.cxx
index 0aae053fd15ea9bf2f50d7498b613ba898834248..ea5097745b48a6f9ececd148ebbd45d76f6b0cb2 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p1_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "LUCID_EventTPCnv/LUCID_DigitCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -46,6 +47,7 @@ void testit (const LUCID_Digit& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   LUCID_Digit trans1 (1, 2, 3, 4, 5, 6, true);
     
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p2_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p2_test.cxx
index 1b5bd9c03f270eb58eb2a07e2f1bdc247c2128f8..813dcd1e4c1f2482bea446c33985f25bb40fdfeb 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p2_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p2_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "LUCID_EventTPCnv/LUCID_DigitCnv_p2.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -46,6 +47,7 @@ void testit (const LUCID_Digit& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   LUCID_Digit trans1 (1, 2.5, 3, 4, 5, 6, true);
     
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p1_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p1_test.cxx
index b956bea260a95090c091f1684fcc6ef188b9ca4f..a5bb85aba2ec191361be0a7e93663ed8dac076f0 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p1_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "LUCID_EventTPCnv/LUCID_DigitContainerCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -56,6 +57,7 @@ void testit (const LUCID_DigitContainer& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   LUCID_DigitContainer trans1;
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p2_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p2_test.cxx
index 8bc2ecce2cae0e7cb1fefc43d2d4b91850d29fb8..134d19593adc161681802b2c7460d7147e319f87 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p2_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p2_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "LUCID_EventTPCnv/LUCID_DigitContainerCnv_p2.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -56,6 +57,7 @@ void testit (const LUCID_DigitContainer& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   LUCID_DigitContainer trans1;
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataCnv_p1_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataCnv_p1_test.cxx
index e6456364812924616e1933601e539222b4ebcefc..6da576de2af00654d701fe874c10dc04c6992916 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataCnv_p1_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "LUCID_EventTPCnv/LUCID_RawDataCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -55,6 +56,7 @@ void testit (const LUCID_RawData& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   LUCID_RawData trans1 (1, 2, 3, 4,
                         5, 6, 7, 8,
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataContainerCnv_p1_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataContainerCnv_p1_test.cxx
index 5e3cf7262a092fcab314f5ce4e0fe2c1c4216380..99cba3fadc88b52a796dc3725f57ad95bafb6f8a 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataContainerCnv_p1_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataContainerCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "LUCID_EventTPCnv/LUCID_RawDataContainerCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -64,6 +65,7 @@ void testit (const LUCID_RawDataContainer& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   LUCID_RawDataContainer trans1;
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_SimHitCnv_p1_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_SimHitCnv_p1_test.cxx
index 3c560298bda13d4f037ce584f83b26723f25eb7a..3a7a3928f3cf7a372be0bb46958d99ef54458d5b 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_SimHitCnv_p1_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_SimHitCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "LUCID_EventTPCnv/LUCID_SimHitCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -54,6 +55,7 @@ void testit (const LUCID_SimHit& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   LUCID_SimHit trans1 (1, 2, 3, 4,
                        5.5, 6.5, 7.5,