diff --git a/examples/compute_initial_state.cpp b/examples/compute_initial_state.cpp
index a88638f02..a2b8c2ed8 100644
--- a/examples/compute_initial_state.cpp
+++ b/examples/compute_initial_state.cpp
@@ -90,7 +90,7 @@ try
     Opm::DeckConstPtr deck = parser->parseFile(deck_filename , parseContext);
     Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck, parseContext));
     const double grav = param.getDefault("gravity", unit::gravity);
-    GridManager gm(deck);
+    GridManager gm(eclipseState->getInputGrid());
     const UnstructuredGrid& grid = *gm.c_grid();
     BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param);
     warnIfUnusedParams(param);
diff --git a/examples/diagnose_relperm.cpp b/examples/diagnose_relperm.cpp
index 862fb96d7..6de6a9489 100644
--- a/examples/diagnose_relperm.cpp
+++ b/examples/diagnose_relperm.cpp
@@ -78,7 +78,7 @@ try
     Opm::DeckConstPtr deck(parser->parseFile(eclipseFilename, parseContext));
     eclState.reset(new EclipseState(deck, parseContext));
 
-    GridManager gm(deck);
+    GridManager gm(eclState->getInputGrid());
     const UnstructuredGrid& grid = *gm.c_grid();
     using boost::filesystem::path; 
     path fpath(eclipseFilename);
diff --git a/opm/core/wells/WellsManager_impl.hpp b/opm/core/wells/WellsManager_impl.hpp
index 1f44443a0..9d9190313 100644
--- a/opm/core/wells/WellsManager_impl.hpp
+++ b/opm/core/wells/WellsManager_impl.hpp
@@ -390,7 +390,7 @@ WellsManager::init(const Opm::EclipseStateConstPtr eclipseState,
     DoubleArray ntg_glob(eclipseState, "NTG", 1.0);
     NTGArray    ntg(ntg_glob, global_cell);
 
-    EclipseGridConstPtr eclGrid = eclipseState->getEclipseGrid();
+    EclipseGridConstPtr eclGrid = eclipseState->getInputGrid();
 
     // use cell thickness (dz) from eclGrid
     // dz overwrites values calculated by WellDetails::getCubeDim
diff --git a/tests/test_blackoilstate.cpp b/tests/test_blackoilstate.cpp
index 0cff885a9..b1942dbb0 100644
--- a/tests/test_blackoilstate.cpp
+++ b/tests/test_blackoilstate.cpp
@@ -28,6 +28,13 @@ using namespace Opm;
 using namespace std;
 
 
+// ACTNUM 1 998*2 3
+std::vector<int> get_testBlackoilStateActnum() {
+    std::vector<int> actnum(10 * 10 * 10, 2);
+    actnum.front() = 1;
+    actnum.back() = 3;
+    return actnum;
+}
 
 BOOST_AUTO_TEST_CASE(EqualsDifferentDeckReturnFalse) {
 
@@ -35,12 +42,20 @@ BOOST_AUTO_TEST_CASE(EqualsDifferentDeckReturnFalse) {
     const string filename1 = "testBlackoilState1.DATA";
     const string filename2 = "testBlackoilState2.DATA";
     Opm::ParserPtr parser(new Opm::Parser());
-    Opm::DeckConstPtr deck1(parser->parseFile(filename1, parseContext));
-    Opm::DeckConstPtr deck2(parser->parseFile(filename2, parseContext));
 
-    GridManager gridManager1(deck1);
+    Opm::DeckConstPtr deck1(parser->parseFile(filename1, parseContext));
+    auto eg1 = std::make_shared<Opm::EclipseGrid>(deck1);
+    std::vector<int> actnum = get_testBlackoilStateActnum();
+    eg1->resetACTNUM(actnum.data());
+
+
+    Opm::DeckConstPtr deck2(parser->parseFile(filename2, parseContext));
+    auto eg2 = std::make_shared<Opm::EclipseGrid>(deck2);
+
+    GridManager gridManager1(eg1);
     const UnstructuredGrid& grid1 = *gridManager1.c_grid();
-    GridManager gridManager2(deck2);
+
+    GridManager gridManager2(eg2);
     const UnstructuredGrid& grid2 = *gridManager2.c_grid();
 
     BlackoilState state1( UgGridHelpers::numCells( grid1 ) , UgGridHelpers::numFaces( grid1 ) , 3);
@@ -58,8 +73,11 @@ BOOST_AUTO_TEST_CASE(EqualsNumericalDifferenceReturnFalse) {
     Opm::ParseContext parseContext;
     Opm::ParserPtr parser(new Opm::Parser());
     Opm::DeckConstPtr deck(parser->parseFile(filename , parseContext));
+    auto eg = std::make_shared<Opm::EclipseGrid>(deck);
+    std::vector<int> actnum = get_testBlackoilStateActnum();
+    eg->resetACTNUM(actnum.data());
 
-    GridManager gridManager(deck);
+    GridManager gridManager(eg);
     const UnstructuredGrid& grid = *gridManager.c_grid();
 
     BlackoilState state1( UgGridHelpers::numCells( grid ) , UgGridHelpers::numFaces( grid ) , 3);
diff --git a/tests/test_pinchprocessor.cpp b/tests/test_pinchprocessor.cpp
index 6a2711a5d..cba80906e 100644
--- a/tests/test_pinchprocessor.cpp
+++ b/tests/test_pinchprocessor.cpp
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE(Processing)
     Opm::DeckConstPtr deck = parser->parseFile(filename, parseContext);
     std::shared_ptr<EclipseState> eclstate (new Opm::EclipseState(deck, parseContext));
     const auto& porv = eclstate->get3DProperties().getDoubleGridProperty("PORV").getData();
-    EclipseGridConstPtr eclgrid = eclstate->getEclipseGrid();
+    EclipseGridConstPtr eclgrid = eclstate->getInputGrid();
 
     BOOST_CHECK_EQUAL(eclgrid->getMinpvMode(), MinpvMode::EclSTD);
 
diff --git a/tests/test_relpermdiagnostics.cpp b/tests/test_relpermdiagnostics.cpp
index 65862ae3d..ae9c285e3 100644
--- a/tests/test_relpermdiagnostics.cpp
+++ b/tests/test_relpermdiagnostics.cpp
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(diagnosis)
     Opm::DeckConstPtr deck(parser->parseFile("../tests/relpermDiagnostics.DATA", parseContext));
     eclState.reset(new EclipseState(deck, parseContext));
 
-    GridManager gm(deck);
+    GridManager gm(eclState->getInputGrid());
     const UnstructuredGrid& grid = *gm.c_grid();
     std::string logFile = "LOGFILE.txt";
     std::shared_ptr<EclipsePRTLog> prtLog = std::make_shared<EclipsePRTLog>(logFile, Log::DefaultMessageTypes);
diff --git a/tests/test_stoppedwells.cpp b/tests/test_stoppedwells.cpp
index 213e59857..b67a148d2 100644
--- a/tests/test_stoppedwells.cpp
+++ b/tests/test_stoppedwells.cpp
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(TestStoppedWells)
     Opm::DeckConstPtr deck(parser->parseFile(filename , parseContext));
 
     Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseContext));
-    Opm::GridManager gridManager(deck);
+    Opm::GridManager gridManager(eclipseState->getInputGrid());
 
     double target_surfacerate_inj;
     double target_surfacerate_prod;
diff --git a/tests/test_wellsmanager.cpp b/tests/test_wellsmanager.cpp
index 8b97cc100..2d2587405 100644
--- a/tests/test_wellsmanager.cpp
+++ b/tests/test_wellsmanager.cpp
@@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE(New_Constructor_Works) {
     Opm::DeckConstPtr deck(parser->parseFile(filename, parseContext));
 
     Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck, parseContext));
-    Opm::GridManager gridManager(deck);
+    Opm::GridManager gridManager(eclipseState->getInputGrid());
 
     {
         Opm::WellsManager wellsManager(eclipseState, 0, *gridManager.c_grid(), NULL);
@@ -219,7 +219,7 @@ BOOST_AUTO_TEST_CASE(WellsEqual) {
     Opm::DeckConstPtr deck(parser->parseFile(filename, parseContext));
 
     Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck, parseContext));
-    Opm::GridManager gridManager(deck);
+    Opm::GridManager gridManager(eclipseState->getInputGrid());
 
     Opm::WellsManager wellsManager0(eclipseState, 0, *gridManager.c_grid(), NULL);
     Opm::WellsManager wellsManager1(eclipseState, 1, *gridManager.c_grid(), NULL);
@@ -235,7 +235,7 @@ BOOST_AUTO_TEST_CASE(ControlsEqual) {
     Opm::DeckConstPtr deck(parser->parseFile(filename, parseContext));
 
     Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck, parseContext));
-    Opm::GridManager gridManager(deck);
+    Opm::GridManager gridManager(eclipseState->getInputGrid());
 
     Opm::WellsManager wellsManager0(eclipseState, 0, *gridManager.c_grid(), NULL);
     Opm::WellsManager wellsManager1(eclipseState, 1, *gridManager.c_grid(), NULL);
@@ -258,7 +258,7 @@ BOOST_AUTO_TEST_CASE(WellShutOK) {
     Opm::DeckConstPtr deck(parser->parseFile(filename, parseContext));
 
     Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck, parseContext));
-    Opm::GridManager gridManager(deck);
+    Opm::GridManager gridManager(eclipseState->getInputGrid());
 
     Opm::WellsManager wellsManager2(eclipseState, 2, *gridManager.c_grid(), NULL);
 
@@ -275,7 +275,7 @@ BOOST_AUTO_TEST_CASE(WellSTOPOK) {
     Opm::DeckConstPtr deck(parser->parseFile(filename, parseContext));
 
     Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck, parseContext));
-    Opm::GridManager gridManager(deck);
+    Opm::GridManager gridManager(eclipseState->getInputGrid());
 
     Opm::WellsManager wellsManager(eclipseState, 0, *gridManager.c_grid(), NULL);