diff --git a/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p1_test.cxx b/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p1_test.cxx
index 070b0804e7e34c414d06607ca63f4f77527a3e23..dc07862958c8524fbd856f502ac836af9cbde3ab 100644
--- a/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p1_test.cxx
+++ b/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p1_test.cxx
@@ -15,6 +15,7 @@
 #include "eflowEventTPCnv/eflowObjectCnv_p1.h"
 #include "SGTools/TestStore.h"
 #include "CLHEP/Vector/ThreeVector.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -77,6 +78,15 @@ void testit (const eflowObject& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get proxies created outside of leak checking.
+  ElementLink<CaloClusterContainer> foo ("foo", 0);
+  ElementLink<CaloClusterContainer> bar ("bar", 0);
+  ElementLink<Rec::TrackParticleContainer> aaa ("aaa", 0);
+  ElementLink<Rec::TrackParticleContainer> bbb ("bbb", 0);
+  ElementLink<Rec::TrackParticleContainer> ccc ("ccc", 0);
+  ElementLink<Analysis::MuonContainer> aa ("aa", 0);
+  ElementLink<VxContainer> bb ("bb", 0);
+  Athena_test::Leakcheck check;
 
   eflowObject trans1;
   trans1.setE (100.5);
diff --git a/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p2_test.cxx b/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p2_test.cxx
index 362d5da62f6ec2a6d625ffc626d70fd55a037efb..26b34463215f4d797d97d3e6bb6263a2c52d0de4 100644
--- a/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p2_test.cxx
+++ b/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p2_test.cxx
@@ -15,6 +15,7 @@
 #include "eflowEventTPCnv/eflowObjectCnv_p2.h"
 #include "SGTools/TestStore.h"
 #include "CLHEP/Vector/ThreeVector.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -77,6 +78,15 @@ void testit (const eflowObject& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get proxies created outside of leak checking.
+  ElementLink<CaloClusterContainer> foo ("foo", 0);
+  ElementLink<CaloClusterContainer> bar ("bar", 0);
+  ElementLink<Rec::TrackParticleContainer> aaa ("aaa", 0);
+  ElementLink<Rec::TrackParticleContainer> bbb ("bbb", 0);
+  ElementLink<Rec::TrackParticleContainer> ccc ("ccc", 0);
+  ElementLink<Analysis::MuonContainer> aa ("aa", 0);
+  ElementLink<VxContainer> bb ("bb", 0);
+  Athena_test::Leakcheck check;
 
   eflowObject trans1;
   trans1.setE (100.5);
diff --git a/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p3_test.cxx b/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p3_test.cxx
index a8cddf554d572ad5214e2d67f80be72187a43ceb..790e742af33460ad98ee1cad4e924b4a0551a2bb 100644
--- a/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p3_test.cxx
+++ b/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p3_test.cxx
@@ -15,6 +15,7 @@
 #include "eflowEventTPCnv/eflowObjectCnv_p3.h"
 #include "SGTools/TestStore.h"
 #include "CLHEP/Vector/ThreeVector.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -74,7 +75,16 @@ void testit (const eflowObject& trans1)
 
 void test1()
 {
-  std::cout << "test1\n";
+  std::cout << "test1\n"; 
+  // Get proxies created outside of leak checking.
+  ElementLink<CaloClusterContainer> foo ("foo", 0);
+  ElementLink<CaloClusterContainer> bar ("bar", 0);
+  ElementLink<Rec::TrackParticleContainer> aaa ("aaa", 0);
+  ElementLink<Rec::TrackParticleContainer> bbb ("bbb", 0);
+  ElementLink<Rec::TrackParticleContainer> ccc ("ccc", 0);
+  ElementLink<Analysis::MuonContainer> aa ("aa", 0);
+  ElementLink<VxContainer> bb ("bb", 0);
+  Athena_test::Leakcheck check;
 
   eflowObject trans1;
   trans1.setE (100.5);
diff --git a/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p4_test.cxx b/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p4_test.cxx
index 125c40705c70c7d41c607d243dc0a9e124b2af84..5b83be84b95356f6ce9e2e6c62a84fcc849f26b3 100644
--- a/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p4_test.cxx
+++ b/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p4_test.cxx
@@ -15,6 +15,7 @@
 #include "eflowEventTPCnv/eflowObjectCnv_p4.h"
 #include "SGTools/TestStore.h"
 #include "CLHEP/Vector/ThreeVector.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -75,6 +76,15 @@ void testit (const eflowObject& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get proxies created outside of leak checking.
+  ElementLink<CaloClusterContainer> foo ("foo", 0);
+  ElementLink<CaloClusterContainer> bar ("bar", 0);
+  ElementLink<Rec::TrackParticleContainer> aaa ("aaa", 0);
+  ElementLink<Rec::TrackParticleContainer> bbb ("bbb", 0);
+  ElementLink<Rec::TrackParticleContainer> ccc ("ccc", 0);
+  ElementLink<Analysis::MuonContainer> aa ("aa", 0);
+  ElementLink<VxContainer> bb ("bb", 0);
+  Athena_test::Leakcheck check;
 
   eflowObject trans1;
   trans1.setE (100.5);
diff --git a/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p5_test.cxx b/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p5_test.cxx
index 8ed882285682e77e05fcffaf95d3d5c4ca0bedc4..8ba4e54ad4aa5d2c04d343674a6d06a85ac787fd 100644
--- a/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p5_test.cxx
+++ b/Reconstruction/eflowEventTPCnv/test/eflowObjectCnv_p5_test.cxx
@@ -15,6 +15,7 @@
 #include "eflowEventTPCnv/eflowObjectCnv_p5.h"
 #include "SGTools/TestStore.h"
 #include "CLHEP/Vector/ThreeVector.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -75,6 +76,15 @@ void testit (const eflowObject& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get proxies created outside of leak checking.
+  ElementLink<CaloClusterContainer> foo ("foo", 0);
+  ElementLink<CaloClusterContainer> bar ("bar", 0);
+  ElementLink<Rec::TrackParticleContainer> aaa ("aaa", 0);
+  ElementLink<Rec::TrackParticleContainer> bbb ("bbb", 0);
+  ElementLink<Rec::TrackParticleContainer> ccc ("ccc", 0);
+  ElementLink<Analysis::MuonContainer> aa ("aa", 0);
+  ElementLink<VxContainer> bb ("bb", 0);
+  Athena_test::Leakcheck check;
 
   eflowObject trans1;
   trans1.setE (100.5);
diff --git a/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p1_test.cxx b/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p1_test.cxx
index 99f8821d3cd4f3dbade9e181ba4669b0d6542598..6d5d791264fd2c6b3b35dbfc61e25c4531a86993 100644
--- a/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p1_test.cxx
+++ b/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p1_test.cxx
@@ -16,6 +16,7 @@
 #include "SGTools/TestStore.h"
 #include "CxxUtils/make_unique.h"
 #include "CLHEP/Vector/ThreeVector.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -100,6 +101,15 @@ void testit (const eflowObjectContainer& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get proxies created outside of leak checking.
+  ElementLink<CaloClusterContainer> foo ("foo", 0);
+  ElementLink<CaloClusterContainer> bar ("bar", 0);
+  ElementLink<Rec::TrackParticleContainer> aaa ("aaa", 0);
+  ElementLink<Rec::TrackParticleContainer> bbb ("bbb", 0);
+  ElementLink<Rec::TrackParticleContainer> ccc ("ccc", 0);
+  ElementLink<Analysis::MuonContainer> aa ("aa", 0);
+  ElementLink<VxContainer> bb ("bb", 0);
+  Athena_test::Leakcheck check;
 
   eflowObjectContainer trans1;
   for (int i=0; i < 10; i++) {
diff --git a/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p2_test.cxx b/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p2_test.cxx
index 43043a3cde3868cd802c689c1b3c150d0322c602..748c4d5c86c0ab827010ca83c16bbb4f7838019c 100644
--- a/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p2_test.cxx
+++ b/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p2_test.cxx
@@ -16,6 +16,7 @@
 #include "SGTools/TestStore.h"
 #include "CxxUtils/make_unique.h"
 #include "CLHEP/Vector/ThreeVector.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -100,6 +101,15 @@ void testit (const eflowObjectContainer& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get proxies created outside of leak checking.
+  ElementLink<CaloClusterContainer> foo ("foo", 0);
+  ElementLink<CaloClusterContainer> bar ("bar", 0);
+  ElementLink<Rec::TrackParticleContainer> aaa ("aaa", 0);
+  ElementLink<Rec::TrackParticleContainer> bbb ("bbb", 0);
+  ElementLink<Rec::TrackParticleContainer> ccc ("ccc", 0);
+  ElementLink<Analysis::MuonContainer> aa ("aa", 0);
+  ElementLink<VxContainer> bb ("bb", 0);
+  Athena_test::Leakcheck check;
 
   eflowObjectContainer trans1;
   for (int i=0; i < 10; i++) {
diff --git a/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p3_test.cxx b/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p3_test.cxx
index 5a22c368ce910ca819d626d1955b3d20c2b0025d..72cfb6b46a0a7ae9893d81053c2c8c26a0bcadf5 100644
--- a/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p3_test.cxx
+++ b/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p3_test.cxx
@@ -16,6 +16,7 @@
 #include "SGTools/TestStore.h"
 #include "CxxUtils/make_unique.h"
 #include "CLHEP/Vector/ThreeVector.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -98,6 +99,15 @@ void testit (const eflowObjectContainer& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get proxies created outside of leak checking.
+  ElementLink<CaloClusterContainer> foo ("foo", 0);
+  ElementLink<CaloClusterContainer> bar ("bar", 0);
+  ElementLink<Rec::TrackParticleContainer> aaa ("aaa", 0);
+  ElementLink<Rec::TrackParticleContainer> bbb ("bbb", 0);
+  ElementLink<Rec::TrackParticleContainer> ccc ("ccc", 0);
+  ElementLink<Analysis::MuonContainer> aa ("aa", 0);
+  ElementLink<VxContainer> bb ("bb", 0);
+  Athena_test::Leakcheck check;
 
   eflowObjectContainer trans1;
   for (int i=0; i < 10; i++) {
diff --git a/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p4_test.cxx b/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p4_test.cxx
index 3c8efccf5179ba82757c6ac38ff8c7ec2a1eec70..a63168a52b41a0dada7c58a8439deb823d437dff 100644
--- a/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p4_test.cxx
+++ b/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p4_test.cxx
@@ -16,6 +16,7 @@
 #include "SGTools/TestStore.h"
 #include "CxxUtils/make_unique.h"
 #include "CLHEP/Vector/ThreeVector.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -98,6 +99,15 @@ void testit (const eflowObjectContainer& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get proxies created outside of leak checking.
+  ElementLink<CaloClusterContainer> foo ("foo", 0);
+  ElementLink<CaloClusterContainer> bar ("bar", 0);
+  ElementLink<Rec::TrackParticleContainer> aaa ("aaa", 0);
+  ElementLink<Rec::TrackParticleContainer> bbb ("bbb", 0);
+  ElementLink<Rec::TrackParticleContainer> ccc ("ccc", 0);
+  ElementLink<Analysis::MuonContainer> aa ("aa", 0);
+  ElementLink<VxContainer> bb ("bb", 0);
+  Athena_test::Leakcheck check;
 
   eflowObjectContainer trans1;
   for (int i=0; i < 10; i++) {
diff --git a/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p5_test.cxx b/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p5_test.cxx
index 7f5fd9ed991d7c11ce5a236b6ce6ce9fa27eaba0..ddd5d84438cd0d2c2a6e08f1012ad36f2b8401bd 100644
--- a/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p5_test.cxx
+++ b/Reconstruction/eflowEventTPCnv/test/eflowObjectContainerCnv_p5_test.cxx
@@ -16,6 +16,7 @@
 #include "SGTools/TestStore.h"
 #include "CxxUtils/make_unique.h"
 #include "CLHEP/Vector/ThreeVector.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -98,6 +99,15 @@ void testit (const eflowObjectContainer& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get proxies created outside of leak checking.
+  ElementLink<CaloClusterContainer> foo ("foo", 0);
+  ElementLink<CaloClusterContainer> bar ("bar", 0);
+  ElementLink<Rec::TrackParticleContainer> aaa ("aaa", 0);
+  ElementLink<Rec::TrackParticleContainer> bbb ("bbb", 0);
+  ElementLink<Rec::TrackParticleContainer> ccc ("ccc", 0);
+  ElementLink<Analysis::MuonContainer> aa ("aa", 0);
+  ElementLink<VxContainer> bb ("bb", 0);
+  Athena_test::Leakcheck check;
 
   eflowObjectContainer trans1;
   for (int i=0; i < 10; i++) {