diff --git a/tests/forces/Test_contfrac_force.cc b/tests/forces/Test_contfrac_force.cc
index bbfae8e3..dfe776d9 100644
--- a/tests/forces/Test_contfrac_force.cc
+++ b/tests/forces/Test_contfrac_force.cc
@@ -99,7 +99,7 @@ int main (int argc, char ** argv)
     PokeIndex<LorentzIndex>(mom,mommu,mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin();i<mom.end();i++){
+    thread_loop( (auto i=mom.begin();i<mom.end();i++),{
       Uprime[i](mu) =
 	  U[i](mu)
 	+ mom[i](mu)*U[i](mu)*dt 
@@ -109,8 +109,7 @@ int main (int argc, char ** argv)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
 	;
-    }
-
+    });
   }
   
   Dcf.ImportGauge(Uprime);
diff --git a/tests/forces/Test_dwf_force_eofa.cc b/tests/forces/Test_dwf_force_eofa.cc
index 6d9f97c7..955b4e7a 100644
--- a/tests/forces/Test_dwf_force_eofa.cc
+++ b/tests/forces/Test_dwf_force_eofa.cc
@@ -110,13 +110,13 @@ int main (int argc, char** argv)
     PokeIndex<LorentzIndex>(mom, mommu, mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin(); i<mom.end(); i++){
+    thread_loop( (auto i=mom.begin(); i<mom.end(); i++),{
       Uprime[i](mu) = U[i](mu) + mom[i](mu)*U[i](mu)*dt + mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt/2.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt/6.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt/24.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0);
-    }
+    });
   }
 
   /*Ddwf.ImportGauge(Uprime);
diff --git a/tests/forces/Test_dwf_gpforce.cc b/tests/forces/Test_dwf_gpforce.cc
index 78e164f5..cb3c1fef 100644
--- a/tests/forces/Test_dwf_gpforce.cc
+++ b/tests/forces/Test_dwf_gpforce.cc
@@ -120,7 +120,7 @@ int main (int argc, char ** argv)
     PokeIndex<LorentzIndex>(mom,mommu,mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin();i<mom.end();i++){
+    thread_loop( (auto i=mom.begin();i<mom.end();i++),{
       Uprime[i](mu) =
 	  U[i](mu)
 	+ mom[i](mu)*U[i](mu)*dt 
@@ -130,8 +130,7 @@ int main (int argc, char ** argv)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
 	;
-    }
-
+    });
   }
 
   std::cout << GridLogMessage <<"Initial mom hamiltonian is "<< Hmom <<std::endl;
diff --git a/tests/forces/Test_dwf_gpforce_eofa.cc b/tests/forces/Test_dwf_gpforce_eofa.cc
index 3c9cb4b7..022346ac 100644
--- a/tests/forces/Test_dwf_gpforce_eofa.cc
+++ b/tests/forces/Test_dwf_gpforce_eofa.cc
@@ -115,13 +115,13 @@ int main (int argc, char** argv)
     PokeIndex<LorentzIndex>(mom, mommu, mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin(); i<mom.end(); i++){
+    thread_loop( (auto i=mom.begin(); i<mom.end(); i++),{
       Uprime[i](mu) = U[i](mu) + mom[i](mu)*U[i](mu)*dt + mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt/2.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt/6.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt/24.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0);
-    }
+    });
   }
 
   /*Ddwf.ImportGauge(Uprime);
diff --git a/tests/forces/Test_gp_rect_force.cc b/tests/forces/Test_gp_rect_force.cc
index 57c9573a..95f94dac 100644
--- a/tests/forces/Test_gp_rect_force.cc
+++ b/tests/forces/Test_gp_rect_force.cc
@@ -87,9 +87,9 @@ int main (int argc, char ** argv)
     PokeIndex<LorentzIndex>(mom,mommu,mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin();i<mom.end();i++){ // exp(pmu dt) * Umu
+    thread_loop( (auto i=mom.begin();i<mom.end();i++),{ // exp(pmu dt) * Umu
       Uprime[i](mu) = U[i](mu) + mom[i](mu)*U[i](mu)*dt ;
-    }
+    });
   }
 
   ComplexD Sprime    = Action.S(Uprime);
diff --git a/tests/forces/Test_gpdwf_force.cc b/tests/forces/Test_gpdwf_force.cc
index 6625a369..106c7458 100644
--- a/tests/forces/Test_gpdwf_force.cc
+++ b/tests/forces/Test_gpdwf_force.cc
@@ -105,7 +105,7 @@ int main (int argc, char ** argv)
     PokeIndex<LorentzIndex>(mom,mommu,mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin();i<mom.end();i++){
+    thread_loop( (auto i=mom.begin();i<mom.end();i++),{
       Uprime[i](mu) =
 	  U[i](mu)
 	+ mom[i](mu)*U[i](mu)*dt 
@@ -115,8 +115,7 @@ int main (int argc, char ** argv)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
 	;
-    }
-
+    });
   }
   
   Ddwf.ImportGauge(Uprime);
diff --git a/tests/forces/Test_gpwilson_force.cc b/tests/forces/Test_gpwilson_force.cc
index b0b41b48..8a6d0955 100644
--- a/tests/forces/Test_gpwilson_force.cc
+++ b/tests/forces/Test_gpwilson_force.cc
@@ -106,7 +106,7 @@ int main (int argc, char ** argv)
     PokeIndex<LorentzIndex>(mom,mommu,mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin();i<mom.end();i++){
+    thread_loop( (auto i=mom.begin();i<mom.end();i++),{
       Uprime[i](mu) =
 	  U[i](mu)
 	+ mom[i](mu)*U[i](mu)*dt 
@@ -116,7 +116,7 @@ int main (int argc, char ** argv)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
 	;
-    }
+    });
   }
   
   Wil.ImportGauge(Uprime);
diff --git a/tests/forces/Test_mobius_force.cc b/tests/forces/Test_mobius_force.cc
index b7c7608a..87097a7f 100644
--- a/tests/forces/Test_mobius_force.cc
+++ b/tests/forces/Test_mobius_force.cc
@@ -101,7 +101,7 @@ int main (int argc, char ** argv)
     PokeIndex<LorentzIndex>(mom,mommu,mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin();i<mom.end();i++){
+    thread_loop( (auto i=mom.begin();i<mom.end();i++),{
       Uprime[i](mu) =
 	  U[i](mu)
 	+ mom[i](mu)*U[i](mu)*dt 
@@ -111,8 +111,7 @@ int main (int argc, char ** argv)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
 	;
-    }
-
+    });
   }
   
   Ddwf.ImportGauge(Uprime);
diff --git a/tests/forces/Test_mobius_force_eofa.cc b/tests/forces/Test_mobius_force_eofa.cc
index b5d61d3c..2bfb798c 100644
--- a/tests/forces/Test_mobius_force_eofa.cc
+++ b/tests/forces/Test_mobius_force_eofa.cc
@@ -112,13 +112,13 @@ int main (int argc, char** argv)
     PokeIndex<LorentzIndex>(mom, mommu, mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin(); i<mom.end(); i++){
+    thread_loop( (auto i=mom.begin(); i<mom.end(); i++),{
       Uprime[i](mu) = U[i](mu) + mom[i](mu)*U[i](mu)*dt + mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt/2.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt/6.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt/24.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0);
-    }
+    });
   }
 
   /*Ddwf.ImportGauge(Uprime);
diff --git a/tests/forces/Test_mobius_gpforce_eofa.cc b/tests/forces/Test_mobius_gpforce_eofa.cc
index facec448..c57f611e 100644
--- a/tests/forces/Test_mobius_gpforce_eofa.cc
+++ b/tests/forces/Test_mobius_gpforce_eofa.cc
@@ -117,13 +117,13 @@ int main (int argc, char** argv)
     PokeIndex<LorentzIndex>(mom, mommu, mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin(); i<mom.end(); i++){
+    thread_loop( (auto i=mom.begin(); i<mom.end(); i++),{
       Uprime[i](mu) = U[i](mu) + mom[i](mu)*U[i](mu)*dt + mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt/2.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt/6.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt/24.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
                         + mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0);
-    }
+    });
   }
 
   /*Ddwf.ImportGauge(Uprime);
diff --git a/tests/forces/Test_partfrac_force.cc b/tests/forces/Test_partfrac_force.cc
index 070074e3..bde096eb 100644
--- a/tests/forces/Test_partfrac_force.cc
+++ b/tests/forces/Test_partfrac_force.cc
@@ -101,7 +101,7 @@ int main (int argc, char ** argv)
     PokeIndex<LorentzIndex>(mom,mommu,mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin();i<mom.end();i++){
+    thread_loop( (auto i=mom.begin();i<mom.end();i++),{
       Uprime[i](mu) =
 	  U[i](mu)
 	+ mom[i](mu)*U[i](mu)*dt 
@@ -111,8 +111,7 @@ int main (int argc, char ** argv)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
 	;
-    }
-
+    });
   }
   
   Dpf.ImportGauge(Uprime);
diff --git a/tests/forces/Test_rect_force.cc b/tests/forces/Test_rect_force.cc
index caa8e7bf..dee38b68 100644
--- a/tests/forces/Test_rect_force.cc
+++ b/tests/forces/Test_rect_force.cc
@@ -86,9 +86,9 @@ int main (int argc, char ** argv)
     PokeIndex<LorentzIndex>(mom,mommu,mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin();i<mom.end();i++){ // exp(pmu dt) * Umu
+    thread_loop( (auto i=mom.begin();i<mom.end();i++),{ // exp(pmu dt) * Umu
       Uprime[i](mu) = U[i](mu) + mom[i](mu)*U[i](mu)*dt ;
-    }
+    });
   }
 
   ComplexD Sprime    = Action.S(Uprime);
diff --git a/tests/forces/Test_wilson_force.cc b/tests/forces/Test_wilson_force.cc
index 227126af..bc609d59 100644
--- a/tests/forces/Test_wilson_force.cc
+++ b/tests/forces/Test_wilson_force.cc
@@ -104,7 +104,7 @@ int main (int argc, char ** argv)
     PokeIndex<LorentzIndex>(mom,mommu,mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin();i<mom.end();i++) {
+    thread_loop( (auto i=mom.begin();i<mom.end();i++) ,{
       Uprime[i](mu)  =	  U[i](mu);
       Uprime[i](mu) += mom[i](mu)*U[i](mu)*dt ;
       Uprime[i](mu) += mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt/2.0);
@@ -112,8 +112,7 @@ int main (int argc, char ** argv)
       Uprime[i](mu) += mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt/24.0);
       Uprime[i](mu) += mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0);
       Uprime[i](mu) += mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0);
-    }
-
+    });
   }
 
   std::cout << GridLogMessage <<"Initial mom hamiltonian is "<< Hmom <<std::endl;
diff --git a/tests/forces/Test_zmobius_force.cc b/tests/forces/Test_zmobius_force.cc
index 0146636f..b2cd77ac 100644
--- a/tests/forces/Test_zmobius_force.cc
+++ b/tests/forces/Test_zmobius_force.cc
@@ -115,7 +115,7 @@ int main (int argc, char ** argv)
     PokeIndex<LorentzIndex>(mom,mommu,mu);
 
     // fourth order exponential approx
-    parallel_for(auto i=mom.begin();i<mom.end();i++){
+    thread_loop( (auto i=mom.begin();i<mom.end();i++),{
       Uprime[i](mu) =
 	  U[i](mu)
 	+ mom[i](mu)*U[i](mu)*dt 
@@ -125,8 +125,7 @@ int main (int argc, char ** argv)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
 	+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
 	;
-    }
-
+    });
   }
   
   Ddwf.ImportGauge(Uprime);