diff --git a/test/gtest_time_stamp.cpp b/test/gtest_time_stamp.cpp
index 169532a42076310bb819b85098e1b063902219f7..db76bb1b7010203a01704ac6e03120564d9a7353 100644
--- a/test/gtest_time_stamp.cpp
+++ b/test/gtest_time_stamp.cpp
@@ -3,7 +3,7 @@
 
 #include <thread>
 
-TEST(WolfTestTimeStamp, TimeStampInitNow)
+TEST(TimeStamp, InitNow)
 {
   wolf::TimeStamp start;
 
@@ -23,10 +23,10 @@ TEST(WolfTestTimeStamp, TimeStampInitNow)
 
   ASSERT_LT(start.get(), time_stamp.get());
 
-//  PRINTF("All good at WolfTestTimeStamp::TimeStampInitNow !\n");
+//  PRINTF("All good at TimeStamp::InitNow !\n");
 }
 
-TEST(WolfTestTimeStamp, TimeStampInitScalar)
+TEST(TimeStamp, InitScalar)
 {
   double val(101010);
 
@@ -41,10 +41,10 @@ TEST(WolfTestTimeStamp, TimeStampInitScalar)
 
   ASSERT_STREQ("101010.000000000", ss.str().c_str());
 
-//  PRINTF("All good at WolfTestTimeStamp::TimeStampInitScalar !\n");
+//  PRINTF("All good at TimeStamp::InitScalar !\n");
 }
 
-TEST(WolfTestTimeStamp, TimeStampInitScalarSecNano)
+TEST(TimeStamp, InitScalarSecNano)
 {
   double sec(101010);
   double nano(202020);
@@ -63,10 +63,10 @@ TEST(WolfTestTimeStamp, TimeStampInitScalarSecNano)
 
   ASSERT_STREQ("101010.000202020", ss.str().c_str());
 
-//  PRINTF("All good at WolfTestTimeStamp::TimeStampInitScalarSecNano !\n");
+//  PRINTF("All good at TimeStamp::InitScalarSecNano !\n");
 }
 
-TEST(WolfTestTimeStamp, TimeStampSetNow)
+TEST(TimeStamp, SetNow)
 {
   wolf::TimeStamp t1;
   wolf::TimeStamp t2(t1);
@@ -82,7 +82,7 @@ TEST(WolfTestTimeStamp, TimeStampSetNow)
   ASSERT_LT(t1,t2);
 }
 
-TEST(WolfTestTimeStamp, TimeStampSetScalar)
+TEST(TimeStamp, SetScalar)
 {
   double val(101010.000202020);
 
@@ -99,7 +99,7 @@ TEST(WolfTestTimeStamp, TimeStampSetScalar)
   ASSERT_STREQ("101010.000202020", ss.str().c_str());
 }
 
-TEST(WolfTestTimeStamp, TimeStampSetSecNano)
+TEST(TimeStamp, SetSecNano)
 {
   unsigned long int sec(101010);
   unsigned long int nano(202020);
@@ -113,7 +113,7 @@ TEST(WolfTestTimeStamp, TimeStampSetSecNano)
   ASSERT_EQ(start.getNanoSeconds(), nano);
 }
 
-TEST(WolfTestTimeStamp, TimeStampEquality)
+TEST(TimeStamp, Equality)
 {
   wolf::TimeStamp start;
 
@@ -132,10 +132,10 @@ TEST(WolfTestTimeStamp, TimeStampEquality)
 
   ASSERT_EQ(time_stamp.get(), start.get());
 
-//  PRINTF("All good at WolfTestTimeStamp::TimeStampEquality !\n");
+//  PRINTF("All good at TimeStamp::Equality !\n");
 }
 
-TEST(WolfTestTimeStamp, TimeStampInequality)
+TEST(TimeStamp, Inequality)
 {
   wolf::TimeStamp start;
 
@@ -155,10 +155,10 @@ TEST(WolfTestTimeStamp, TimeStampInequality)
   ASSERT_GE(time_stamp, start);
   ASSERT_GE(start, start);
 
-//  PRINTF("All good at WolfTestTimeStamp::TimeStampInequality !\n");
+//  PRINTF("All good at TimeStamp::Inequality !\n");
 }
 
-TEST(WolfTestTimeStamp, TimeStampSubstraction)
+TEST(TimeStamp, Substraction)
 {
   wolf::TimeStamp t1;
   wolf::TimeStamp t2(t1);
@@ -171,7 +171,7 @@ TEST(WolfTestTimeStamp, TimeStampSubstraction)
   ASSERT_EQ(t1-t2, -dt);
 }
 
-TEST(WolfTestTimeStamp, TimeStampAdding)
+TEST(TimeStamp, Adding)
 {
   wolf::TimeStamp t1,t3;
   wolf::TimeStamp t2(t1);
@@ -183,7 +183,7 @@ TEST(WolfTestTimeStamp, TimeStampAdding)
   ASSERT_EQ(t2, t3);
 }
 
-TEST(WolfTestTimeStamp, TimeStampOperatorOstream)
+TEST(TimeStamp, OperatorOstream)
 {
     wolf::TimeStamp t(5);
     double dt = 1e-4;
@@ -196,10 +196,10 @@ TEST(WolfTestTimeStamp, TimeStampOperatorOstream)
 
     ASSERT_EQ(ss1.str(), ss2.str());
 
-//    PRINTF("All good at WolfTestTimeStamp::TimeStampOperatorOstream !\n");
+//    PRINTF("All good at TimeStamp::OperatorOstream !\n");
 }
 
-TEST(WolfTestTimeStamp, TimeStampSecNanoSec)
+TEST(TimeStamp, SecNanoSec)
 {
     unsigned long int sec = 5;
     unsigned long int nano = 1e5;
@@ -212,6 +212,14 @@ TEST(WolfTestTimeStamp, TimeStampSecNanoSec)
     ASSERT_EQ(t2.getNanoSeconds(),nano);
 }
 
+TEST(TimeStamp, std_min_max)
+{
+    wolf::TimeStamp t1(1.0), t2(2.0);
+
+    ASSERT_TRUE(std::min(t1,t2) == t1);
+    ASSERT_TRUE(std::max(t1,t2) == t2);
+}
+
 int main(int argc, char **argv)
 {
   testing::InitGoogleTest(&argc, argv);