diff --git a/tests/core/Test_qed.cc b/tests/core/Test_qed.cc
index 726c202b..775d6307 100644
--- a/tests/core/Test_qed.cc
+++ b/tests/core/Test_qed.cc
@@ -29,7 +29,6 @@ See the full license in the file "LICENSE" in the top level distribution directo
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace QCD;
 
 typedef PeriodicGaugeImpl<QedGImplR>  QedPeriodicGImplR;
 typedef PhotonR::GaugeField           EmField;
diff --git a/tests/core/Test_staggered5D.cc b/tests/core/Test_staggered5D.cc
index 907cf4ec..7055d183 100644
--- a/tests/core/Test_staggered5D.cc
+++ b/tests/core/Test_staggered5D.cc
@@ -30,7 +30,6 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
- ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_staggered5Dvec.cc b/tests/core/Test_staggered5Dvec.cc
index 190f0eb8..d538663e 100644
--- a/tests/core/Test_staggered5Dvec.cc
+++ b/tests/core/Test_staggered5Dvec.cc
@@ -30,10 +30,11 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
- ;
+
 
 int main (int argc, char ** argv)
 {
+#ifndef GRID_NVCC
   Grid_init(&argc,&argv);
 
   Coordinate latt_size   = GridDefaultLatt();
@@ -193,4 +194,5 @@ int main (int argc, char ** argv)
 
 
   Grid_finalize();
+#endif
 }
diff --git a/tests/core/Test_wilson_clover.cc b/tests/core/Test_wilson_clover.cc
index 8d67a360..3e31f7f6 100644
--- a/tests/core/Test_wilson_clover.cc
+++ b/tests/core/Test_wilson_clover.cc
@@ -29,7 +29,6 @@
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
 
 int main(int argc, char **argv)
 {
diff --git a/tests/debug/Test_split_laplacian.cc b/tests/debug/Test_split_laplacian.cc
index 19d190cf..1e41e112 100644
--- a/tests/debug/Test_split_laplacian.cc
+++ b/tests/debug/Test_split_laplacian.cc
@@ -29,7 +29,6 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
 
 
 int main (int argc, char ** argv)
diff --git a/tests/forces/Test_contfrac_force.cc b/tests/forces/Test_contfrac_force.cc
index 5acad97a..4eeb8c27 100644
--- a/tests/forces/Test_contfrac_force.cc
+++ b/tests/forces/Test_contfrac_force.cc
@@ -101,7 +101,7 @@ int main (int argc, char ** argv)
     auto mom_v = mom.View();
     auto Uprime_v = Uprime.View();
     auto U_v = U.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach( i,mom_v,{
       Uprime_v[i](mu) =
 	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
diff --git a/tests/forces/Test_dwf_force.cc b/tests/forces/Test_dwf_force.cc
index 4d945d6f..091d3fd0 100644
--- a/tests/forces/Test_dwf_force.cc
+++ b/tests/forces/Test_dwf_force.cc
@@ -111,12 +111,11 @@ int main (int argc, char ** argv)
 
     // fourth order exponential approx
 
-#if 0
     auto mom_v    = mom.View();
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach( i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
@@ -126,22 +125,6 @@ int main (int argc, char ** argv)
 	+ mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
 	;
     });
-#else
-    auto mom_v    = mom.View();
-    auto U_v      = U.View();
-    auto Uprime_v = Uprime.View();
-
-    accelerator_loop( i,mom_v,{
-      Uprime_v[i](mu) =	  U_v[i](mu)
-	+ mom_v[i](mu)*U_v[i](mu)*dt 
-	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
-	+ mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt/6.0)
-	+ mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt*dt/24.0)
-	+ mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt*dt*dt/120.0)
-	+ mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
-	;
-    });
-#endif
   }
   
   Ddwf.ImportGauge(Uprime);
diff --git a/tests/forces/Test_dwf_force_eofa.cc b/tests/forces/Test_dwf_force_eofa.cc
index 2cd3d8fb..726ee383 100644
--- a/tests/forces/Test_dwf_force_eofa.cc
+++ b/tests/forces/Test_dwf_force_eofa.cc
@@ -114,7 +114,7 @@ int main (int argc, char** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
diff --git a/tests/forces/Test_dwf_gpforce.cc b/tests/forces/Test_dwf_gpforce.cc
index 60911b22..d762e22a 100644
--- a/tests/forces/Test_dwf_gpforce.cc
+++ b/tests/forces/Test_dwf_gpforce.cc
@@ -123,7 +123,7 @@ int main (int argc, char ** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
diff --git a/tests/forces/Test_dwf_gpforce_eofa.cc b/tests/forces/Test_dwf_gpforce_eofa.cc
index 05e6be88..8a27bddf 100644
--- a/tests/forces/Test_dwf_gpforce_eofa.cc
+++ b/tests/forces/Test_dwf_gpforce_eofa.cc
@@ -118,7 +118,7 @@ int main (int argc, char** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
diff --git a/tests/forces/Test_gp_plaq_force.cc b/tests/forces/Test_gp_plaq_force.cc
index 12600293..c4e214bb 100644
--- a/tests/forces/Test_gp_plaq_force.cc
+++ b/tests/forces/Test_gp_plaq_force.cc
@@ -88,7 +88,7 @@ int main (int argc, char ** argv)
     auto Uprime_v = Uprime.View();
     auto U_v = U.View();
     auto mom_v = mom.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{ // exp(pmu dt) * Umu
+    thread_foreach(i,mom_v,{ // exp(pmu dt) * Umu
       Uprime_v[i](mu) = U_v[i](mu) + mom_v[i](mu)*U_v[i](mu)*dt ;
     });
   }
diff --git a/tests/forces/Test_gp_rect_force.cc b/tests/forces/Test_gp_rect_force.cc
index 9ea3e063..2573af6a 100644
--- a/tests/forces/Test_gp_rect_force.cc
+++ b/tests/forces/Test_gp_rect_force.cc
@@ -90,7 +90,7 @@ int main (int argc, char ** argv)
     auto mom_v   = mom.View();
     auto Uprime_v= Uprime.View();
     auto U_v     = U.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{ // exp(pmu dt) * Umu
+    thread_foreach(i,mom_v,{ // exp(pmu dt) * Umu
       Uprime_v[i](mu) = U_v[i](mu) + mom_v[i](mu)*U_v[i](mu)*dt ;
     });
   }
diff --git a/tests/forces/Test_gpdwf_force.cc b/tests/forces/Test_gpdwf_force.cc
index 50157429..09a1dc4b 100644
--- a/tests/forces/Test_gpdwf_force.cc
+++ b/tests/forces/Test_gpdwf_force.cc
@@ -108,7 +108,7 @@ int main (int argc, char ** argv)
     auto U_v = U.View();
     auto mom_v = mom.View();
     auto Uprime_v = Uprime.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) = U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
diff --git a/tests/forces/Test_gpwilson_force.cc b/tests/forces/Test_gpwilson_force.cc
index 1c1f7768..cd30d898 100644
--- a/tests/forces/Test_gpwilson_force.cc
+++ b/tests/forces/Test_gpwilson_force.cc
@@ -103,7 +103,7 @@ int main (int argc, char ** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
diff --git a/tests/forces/Test_mobius_force.cc b/tests/forces/Test_mobius_force.cc
index 336266e7..a1c4e930 100644
--- a/tests/forces/Test_mobius_force.cc
+++ b/tests/forces/Test_mobius_force.cc
@@ -104,7 +104,7 @@ int main (int argc, char ** argv)
     auto U_v      = U.View();
     auto mom_v    = mom.View();
     auto Uprime_v = Uprime.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
diff --git a/tests/forces/Test_mobius_force_eofa.cc b/tests/forces/Test_mobius_force_eofa.cc
index 8542a522..7af8a955 100644
--- a/tests/forces/Test_mobius_force_eofa.cc
+++ b/tests/forces/Test_mobius_force_eofa.cc
@@ -116,7 +116,7 @@ int main (int argc, char** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
diff --git a/tests/forces/Test_mobius_gpforce_eofa.cc b/tests/forces/Test_mobius_gpforce_eofa.cc
index aa539818..f504458c 100644
--- a/tests/forces/Test_mobius_gpforce_eofa.cc
+++ b/tests/forces/Test_mobius_gpforce_eofa.cc
@@ -119,7 +119,7 @@ int main (int argc, char** argv)
     auto mom_v    = mom.View();
     auto Uprime_v = Uprime.View();
     // fourth order exponential approx
-    thread_loop( (auto i=mom_v.begin(); i<mom_v.end(); i++),{
+    thread_foreach( i, mom_v,{
       Uprime_v[i](mu) = U_v[i](mu) + mom_v[i](mu)*U_v[i](mu)*dt + mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
                         + mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt/6.0)
                         + mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt*dt/24.0)
diff --git a/tests/forces/Test_partfrac_force.cc b/tests/forces/Test_partfrac_force.cc
index df3782be..3ea2c6aa 100644
--- a/tests/forces/Test_partfrac_force.cc
+++ b/tests/forces/Test_partfrac_force.cc
@@ -104,7 +104,7 @@ int main (int argc, char ** argv)
     auto U_v = U.View();
     auto mom_v = mom.View();
     auto Uprime_v = Uprime.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
diff --git a/tests/forces/Test_rect_force.cc b/tests/forces/Test_rect_force.cc
index 054a6dbb..f8f5626b 100644
--- a/tests/forces/Test_rect_force.cc
+++ b/tests/forces/Test_rect_force.cc
@@ -89,7 +89,7 @@ int main (int argc, char ** argv)
     auto Uprime_v = Uprime.View();
     auto U_v      = U.View();
     auto mom_v    = mom.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{ // exp(pmu dt) * Umu
+    thread_foreach(i,mom_v,{ // exp(pmu dt) * Umu
       Uprime_v[i](mu) = U_v[i](mu) + mom_v[i](mu)*U_v[i](mu)*dt ;
     });
   }
diff --git a/tests/forces/Test_wilson_force.cc b/tests/forces/Test_wilson_force.cc
index e77a895c..c11b2991 100644
--- a/tests/forces/Test_wilson_force.cc
+++ b/tests/forces/Test_wilson_force.cc
@@ -108,7 +108,7 @@ int main (int argc, char ** argv)
     auto U_v = U.View();
     auto mom_v = mom.View();
     auto Uprime_v = Uprime.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++) ,{
+    thread_foreach( i,mom_v,{
       Uprime_v[i](mu)  =	  U_v[i](mu);
       Uprime_v[i](mu) += mom_v[i](mu)*U_v[i](mu)*dt ;
       Uprime_v[i](mu) += mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0);
diff --git a/tests/forces/Test_wilsonclover_force.cc b/tests/forces/Test_wilsonclover_force.cc
index dd0e21fd..d9ace23c 100644
--- a/tests/forces/Test_wilsonclover_force.cc
+++ b/tests/forces/Test_wilsonclover_force.cc
@@ -29,7 +29,6 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
 
 int main(int argc, char **argv)
 {
@@ -109,7 +108,7 @@ int main(int argc, char **argv)
     auto Uprime_v = Uprime.View();
     auto U_v      = U.View();
     auto mom_v    = mom.View();
-    thread_loop( (int ss = 0; ss < mom.Grid()->oSites(); ss++),
+    thread_foreach(ss,mom_v,
     {
       Uprime_v[ss]._internal[mu] = ProjectOnGroup(Exponentiate(mom_v[ss]._internal[mu], dt, 12) * U_v[ss]._internal[mu]);
     });
diff --git a/tests/forces/Test_zmobius_force.cc b/tests/forces/Test_zmobius_force.cc
index dabf6263..2730885f 100644
--- a/tests/forces/Test_zmobius_force.cc
+++ b/tests/forces/Test_zmobius_force.cc
@@ -118,7 +118,7 @@ int main (int argc, char ** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
diff --git a/tests/hmc/Test_hmc_EOWilsonCloverFermionGauge.cc b/tests/hmc/Test_hmc_EOWilsonCloverFermionGauge.cc
index fbb8a4a3..6b9b70b5 100644
--- a/tests/hmc/Test_hmc_EOWilsonCloverFermionGauge.cc
+++ b/tests/hmc/Test_hmc_EOWilsonCloverFermionGauge.cc
@@ -30,7 +30,6 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_WC2ASFG_Production.cc b/tests/hmc/Test_hmc_WC2ASFG_Production.cc
index 7ce1d3f9..0bbf4ece 100644
--- a/tests/hmc/Test_hmc_WC2ASFG_Production.cc
+++ b/tests/hmc/Test_hmc_WC2ASFG_Production.cc
@@ -69,7 +69,6 @@ namespace Grid{
 int main(int argc, char **argv)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
 
   typedef Representations< FundamentalRepresentation, TwoIndexAntiSymmetricRepresentation > TheRepresentations;  
 
diff --git a/tests/hmc/Test_hmc_WC2SFG_Production.cc b/tests/hmc/Test_hmc_WC2SFG_Production.cc
index bbb877c8..64a3f1cb 100644
--- a/tests/hmc/Test_hmc_WC2SFG_Production.cc
+++ b/tests/hmc/Test_hmc_WC2SFG_Production.cc
@@ -69,7 +69,7 @@ namespace Grid{
 int main(int argc, char **argv)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   typedef Representations< FundamentalRepresentation, TwoIndexSymmetricRepresentation > TheRepresentations;  
 
diff --git a/tests/hmc/Test_hmc_WCFG_Production.cc b/tests/hmc/Test_hmc_WCFG_Production.cc
index 8b4f8eb7..cebe3791 100644
--- a/tests/hmc/Test_hmc_WCFG_Production.cc
+++ b/tests/hmc/Test_hmc_WCFG_Production.cc
@@ -69,7 +69,7 @@ namespace Grid{
 int main(int argc, char **argv)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_WCMixedRepFG_Production.cc b/tests/hmc/Test_hmc_WCMixedRepFG_Production.cc
index 7d62c18c..211900be 100644
--- a/tests/hmc/Test_hmc_WCMixedRepFG_Production.cc
+++ b/tests/hmc/Test_hmc_WCMixedRepFG_Production.cc
@@ -70,7 +70,7 @@ namespace Grid{
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   // Here change the allowed (higher) representations
   typedef Representations< FundamentalRepresentation, TwoIndexAntiSymmetricRepresentation> TheRepresentations;
diff --git a/tests/hmc/Test_hmc_WCadjFG_Production.cc b/tests/hmc/Test_hmc_WCadjFG_Production.cc
index db655b50..5cf4bac1 100644
--- a/tests/hmc/Test_hmc_WCadjFG_Production.cc
+++ b/tests/hmc/Test_hmc_WCadjFG_Production.cc
@@ -69,7 +69,7 @@ namespace Grid{
 int main(int argc, char **argv)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   typedef Representations< FundamentalRepresentation, AdjointRepresentation > TheRepresentations;  
 
diff --git a/tests/hmc/Test_hmc_WG_Production.cc b/tests/hmc/Test_hmc_WG_Production.cc
index a75d824a..b16c073b 100644
--- a/tests/hmc/Test_hmc_WG_Production.cc
+++ b/tests/hmc/Test_hmc_WG_Production.cc
@@ -47,7 +47,7 @@ namespace Grid{
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   Grid_init(&argc, &argv);
   GridLogLayout();
diff --git a/tests/hmc/Test_hmc_WilsonCloverFermionGauge.cc b/tests/hmc/Test_hmc_WilsonCloverFermionGauge.cc
index 8d5701b8..9e27e3ec 100644
--- a/tests/hmc/Test_hmc_WilsonCloverFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonCloverFermionGauge.cc
@@ -31,7 +31,7 @@ directory
 int main(int argc, char **argv)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/solver/Test_mobius_bcg_nosplit.cc b/tests/solver/Test_mobius_bcg_nosplit.cc
index 2c934de3..3f0b7058 100644
--- a/tests/solver/Test_mobius_bcg_nosplit.cc
+++ b/tests/solver/Test_mobius_bcg_nosplit.cc
@@ -31,7 +31,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/algorithms/iterative/BlockConjugateGradient.h>
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_mobius_bcg_phys_nosplit.cc b/tests/solver/Test_mobius_bcg_phys_nosplit.cc
index 8044e15c..f929bd30 100644
--- a/tests/solver/Test_mobius_bcg_phys_nosplit.cc
+++ b/tests/solver/Test_mobius_bcg_phys_nosplit.cc
@@ -31,7 +31,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/algorithms/iterative/BlockConjugateGradient.h>
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_mobius_bcg_prec_nosplit.cc b/tests/solver/Test_mobius_bcg_prec_nosplit.cc
index 3c120aa4..31120a8e 100644
--- a/tests/solver/Test_mobius_bcg_prec_nosplit.cc
+++ b/tests/solver/Test_mobius_bcg_prec_nosplit.cc
@@ -31,7 +31,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/algorithms/iterative/BlockConjugateGradient.h>
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_staggered_cagmres_unprec.cc b/tests/solver/Test_staggered_cagmres_unprec.cc
index 1462b071..8121c90d 100644
--- a/tests/solver/Test_staggered_cagmres_unprec.cc
+++ b/tests/solver/Test_staggered_cagmres_unprec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_staggered_fcagmres_prec.cc b/tests/solver/Test_staggered_fcagmres_prec.cc
index 58434304..d08073c7 100644
--- a/tests/solver/Test_staggered_fcagmres_prec.cc
+++ b/tests/solver/Test_staggered_fcagmres_prec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_staggered_fgmres_prec.cc b/tests/solver/Test_staggered_fgmres_prec.cc
index e5127d55..98ef83a6 100644
--- a/tests/solver/Test_staggered_fgmres_prec.cc
+++ b/tests/solver/Test_staggered_fgmres_prec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_staggered_gmres_unprec.cc b/tests/solver/Test_staggered_gmres_unprec.cc
index 0502a43f..e6bb5fc7 100644
--- a/tests/solver/Test_staggered_gmres_unprec.cc
+++ b/tests/solver/Test_staggered_gmres_unprec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_staggered_mr_unprec.cc b/tests/solver/Test_staggered_mr_unprec.cc
index c64dda84..d288c9c2 100644
--- a/tests/solver/Test_staggered_mr_unprec.cc
+++ b/tests/solver/Test_staggered_mr_unprec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_wilson_cagmres_unprec.cc b/tests/solver/Test_wilson_cagmres_unprec.cc
index 4fee6171..ad502e05 100644
--- a/tests/solver/Test_wilson_cagmres_unprec.cc
+++ b/tests/solver/Test_wilson_cagmres_unprec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_wilson_fcagmres_prec.cc b/tests/solver/Test_wilson_fcagmres_prec.cc
index e7b70b81..b821a25f 100644
--- a/tests/solver/Test_wilson_fcagmres_prec.cc
+++ b/tests/solver/Test_wilson_fcagmres_prec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_wilson_fgmres_prec.cc b/tests/solver/Test_wilson_fgmres_prec.cc
index 7ec485b4..cf1818ba 100644
--- a/tests/solver/Test_wilson_fgmres_prec.cc
+++ b/tests/solver/Test_wilson_fgmres_prec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_wilson_gmres_unprec.cc b/tests/solver/Test_wilson_gmres_unprec.cc
index 045d724b..7d788391 100644
--- a/tests/solver/Test_wilson_gmres_unprec.cc
+++ b/tests/solver/Test_wilson_gmres_unprec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_wilson_mg_mp.cc b/tests/solver/Test_wilson_mg_mp.cc
index 4e2407c0..e631cd15 100644
--- a/tests/solver/Test_wilson_mg_mp.cc
+++ b/tests/solver/Test_wilson_mg_mp.cc
@@ -31,7 +31,7 @@
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main(int argc, char **argv) {
 
diff --git a/tests/solver/Test_wilson_mr_unprec.cc b/tests/solver/Test_wilson_mr_unprec.cc
index c124dfee..1cc1f418 100644
--- a/tests/solver/Test_wilson_mr_unprec.cc
+++ b/tests/solver/Test_wilson_mr_unprec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_wilsonclover_cagmres_unprec.cc b/tests/solver/Test_wilsonclover_cagmres_unprec.cc
index 004fdb31..e755dcd2 100644
--- a/tests/solver/Test_wilsonclover_cagmres_unprec.cc
+++ b/tests/solver/Test_wilsonclover_cagmres_unprec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_wilsonclover_fcagmres_prec.cc b/tests/solver/Test_wilsonclover_fcagmres_prec.cc
index f0b27966..95fe890e 100644
--- a/tests/solver/Test_wilsonclover_fcagmres_prec.cc
+++ b/tests/solver/Test_wilsonclover_fcagmres_prec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_wilsonclover_fgmres_prec.cc b/tests/solver/Test_wilsonclover_fgmres_prec.cc
index 506182b5..daea527a 100644
--- a/tests/solver/Test_wilsonclover_fgmres_prec.cc
+++ b/tests/solver/Test_wilsonclover_fgmres_prec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_wilsonclover_gmres_unprec.cc b/tests/solver/Test_wilsonclover_gmres_unprec.cc
index 85e27708..667d17d9 100644
--- a/tests/solver/Test_wilsonclover_gmres_unprec.cc
+++ b/tests/solver/Test_wilsonclover_gmres_unprec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_wilsonclover_mg.cc b/tests/solver/Test_wilsonclover_mg.cc
index e749aacb..a5fa907d 100644
--- a/tests/solver/Test_wilsonclover_mg.cc
+++ b/tests/solver/Test_wilsonclover_mg.cc
@@ -31,7 +31,7 @@
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main(int argc, char **argv) {
 
diff --git a/tests/solver/Test_wilsonclover_mg_mp.cc b/tests/solver/Test_wilsonclover_mg_mp.cc
index d9ed1d33..b5178d2e 100644
--- a/tests/solver/Test_wilsonclover_mg_mp.cc
+++ b/tests/solver/Test_wilsonclover_mg_mp.cc
@@ -31,7 +31,7 @@
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main(int argc, char **argv) {
 
diff --git a/tests/solver/Test_wilsonclover_mr_unprec.cc b/tests/solver/Test_wilsonclover_mr_unprec.cc
index 2d603810..c7b5ecfe 100644
--- a/tests/solver/Test_wilsonclover_mr_unprec.cc
+++ b/tests/solver/Test_wilsonclover_mr_unprec.cc
@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {