diff --git a/tests/Makefile.am b/tests/Makefile.am
index a82a1dc3..4181eaea 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,7 +21,9 @@ test_read_vag					\
 test_readpolymer				\
 test_sf2p					\
 test_writeVtkData				\
-unit_test
+unit_test                                       \
+pvt_test					\
+relperm_test                 
 
 
 bo_resprop_test_SOURCES = bo_resprop_test.cpp
@@ -54,6 +56,12 @@ test_writeVtkData_SOURCES = test_writeVtkData.cpp
 
 unit_test_SOURCES         = unit_test.cpp
 
+pvt_test_SOURCES          = pvt_test.cpp
+pvt_test_LDADD            = $(LDADD)
+
+relperm_test_SOURCES      = relperm_test.cpp
+relperm_test_LDADD       = $(LDADD)
+
 
 if UMFPACK
 noinst_PROGRAMS    += test_cfs_tpfa
diff --git a/tests/pvt_test.cpp b/tests/pvt_test.cpp
new file mode 100644
index 00000000..45e2775d
--- /dev/null
+++ b/tests/pvt_test.cpp
@@ -0,0 +1,87 @@
+/*
+  Copyright 2012 SINTEF ICT, Applied Mathematics.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "config.h"
+
+#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/eclipse/EclipseGridInspector.hpp>
+#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
+#include <opm/core/grid.h>
+
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
+
+int main(int argc, char** argv)
+{
+    // Parameters.
+    Opm::parameter::ParameterGroup param(argc, argv);
+
+    // Parser.
+    std::string ecl_file = param.get<std::string>("deck_filename");
+    std::string input_file = param.get<std::string>("input_filename");
+    std::string matrix_output = param.get<std::string>("matrix_outout");
+    std::string rs_output = param.get<std::string>("rs_output");
+    std::string b_output = param.get<std::string>("b_output");
+    Opm::EclipseGridParser deck(ecl_file);
+    UnstructuredGrid grid;
+    grid.number_of_cells = 1;
+    grid.global_cell = NULL;
+    Opm::BlackoilPropertiesFromDeck props(deck, grid);
+    Opm::BlackoilPvtProperties pvt;
+    pvt.init(deck);
+    
+  
+    const int n = 1;
+    std::fstream inos(input_file.c_str());
+    int np=props.numPhases();
+    while(inos.good()){
+        double p[n];
+        double z[np*n];
+        int cells[n] = { 0 };
+        inos >> p[0];      
+        for(int i=0; i < np; ++i){
+            inos >> z[i];
+        }
+        double A[np*np*n];
+        props.matrix(n, p, z, cells, A, 0);
+        std::fstream aos(matrix_output.c_str());
+        std::copy(A, A + np*np, std::ostream_iterator<double>(aos, " "));
+        std::cout << std::endl;
+        double b[np];
+        double dbdp[np];            
+        pvt.dBdp(n, p, z, b, dbdp);
+        std::fstream bos(b_output.c_str());
+        std::copy(b, b + np, std::ostream_iterator<double>(bos, " "));
+        std::copy(b, dbdp + np, std::ostream_iterator<double>(bos, " "));            
+        std::cout << std::endl;
+        double rs[np];
+        double drs[np];
+        //pvt.R(n, p, z, rs);
+        pvt.dRdp(n, p, z, rs,drs);            
+        std::fstream rsos(rs_output.c_str());
+        std::copy(b, rs + np, std::ostream_iterator<double>(rsos, " "));
+        std::copy(b, drs + np, std::ostream_iterator<double>(rsos, " "));
+        std::cout << std::endl;
+    }
+}
diff --git a/tests/relperm_test.cpp b/tests/relperm_test.cpp
new file mode 100644
index 00000000..64897289
--- /dev/null
+++ b/tests/relperm_test.cpp
@@ -0,0 +1,82 @@
+/*
+  Copyright 2012 SINTEF ICT, Applied Mathematics.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "config.h"
+
+#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/eclipse/EclipseGridInspector.hpp>
+#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
+#include <opm/core/grid.h>
+
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
+#include <fstream>
+
+int main(int argc, char** argv)
+{
+    // Parameters.
+    Opm::parameter::ParameterGroup param(argc, argv);
+
+    // Parser.
+    std::string ecl_file = param.get<std::string>("deck_filename");
+    std::string input_file = param.get<std::string>("input_filename");
+    std::string relperm_output = param.get<std::string>("relperm_output");
+    //std::string relperm_output = param.get<std::string>("relperm_outout");
+    Opm::EclipseGridParser deck(ecl_file);
+    UnstructuredGrid grid;
+    grid.number_of_cells = 1;
+    grid.global_cell = NULL;
+    Opm::BlackoilPropertiesFromDeck props(deck, grid);
+  
+    std::fstream inos(input_file.c_str());//, std::fstream::in);
+    if(!inos.good()){
+        std::cout << "Could not open :" << input_file << std::endl;
+        exit(3);
+    }
+    std::fstream kros(relperm_output.c_str(), std::fstream::out | std::fstream::trunc);
+    if(!kros.good()){
+        std::cout << "Could not open :" << input_file << std::endl;
+        exit(3);
+    }
+    int np=props.numPhases();
+    while((inos.good()) && (!inos.eof())){
+      double s[np];
+      for(int i=0; i < np; ++i){
+	inos >> s[i];
+      }
+      if(inos.good()){
+      double kr[np];
+      double dkr[np*np];
+      int cell[1];
+      cell[0]=1;
+      props.relperm(1,s, cell, kr, dkr);
+      std::copy(s, s + np, std::ostream_iterator<double>(kros, " "));
+      kros << " ";
+      std::copy(kr, kr + np, std::ostream_iterator<double>(kros, " "));
+      kros << " ";
+      std::copy(dkr, dkr + np*np, std::ostream_iterator<double>(kros, " "));
+      kros << "\n";
+      }
+    }
+}