diff --git a/tests/BasicSimulator.cpp b/tests/BasicSimulator.cpp
index e390432a..22a50a90 100644
--- a/tests/BasicSimulator.cpp
+++ b/tests/BasicSimulator.cpp
@@ -442,10 +442,10 @@ int main(int argc, char **argv)
 	MPI_Allreduce(&sum_local,&pore_vol,1,MPI_DOUBLE,MPI_SUM,MPI_COMM_WORLD);
 
 
-	// Generate the residual NWP 
+	/*	// Generate the residual NWP 
 	if (!pBC && rank==0) printf("Initializing with NWP saturation = %f \n",wp_saturation);
 	if (!pBC)	GenerateResidual(id,Nx,Ny,Nz,wp_saturation);
-	
+	*/
 #endif
 
 	//.........................................................
@@ -477,6 +477,7 @@ int main(int argc, char **argv)
 	id[0] = id[Nx-1] = id[(Ny-1)*Nx] = id[(Ny-1)*Nx + Nx-1] = 0;
 	id[(Nz-1)*Nx*Ny] = id[(Nz-1)*Nx*Ny+Nx-1] = id[(Nz-1)*Nx*Ny+(Ny-1)*Nx] = id[(Nz-1)*Nx*Ny+(Ny-1)*Nx + Nx-1] = 0;
 	//.........................................................
+	/*
 #ifdef USE_EXP_CONTACT_ANGLE
 	// If negative phi_s is chosen, flip the ID for the wetting and non-wetting phase
 	if (phi_s < 0.0 && !pBC){
@@ -497,7 +498,7 @@ int main(int argc, char **argv)
 	}
 	
 #endif
-
+	*/
 	// Set up MPI communication structurese
 	if (rank==0)	printf ("Setting up communication control structures \n");
 	//......................................................................................
diff --git a/tests/lbpm_random_pp.cpp b/tests/lbpm_random_pp.cpp
index e4a01927..6d9b9872 100644
--- a/tests/lbpm_random_pp.cpp
+++ b/tests/lbpm_random_pp.cpp
@@ -10,6 +10,7 @@
 #include <fstream>
 #include <sstream>
 #include <Array.h>
+#include <Domain.h>
 
 inline void GenerateResidual(char *ID, int Nx, int Ny, int Nz, double Saturation)
 {
@@ -202,8 +203,8 @@ int main(int argc, char **argv)
     }
 
 	// Generate the residual NWP
-	if (rank==0) printf("Initializing with NWP saturation = %f \n",wp_saturation);
-	GenerateResidual(id,Nx,Ny,Nz,wp_saturation);
+	if (rank==0) printf("Initializing with NWP saturation = %f \n",Saturation);
+	GenerateResidual(id,Nx,Ny,Nz,Saturation);
 
 	if (InitialWetting == 1)	FlipID(id,Nx*Ny*Nz);