diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p2_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p2_test.cxx
index e15be1f830c4919d9c937ea4079ffd5e0865e045..043d0f9824415ce7391760029f8d4ada1e70ba2c 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigEFBphysCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +14,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -55,6 +54,7 @@ void testit (const TrigEFBphys& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak check.
   ElementLink<TrigEFBphysContainer> foo ("foo", 10);
   ElementLink<Rec::TrackParticleContainer> bar1 ("bar1", 1);
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p3_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p3_test.cxx
index 60bc875f27d87e587b4ac8f050c43226f6886952..63d055a91a01558c6a5644995d866981887cb5b2 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p3_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigEFBphysCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +14,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -55,6 +54,7 @@ void testit (const TrigEFBphys& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak check.
   ElementLink<TrigEFBphysContainer> foo ("foo", 10);
   ElementLink<Rec::TrackParticleContainer> bar1 ("bar1", 1);
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p2_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p2_test.cxx
index c3543bce3b3adbd34a52543afddd878c670fe61b..3ce04721e2a16ff24aa1ba2f3b54ca7566c85fd3 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigElectronCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -18,6 +16,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -79,6 +78,7 @@ void testit (const TrigElectron& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak check.
   ElementLink< TrigEMClusterContainer > foo ("foo", 10);
   ElementLink< TrigInDetTrackCollection > bar ("bar", 20);
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p3_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p3_test.cxx
index 4a67ad19aa022b02d02172f92d7e1963abc08621..d8c99d29e660d41c77a3c4471bb7de331c29940b 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p3_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigElectronCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -17,6 +15,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -76,6 +75,7 @@ void testit (const TrigElectron& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak check.
   ElementLink< TrigEMClusterContainer > foo ("foo", 10);
   ElementLink< TrigInDetTrackCollection > bar ("bar", 20);
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p2_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p2_test.cxx
index 6213058aaeacbb766cc609175b857b42102e4055..1948ef255ab2f46039afd97718070b453b06c29e 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigL2BphysCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +14,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -55,6 +54,7 @@ void testit (const TrigL2Bphys& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak check.
   ElementLink<TrigL2BphysContainer> foo ("foo", 10);
   ElementLink<TrigInDetTrackCollection> bar1 ("bar1", 1);
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p3_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p3_test.cxx
index 91f1ed2b07dbd80e0fc2c290ac94a6c9982b1a0b..9f9ffddd11374ebddac36bc1f4659f01f74387b8 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p3_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigL2BphysCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +14,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -55,6 +54,7 @@ void testit (const TrigL2Bphys& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak check.
   ElementLink<TrigL2BphysContainer> foo ("foo", 10);
   ElementLink<TrigInDetTrackCollection> bar1 ("bar1", 1);
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p2_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p2_test.cxx
index 9e91ddfcc23fa4feb0f65ed4b545ef8d7e275b02..7f6cda479ccf145a1a6e167c2e1018366f4749bc 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigPhotonCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -18,6 +16,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -73,6 +72,7 @@ void testit (const TrigPhoton& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak check.
   ElementLink< TrigEMClusterContainer > foo ("foo", 10);
   Athena_test::Leakcheck check;
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p3_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p3_test.cxx
index 93ce00669a5ff7bc585e394f4cd8a854ce34c26f..cba8c1125e1789f7ac9af4483477569bf6cb6279 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p3_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigPhotonCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -17,6 +15,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -70,6 +69,7 @@ void testit (const TrigPhoton& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak check.
   ElementLink< TrigEMClusterContainer > foo ("foo", 10);
   Athena_test::Leakcheck check;