diff --git a/tests/testSingle.c b/tests/testSingle.c
index 02c52160d0d442496629f1bb3947f89524964fb8..1bab13959b5d04f23170b761b953de0fa43561b9 100644
--- a/tests/testSingle.c
+++ b/tests/testSingle.c
@@ -2,20 +2,20 @@
  * This file is part of SWIFT.
  * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
  * by the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  ******************************************************************************/
 
 /* Config parameters. */
@@ -34,7 +34,7 @@
 
 /* Conditional headers. */
 #ifdef HAVE_LIBZ
-    #include <zlib.h>
+#include <zlib.h>
 #endif
 
 /* Local headers. */
@@ -42,88 +42,111 @@
 
 /* Ticks per second on this machine. */
 #ifndef CPU_TPS
-    #define CPU_TPS 2.67e9
+#define CPU_TPS 2.67e9
 #endif
 
 /* Engine policy flags. */
 #ifndef ENGINE_POLICY
-    #define ENGINE_POLICY engine_policy_none
+#define ENGINE_POLICY engine_policy_none
 #endif
 
+#ifdef DEFAULT_SPH
 
 /**
  * @brief Main routine that loads a few particles and generates some output.
  *
  */
- 
-int main ( int argc , char *argv[] ) {
-
-    int k, N = 100;
-    struct part p1, p2;
-    float x, w, dwdx, r2, dx[3] = { 0.0f , 0.0f , 0.0f }, gradw[3];
-    
-    /* Greeting message */
-    printf( "This is %s\n", package_description() );
-
-    /* Init the particles. */
-    for ( k = 0 ; k < 3 ; k++ ) {
-        p1.a[k] = 0.0f; p1.v[k] = 0.0f; p1.x[k] = 0.0;
-        p2.a[k] = 0.0f; p2.v[k] = 0.0f; p2.x[k] = 0.0;
-        }
-    p1.v[0] = 100.0f;
-    p1.id = 0; p2.id = 1;
-    p1.density.wcount = 48.0f; p2.density.wcount = 48.0f;
-    p1.rho = 1.0f; p1.mass = 9.7059e-4; p1.h = 0.222871287 / 2;
-    p2.rho = 1.0f; p2.mass = 9.7059e-4; p2.h = 0.222871287 / 2;
-    p1.force.c = 0.0040824829f; p1.force.balsara = 0.0f;
-    p2.force.c = 58.8972740361f; p2.force.balsara = 0.0f;
-    p1.u = 1.e-5 / ((const_hydro_gamma - 1.)*p1.rho);
-    p2.u = 1.e-5 / ((const_hydro_gamma - 1.)*p2.rho) + 100.0f / ( 33 * p2.mass );
-    p1.force.POrho2 = p1.u * ( const_hydro_gamma - 1.0f ) / p1.rho;
-    p2.force.POrho2 = p2.u * ( const_hydro_gamma - 1.0f ) / p2.rho;
-    
-    /* Dump a header. */
-    printParticle_single( &p1 );
-    printParticle_single( &p2 );
-    printf( "# r a_1 udt_1 a_2 udt_2\n" );
-    
-    /* Loop over the different radii. */
-    for ( k = 1 ; k <= N ; k++ ) {
-    
-        /* Set the distance/radius. */
-        dx[0] = -((float)k)/N * fmaxf( p1.h , p2.h ) * kernel_gamma;
-        r2 = dx[0]*dx[0];
-        
-        /* Clear the particle fields. */
-        p1.a[0] = 0.0f; p1.force.u_dt = 0.0f;
-        p2.a[0] = 0.0f; p2.force.u_dt = 0.0f;
-        
-        /* Interact the particles. */
-        runner_iact_force( r2 , dx , p1.h , p2.h , &p1 , &p2 );
-        
-        /* Clear the particle fields. */
-        /* p1.rho = 0.0f; p1.density.wcount = 0.0f;
-        p2.rho = 0.0f; p2.density.wcount = 0.0f; */
-        
-        /* Interact the particles. */
-        // runner_iact_density( r2 , dx , p1.h , p2.h , &p1 , &p2 );
-        
-        /* Evaluate just the kernel. */
-        x = fabsf( dx[0] ) / p1.h;
-        kernel_deval( x , &w , &dwdx );
-        gradw[0] = dwdx / (p1.h*p1.h*p1.h*p1.h) * dx[0] / sqrtf( dx[0]*dx[0] + dx[1]*dx[1] + dx[2]*dx[2] );
-        gradw[1] = dwdx / (p1.h*p1.h*p1.h*p1.h) * dx[1] / sqrtf( dx[0]*dx[0] + dx[1]*dx[1] + dx[2]*dx[2] );
-        gradw[2] = dwdx / (p1.h*p1.h*p1.h*p1.h) * dx[2] / sqrtf( dx[0]*dx[0] + dx[1]*dx[1] + dx[2]*dx[2] );
-        
-        /* Output the results. */
-        printf( "%.3e %.3e %.3e %.3e %.3e %.3e %.3e %.3e %.3e %.3e\n" ,
-            -dx[0] , p1.a[0] , p1.a[1] , p1.a[2] , p1.force.u_dt , 
-            /// -dx[0] , p1.rho , p1.density.wcount , p2.rho , p2.density.wcount ,
-            w , dwdx , gradw[0] , gradw[1] , gradw[2] );
-    
-        } /* loop over radii. */
-    
-    /* All is calm, all is bright. */
-    return 0;
-    
-    }
+
+int main(int argc, char *argv[]) {
+
+  int k, N = 100;
+  struct part p1, p2;
+  float x, w, dwdx, r2, dx[3] = {0.0f, 0.0f, 0.0f}, gradw[3];
+
+  /* Greeting message */
+  printf("This is %s\n", package_description());
+
+  /* Init the particles. */
+  for (k = 0; k < 3; k++) {
+    p1.a_hydro[k] = 0.0f;
+    p1.v[k] = 0.0f;
+    p1.x[k] = 0.0;
+    p2.a_hydro[k] = 0.0f;
+    p2.v[k] = 0.0f;
+    p2.x[k] = 0.0;
+  }
+  p1.v[0] = 100.0f;
+  p1.id = 0;
+  p2.id = 1;
+  p1.density.wcount = 48.0f;
+  p2.density.wcount = 48.0f;
+  p1.rho = 1.0f;
+  p1.mass = 9.7059e-4;
+  p1.h = 0.222871287 / 2;
+  p2.rho = 1.0f;
+  p2.mass = 9.7059e-4;
+  p2.h = 0.222871287 / 2;
+  p1.force.c = 0.0040824829f;
+  p1.force.balsara = 0.0f;
+  p2.force.c = 58.8972740361f;
+  p2.force.balsara = 0.0f;
+  p1.u = 1.e-5 / ((const_hydro_gamma - 1.) * p1.rho);
+  p2.u = 1.e-5 / ((const_hydro_gamma - 1.) * p2.rho) + 100.0f / (33 * p2.mass);
+  p1.force.POrho2 = p1.u * (const_hydro_gamma - 1.0f) / p1.rho;
+  p2.force.POrho2 = p2.u * (const_hydro_gamma - 1.0f) / p2.rho;
+
+  /* Dump a header. */
+  printParticle_single(&p1);
+  printParticle_single(&p2);
+  printf("# r a_1 udt_1 a_2 udt_2\n");
+
+  /* Loop over the different radii. */
+  for (k = 1; k <= N; k++) {
+
+    /* Set the distance/radius. */
+    dx[0] = -((float)k) / N * fmaxf(p1.h, p2.h) * kernel_gamma;
+    r2 = dx[0] * dx[0];
+
+    /* Clear the particle fields. */
+    p1.a[0] = 0.0f;
+    p1.force.u_dt = 0.0f;
+    p2.a[0] = 0.0f;
+    p2.force.u_dt = 0.0f;
+
+    /* Interact the particles. */
+    runner_iact_force(r2, dx, p1.h, p2.h, &p1, &p2);
+
+    /* Clear the particle fields. */
+    /* p1.rho = 0.0f; p1.density.wcount = 0.0f;
+    p2.rho = 0.0f; p2.density.wcount = 0.0f; */
+
+    /* Interact the particles. */
+    // runner_iact_density( r2 , dx , p1.h , p2.h , &p1 , &p2 );
+
+    /* Evaluate just the kernel. */
+    x = fabsf(dx[0]) / p1.h;
+    kernel_deval(x, &w, &dwdx);
+    gradw[0] = dwdx / (p1.h * p1.h * p1.h * p1.h) * dx[0] /
+               sqrtf(dx[0] * dx[0] + dx[1] * dx[1] + dx[2] * dx[2]);
+    gradw[1] = dwdx / (p1.h * p1.h * p1.h * p1.h) * dx[1] /
+               sqrtf(dx[0] * dx[0] + dx[1] * dx[1] + dx[2] * dx[2]);
+    gradw[2] = dwdx / (p1.h * p1.h * p1.h * p1.h) * dx[2] /
+               sqrtf(dx[0] * dx[0] + dx[1] * dx[1] + dx[2] * dx[2]);
+
+    /* Output the results. */
+    printf(
+        "%.3e %.3e %.3e %.3e %.3e %.3e %.3e %.3e %.3e %.3e\n", -dx[0], p1.a[0],
+        p1.a[1], p1.a[2], p1.force.u_dt,
+        /// -dx[0] , p1.rho , p1.density.wcount , p2.rho , p2.density.wcount ,
+        w, dwdx, gradw[0], gradw[1], gradw[2]);
+
+  } /* loop over radii. */
+
+  /* All is calm, all is bright. */
+  return 0;
+}
+#else
+
+int main() { return 0; }
+
+#endif