diff --git a/src/Unittests/unittests_add_face.hh b/src/Unittests/unittests_add_face.hh
index ca9959f9..03addaee 100644
--- a/src/Unittests/unittests_add_face.hh
+++ b/src/Unittests/unittests_add_face.hh
@@ -89,8 +89,8 @@ TEST_F(OpenMeshAddFaceTriangleMesh, AddTrianglesToTrimesh) {
   //  0 === 3
 
   // Check setup
-  EXPECT_EQ(4, mesh_.n_vertices() ) << "Wrong number of vertices";
-  EXPECT_EQ(2, mesh_.n_faces() )    << "Wrong number of faces";
+  EXPECT_EQ(4u, mesh_.n_vertices() ) << "Wrong number of vertices";
+  EXPECT_EQ(2u, mesh_.n_faces() )    << "Wrong number of faces";
 
 }
 
@@ -126,8 +126,8 @@ TEST_F(OpenMeshAddFaceTriangleMesh, AddQuadToTrimesh) {
   //  0 === 3
 
   // Check setup
-  EXPECT_EQ(4, mesh_.n_vertices() ) << "Wrong number of vertices";
-  EXPECT_EQ(2, mesh_.n_faces() )    << "Wrong number of faces";
+  EXPECT_EQ(4u, mesh_.n_vertices() ) << "Wrong number of vertices";
+  EXPECT_EQ(2u, mesh_.n_faces() )    << "Wrong number of faces";
 
 }
 
@@ -163,8 +163,8 @@ TEST_F(OpenMeshAddFacePolyMesh, AddQuadToPolymesh) {
   //  0 === 3
 
   // Check setup
-  EXPECT_EQ(4, mesh_.n_vertices() ) << "Wrong number of vertices";
-  EXPECT_EQ(1, mesh_.n_faces() )    << "Wrong number of faces";
+  EXPECT_EQ(4u, mesh_.n_vertices() ) << "Wrong number of vertices";
+  EXPECT_EQ(1u, mesh_.n_faces() )    << "Wrong number of faces";
 
 }
 
diff --git a/src/Unittests/unittests_loading.hh b/src/Unittests/unittests_loading.hh
index 38be4552..967deadd 100644
--- a/src/Unittests/unittests_loading.hh
+++ b/src/Unittests/unittests_loading.hh
@@ -43,9 +43,9 @@ TEST_F(OpenMeshLoader, LoadSimpleOFFFile) {
 
     EXPECT_TRUE(ok);
 
-    EXPECT_EQ(7526, mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
-    EXPECT_EQ(22572, mesh_.n_edges()) << "The number of loaded edges is not correct!";
-    EXPECT_EQ(15048, mesh_.n_faces()) << "The number of loaded faces is not correct!";
+    EXPECT_EQ(7526u , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+    EXPECT_EQ(22572u, mesh_.n_edges()) << "The number of loaded edges is not correct!";
+    EXPECT_EQ(15048u, mesh_.n_faces()) << "The number of loaded faces is not correct!";
 }
 
 
@@ -62,9 +62,9 @@ TEST_F(OpenMeshLoader, LoadSimpleSTLFile) {
 
     EXPECT_TRUE(ok);
 
-    EXPECT_EQ(7526, mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
-    EXPECT_EQ(22572, mesh_.n_edges()) << "The number of loaded edges is not correct!";
-    EXPECT_EQ(15048, mesh_.n_faces()) << "The number of loaded faces is not correct!";
+    EXPECT_EQ(7526u  , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+    EXPECT_EQ(22572u , mesh_.n_edges()) << "The number of loaded edges is not correct!";
+    EXPECT_EQ(15048u , mesh_.n_faces()) << "The number of loaded faces is not correct!";
 }
 
 
@@ -81,9 +81,9 @@ TEST_F(OpenMeshLoader, LoadSimpleSTLBinaryFile) {
 
     EXPECT_TRUE(ok);
 
-    EXPECT_EQ(7526, mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
-    EXPECT_EQ(22572, mesh_.n_edges()) << "The number of loaded edges is not correct!";
-    EXPECT_EQ(15048, mesh_.n_faces()) << "The number of loaded faces is not correct!";
+    EXPECT_EQ(7526u  , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+    EXPECT_EQ(22572u , mesh_.n_edges()) << "The number of loaded edges is not correct!";
+    EXPECT_EQ(15048u , mesh_.n_faces()) << "The number of loaded faces is not correct!";
 }
 
 
@@ -100,9 +100,9 @@ TEST_F(OpenMeshLoader, LoadSimplePointPLYFileWithBadEncoding) {
 
     EXPECT_TRUE(ok) << "Unable to load pointCloudBadEncoding.ply";
 
-    EXPECT_EQ(10, mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
-    EXPECT_EQ(0, mesh_.n_edges()) << "The number of loaded edges is not correct!";
-    EXPECT_EQ(0, mesh_.n_faces()) << "The number of loaded faces is not correct!";
+    EXPECT_EQ(10u , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+    EXPECT_EQ(0u  , mesh_.n_edges()) << "The number of loaded edges is not correct!";
+    EXPECT_EQ(0u  , mesh_.n_faces()) << "The number of loaded faces is not correct!";
 }
 
 /*
@@ -117,9 +117,9 @@ TEST_F(OpenMeshLoader, LoadSimplePointPLYFileWithGoodEncoding) {
 
     EXPECT_TRUE(ok) << "Unable to load pointCloudGoodEncoding.ply";
 
-    EXPECT_EQ(10, mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
-    EXPECT_EQ(0, mesh_.n_edges()) << "The number of loaded edges is not correct!";
-    EXPECT_EQ(0, mesh_.n_faces()) << "The number of loaded faces is not correct!";
+    EXPECT_EQ(10u , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+    EXPECT_EQ(0u  , mesh_.n_edges()) << "The number of loaded edges is not correct!";
+    EXPECT_EQ(0u  , mesh_.n_faces()) << "The number of loaded faces is not correct!";
 }
 
 
@@ -134,9 +134,9 @@ TEST_F(OpenMeshLoader, LoadSimpleOBJ) {
 
     EXPECT_TRUE(ok) << "Unable to load cube-minimal.obj";
 
-    EXPECT_EQ(8, mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
-    EXPECT_EQ(18, mesh_.n_edges()) << "The number of loaded edges is not correct!";
-    EXPECT_EQ(12, mesh_.n_faces()) << "The number of loaded faces is not correct!";
+    EXPECT_EQ(8u  , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+    EXPECT_EQ(18u , mesh_.n_edges()) << "The number of loaded edges is not correct!";
+    EXPECT_EQ(12u , mesh_.n_faces()) << "The number of loaded faces is not correct!";
 }
 
 /*
@@ -155,10 +155,10 @@ TEST_F(OpenMeshLoader, LoadSimpleOBJCheckHalfEdgeAndVertexNormals) {
 
   EXPECT_TRUE(ok) << file_name;
 
-  EXPECT_EQ(8,   mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
-  EXPECT_EQ(18,  mesh_.n_edges()) << "The number of loaded edges is not correct!";
-  EXPECT_EQ(12,  mesh_.n_faces()) << "The number of loaded faces is not correct!";
-  EXPECT_EQ(36, mesh_.n_halfedges()) << "The number of loaded halfedges is not correct!";
+  EXPECT_EQ(8u  ,   mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+  EXPECT_EQ(18u ,  mesh_.n_edges()) << "The number of loaded edges is not correct!";
+  EXPECT_EQ(12u ,  mesh_.n_faces()) << "The number of loaded faces is not correct!";
+  EXPECT_EQ(36u , mesh_.n_halfedges()) << "The number of loaded halfedges is not correct!";
 
   ///////////////////////////////////////////////
   //check vertex normals
@@ -259,9 +259,9 @@ TEST_F(OpenMeshLoader, LoadSimpleOBJWithVertexColorsAfterVertices) {
 
     EXPECT_TRUE(ok) << "Unable to load cube-minimal-vertex-colors-after-vertex-definition.obj";
 
-    EXPECT_EQ(8,   mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
-    EXPECT_EQ(18,  mesh_.n_edges()) << "The number of loaded edges is not correct!";
-    EXPECT_EQ(12,  mesh_.n_faces()) << "The number of loaded faces is not correct!";
+    EXPECT_EQ(8u  , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+    EXPECT_EQ(18u , mesh_.n_edges()) << "The number of loaded edges is not correct!";
+    EXPECT_EQ(12u , mesh_.n_faces()) << "The number of loaded faces is not correct!";
    
     EXPECT_EQ(0,   mesh_.color(mesh_.vertex_handle(0))[0] ) << "Wrong vertex color at vertex 0 component 0";
     EXPECT_EQ(0,   mesh_.color(mesh_.vertex_handle(0))[1] ) << "Wrong vertex color at vertex 0 component 1";
@@ -295,9 +295,9 @@ TEST_F(OpenMeshLoader, LoadSimpleOBJWithVertexColorsAsVCLines) {
 
     EXPECT_TRUE(ok) << "Unable to load cube-minimal-vertex-colors-as-vc-lines.obj";
 
-    EXPECT_EQ(8,   mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
-    EXPECT_EQ(18,  mesh_.n_edges()) << "The number of loaded edges is not correct!";
-    EXPECT_EQ(12,  mesh_.n_faces()) << "The number of loaded faces is not correct!";
+    EXPECT_EQ(8u  , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+    EXPECT_EQ(18u , mesh_.n_edges()) << "The number of loaded edges is not correct!";
+    EXPECT_EQ(12u , mesh_.n_faces()) << "The number of loaded faces is not correct!";
 
     EXPECT_EQ(0,   mesh_.color(mesh_.vertex_handle(0))[0] ) << "Wrong vertex color at vertex 0 component 0";
     EXPECT_EQ(0,   mesh_.color(mesh_.vertex_handle(0))[1] ) << "Wrong vertex color at vertex 0 component 1";
@@ -330,9 +330,9 @@ TEST_F(OpenMeshLoader, LoadSimplePLY) {
 
     EXPECT_TRUE(ok) << "Unable to load cube-minimal.ply";
 
-    EXPECT_EQ(8,   mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
-    EXPECT_EQ(18,  mesh_.n_edges()) << "The number of loaded edges is not correct!";
-    EXPECT_EQ(12,  mesh_.n_faces()) << "The number of loaded faces is not correct!";
+    EXPECT_EQ(8u  , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+    EXPECT_EQ(18u , mesh_.n_edges()) << "The number of loaded edges is not correct!";
+    EXPECT_EQ(12u , mesh_.n_faces()) << "The number of loaded faces is not correct!";
 
 }
 
@@ -350,9 +350,9 @@ TEST_F(OpenMeshLoader, LoadSimplePLYWithNormals) {
 
     EXPECT_TRUE(ok) << "Unable to load cube-minimal-normals.ply";
 
-    EXPECT_EQ(8,   mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
-    EXPECT_EQ(18,  mesh_.n_edges()) << "The number of loaded edges is not correct!";
-    EXPECT_EQ(12,  mesh_.n_faces()) << "The number of loaded faces is not correct!";
+    EXPECT_EQ(8u  , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+    EXPECT_EQ(18u , mesh_.n_edges()) << "The number of loaded edges is not correct!";
+    EXPECT_EQ(12u , mesh_.n_faces()) << "The number of loaded faces is not correct!";
 
 
     EXPECT_EQ(0, mesh_.normal(mesh_.vertex_handle(0))[0] ) << "Wrong normal at vertex 0 component 0";
diff --git a/src/Unittests/unittests_subdivider.hh b/src/Unittests/unittests_subdivider.hh
index 6772bddb..cfbdda26 100644
--- a/src/Unittests/unittests_subdivider.hh
+++ b/src/Unittests/unittests_subdivider.hh
@@ -144,8 +144,8 @@ TEST_F(OpenMeshSubdivider_Triangle, Subdivider_Loop) {
   OpenMesh::Subdivider::Uniform::Sqrt3T<Mesh> sqrt3;
 
   // Check setup
-  EXPECT_EQ(9, mesh_.n_vertices() ) << "Wrong number of vertices";
-  EXPECT_EQ(8, mesh_.n_faces() )    << "Wrong number of faces";
+  EXPECT_EQ(9u, mesh_.n_vertices() ) << "Wrong number of vertices";
+  EXPECT_EQ(8u, mesh_.n_faces() )    << "Wrong number of faces";
 
   // Execute 3 subdivision steps
   sqrt3.attach(mesh_);
@@ -153,8 +153,8 @@ TEST_F(OpenMeshSubdivider_Triangle, Subdivider_Loop) {
   sqrt3.detach();
 
   // Check setup
-  EXPECT_EQ(121, mesh_.n_vertices() ) << "Wrong number of vertices after subdivision with sqrt3";
-  EXPECT_EQ(216, mesh_.n_faces() )    << "Wrong number of faces after subdivision with sqrt3";
+  EXPECT_EQ(121u, mesh_.n_vertices() ) << "Wrong number of vertices after subdivision with sqrt3";
+  EXPECT_EQ(216u, mesh_.n_faces() )    << "Wrong number of faces after subdivision with sqrt3";
 
 }
 
@@ -232,16 +232,16 @@ TEST_F(OpenMeshSubdivider_Poly, Subdivider_CatmullClark) {
   OpenMesh::Subdivider::Uniform::CatmullClarkT<PolyMesh> catmull;
 
   // Check setup
-  EXPECT_EQ(9, mesh_.n_vertices() ) << "Wrong number of vertices";
-  EXPECT_EQ(4, mesh_.n_faces() )    << "Wrong number of faces";
+  EXPECT_EQ(9u, mesh_.n_vertices() ) << "Wrong number of vertices";
+  EXPECT_EQ(4u, mesh_.n_faces() )    << "Wrong number of faces";
 
   // Execute 3 subdivision steps
   catmull.attach(mesh_);
   catmull( 3 );
   catmull.detach();
 
-  EXPECT_EQ(289, mesh_.n_vertices() ) << "Wrong number of vertices after subdivision with catmull clark";
-  EXPECT_EQ(256, mesh_.n_faces() )    << "Wrong number of faces after subdivision with catmull clark";
+  EXPECT_EQ(289u, mesh_.n_vertices() ) << "Wrong number of vertices after subdivision with catmull clark";
+  EXPECT_EQ(256u, mesh_.n_faces() )    << "Wrong number of faces after subdivision with catmull clark";
 
 }
 
diff --git a/src/Unittests/unittests_trimesh_circulators.hh b/src/Unittests/unittests_trimesh_circulators.hh
index 564b773a..42366bc1 100644
--- a/src/Unittests/unittests_trimesh_circulators.hh
+++ b/src/Unittests/unittests_trimesh_circulators.hh
@@ -553,8 +553,8 @@ TEST_F(OpenMeshCirculators, FaceFaceIteratorHandleConversion) {
    */
 
   // Check setup
-  EXPECT_EQ(4, mesh_.n_vertices() ) << "Wrong number of vertices";
-  EXPECT_EQ(2, mesh_.n_faces() )    << "Wrong number of faces";
+  EXPECT_EQ(4u , mesh_.n_vertices() ) << "Wrong number of vertices";
+  EXPECT_EQ(2u , mesh_.n_faces() )    << "Wrong number of faces";
 
 
   Mesh::ConstFaceFaceIter face_iter = mesh_.cff_iter(fh1);
diff --git a/src/Unittests/unittests_trimesh_collapse.hh b/src/Unittests/unittests_trimesh_collapse.hh
index 8bba1e7e..b733ce13 100644
--- a/src/Unittests/unittests_trimesh_collapse.hh
+++ b/src/Unittests/unittests_trimesh_collapse.hh
@@ -157,7 +157,7 @@ TEST_F(OpenMeshCollapse, CollapseTetrahedronComplex) {
    */
 
 
-  EXPECT_EQ(4 , mesh_.n_faces() ) << "Wrong number of faces (garbage collection not executed!)";
+  EXPECT_EQ(4u , mesh_.n_faces() ) << "Wrong number of faces (garbage collection not executed!)";
 
   // Check if the right vertices got deleted
   EXPECT_TRUE( mesh_.status(mesh_.face_handle(0)).deleted() ) << "Face 0 not deleted";
@@ -259,7 +259,7 @@ TEST_F(OpenMeshCollapse, CollapseTetrahedronComplex) {
      *
      */
 
-  EXPECT_EQ(2 , mesh_.n_faces() ) << "Wrong number of faces (garbage collection executed!)";
+  EXPECT_EQ(2u , mesh_.n_faces() ) << "Wrong number of faces (garbage collection executed!)";
 
   // Check the vertices of the two remaining faces
   Mesh::FaceHandle fh_0 = mesh_.face_handle(0);