diff --git a/ApplicationCode/UnitTests/RifRoffReader-Test.cpp b/ApplicationCode/UnitTests/RifRoffReader-Test.cpp
index 048e37c440..444d881978 100644
--- a/ApplicationCode/UnitTests/RifRoffReader-Test.cpp
+++ b/ApplicationCode/UnitTests/RifRoffReader-Test.cpp
@@ -47,7 +47,7 @@ std::string readIncorrectFile( const QString filename )
 TEST( RifRoffReader, ReadWrongFileType )
 {
     // Read a surface file: no expected to work
-    QString filename( "RifSurfaceReader/test.ptl" );
+    QString filename( "RifSurfaceImporter/test.ptl" );
     ASSERT_EQ( readIncorrectFile( filename ), std::string( "Unexpected file type: roff-asc header missing." ) );
 }
 
diff --git a/ApplicationCode/UnitTests/RifSurfaceImporter-Test.cpp b/ApplicationCode/UnitTests/RifSurfaceImporter-Test.cpp
index 4f1a1b2261..c07a607b53 100644
--- a/ApplicationCode/UnitTests/RifSurfaceImporter-Test.cpp
+++ b/ApplicationCode/UnitTests/RifSurfaceImporter-Test.cpp
@@ -13,7 +13,7 @@ TEST( RifSurfaceImporter, GocadReadValidFile )
 {
     QDir baseFolder( TEST_DATA_DIR );
 
-    QString filename( "RifSurfaceReader/tsurf_eks.ts" );
+    QString filename( "RifSurfaceImporter/tsurf_eks.ts" );
     QString filePath = baseFolder.absoluteFilePath( filename );
     EXPECT_TRUE( QFile::exists( filePath ) );
 
@@ -35,7 +35,7 @@ TEST( RifSurfaceImporter, GocadReadWrongIndices )
 {
     QDir baseFolder( TEST_DATA_DIR );
 
-    QString filename( "RifSurfaceReader/tsurf_invalid.ts" );
+    QString filename( "RifSurfaceImporter/tsurf_invalid.ts" );
     QString filePath = baseFolder.absoluteFilePath( filename );
     EXPECT_TRUE( QFile::exists( filePath ) );
 
@@ -54,7 +54,7 @@ TEST( RifSurfaceImporter, GocadReadProperties )
 {
     QDir baseFolder( TEST_DATA_DIR );
 
-    QString filename( "RifSurfaceReader/geom_with_properties.ts" );
+    QString filename( "RifSurfaceImporter/geom_with_properties.ts" );
     QString filePath = baseFolder.absoluteFilePath( filename );
     EXPECT_TRUE( QFile::exists( filePath ) );
 
@@ -95,7 +95,7 @@ TEST( RifSurfaceImporter, GocadReadNoProperty )
 {
     QDir baseFolder( TEST_DATA_DIR );
 
-    QString filename( "RifSurfaceReader/tsurf_eks.ts" );
+    QString filename( "RifSurfaceImporter/tsurf_eks.ts" );
     QString filePath = baseFolder.absoluteFilePath( filename );
     EXPECT_TRUE( QFile::exists( filePath ) );
 
@@ -113,7 +113,7 @@ TEST( RifSurfaceImporter, GocadReadNonExistingProperty )
 {
     QDir baseFolder( TEST_DATA_DIR );
 
-    QString filename( "RifSurfaceReader/geom_with_properties.ts" );
+    QString filename( "RifSurfaceImporter/geom_with_properties.ts" );
     QString filePath = baseFolder.absoluteFilePath( filename );
     EXPECT_TRUE( QFile::exists( filePath ) );
 
@@ -130,7 +130,7 @@ TEST( RifSurfaceImporter, ReadWrongFileType )
     QDir baseFolder( TEST_DATA_DIR );
 
     {
-        QString filename( "RifSurfaceReader/test.ptl" );
+        QString filename( "RifSurfaceImporter/test.ptl" );
         QString filePath = baseFolder.absoluteFilePath( filename );
         EXPECT_TRUE( QFile::exists( filePath ) );
 
@@ -146,7 +146,7 @@ TEST( RifSurfaceImporter, ReadWrongFileType )
     }
 
     {
-        QString filename( "RifSurfaceReader/tsurf_eks.ts" );
+        QString filename( "RifSurfaceImporter/tsurf_eks.ts" );
         QString filePath = baseFolder.absoluteFilePath( filename );
         EXPECT_TRUE( QFile::exists( filePath ) );
 
@@ -164,7 +164,7 @@ TEST( RifSurfaceImporter, ReadPetrelData )
 {
     QDir baseFolder( TEST_DATA_DIR );
 
-    QString filename( "RifSurfaceReader/test.ptl" );
+    QString filename( "RifSurfaceImporter/test.ptl" );
     QString filePath = baseFolder.absoluteFilePath( filename );
     EXPECT_TRUE( QFile::exists( filePath ) );
 
@@ -179,3 +179,28 @@ TEST( RifSurfaceImporter, ReadPetrelData )
     EXPECT_EQ( (size_t)0, indices.front() );
     EXPECT_EQ( (size_t)3439, indices.back() );
 }
+
+TEST( RifSurfaceImporter, ReadClippedPetrelData )
+{
+    QDir baseFolder( TEST_DATA_DIR );
+
+    QString filename( "RifSurfaceImporter/test_small_flipped_clipped.ptl" );
+    QString filePath = baseFolder.absoluteFilePath( filename );
+    EXPECT_TRUE( QFile::exists( filePath ) );
+
+    auto surface = RifSurfaceImporter::readPetrelFile( filePath );
+
+    auto vertices = surface.first;
+    auto indices  = surface.second;
+
+    EXPECT_EQ( (size_t)8, vertices.size() );
+    EXPECT_EQ( (size_t)18, indices.size() );
+
+    EXPECT_EQ( (size_t)0, indices.front() );
+    EXPECT_EQ( (size_t)2, indices.back() );
+
+    for ( size_t i = 0; i < indices.size(); i++ )
+    {
+        EXPECT_TRUE( indices[i] != ( (unsigned)-1 ) );
+    }
+}
diff --git a/ApplicationCode/UnitTests/TestData/RifSurfaceReader/geom_with_properties.ts b/ApplicationCode/UnitTests/TestData/RifSurfaceImporter/geom_with_properties.ts
similarity index 100%
rename from ApplicationCode/UnitTests/TestData/RifSurfaceReader/geom_with_properties.ts
rename to ApplicationCode/UnitTests/TestData/RifSurfaceImporter/geom_with_properties.ts
diff --git a/ApplicationCode/UnitTests/TestData/RifSurfaceReader/geom_with_properties_original.ts b/ApplicationCode/UnitTests/TestData/RifSurfaceImporter/geom_with_properties_original.ts
similarity index 100%
rename from ApplicationCode/UnitTests/TestData/RifSurfaceReader/geom_with_properties_original.ts
rename to ApplicationCode/UnitTests/TestData/RifSurfaceImporter/geom_with_properties_original.ts
diff --git a/ApplicationCode/UnitTests/TestData/RifSurfaceReader/geom_with_properties_updated.ts b/ApplicationCode/UnitTests/TestData/RifSurfaceImporter/geom_with_properties_updated.ts
similarity index 100%
rename from ApplicationCode/UnitTests/TestData/RifSurfaceReader/geom_with_properties_updated.ts
rename to ApplicationCode/UnitTests/TestData/RifSurfaceImporter/geom_with_properties_updated.ts
diff --git a/ApplicationCode/UnitTests/TestData/RifSurfaceReader/test.ptl b/ApplicationCode/UnitTests/TestData/RifSurfaceImporter/test.ptl
similarity index 100%
rename from ApplicationCode/UnitTests/TestData/RifSurfaceReader/test.ptl
rename to ApplicationCode/UnitTests/TestData/RifSurfaceImporter/test.ptl
diff --git a/ApplicationCode/UnitTests/TestData/RifSurfaceImporter/test_small_flipped_clipped.ptl b/ApplicationCode/UnitTests/TestData/RifSurfaceImporter/test_small_flipped_clipped.ptl
new file mode 100644
index 0000000000..a482b5f11c
--- /dev/null
+++ b/ApplicationCode/UnitTests/TestData/RifSurfaceImporter/test_small_flipped_clipped.ptl
@@ -0,0 +1,27 @@
+#Type: scattered data
+#Version: 6
+#Description: No description
+#Format: free
+#Field: 1 x
+#Field: 2 y
+#Field: 3 z meters
+#Field: 4 column
+#Field: 5 row
+#Projection: Local Rectangular
+#Units: meters
+#End: 
+#Information from grid
+#Grid_size: Not_avaiable
+#Grid_space: Not_available
+#Z_field: z
+#Vertical_faults: Not_available
+#History: No history
+#Z_units: meters
+455586.440000 7321154.500000 -2596.739000 1 1
+455638.060000 7321221.000000 -2609.231900 2 1
+455679.250000 7321294.000000 -2608.159900 3 1
+455608.340000 7321073.000000 -2578.846900 1 2
+455660.470000 7321140.000000 -2588.700000 2 2
+455717.560000 7321214.500000 -2584.720900 3 2
+455624.750000 7320986.000000 -2573.064900 1 3
+455680.310000 7321061.000000 -2577.110100 2 3
diff --git a/ApplicationCode/UnitTests/TestData/RifSurfaceReader/tsurf_eks.ts b/ApplicationCode/UnitTests/TestData/RifSurfaceImporter/tsurf_eks.ts
similarity index 100%
rename from ApplicationCode/UnitTests/TestData/RifSurfaceReader/tsurf_eks.ts
rename to ApplicationCode/UnitTests/TestData/RifSurfaceImporter/tsurf_eks.ts
diff --git a/ApplicationCode/UnitTests/TestData/RifSurfaceReader/tsurf_invalid.ts b/ApplicationCode/UnitTests/TestData/RifSurfaceImporter/tsurf_invalid.ts
similarity index 100%
rename from ApplicationCode/UnitTests/TestData/RifSurfaceReader/tsurf_invalid.ts
rename to ApplicationCode/UnitTests/TestData/RifSurfaceImporter/tsurf_invalid.ts