diff --git a/test/porousmediumflow/3p3c/implicit/grids/column.dgf b/test/porousmediumflow/3p3c/implicit/grids/column.dgf
deleted file mode 100644
index 1818d513a695ade5de02a567e57c0de740b0db46..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/3p3c/implicit/grids/column.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-0.1 1.20   % second corner
-1 120   % 22 cells in x and 12 in y direction
-#
-GridParameter
-overlap 0
-periodic
-closure green
-#GridParameter
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/3p3c/implicit/grids/kuev_3p3cni.dgf b/test/porousmediumflow/3p3c/implicit/grids/kuev_3p3cni.dgf
deleted file mode 100644
index f8a5dea942b8934c72db5be0f73b547ab114e806..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/3p3c/implicit/grids/kuev_3p3cni.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0      % first corner
-1.5 0.74 % second corner
-15 8     % cells in and y direction
-#
-GridParameter
-overlap 0
-periodic
-closure green
-#GridParameter
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/3p3c/implicit/grids/test_3p3c.dgf b/test/porousmediumflow/3p3c/implicit/grids/test_3p3c.dgf
deleted file mode 100644
index 7b7f27a3c38da42181383500f3df92852d3d04a9..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/3p3c/implicit/grids/test_3p3c.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0    % first corner
-500 10 % second corner
-250 10 % cells in x and y direction
-#
-GridParameter
-overlap 0
-periodic
-closure green
-#GridParameter
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/3p3c/implicit/grids/test_3p3c_coarse.dgf b/test/porousmediumflow/3p3c/implicit/grids/test_3p3c_coarse.dgf
deleted file mode 100644
index b36f87afc6a5a68eacf212b911ea68dee2328245..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/3p3c/implicit/grids/test_3p3c_coarse.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0    % first corner
-500 10 % second corner
-40 4   % cells in x and y direction
-#
-GridParameter
-overlap 0
-periodic
-closure green
-#GridParameter
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/3p3c/implicit/test_box3p3c.input b/test/porousmediumflow/3p3c/implicit/test_box3p3c.input
index 5bc35023d2ec7eced124fbd571d8264cefbaed87..80639b17c803e26b67c7a4061dbfe05ed3b7ca1d 100644
--- a/test/porousmediumflow/3p3c/implicit/test_box3p3c.input
+++ b/test/porousmediumflow/3p3c/implicit/test_box3p3c.input
@@ -3,7 +3,8 @@ DtInitial = 60 # [s]
 TEnd = 864000 # [s]
 
 [Grid]
-File = ./grids/test_3p3c.dgf
+UpperRight = 500 10
+Cells = 250 10
 
 [Problem]
 Name = infiltrationbox
diff --git a/test/porousmediumflow/3p3c/implicit/test_box3p3c_reference.input b/test/porousmediumflow/3p3c/implicit/test_box3p3c_reference.input
index c31a525356208612d9e582a061c3a6af4c21dd20..26470f2cb7214b99a460b52c31b97c136ee57aff 100644
--- a/test/porousmediumflow/3p3c/implicit/test_box3p3c_reference.input
+++ b/test/porousmediumflow/3p3c/implicit/test_box3p3c_reference.input
@@ -3,7 +3,8 @@ DtInitial = 86400 # [s]
 TEnd = 864000 # [s]
 
 [Grid]
-File = ./grids/test_3p3c_coarse.dgf
+UpperRight = 500 10
+Cells = 40 4
 
 [Problem]
 Name = box3p3c
diff --git a/test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.input b/test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.input
index 8c6853ac47e203d96d0c9aef14bab63417d2d1b2..bed5d51223df232d4315240d586d8e35b04d9bac 100644
--- a/test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.input
+++ b/test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.input
@@ -3,7 +3,8 @@ DtInitial = 1 # [s]
 TEnd = 200 # [s]
 
 [Grid]
-File = ./grids/column.dgf
+UpperRight = 0.1 1.20
+Cells = 1 120
 
 [Problem]
 Name = columnxylolbox # name passed to the output routines
@@ -12,4 +13,4 @@ Name = columnxylolbox # name passed to the output routines
 NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences
 
 [TimeManager]
-MaxTimeStepSize= 4. # Set the maximum time step
+MaxTimeStepSize= 4.0 # Set the maximum time step
diff --git a/test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.input b/test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.input
index a154da00699415b8ea8d65363b8d946ae0698d09..3e844993aa30d88519714b2b14097eb095edb1d5 100644
--- a/test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.input
+++ b/test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.input
@@ -5,7 +5,8 @@ MaxTimeStepSize = 60 # [s]
 EpisodeLength = 1000 # [s]
 
 [Grid]
-File = ./grids/kuev_3p3cni.dgf
+UpperRight = 1.5 0.74
+Cells = 15 8
 
 [Problem]
 Name = kuevettebox # name passed to the output routines
diff --git a/test/porousmediumflow/3p3c/implicit/test_cc3p3c.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3c.input
index 07c896f8bc9f126d414b093a2337bd08c652bba3..750bf8c828465dfbdbeba46bb1b6eee6fd75684a 100644
--- a/test/porousmediumflow/3p3c/implicit/test_cc3p3c.input
+++ b/test/porousmediumflow/3p3c/implicit/test_cc3p3c.input
@@ -3,7 +3,8 @@ DtInitial = 60 # [s]
 TEnd = 864000 # [s]
 
 [Grid]
-File = ./grids/test_3p3c.dgf
+UpperRight = 500 10
+Cells = 250 10
 
 [Problem]
 Name = infiltrationcc
diff --git a/test/porousmediumflow/3p3c/implicit/test_cc3p3c_reference.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3c_reference.input
index 7dd86952098e968c9da1805e913c23075c95b03a..553e58c86c6f5776a71cc057a3cd38cf9cec09e7 100644
--- a/test/porousmediumflow/3p3c/implicit/test_cc3p3c_reference.input
+++ b/test/porousmediumflow/3p3c/implicit/test_cc3p3c_reference.input
@@ -3,7 +3,8 @@ DtInitial = 86400 # [s]
 TEnd = 864000 # [s]
 
 [Grid]
-File = ./grids/test_3p3c_coarse.dgf
+UpperRight = 500 10
+Cells = 40 4
 
 [Problem]
 Name = cc3p3c
diff --git a/test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.input
index c85cf38d3c40a61fa591ddd7d7b9ef6eecce786b..73b95afdfb9c2dee5e284868e95f1171714f15b0 100644
--- a/test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.input
+++ b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.input
@@ -3,7 +3,8 @@ DtInitial = 1 # [s]
 TEnd = 200 # [s]
 
 [Grid]
-File = ./grids/column.dgf
+UpperRight = 0.1 1.20
+Cells = 1 120
 
 [Problem]
 Name = columnxylolcc # name passed to the output routines
diff --git a/test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.input
index 9bf1894b743427438744133599496fecf2f246fd..ffe5648570eb4fab0f6feab5dab88bd63a6946cc 100644
--- a/test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.input
+++ b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.input
@@ -5,7 +5,8 @@ MaxTimeStepSize = 60 # [s]
 EpisodeLength = 1000 # [s]
 
 [Grid]
-File = ./grids/kuev_3p3cni.dgf
+UpperRight = 1.5 0.74
+Cells = 15 8
 
 [Problem]
 Name = kuevettecc # name passed to the output routines