diff --git a/tests/Test_simd.cc b/tests/Test_simd.cc
index 581eac7b..17b6c9d5 100644
--- a/tests/Test_simd.cc
+++ b/tests/Test_simd.cc
@@ -511,6 +511,7 @@ void ExchangeTester(const functor &func)
       }
     }
     //    assert(found==1);
+    assert(found==1||found==0);
   }
   for(int i=0;i<Nsimd;i++){
     int found=0;
@@ -521,6 +522,7 @@ void ExchangeTester(const functor &func)
       }
     }
     //    assert(found==1);
+    assert(found==1||found==0);
   }
 
   /*
diff --git a/tests/Test_stencil.cc b/tests/Test_stencil.cc
index 2f8444b6..c487ddda 100644
--- a/tests/Test_stencil.cc
+++ b/tests/Test_stencil.cc
@@ -70,7 +70,6 @@ int main(int argc, char ** argv) {
   }
   Integer stride =1000;
   {
-    double nrm;
     LatticeComplex coor(&Fine);
 
     for(int d=0;d<Nd;d++){
@@ -150,7 +149,7 @@ int main(int argc, char ** argv) {
 	}}}}
 
 	if (nrm > 1.0e-4) {
-	  for(int i=0;i<Check._odata.size();i++){
+	  for(int i=0;i<Check._odata_size;i++){
 	    std::cout << i<<" Check.odata "<<Check._odata[i]<< "\n"<<i<<" Bar.odata "<<Bar._odata[i]<<std::endl;
 	  }
 	}
diff --git a/tests/core/Test_main.cc b/tests/core/Test_main.cc
index e5f675f1..b0a2e5fc 100644
--- a/tests/core/Test_main.cc
+++ b/tests/core/Test_main.cc
@@ -450,7 +450,7 @@ int main(int argc, char **argv) {
       double t0, t1, flops;
       double bytes;
       int ncall = 5000;
-      int Nc = Grid::QCD::Nc;
+      int Nc = Grid::Nc;
 
       LatticeGaugeField U(&Fine);
       //    LatticeColourMatrix Uy = peekLorentz(U,1);
diff --git a/tests/core/Test_staggered5Dvec.cc b/tests/core/Test_staggered5Dvec.cc
index f2e73cd1..01a49db3 100644
--- a/tests/core/Test_staggered5Dvec.cc
+++ b/tests/core/Test_staggered5Dvec.cc
@@ -129,9 +129,9 @@ int main (int argc, char ** argv)
   std::cout<<GridLogMessage << "Calling vectorised staggered operator"<<std::endl;
 
 #ifdef AVX512
-  QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptInlineAsm;
+  StaggeredKernelsStatic::Opt=StaggeredKernelsStatic::OptInlineAsm;
 #else
-  QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptGeneric;
+  StaggeredKernelsStatic::Opt=StaggeredKernelsStatic::OptGeneric;
 #endif
 
   t0=usecond();
@@ -151,7 +151,7 @@ int main (int argc, char ** argv)
   FermionField ssrc  (sFGrid);  localConvert(src,ssrc);
   FermionField sresult(sFGrid); sresult=zero;
 
-  QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptHandUnroll;
+  StaggeredKernelsStatic::Opt=StaggeredKernelsStatic::OptHandUnroll;
   t0=usecond();
   for(int i=0;i<ncall1;i++){
     sDs.Dhop(ssrc,sresult,0);
@@ -165,9 +165,9 @@ int main (int argc, char ** argv)
 
 
 #ifdef AVX512
-  QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptInlineAsm;
+  StaggeredKernelsStatic::Opt=StaggeredKernelsStatic::OptInlineAsm;
 #else
-  QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptGeneric;
+  StaggeredKernelsStatic::Opt=StaggeredKernelsStatic::OptGeneric;
 #endif
 
   err = tmp-result; 
diff --git a/tests/core/Test_wilson_even_odd.cc b/tests/core/Test_wilson_even_odd.cc
index 20d271de..046f60e2 100644
--- a/tests/core/Test_wilson_even_odd.cc
+++ b/tests/core/Test_wilson_even_odd.cc
@@ -70,7 +70,8 @@ int main (int argc, char ** argv)
   LatticeFermion    ref(&Grid);    ref=zero;
   LatticeFermion    tmp(&Grid);    tmp=zero;
   LatticeFermion    err(&Grid);    tmp=zero;
-  LatticeGaugeField Umu(&Grid); SU3::HotConfiguration(pRNG,Umu);
+  LatticeGaugeField Umu(&Grid); 
+  SU3::HotConfiguration(pRNG,Umu);
   std::vector<LatticeColourMatrix> U(4,&Grid);
 
   double volume=1;