diff --git a/Tests/MeshLib/TestAddLayerToMesh.cpp b/Tests/MeshLib/TestAddLayerToMesh.cpp
index 77a30369335a227ba4b92a9584c97dcb8b79346b..0f9c2d25a2f7691ca5397a53df21cf22919c4fa1 100644
--- a/Tests/MeshLib/TestAddLayerToMesh.cpp
+++ b/Tests/MeshLib/TestAddLayerToMesh.cpp
@@ -118,7 +118,7 @@ TEST(MeshLib, AddTopLayerToTriMesh)
     {
         test->resize(mesh->getNumberOfElements(), 0.1);
     }
-    ASSERT_EQ(2, mesh->getProperties().getPropertyVectorNames().size());
+    ASSERT_EQ(2, mesh->getProperties().size());
     double const height (1);
     constexpr bool copy_material_ids = false;
     std::unique_ptr<MeshLib::Mesh> const result (MeshLib::addLayerToMesh(*mesh,
@@ -134,7 +134,7 @@ TEST(MeshLib, AddTopLayerToTriMesh)
     ASSERT_EQ(mesh->getNumberOfElements(),
               n_elems.at(MeshLib::MeshElemType::PRISM));
 
-    ASSERT_EQ(1, result->getProperties().getPropertyVectorNames().size());
+    ASSERT_EQ(1, result->getProperties().size());
     auto const* const new_mats =
         result->getProperties().getPropertyVector<int>(mat_name);
     ASSERT_EQ(result->getNumberOfElements(), new_mats->size());
@@ -305,7 +305,7 @@ TEST(MeshLib, AddBottomLayerToPrismMesh)
               n_elems.at(MeshLib::MeshElemType::TRIANGLE));
     ASSERT_EQ(2 * mesh->getNumberOfElements(),
               n_elems.at(MeshLib::MeshElemType::PRISM));
-    ASSERT_EQ(1, result->getProperties().getPropertyVectorNames().size());
+    ASSERT_EQ(1, result->getProperties().size());
     auto const* const new_mats =
         result->getProperties().getPropertyVector<int>(mat_name);
     ASSERT_EQ(result->getNumberOfElements(), new_mats->size());
diff --git a/Tests/MeshLib/TestRasterToMesh.cpp b/Tests/MeshLib/TestRasterToMesh.cpp
index 1a90c636c7702d75ffc9572ae525120d76df61ed..cc5ec97156d04d42a95f53b472c569276a338833 100644
--- a/Tests/MeshLib/TestRasterToMesh.cpp
+++ b/Tests/MeshLib/TestRasterToMesh.cpp
@@ -57,9 +57,7 @@ TEST_F(RasterToMeshTest, convertRasterToTriMeshElevation)
     ASSERT_EQ(_n_nodes, mesh->getNodes().size());
     ASSERT_EQ(_n_nodes, mesh->getNumberOfNodes());
 
-    std::vector<std::string> const names =
-        mesh->getProperties().getPropertyVectorNames();
-    ASSERT_TRUE(names.empty());
+    ASSERT_EQ(0, mesh->getProperties().size());
 
     auto const& n_types =
         MeshLib::MeshInformation::getNumberOfElementTypes(*mesh);
@@ -81,9 +79,7 @@ TEST_F(RasterToMeshTest, convertRasterToQuadMeshElevation)
 
     ASSERT_EQ(_n_nodes, mesh->getNumberOfBaseNodes());
 
-    std::vector<std::string> const names =
-        mesh->getProperties().getPropertyVectorNames();
-    ASSERT_TRUE(names.empty());
+    ASSERT_EQ(0, mesh->getProperties().size());
 
     auto const& n_types =
         MeshLib::MeshInformation::getNumberOfElementTypes(*mesh);
@@ -118,9 +114,7 @@ TEST_F(RasterToMeshTest, convertRasterToTriMeshValue)
 
     ASSERT_EQ(_n_nodes, mesh->getNumberOfBaseNodes());
 
-    std::vector<std::string> const names =
-        mesh->getProperties().getPropertyVectorNames();
-    ASSERT_EQ(1, names.size());
+    ASSERT_EQ(1, mesh->getProperties().size());
 
     MeshLib::PropertyVector<double>* const prop =
         mesh->getProperties().getPropertyVector<double>("test");
@@ -152,9 +146,7 @@ TEST_F(RasterToMeshTest, convertRasterToQuadMeshValue)
 
     ASSERT_EQ(_n_nodes, mesh->getNumberOfBaseNodes());
 
-    std::vector<std::string> const names =
-        mesh->getProperties().getPropertyVectorNames();
-    ASSERT_EQ(1, names.size());
+    ASSERT_EQ(1, mesh->getProperties().size());
 
     MeshLib::PropertyVector<double>* const prop =
         mesh->getProperties().getPropertyVector<double>("test");
@@ -186,9 +178,7 @@ TEST_F(RasterToMeshTest, convertRasterToPrismMeshValue)
 
     ASSERT_EQ(2 * _n_nodes, mesh->getNumberOfBaseNodes());
 
-    std::vector<std::string> const names =
-        mesh->getProperties().getPropertyVectorNames();
-    ASSERT_EQ(1, names.size());
+    ASSERT_EQ(1, mesh->getProperties().size());
 
     MeshLib::PropertyVector<double>* const prop =
         mesh->getProperties().getPropertyVector<double>("test");
@@ -220,9 +210,7 @@ TEST_F(RasterToMeshTest, convertRasterToHexMeshValue)
 
     ASSERT_EQ(2 * _n_nodes, mesh->getNumberOfBaseNodes());
 
-    std::vector<std::string> const names =
-        mesh->getProperties().getPropertyVectorNames();
-    ASSERT_EQ(1, names.size());
+    ASSERT_EQ(1, mesh->getProperties().size());
 
     MeshLib::PropertyVector<int>* const prop =
         mesh->getProperties().getPropertyVector<int>("MaterialIDs");
@@ -254,9 +242,7 @@ TEST_F(RasterToMeshTest, convertRasterToQuadMeshNone)
 
     ASSERT_EQ(_n_nodes, mesh->getNumberOfBaseNodes());
 
-    std::vector<std::string> const names =
-        mesh->getProperties().getPropertyVectorNames();
-    ASSERT_TRUE(names.empty());
+    ASSERT_EQ(0, mesh->getProperties().size());
 
     for (MeshLib::Node* n : mesh->getNodes())
     {
@@ -283,9 +269,7 @@ TEST_F(RasterToMeshTest, vtkImage)
 
     ASSERT_EQ(_n_nodes, mesh->getNumberOfBaseNodes());
 
-    std::vector<std::string> const names =
-        mesh->getProperties().getPropertyVectorNames();
-    ASSERT_EQ(1, names.size());
+    ASSERT_EQ(1, mesh->getProperties().size());
 
     MeshLib::PropertyVector<double>* const prop =
         mesh->getProperties().getPropertyVector<double>("test");