diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/ADDREGTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/ADDREGTests.cpp
index ea980696d..5313223ab 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/ADDREGTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/ADDREGTests.cpp
@@ -149,6 +149,14 @@ static Opm::DeckPtr createValidIntDeck() {
         "DIMENS\n"
         " 5 5 1 /\n"
         "GRID\n"
+        "DX\n"
+        "25*0.25 /\n"
+        "DY\n"
+        "25*0.25 /\n"
+        "DZ\n"
+        "25*0.25 /\n"
+        "TOPS\n"
+        "25*0.25 /\n"
         "MULTNUM \n"
         "1  1  2  2 2\n"
         "1  1  2  2 2\n"
@@ -180,6 +188,14 @@ static Opm::DeckPtr createValidPERMXDeck() {
         "DIMENS\n"
         " 5 5 1 /\n"
         "GRID\n"
+        "DX\n"
+        "25*0.25 /\n"
+        "DY\n"
+        "25*0.25 /\n"
+        "DZ\n"
+        "25*0.25 /\n"
+        "TOPS\n"
+        "25*0.25 /\n"
         "MULTNUM \n"
         "1  1  2  2 2\n"
         "1  1  2  2 2\n"
diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/CopyRegTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/CopyRegTests.cpp
index a34b8cabb..59189969a 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/CopyRegTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/CopyRegTests.cpp
@@ -149,6 +149,14 @@ static Opm::DeckPtr createValidIntDeck() {
         "DIMENS\n"
         " 5 5 1 /\n"
         "GRID\n"
+        "DX\n"
+        "25*0.25 /\n"
+        "DY\n"
+        "25*0.25 /\n"
+        "DZ\n"
+        "25*0.25 /\n"
+        "TOPS\n"
+        "25*0.25 /\n"
         "MULTNUM \n"
         "1  1  2  2 2\n"
         "1  1  2  2 2\n"
diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/EqualRegTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/EqualRegTests.cpp
index 0bd7ffba3..97dbf31a5 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/EqualRegTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/EqualRegTests.cpp
@@ -123,6 +123,14 @@ static Opm::DeckPtr createValidIntDeck() {
         "DIMENS\n"
         " 5 5 1 /\n"
         "GRID\n"
+        "DX\n"
+        "25*0.25 /\n"
+        "DY\n"
+        "25*0.25 /\n"
+        "DZ\n"
+        "25*0.25 /\n"
+        "TOPS\n"
+        "25*0.25 /\n"
         "FLUXNUM \n"
         "1  1  2  2 2\n"
         "1  1  2  2 2\n"
@@ -158,6 +166,14 @@ static Opm::DeckPtr createValidPERMXDeck() {
         "DIMENS\n"
         " 5 5 1 /\n"
         "GRID\n"
+        "DX\n"
+        "25*0.25 /\n"
+        "DY\n"
+        "25*0.25 /\n"
+        "DZ\n"
+        "25*0.25 /\n"
+        "TOPS\n"
+        "25*0.25 /\n"
         "MULTNUM \n"
         "1  1  2  2 2\n"
         "1  1  2  2 2\n"
diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp
index 2ac04a457..59b2966bf 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp
@@ -73,6 +73,14 @@ static Opm::DeckPtr createInvalidMULTREGTDeck() {
         "DIMENS\n"
         " 3 3 2 /\n"
         "GRID\n"
+        "DX\n"
+        "18*0.25 /\n"
+        "DY\n"
+        "18*0.25 /\n"
+        "DZ\n"
+        "18*0.25 /\n"
+        "TOPS\n"
+        "9*0.25 /\n"
         "FLUXNUM\n"
         "1 1 2\n"
         "1 1 2\n"
@@ -133,6 +141,14 @@ static Opm::DeckPtr createNotSupportedMULTREGTDeck() {
         "DIMENS\n"
         " 3 3 2 /\n"
         "GRID\n"
+        "DX\n"
+        "18*0.25 /\n"
+        "DY\n"
+        "18*0.25 /\n"
+        "DZ\n"
+        "18*0.25 /\n"
+        "TOPS\n"
+        "9*0.25 /\n"
         "FLUXNUM\n"
         "1 1 2\n"
         "1 1 2\n"
@@ -204,6 +220,14 @@ static Opm::DeckPtr createCopyMULTNUMDeck() {
         "DIMENS\n"
         "2 2 2 /\n"
         "GRID\n"
+        "DX\n"
+        "8*0.25 /\n"
+        "DY\n"
+        "8*0.25 /\n"
+        "DZ\n"
+        "8*0.25 /\n"
+        "TOPS\n"
+        "4*0.25 /\n"
         "FLUXNUM\n"
         "1 2\n"
         "1 2\n"
diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/MultiRegTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/MultiRegTests.cpp
index 76c950574..51e76955c 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/MultiRegTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/MultiRegTests.cpp
@@ -146,6 +146,14 @@ static Opm::DeckPtr createValidIntDeck() {
         "DIMENS\n"
         " 5 5 1 /\n"
         "GRID\n"
+        "DX\n"
+        "25*0.25 /\n"
+        "DY\n"
+        "25*0.25 /\n"
+        "DZ\n"
+        "25*0.25 /\n"
+        "TOPS\n"
+        "25*0.25 /\n"
         "REGIONS\n"
         "SATNUM \n"
         "1  1  2  2 2\n"
diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/PORVTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/PORVTests.cpp
index ab0145b8e..f0e633258 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/PORVTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/PORVTests.cpp
@@ -346,8 +346,7 @@ static Opm::DeckPtr createDeckNakedGRID() {
 BOOST_AUTO_TEST_CASE(NAKED_GRID_THROWS) {
     /* Check that MULTIPLE Boxed PORV and MULTPV statements work and NTG */
     Opm::DeckPtr deck = createDeckNakedGRID();
-    const auto props = getProps(deck);
-    BOOST_CHECK_THROW( props.getDoubleGridProperty("PORV") , std::invalid_argument );
+    BOOST_CHECK_THROW( getProps(deck) , std::invalid_argument );
 }
 
 static Opm::DeckPtr createDeckWithPOROZero() {
diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/GeomodifierTests.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/GeomodifierTests.cpp
index 26ef2b1b7..d9f60342e 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/tests/GeomodifierTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/tests/GeomodifierTests.cpp
@@ -47,6 +47,15 @@ BOOST_AUTO_TEST_CASE( CheckUnsoppertedInSCHEDULE ) {
         "RUNSPEC\n"
         "DIMENS\n"
         "  10 10 10 / \n"
+        "GRID\n"
+        "DX\n"
+        "1000*0.25 /\n"
+        "DY\n"
+        "1000*0.25 /\n"
+        "DZ\n"
+        "1000*0.25 /\n"
+        "TOPS\n"
+        "100*0.25 /\n"
         "SCHEDULE\n"
         "TSTEP -- 1,2\n"
         "   10 10/\n"
diff --git a/opm/parser/eclipse/EclipseState/tests/Eclipse3DPropertiesTests.cpp b/opm/parser/eclipse/EclipseState/tests/Eclipse3DPropertiesTests.cpp
index cd2b3aa55..46dd836d8 100644
--- a/opm/parser/eclipse/EclipseState/tests/Eclipse3DPropertiesTests.cpp
+++ b/opm/parser/eclipse/EclipseState/tests/Eclipse3DPropertiesTests.cpp
@@ -46,6 +46,14 @@ static Opm::DeckPtr createDeck() {
             "DIMENS\n"
             " 10 10 10 /\n"
             "GRID\n"
+            "DX\n"
+            "1000*0.25 /\n"
+            "DY\n"
+            "1000*0.25 /\n"
+            "DZ\n"
+            "1000*0.25 /\n"
+            "TOPS\n"
+            "100*0.25 /\n"
             "FAULTS \n"
             "  'F1'  1  1  1  4   1  4  'X' / \n"
             "  'F2'  5  5  1  4   1  4  'X-' / \n"
@@ -82,6 +90,14 @@ static Opm::DeckPtr createValidIntDeck() {
             "DIMENS\n"
             " 5 5 1 /\n"
             "GRID\n"
+            "DX\n"
+            "25*0.25 /\n"
+            "DY\n"
+            "25*0.25 /\n"
+            "DZ\n"
+            "25*0.25 /\n"
+            "TOPS\n"
+            "25*0.25 /\n"
             "MULTNUM \n"
             "1  1  2  2 2\n"
             "1  1  2  2 2\n"
@@ -111,6 +127,14 @@ static Opm::DeckPtr createValidPERMXDeck() {
             "DIMENS\n"
             " 5 5 1 /\n"
             "GRID\n"
+            "DX\n"
+            "25*0.25 /\n"
+            "DY\n"
+            "25*0.25 /\n"
+            "DZ\n"
+            "25*0.25 /\n"
+            "TOPS\n"
+            "25*0.25 /\n"
             "MULTNUM \n"
             "1  1  2  2 2\n"
             "1  1  2  2 2\n"
@@ -245,9 +269,14 @@ BOOST_AUTO_TEST_CASE(getRegions) {
             "DIMENS\n"
             " 2 2 1 /\n"
             "GRID\n"
-            "DXV \n 2*400 /\n"
-            "DYV \n 2*400 /\n"
-            "DZV \n 1*400 /\n"
+            "DX\n"
+            "4*0.25 /\n"
+            "DY\n"
+            "4*0.25 /\n"
+            "DZ\n"
+            "4*0.25 /\n"
+            "TOPS\n"
+            "4*0.25 /\n"
             "REGIONS\n"
             "FIPNUM\n"
             "1 1 2 3 /\n";
diff --git a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp b/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
index d9bde9ac8..ccfa8dc17 100644
--- a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
+++ b/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
@@ -118,6 +118,14 @@ const char *deckData =
 "DIMENS\n"
 " 10 10 10 /\n"
 "GRID\n"
+"DX\n"
+"1000*0.25 /\n"
+"DY\n"
+"1000*0.25 /\n"
+"DZ\n"
+"1000*0.25 /\n"
+"TOPS\n"
+"100*0.25 /\n"
 "FAULTS \n"
 "  'F1'  1  1  1  4   1  4  'X' / \n"
 "  'F2'  5  5  1  4   1  4  'X-' / \n"
@@ -160,6 +168,14 @@ const char *deckData =
 "DIMENS\n"
 " 10 10 10 /\n"
 "GRID\n"
+"DX\n"
+"1000*0.25 /\n"
+"DY\n"
+"1000*0.25 /\n"
+"DZ\n"
+"1000*0.25 /\n"
+"TOPS\n"
+"100*0.25 /\n"
 "PROPS\n"
 "-- multiply one layer for each face\n"
 "MULTX\n"
@@ -194,24 +210,31 @@ BOOST_CHECK_EQUAL( schedule->getStartTime() , boost::posix_time::ptime(boost::gr
 
 static DeckPtr createDeckSimConfig() {
 const std::string& inputStr = "RUNSPEC\n"
-			  "EQLOPTS\n"
-			  "THPRES /\n "
-			  "DIMENS\n"
-			  "10 3 4 /\n"
-			  "\n"
-			  "GRID\n"
-			  "REGIONS\n"
-			  "EQLNUM\n"
-			  "10*1 10*2 100*3 /\n "
-			  "\n"
-
-			  "SOLUTION\n"
-			  "THPRES\n"
-			  "1 2 12.0/\n"
-			  "1 3 5.0/\n"
-			  "2 3 7.0/\n"
-			  "/\n"
-			  "\n";
+                "EQLOPTS\n"
+                "THPRES /\n "
+                "DIMENS\n"
+                "10 3 4 /\n"
+                "\n"
+                "GRID\n"
+                "DX\n"
+                "120*0.25 /\n"
+                "DY\n"
+                "120*0.25 /\n"
+                "DZ\n"
+                "120*0.25 /\n"
+                "TOPS\n"
+                "30*0.25 /\n"
+                "REGIONS\n"
+                "EQLNUM\n"
+                "10*1 10*2 100*3 /\n "
+                "\n"
+                "SOLUTION\n"
+                "THPRES\n"
+                "1 2 12.0/\n"
+                "1 3 5.0/\n"
+                "2 3 7.0/\n"
+                "/\n"
+                "\n";
 
 
 ParserPtr parser(new Parser());
@@ -352,6 +375,14 @@ static DeckPtr createDeckNoGridOpts() {
         "DIMENS\n"
         " 10 10 10 /\n"
         "GRID\n"
+        "DX\n"
+        "1000*0.25 /\n"
+        "DY\n"
+        "1000*0.25 /\n"
+        "DZ\n"
+        "1000*0.25 /\n"
+        "TOPS\n"
+        "100*0.25 /\n"
         "FLUXNUM\n"
         "  1000*1 /\n"
         "MULTNUM\n"
@@ -371,6 +402,14 @@ static DeckPtr createDeckWithGridOpts() {
         "DIMENS\n"
         " 10 10 10 /\n"
         "GRID\n"
+        "DX\n"
+        "1000*0.25 /\n"
+        "DY\n"
+        "1000*0.25 /\n"
+        "DZ\n"
+        "1000*0.25 /\n"
+        "TOPS\n"
+        "100*0.25 /\n"
         "FLUXNUM\n"
         "  1000*1 /\n"
         "MULTNUM\n"
@@ -432,6 +471,14 @@ BOOST_AUTO_TEST_CASE(TestIOConfigCreation) {
                           "DIMENS\n"
                           " 10 10 10 /\n"
                           "GRID\n"
+                          "DX\n"
+                          "1000*0.25 /\n"
+                          "DY\n"
+                          "1000*0.25 /\n"
+                          "DZ\n"
+                          "1000*0.25 /\n"
+                          "TOPS\n"
+                          "100*0.25 /\n"
                           "START             -- 0 \n"
                           "19 JUN 2007 / \n"
                           "SCHEDULE\n"
@@ -469,6 +516,14 @@ BOOST_AUTO_TEST_CASE(TestIOConfigCreationWithSolutionRPTRST) {
                           "\n"
                           "DIMENS\n"
                           " 10 10 10 /\n"
+                          "DX\n"
+                          "1000*0.25 /\n"
+                          "DY\n"
+                          "1000*0.25 /\n"
+                          "DZ\n"
+                          "1000*0.25 /\n"
+                          "TOPS\n"
+                          "100*0.25 /\n"
                           "SOLUTION\n"
                           "RPTRST\n"
                           "BASIC=1/\n"
@@ -511,6 +566,14 @@ BOOST_AUTO_TEST_CASE(TestIOConfigCreationWithSolutionRPTSOL) {
                         "DIMENS\n"
                         " 10 10 10 /\n"
                         "GRID\n"
+                        "DX\n"
+                        "1000*0.25 /\n"
+                        "DY\n"
+                        "1000*0.25 /\n"
+                        "DZ\n"
+                        "1000*0.25 /\n"
+                        "TOPS\n"
+                        "100*0.25 /\n"
                         "SOLUTION\n"
                         "RPTSOL\n"
                         "RESTART=2\n"
@@ -539,6 +602,14 @@ BOOST_AUTO_TEST_CASE(TestIOConfigCreationWithSolutionRPTSOL) {
                           "DIMENS\n"
                           " 10 10 10 /\n"
                           "GRID\n"
+                          "DX\n"
+                          "1000*0.25 /\n"
+                          "DY\n"
+                          "1000*0.25 /\n"
+                          "DZ\n"
+                          "1000*0.25 /\n"
+                          "TOPS\n"
+                          "100*0.25 /\n"
                           "SOLUTION\n"
                           "RPTSOL\n"
                           "0 0 0 0 0 0 2\n"
diff --git a/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp b/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp
index 39f5c0dd6..d17a0a2b4 100644
--- a/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp
+++ b/opm/parser/eclipse/IntegrationTests/IOConfigIntegrationTest.cpp
@@ -53,7 +53,7 @@ void verifyRestartConfig(IOConfigConstPtr ioconfig, std::vector<std::tuple<int ,
 
 
 
-BOOST_AUTO_TEST_CASE( NorneResttartConfig ) {
+BOOST_AUTO_TEST_CASE( NorneRestartConfig ) {
     std::vector<std::tuple<int , bool, boost::gregorian::date> > rptConfig;
     rptConfig.push_back( std::make_tuple(0 , true , boost::gregorian::date( 1997,11,6)) );
     rptConfig.push_back( std::make_tuple(1 , true , boost::gregorian::date( 1997,11,14)) );
diff --git a/opm/parser/eclipse/Parser/tests/ParseContextTests.cpp b/opm/parser/eclipse/Parser/tests/ParseContextTests.cpp
index 53fad86db..ef035fd9f 100644
--- a/opm/parser/eclipse/Parser/tests/ParseContextTests.cpp
+++ b/opm/parser/eclipse/Parser/tests/ParseContextTests.cpp
@@ -147,6 +147,15 @@ BOOST_AUTO_TEST_CASE( CheckUnsupportedInSCHEDULE ) {
         "RUNSPEC\n"
         "DIMENS\n"
         "  10 10 10 / \n"
+        "GRID\n"
+        "DX\n"
+        "1000*0.25 /\n"
+        "DY\n"
+        "1000*0.25 /\n"
+        "DZ\n"
+        "1000*0.25 /\n"
+        "TOPS\n"
+        "100*0.25 /\n"
         "SCHEDULE\n"
         "MULTZ\n"
         "   1000*0.10 /\n"
@@ -158,6 +167,15 @@ BOOST_AUTO_TEST_CASE( CheckUnsupportedInSCHEDULE ) {
         "RUNSPEC\n"
         "DIMENS\n"
         "  10 10 10 / \n"
+        "GRID\n"
+        "DX\n"
+        "1000*0.25 /\n"
+        "DY\n"
+        "1000*0.25 /\n"
+        "DZ\n"
+        "1000*0.25 /\n"
+        "TOPS\n"
+        "100*0.25 /\n"
         "SCHEDULE\n"
         "MULTFLT\n"
         "   'F1' 0.10 /\n"
@@ -226,6 +244,15 @@ BOOST_AUTO_TEST_CASE(TestCOMPORD) {
         "RUNSPEC\n"
         "DIMENS\n"
         "  10 10 10 / \n"
+        "GRID\n"
+        "DX\n"
+        "1000*0.25 /\n"
+        "DY\n"
+        "1000*0.25 /\n"
+        "DZ\n"
+        "1000*0.25 /\n"
+        "TOPS\n"
+        "100*0.25 /\n"
         "SCHEDULE\n"
         "COMPORD\n"
         "  '*'  'DEPTH' /\n"
diff --git a/testdata/integration_tests/BOX/BOXTEST1 b/testdata/integration_tests/BOX/BOXTEST1
index 0716ab73c..5e9772add 100644
--- a/testdata/integration_tests/BOX/BOXTEST1
+++ b/testdata/integration_tests/BOX/BOXTEST1
@@ -4,6 +4,14 @@ DIMENS
  10 10 10 /
 
 GRID
+DX
+1000*1 /
+DY
+1000*1 /
+DZ
+1000*1 /
+TOPS
+100*1 /
 
 PERMX
   1000*1 /
diff --git a/testdata/integration_tests/IOConfig/RPTRST_DECK.DATA b/testdata/integration_tests/IOConfig/RPTRST_DECK.DATA
index 0b02752c0..b3bcfe75a 100644
--- a/testdata/integration_tests/IOConfig/RPTRST_DECK.DATA
+++ b/testdata/integration_tests/IOConfig/RPTRST_DECK.DATA
@@ -4,6 +4,14 @@ DIMENS
 START
  06  'NOV' 1997 /
 GRID
+DX
+113344*1 /
+DY
+113344*1 /
+DZ
+113344*1 /
+TOPS
+5152*1 /
 SPECGRID
    46  112   22     1     F     /
 SOLUTION
diff --git a/testdata/integration_tests/IOConfig/RPT_TEST2.DATA b/testdata/integration_tests/IOConfig/RPT_TEST2.DATA
index 73a1035c0..1ca81c668 100644
--- a/testdata/integration_tests/IOConfig/RPT_TEST2.DATA
+++ b/testdata/integration_tests/IOConfig/RPT_TEST2.DATA
@@ -8,8 +8,14 @@ START
 1 'JAN' 2000  /
 
 GRID
-SPECGRID
-   46  112   22     1     F     /
+DX
+905296*1 /
+DY
+905296*1 /
+DZ
+905296*1 /
+TOPS
+32332*1 /
 
 SOLUTION
 
diff --git a/testdata/integration_tests/TRANS/Deck1 b/testdata/integration_tests/TRANS/Deck1
index 04bdff60d..f9e779d0b 100644
--- a/testdata/integration_tests/TRANS/Deck1
+++ b/testdata/integration_tests/TRANS/Deck1
@@ -10,6 +10,14 @@ DIMENS
  5 5 1 /
 
 GRID
+DX
+25*1 /
+DY
+25*1 /
+DZ
+25*1 /
+TOPS
+25*1 /
 
 FAULTS
    'F1'  3  3   1  5  1  1  'X' /