diff --git a/tests/TestPressVel.cpp b/tests/TestPressVel.cpp
index 7e352c99..db19ba2c 100644
--- a/tests/TestPressVel.cpp
+++ b/tests/TestPressVel.cpp
@@ -10,21 +10,6 @@
 #include "common/MPI_Helpers.h"
 
 
-std::shared_ptr<Database> loadInputs( int nprocs )
-{
-    auto db = std::make_shared<Database>( "Domain.in" );
-    const int dim = 50;
-    db->putScalar<int>( "BC", 0 );
-    if ( nprocs == 1 ){
-        db->putVector<int>( "nproc", { 1, 1, 1 } );
-        db->putVector<int>( "n", { 4, 4, 4 } );
-        db->putScalar<int>( "nspheres", 0 );
-        db->putVector<double>( "L", { 1, 1, 1 } );
-    }
-    return db;
-}
-
-
 //***************************************************************************************
 int main(int argc, char **argv)
 {
@@ -59,14 +44,15 @@ int main(int argc, char **argv)
 		Fz = 1.0e-4;
 
         // Load inputs
-        auto db = loadInputs( nprocs );
-        int Nx = db->getVector<int>( "n" )[0];
-        int Ny = db->getVector<int>( "n" )[1];
-        int Nz = db->getVector<int>( "n" )[2];
-        int nprocx = db->getVector<int>( "nproc" )[0];
-        int nprocy = db->getVector<int>( "nproc" )[1];
-        int nprocz = db->getVector<int>( "nproc" )[2];
-
+		if (rank==0)	printf("Loading input database \n");
+		auto db = std::make_shared<Database>(FILENAME);
+		auto domain_db= db-> getDatabase("Domain");
+        int Nx = domain_db->getVector<int>( "n" )[0];
+        int Ny = domain_db->getVector<int>( "n" )[1];
+        int Nz = domain_db->getVector<int>( "n" )[2];
+        int nprocx = domain_db->getVector<int>( "nproc" )[0];
+        int nprocy = domain_db->getVector<int>( "nproc" )[1];
+        int nprocz = domain_db->getVector<int>( "nproc" )[2];
 		if (rank==0){
 			printf("********************************************************\n");
 			printf("Sub-domain size = %i x %i x %i\n",Nx,Ny,Nz);
@@ -91,7 +77,6 @@ int main(int argc, char **argv)
 
 		Domain Dm(db);
 
-
 		Nx += 2;
 		Ny += 2;
 		Nz += 2;
@@ -104,12 +89,6 @@ int main(int argc, char **argv)
 		sprintf(LocalRankString,"%05d",rank);
 		char LocalRankFilename[40];
 		sprintf(LocalRankFilename,"ID.%05i",rank);
-		/*
-		FILE *IDFILE = fopen(LocalRankFilename,"rb");
-		if (IDFILE==NULL) ERROR("Error opening file: ID.xxxxx");
-		fread(Dm.id,1,N,IDFILE);
-		fclose(IDFILE);
-		*/
 
 		Dm.CommInit(comm);
 
@@ -211,7 +190,6 @@ int main(int argc, char **argv)
 	 	}
 		ScaLBL_CopyToDevice(dist, DIST, 19*Np*sizeof(double));	
 
-	
 	   double *Vz;
   	   Vz= new double [Np];
 	   size_t SIZE=Np*sizeof(double);