diff --git a/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
index 0d3259e58ef3f13415dfcf3de34d8c90e7322aef..e35f4ddadc1c7f319c1b11583b7ed092d5643241 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
@@ -160,7 +160,7 @@ int VtkVisImageItem::callVTKWriter(vtkAlgorithm* algorithm, const std::string &f
         vtkSmartPointer<vtkXMLImageDataWriter> iWriter =
                 vtkSmartPointer<vtkXMLImageDataWriter>::New();
         iWriter->SetInputData(algID->GetOutputDataObject(0));
-        if (BaseLib::getFileExtension(filename) != "vti")
+        if (BaseLib::getFileExtension(filename) != ".vti")
         {
             file_name_cpy.append(".vti");
         }
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
index 46ad898ef7ae3115e4a04eebf4e4d681be87e3b2..901282e77d25638fede360a3eae7a6719ad7ae03 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
@@ -252,7 +252,7 @@ int VtkVisPointSetItem::callVTKWriter(vtkAlgorithm* algorithm, const std::string
         vtkSmartPointer<vtkXMLPolyDataWriter> pdWriter =
                 vtkSmartPointer<vtkXMLPolyDataWriter>::New();
         pdWriter->SetInputData(algPD->GetOutputDataObject(0));
-        if (BaseLib::getFileExtension(filename) != "vtp")
+        if (BaseLib::getFileExtension(filename) != ".vtp")
         {
             file_name_cpy.append(".vtp");
         }
@@ -266,7 +266,7 @@ int VtkVisPointSetItem::callVTKWriter(vtkAlgorithm* algorithm, const std::string
         vtkSmartPointer<vtkXMLUnstructuredGridWriter> ugWriter =
                 vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New();
         ugWriter->SetInputData(algUG->GetOutputDataObject(0));
-        if (BaseLib::getFileExtension(filename) != "vtu")
+        if (BaseLib::getFileExtension(filename) != ".vtu")
         {
             file_name_cpy.append(".vtu");
         }
diff --git a/Applications/FileIO/AsciiRasterInterface.cpp b/Applications/FileIO/AsciiRasterInterface.cpp
index e955fa28729fc8dad6c72f2a591117e513b3bc84..0e5ede1797b9b05765cb61397bed1f8aa304decb 100644
--- a/Applications/FileIO/AsciiRasterInterface.cpp
+++ b/Applications/FileIO/AsciiRasterInterface.cpp
@@ -28,11 +28,11 @@ GeoLib::Raster* AsciiRasterInterface::readRaster(std::string const& fname)
 {
     std::string ext (BaseLib::getFileExtension(fname));
     std::transform(ext.begin(), ext.end(), ext.begin(), tolower);
-    if (ext == "asc")
+    if (ext == ".asc")
     {
         return getRasterFromASCFile(fname);
     }
-    if (ext == "grd")
+    if (ext == ".grd")
     {
         return getRasterFromSurferFile(fname);
     }
diff --git a/Applications/FileIO/SWMM/SWMMInterface.cpp b/Applications/FileIO/SWMM/SWMMInterface.cpp
index 7c3712919d00f0e6aee7739e30a4f15b6b66ab75..072afa331289b49bd23a8ca59f07cb0f9b382398 100644
--- a/Applications/FileIO/SWMM/SWMMInterface.cpp
+++ b/Applications/FileIO/SWMM/SWMMInterface.cpp
@@ -127,7 +127,7 @@ SwmmInterface::~SwmmInterface()
 
 bool SwmmInterface::isSwmmInputFile(std::string const& inp_file_name)
 {
-    if (!boost::iequals(BaseLib::getFileExtension(inp_file_name), "inp"))
+    if (!boost::iequals(BaseLib::getFileExtension(inp_file_name), ".inp"))
     {
         ERR("SWMMInterface: {:s} is not a SWMM input file.", inp_file_name);
         return false;
diff --git a/Applications/FileIO/TetGenInterface.cpp b/Applications/FileIO/TetGenInterface.cpp
index d138aae57fecb8be7761a41ec978da79b3bcd9cd..1548468abc65393c67d3d587dc7675cf18301e20 100644
--- a/Applications/FileIO/TetGenInterface.cpp
+++ b/Applications/FileIO/TetGenInterface.cpp
@@ -47,7 +47,7 @@ bool TetGenInterface::readTetGenGeometry (std::string const& geo_fname,
         return false;
     }
     std::string ext (BaseLib::getFileExtension(geo_fname));
-    if (ext != "smesh")
+    if (ext != ".smesh")
     {
         ERR ("TetGenInterface::readTetGenGeometry() - unknown file type (only *.smesh is supported).");
         return false;
diff --git a/Applications/FileIO/readGeometryFromFile.cpp b/Applications/FileIO/readGeometryFromFile.cpp
index d1ba309b59bfad2aa273d709a44bccf305632757..cb4b540c3473aeab6f10f8838dbebb620cbd52cc 100644
--- a/Applications/FileIO/readGeometryFromFile.cpp
+++ b/Applications/FileIO/readGeometryFromFile.cpp
@@ -26,7 +26,7 @@ void readGeometryFromFile(std::string const& fname,
                           GeoLib::GEOObjects& geo_objs,
                           std::string const& gmsh_path)
 {
-    if (BaseLib::getFileExtension(fname) == "gml")
+    if (BaseLib::getFileExtension(fname) == ".gml")
     {
         GeoLib::IO::BoostXmlGmlInterface xml(geo_objs);
         xml.readFile(fname);
diff --git a/Applications/FileIO/writeGeometryToFile.cpp b/Applications/FileIO/writeGeometryToFile.cpp
index b0446b1fef7244171062ac780874b5bc99c57583..75584d897dfa2387f5fa4b881aa1c821767841e2 100644
--- a/Applications/FileIO/writeGeometryToFile.cpp
+++ b/Applications/FileIO/writeGeometryToFile.cpp
@@ -23,7 +23,7 @@ void writeGeometryToFile(std::string const& geo_name,
     GeoLib::GEOObjects& geo_objs, std::string const& fname)
 {
     std::string const extension(BaseLib::getFileExtension(fname));
-    if (extension == "gml" || extension == "GML") {
+    if (extension == ".gml" || extension == ".GML") {
         GeoLib::IO::BoostXmlGmlInterface xml(geo_objs);
         xml.setNameForExport(geo_name);
         xml.writeToFile(fname);
diff --git a/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp b/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp
index 010cfdeefe4b5ee26b7def7e6d337d78ed99a628..e0406999ea36421b5a2bdd82a3681d43aa9cc188 100644
--- a/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp
+++ b/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp
@@ -148,7 +148,7 @@ int main (int argc, char* argv[])
     }
 
     std::string output_name(mesh_out_arg.getValue());
-    if (!BaseLib::hasFileExtension("vtu", output_name))
+    if (!BaseLib::hasFileExtension(".vtu", output_name))
     {
         output_name.append(".vtu");
     }
diff --git a/Applications/Utils/MeshEdit/moveMeshNodes.cpp b/Applications/Utils/MeshEdit/moveMeshNodes.cpp
index dd8cabb7b4842ee88f3a57298abb339d31fef169..5a4bf10906771094b35da5fb494721612020e3e8 100644
--- a/Applications/Utils/MeshEdit/moveMeshNodes.cpp
+++ b/Applications/Utils/MeshEdit/moveMeshNodes.cpp
@@ -72,7 +72,7 @@ int main (int argc, char* argv[])
     const std::string msh_name(argv[1]);
     const std::string current_key(argv[2]);
     std::string const ext (BaseLib::getFileExtension(msh_name));
-    if (!(ext == "msh" || ext == "vtu"))
+    if (!(ext == ".msh" || ext == ".vtu"))
     {
         ERR("Error: Parameter 1 must be a mesh-file (*.msh / *.vtu).");
         INFO("Usage: {:s} <msh-file.gml> <keyword> <value>", argv[0]);
diff --git a/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp b/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp
index 3797c5096535a6a84b8033cf0b14571b2741319d..c33f4059d60ebbe89eb30480108639b1cf0a84eb 100644
--- a/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp
+++ b/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp
@@ -140,7 +140,7 @@ int main(int argc, char* argv[])
         std::string const ext = BaseLib::getFileExtension(filename);
 
         GeoLib::Raster r(h1, raster[i].begin(), raster[i].end());
-        FileIO::AsciiRasterInterface::writeRasterAsASC(r, basename + std::to_string(i) + "." + ext);
+        FileIO::AsciiRasterInterface::writeRasterAsASC(r, basename + std::to_string(i) + ext);
         INFO("Layer {:d} written.", i + 1);
     }
     return EXIT_SUCCESS;
diff --git a/Applications/Utils/PostProcessing/postLIE.cpp b/Applications/Utils/PostProcessing/postLIE.cpp
index d2e09168701d38d5f8afc1ee17533f6506d0ac3e..9ec2fa5884586790d50ac9c914dec24aaf1865c7 100644
--- a/Applications/Utils/PostProcessing/postLIE.cpp
+++ b/Applications/Utils/PostProcessing/postLIE.cpp
@@ -136,11 +136,11 @@ int main(int argc, char* argv[])
     cmd.parse(argc, argv);
 
     auto const in_file_ext = BaseLib::getFileExtension(arg_in_file.getValue());
-    if (in_file_ext == "pvd")
+    if (in_file_ext == ".pvd")
     {
         postPVD(arg_in_file.getValue(), arg_out_file.getValue());
     }
-    else if (in_file_ext == "vtu")
+    else if (in_file_ext == ".vtu")
     {
         postVTU(arg_in_file.getValue(), arg_out_file.getValue());
     }
diff --git a/Applications/Utils/SWMMConverter/SWMMConverter.cpp b/Applications/Utils/SWMMConverter/SWMMConverter.cpp
index d1f4cf4c0366eed03f0e5d6da5b69ae6137239bc..a751557095de47532c491618ac3510d2281dacf7 100644
--- a/Applications/Utils/SWMMConverter/SWMMConverter.cpp
+++ b/Applications/Utils/SWMMConverter/SWMMConverter.cpp
@@ -78,8 +78,7 @@ int writeMeshOutput(std::string const& input_file,
     }
 
     std::string const basename = BaseLib::dropFileExtension(output_file);
-    std::string const extension =
-        std::string("." + BaseLib::getFileExtension(output_file));
+    std::string const extension = BaseLib::getFileExtension(output_file);
     std::size_t const n_time_steps(swmm->getNumberOfTimeSteps());
     INFO("Number of simulation time steps: {:d}", n_time_steps);
     for (std::size_t i = 0; i < n_time_steps; i++)
@@ -138,8 +137,7 @@ int writeCsvOutput(std::string input_file,
     }
 
     std::string const basename = BaseLib::dropFileExtension(output_file);
-    std::string const extension =
-        std::string("." + BaseLib::getFileExtension(output_file));
+    std::string const extension = BaseLib::getFileExtension(output_file);
 
     if (node_args)
         writeObjectsOfSwmmTypeToCsv(*swmm, FileIO::SwmmObject::NODE, basename,
diff --git a/BaseLib/FileTools.cpp b/BaseLib/FileTools.cpp
index a6952cf0dcc1ca905bb2ca01625aad85546a7c02..545dc17436e08d6c4051ad4ae16b669df0cc5ac9 100644
--- a/BaseLib/FileTools.cpp
+++ b/BaseLib/FileTools.cpp
@@ -62,19 +62,6 @@ double swapEndianness(double const& v)
     return b.v;
 }
 
-namespace
-{
-
-/** Finds the position of last dot.
- * This could be used to extract file extension.
- */
-
-std::string::size_type findLastDot(std::string const& path)
-{
-    return path.find_last_of('.');
-}
-} // end namespace
-
 std::string dropFileExtension(std::string const& filename)
 {
     auto const filename_path = fs::path(filename);
@@ -94,13 +81,7 @@ std::string extractBaseNameWithoutExtension(std::string const& pathname)
 
 std::string getFileExtension(const std::string &path)
 {
-    const std::string str = extractBaseName(path);
-    auto const p = findLastDot(str);
-    if (p == std::string::npos)
-    {
-        return std::string();
-    }
-    return str.substr(p + 1);
+    return fs::path(path).extension();
 }
 
 bool hasFileExtension(std::string const& extension, std::string const& filename)
@@ -108,13 +89,6 @@ bool hasFileExtension(std::string const& extension, std::string const& filename)
     return boost::iequals(extension, getFileExtension(filename));
 }
 
-static const char pathSeparator =
-#ifdef _WIN32
-                            '\\';
-#else
-                            '/';
-#endif
-
 std::string extractPath(std::string const& pathname)
 {
     return fs::path(pathname).parent_path();
diff --git a/MeshLib/IO/VtkIO/VtuInterface.cpp b/MeshLib/IO/VtkIO/VtuInterface.cpp
index e7c26b0eafcebccc3f08958093dbdb7d03730228..6b958a75f4472df6d6984fb744bfa60533b04804 100644
--- a/MeshLib/IO/VtkIO/VtuInterface.cpp
+++ b/MeshLib/IO/VtkIO/VtuInterface.cpp
@@ -77,7 +77,7 @@ std::string getVtuFileNameForPetscOutputWithoutExtension(
     std::string const& file_name)
 {
     auto const file_name_extension = BaseLib::getFileExtension(file_name);
-    if (file_name_extension != "vtu")
+    if (file_name_extension != ".vtu")
     {
         OGS_FATAL("Expected a .vtu file for petsc output.");
     }
diff --git a/MeshLib/IO/readMeshFromFile.cpp b/MeshLib/IO/readMeshFromFile.cpp
index b211aa66a83ecf6a24c4cea298a7b4ced5fe94ac..5b2f94aa849df32eb29d1e83078b1398ec99ddfb 100644
--- a/MeshLib/IO/readMeshFromFile.cpp
+++ b/MeshLib/IO/readMeshFromFile.cpp
@@ -69,13 +69,13 @@ MeshLib::Mesh* readMeshFromFile(const std::string &file_name)
 
 MeshLib::Mesh* readMeshFromFileSerial(const std::string &file_name)
 {
-    if (BaseLib::hasFileExtension("msh", file_name))
+    if (BaseLib::hasFileExtension(".msh", file_name))
     {
         MeshLib::IO::Legacy::MeshIO meshIO;
         return meshIO.loadMeshFromFile(file_name);
     }
 
-    if (BaseLib::hasFileExtension("vtu", file_name))
+    if (BaseLib::hasFileExtension(".vtu", file_name))
     {
         return MeshLib::IO::VtuInterface::readVTUFile(file_name);
     }
diff --git a/MeshLib/IO/writeMeshToFile.cpp b/MeshLib/IO/writeMeshToFile.cpp
index ea54d209e6e3b90f87d1dd721924b20e8878f61c..debc78c3bd7caee1d1aa78616e9135722b589693 100644
--- a/MeshLib/IO/writeMeshToFile.cpp
+++ b/MeshLib/IO/writeMeshToFile.cpp
@@ -25,14 +25,14 @@ namespace IO
 {
 int writeMeshToFile(const MeshLib::Mesh &mesh, const std::string &file_name)
 {
-    if (BaseLib::hasFileExtension("msh", file_name))
+    if (BaseLib::hasFileExtension(".msh", file_name))
     {
         MeshLib::IO::Legacy::MeshIO meshIO;
         meshIO.setMesh(&mesh);
         meshIO.writeToFile(file_name);
         return 0;
     }
-    if (BaseLib::hasFileExtension("vtu", file_name))
+    if (BaseLib::hasFileExtension(".vtu", file_name))
     {
         MeshLib::IO::VtuInterface writer(&mesh);
         auto const result = writer.writeToFile(file_name);
diff --git a/Tests/BaseLib/TestFilePathStringManipulation.cpp b/Tests/BaseLib/TestFilePathStringManipulation.cpp
deleted file mode 100644
index 159781419ff2913260508265be8833a9c8222a86..0000000000000000000000000000000000000000
--- a/Tests/BaseLib/TestFilePathStringManipulation.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * \file
- * \author
- * \date
- * \brief
- *
- * \copyright
- * Copyright (c) 2012-2020, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.org/project/license
- */
-
-#include "gtest/gtest.h"
-
-#include "BaseLib/FileTools.h"
-
-#ifdef WIN32
-TEST(BaseLib, GetFileExtensionWin)
-{
-    ASSERT_EQ ( BaseLib::getFileExtension("file"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\file"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("path\\"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\path\\"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("path\\file"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\path\\file"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\path\\path\\file"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\path\\path\\path\\"), "" );
-
-    ASSERT_EQ ( BaseLib::getFileExtension("file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("path.ext\\"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\path.ext\\"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("path\\file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\path\\file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\path\\path\\file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\path\\path\\path.ext\\"), "" );
-
-    ASSERT_EQ ( BaseLib::getFileExtension("path.wrong\\file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\path.wrong\\file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\path.wrong0\\path.wrong\\file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("\\path.wrong0\\path.wrong\\path.ext\\"), "" );
-}
-#else
-TEST(BaseLib, getFileExtensionUnix)
-{
-    ASSERT_EQ ( BaseLib::getFileExtension("file"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/file"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("path/"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/path/"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("path/file"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/path/file"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/path/path/file"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/path/path/path/"), "" );
-
-    ASSERT_EQ ( BaseLib::getFileExtension("file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("path.ext/"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/path.ext/"), "" );
-    ASSERT_EQ ( BaseLib::getFileExtension("path/file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/path/file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/path/path/file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/path/path/path.ext/"), "" );
-
-    ASSERT_EQ ( BaseLib::getFileExtension("path.wrong/file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/path.wrong/file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/path.wrong0/path.wrong/file.ext"), "ext" );
-    ASSERT_EQ ( BaseLib::getFileExtension("/path.wrong0/path.wrong/path.ext/"), "" );
-}
-#endif
-
-#ifdef WIN32
-TEST(BaseLib, HasFileExtensionWin)
-{
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "file"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "\\file"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "path\\"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "\\path\\"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "path\\file"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "\\path\\file"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "\\path\\path\\file"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "\\path\\path\\path\\"));
-
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "\\file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "path.ext\\"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "\\path.ext\\"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "path\\file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "\\path\\file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "\\path\\path\\file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "\\path\\path\\path.ext\\"));
-
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "path.wrong\\file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "\\path.wrong\\file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "\\path.wrong0\\path.wrong\\file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "\\path.wrong0\\path.wrong\\path.ext\\"));
-
-    ASSERT_TRUE ( BaseLib::hasFileExtension("EXT", "file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("EXT", "file.EXT"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "file.EXT"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("Ext", "file.exT"));
-
-    ASSERT_TRUE ( BaseLib::hasFileExtension("EXT", "path\\file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("EXT", "path\\file.EXT"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "path\\file.EXT"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("Ext", "path\\file.exT"));
-}
-#else
-TEST(BaseLib, HasFileExtensionUnix)
-{
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "file"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "/file"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "path/"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "/path/"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "path/file"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "/path/file"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "/path/path/file"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "/path/path/path/"));
-
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "/file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "path.ext/"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "/path.ext/"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "path/file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "/path/file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "/path/path/file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "/path/path/path.ext/"));
-
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "path.wrong/file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "/path.wrong/file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "/path.wrong0/path.wrong/file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("", "/path.wrong0/path.wrong/path.ext/"));
-
-    ASSERT_TRUE ( BaseLib::hasFileExtension("EXT", "file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("EXT", "file.EXT"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "file.EXT"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("Ext", "file.exT"));
-
-    ASSERT_TRUE ( BaseLib::hasFileExtension("EXT", "path/file.ext"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("EXT", "path/file.EXT"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("ext", "path/file.EXT"));
-    ASSERT_TRUE ( BaseLib::hasFileExtension("Ext", "path/file.exT"));
-}
-#endif
diff --git a/Tests/FileIO/TestTetGenInterface.cpp b/Tests/FileIO/TestTetGenInterface.cpp
index 57ab6981516147377f389250f9dd2eca64661780..ef995e9a70dc55ff90ed88e72ea9661f1e89237a 100644
--- a/Tests/FileIO/TestTetGenInterface.cpp
+++ b/Tests/FileIO/TestTetGenInterface.cpp
@@ -54,6 +54,7 @@ TEST(FileIO, DISABLED_TetGenSmeshInterface)
 {
     std::string const file_name (TestInfoLib::TestInfo::data_path + "/FileIO/AmmerSubsurfaceCoarse.vtu");
     std::unique_ptr<MeshLib::Mesh const> const mesh (MeshLib::IO::readMeshFromFile(file_name));
+    ASSERT_NE(mesh, nullptr);
 
     std::string const tg_new_name (BaseLib::randomString(32));
     std::string const output_name =