diff --git a/test/porousmediumflow/richards/implicit/grids/richardsanalytical-1x64.dgf b/test/porousmediumflow/richards/implicit/grids/richardsanalytical-1x64.dgf
deleted file mode 100644
index 1d03a21af4248a436d3f38677be49cbb9280b697..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/richards/implicit/grids/richardsanalytical-1x64.dgf
+++ /dev/null
@@ -1,6 +0,0 @@
-DGF
-Interval
-0 0   % first corner 
-6 4   % second corner
-1 512  % cells in x and in y direction
-#
diff --git a/test/porousmediumflow/richards/implicit/grids/richardslens-24x16.dgf b/test/porousmediumflow/richards/implicit/grids/richardslens-24x16.dgf
deleted file mode 100644
index 190de1ef5d5273fa83ffce469b397dd6193c44aa..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/richards/implicit/grids/richardslens-24x16.dgf
+++ /dev/null
@@ -1,11 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-6 4   % second corner
-24 16 % cells in x and in y direction
-#
-
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/richards/implicit/grids/richardslens-48x32.dgf b/test/porousmediumflow/richards/implicit/grids/richardslens-48x32.dgf
deleted file mode 100644
index 199f78c5b7a402f63fb3584164ff299c6642b0bb..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/richards/implicit/grids/richardslens-48x32.dgf
+++ /dev/null
@@ -1,11 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-6 4   % second corner
-48 32 % cells in x and in y direction
-#
-
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/richards/implicit/grids/richardslens-96x64.dgf b/test/porousmediumflow/richards/implicit/grids/richardslens-96x64.dgf
deleted file mode 100644
index 4d771763a2e7cfc1d4ac38a8112a4e959b121e13..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/richards/implicit/grids/richardslens-96x64.dgf
+++ /dev/null
@@ -1,11 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-6 4   % second corner
-96 64   % cells in x and in y direction
-#
-
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/richards/implicit/grids/test_richardsniconduction.dgf b/test/porousmediumflow/richards/implicit/grids/test_richardsniconduction.dgf
deleted file mode 100644
index b2cbd566409b7de9793440af9353d8d70011886a..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/richards/implicit/grids/test_richardsniconduction.dgf
+++ /dev/null
@@ -1,11 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-5 1   % second corner
-200 1  % number of cells in x and y direction
-#
-
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/richards/implicit/grids/test_richardsniconvection.dgf b/test/porousmediumflow/richards/implicit/grids/test_richardsniconvection.dgf
deleted file mode 100644
index 0bccad0e53a60748fe923b7ca9a5d950ef1399c5..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/richards/implicit/grids/test_richardsniconvection.dgf
+++ /dev/null
@@ -1,11 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-20 1   % second corner
-80 1  % number of cells in x and y direction
-#
-
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/richards/implicit/test_boxrichards.input b/test/porousmediumflow/richards/implicit/test_boxrichards.input
index 25fe8e5727084310d9e8e43d0b6d4257639f43b8..41619629976aa26cac47fa78c24208efecbe4abc 100644
--- a/test/porousmediumflow/richards/implicit/test_boxrichards.input
+++ b/test/porousmediumflow/richards/implicit/test_boxrichards.input
@@ -3,7 +3,8 @@ DtInitial = 100 # [s]
 TEnd = 3000 # [s]
 
 [Grid]
-File = ./grids/richardslens-24x16.dgf
+UpperRight = 6 4
+Cells = 24 16
 
 [Problem]
 Name = richardslensbox
diff --git a/test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.input b/test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.input
index da1e6086d3d803d9ec3418c96b3cbcf3cd2ae0c3..afed3ddd3cde6462f0baad1c93be5f6c65387179 100644
--- a/test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.input
+++ b/test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.input
@@ -4,7 +4,8 @@ TEnd = 1e5 # [s]
 MaxTimeStepSize = 1e10 # [s]
 
 [Grid]
-File = ./grids/test_richardsniconduction.dgf
+UpperRight = 5 1
+Cells = 200 1
 
 [Problem]
 Name = test_boxrichardsniconduction # name passed to the output routines
diff --git a/test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.input b/test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.input
index e7a20189f86fc372638d671b25c5e08b7c1944cc..98fd0d6c70570f9963ab0ee8c7b28f75c8d8c914 100644
--- a/test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.input
+++ b/test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.input
@@ -4,7 +4,8 @@ TEnd = 3e4 # [s]
 MaxTimeStepSize = 1e3 # [s]
 
 [Grid]
-File = ./grids/test_richardsniconvection.dgf
+UpperRight = 20 1
+Cells = 80 1
 
 [Problem]
 Name = test_boxrichardsniconvection # name passed to the output routines
diff --git a/test/porousmediumflow/richards/implicit/test_ccrichards.input b/test/porousmediumflow/richards/implicit/test_ccrichards.input
index 3d19ce46f9e5a514e4ab1170581102d73a0a315d..effd06edc0c35f4788f9859c01abbdb7b81e6881 100644
--- a/test/porousmediumflow/richards/implicit/test_ccrichards.input
+++ b/test/porousmediumflow/richards/implicit/test_ccrichards.input
@@ -3,7 +3,8 @@ DtInitial = 100 # [s]
 TEnd = 3000 # [s]
 
 [Grid]
-File = ./grids/richardslens-24x16.dgf
+UpperRight = 6 4
+Cells = 24 16
 
 [Problem]
 Name = richardslenscc
diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input
index 73435ae63ab9999e29044b950f7b8d181058c229..4d6e06e7831b975f05ea629f82b61b59b6697414 100644
--- a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input
+++ b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input
@@ -4,7 +4,8 @@ TEnd = 100 # [s]
 MaxTimeStepSize = 1e-1 # [s]
 
 [Grid]
-File = ./grids/richardsanalytical-1x64.dgf
+UpperRight = 6 4
+Cells = 1 512
 
 [Problem]
 Name = richardsanalyticalcc
diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.input b/test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.input
index 77fc39cc96ebe7cdff9bcf55a0e9ef9ba2e44e20..9f1d1ae0be5cd13fd00c17a9484ef04e71cd921f 100644
--- a/test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.input
+++ b/test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.input
@@ -4,7 +4,8 @@ TEnd = 1e5 # [s]
 MaxTimeStepSize = 1e10 # [s]
 
 [Grid]
-File = ./grids/test_richardsniconduction.dgf
+UpperRight = 5 1
+Cells = 200 1
 
 [Problem]
 Name = test_ccrichardsniconduction # name passed to the output routines
diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.input b/test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.input
index c7e7eec25d3b9a6faf286e9912a8e631f189e9cb..a8d961715fd7da74e3a207179802805a25312375 100644
--- a/test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.input
+++ b/test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.input
@@ -4,7 +4,8 @@ TEnd = 3e4 # [s]
 MaxTimeStepSize = 1e3 # [s]
 
 [Grid]
-File = ./grids/test_richardsniconvection.dgf
+UpperRight = 20 1
+Cells = 80 1
 
 [Problem]
 Name = test_ccrichardsniconvection # name passed to the output routines