diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p2_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p2_test.cxx
index fe262d27e47de6c32120b1c9339144f532ffe1be..8cedb1b16f9a5bc95053a21332a64d0e91e7ab0a 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_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 TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_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>
 #include <sstream>
@@ -52,6 +51,7 @@ void testit (const CombinedMuonFeature& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak checking.
   ElementLink<MuonFeatureContainer> foo ("foo", 1);
   ElementLink<TrigInDetTrackCollection> bar ("bar", 2);
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p3_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p3_test.cxx
index ff3b0653ef7aa3a93b2fa0896e1d8a14806ff022..a245e2a35030b68773a04f92c246622658137b72 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_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 TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_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>
 #include <sstream>
@@ -52,6 +51,7 @@ void testit (const CombinedMuonFeature& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak checking.
   ElementLink<MuonFeatureContainer> foo ("foo", 1);
   ElementLink<TrigInDetTrackCollection> bar ("bar", 2);
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p4_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p4_test.cxx
index 83fc93c5d7c7bc09a6abc8b2c56841e74475a3cc..00b22805c2d8a4052a7cacb92a71505665cacf02 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p4_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p4_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 TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p4_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>
 #include <sstream>
@@ -50,6 +49,7 @@ void testit (const CombinedMuonFeature& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak checking.
   ElementLink<MuonFeatureContainer> foo ("foo", 1);
   ElementLink<TrigInDetTrackCollection> bar ("bar", 2);
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p2_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p2_test.cxx
index a506a51fb3a41ce94501e60aab7f0e8ae9e9e8a4..5e81e29951555685b1a3542021d5b5ce795d4f9d 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_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 TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_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>
 #include <sstream>
@@ -49,6 +48,7 @@ void testit (const TileTrackMuFeature& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak checking.
   ElementLink< TileMuFeatureContainer> foo ("foo", 10);
   ElementLink< TrigInDetTrackCollection> bar ("bar", 20);
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p3_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p3_test.cxx
index 396e62ec8ff8019cb8a42adf573cc3437983b446..332419dd7a0278bff7fc859e6be6cb1bfca45e8d 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_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 TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_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>
 #include <sstream>
@@ -49,6 +48,7 @@ void testit (const TileTrackMuFeature& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak checking.
   ElementLink< TileMuFeatureContainer> foo ("foo", 10);
   ElementLink< TrigInDetTrackCollection> bar ("bar", 20);
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFCbTrackCnv_p7_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFCbTrackCnv_p7_test.cxx
index bde9afcc9feff3e0cde928eece798b312635adac..d59eed7f049ecb65dcbf8ef412e44056b3077598 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFCbTrackCnv_p7_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFCbTrackCnv_p7_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 TrigMuonEventTPCnv/test/TrigMuonEFCbTrackCnv_p7_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -18,6 +16,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -88,6 +87,7 @@ void testit (const TrigMuonEFCbTrack& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak checking.
   ElementLink<Rec::TrackParticleContainer> foo ("foo", 10);
   Athena_test::Leakcheck check;
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p4_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p4_test.cxx
index f32e49bb5280a41947b2fc0c81c5aece7ea1df65..12e046cdaa7a895e90029954c324727c82268d3d 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p4_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p4_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p4_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>
 
@@ -155,6 +154,7 @@ void testit (const TrigMuonEFInfo& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak checking.
   ElementLink<Rec::TrackParticleContainer> foo ("foo", 10);
   Athena_test::Leakcheck check;
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p5_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p5_test.cxx
index 8de4a0a770ed62e125b24e6eb27e6583804f95df..31d6463e5e014782456d8871355430f174187373 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p5_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p5_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p5_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>
 
@@ -153,6 +152,7 @@ void testit (const TrigMuonEFInfo& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak checking.
   ElementLink<Rec::TrackParticleContainer> foo ("foo", 10);
   Athena_test::Leakcheck check;
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoTrackCnv_p1_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoTrackCnv_p1_test.cxx
index 09366942cf2bd36dea51250a95760a5d0142d42e..305082f19ecfadc9fc42b2a2af2e74ba9e369922 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoTrackCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoTrackCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/TrigMuonEFInfoTrackCnv_p1_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>
 
@@ -110,6 +109,7 @@ void testit (const TrigMuonEFInfoTrack& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak checking.
   ElementLink<Rec::TrackParticleContainer>foo("foo", 10);
   Athena_test::Leakcheck check;
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFIsolationCnv_p2_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFIsolationCnv_p2_test.cxx
index e4022b6cded5fcb15833e4e5f750a31fafb94d87..edeff5ecaa71e91400387ae3f0e111667e81b697 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFIsolationCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFIsolationCnv_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 TrigMuonEventTPCnv/test/TrigMuonEFIsolationCnv_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>
 
@@ -50,6 +49,7 @@ void testit (const TrigMuonEFIsolation& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak checking.
   ElementLink<TrigMuonEFInfoContainer> foo ("foo", 10);
   Athena_test::Leakcheck check;