diff --git a/cmake/project.cmake b/cmake/project.cmake
index 63696d4..8c4c7a6 100644
--- a/cmake/project.cmake
+++ b/cmake/project.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-set(SAFU_VERSION 0.52.4)
+set(SAFU_VERSION 0.53.0)
 
 # Attention: Aside from the version, as many things as possible in this file
 #   should be put into functions, as this solves potential issues with commands
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_add_array_array.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_add_array_array.c
index 7fdaa13..77e10b2 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_add_array_array.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_add_array_array.c
@@ -48,11 +48,11 @@ void safuTestSafuJsonAddNewTimestampErrAddArrayArray(UNUSED void **state) {
     SHOULD("%s", "fail to add an array for a timestamp to a json array");
 
     const struct timespec testRows[] = {
-        {0, 0},         {0, 42},         {0, INT64_MAX},         {0, INT64_MIN},         {0, -12},
-        {42, 0},        {42, 42},        {42, INT64_MAX},        {42, INT64_MIN},        {42, -12},
-        {INT64_MAX, 0}, {INT64_MAX, 42}, {INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MIN}, {INT64_MAX, -12},
-        {INT64_MIN, 0}, {INT64_MIN, 42}, {INT64_MIN, INT64_MAX}, {INT64_MIN, INT64_MIN}, {INT64_MIN, -12},
-        {-12, 0},       {-12, 42},       {-12, INT64_MAX},       {-12, INT64_MIN},       {-12, -12},
+        {0, 0},          {0, 42},          {0, INTMAX_MAX},          {0, INTMAX_MIN},          {0, -12},
+        {42, 0},         {42, 42},         {42, INTMAX_MAX},         {42, INTMAX_MIN},         {42, -12},
+        {INTMAX_MAX, 0}, {INTMAX_MAX, 42}, {INTMAX_MAX, INTMAX_MAX}, {INTMAX_MAX, INTMAX_MIN}, {INTMAX_MAX, -12},
+        {INTMAX_MIN, 0}, {INTMAX_MIN, 42}, {INTMAX_MIN, INTMAX_MAX}, {INTMAX_MIN, INTMAX_MIN}, {INTMAX_MIN, -12},
+        {-12, 0},        {-12, 42},        {-12, INTMAX_MAX},        {-12, INTMAX_MIN},        {-12, -12},
     };
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
         _testCase(testRows[i]);
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_add_array_object.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_add_array_object.c
index 7af8f8d..71be5fa 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_add_array_object.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_add_array_object.c
@@ -54,28 +54,28 @@ void safuTestSafuJsonAddNewTimestampErrAddArrayObject(UNUSED void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };
 
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_nsec_array.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_nsec_array.c
index ffd7dba..d29cab5 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_nsec_array.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_nsec_array.c
@@ -49,11 +49,11 @@ void safuTestSafuJsonAddNewTimestampErrCreateNSecArray(void **state) {
     assert_non_null(jobj);
 
     const struct timespec testRows[] = {
-        {0, 0},         {0, 42},         {0, INT64_MAX},         {0, INT64_MIN},         {0, -12},
-        {42, 0},        {42, 42},        {42, INT64_MAX},        {42, INT64_MIN},        {42, -12},
-        {INT64_MAX, 0}, {INT64_MAX, 42}, {INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MIN}, {INT64_MAX, -12},
-        {INT64_MIN, 0}, {INT64_MIN, 42}, {INT64_MIN, INT64_MAX}, {INT64_MIN, INT64_MIN}, {INT64_MIN, -12},
-        {-12, 0},       {-12, 42},       {-12, INT64_MAX},       {-12, INT64_MIN},       {-12, -12},
+        {0, 0},          {0, 42},          {0, INTMAX_MAX},          {0, INTMAX_MIN},          {0, -12},
+        {42, 0},         {42, 42},         {42, INTMAX_MAX},         {42, INTMAX_MIN},         {42, -12},
+        {INTMAX_MAX, 0}, {INTMAX_MAX, 42}, {INTMAX_MAX, INTMAX_MAX}, {INTMAX_MAX, INTMAX_MIN}, {INTMAX_MAX, -12},
+        {INTMAX_MIN, 0}, {INTMAX_MIN, 42}, {INTMAX_MIN, INTMAX_MAX}, {INTMAX_MIN, INTMAX_MIN}, {INTMAX_MIN, -12},
+        {-12, 0},        {-12, 42},        {-12, INTMAX_MAX},        {-12, INTMAX_MIN},        {-12, -12},
     };
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
         _testCase(jobj, i, testRows[i]);
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_nsec_object.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_nsec_object.c
index ee7fc95..a25caa4 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_nsec_object.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_nsec_object.c
@@ -53,28 +53,28 @@ void safuTestSafuJsonAddNewTimestampErrCreateNSecObject(void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };
 
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_sec_array.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_sec_array.c
index fc2b417..5f7b0b8 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_sec_array.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_sec_array.c
@@ -35,11 +35,11 @@ void safuTestSafuJsonAddNewTimestampErrCreateSecArray(void **state) {
     assert_non_null(jobj);
 
     const struct timespec testRows[] = {
-        {0, 0},         {0, 42},         {0, INT64_MAX},         {0, INT64_MIN},         {0, -12},
-        {42, 0},        {42, 42},        {42, INT64_MAX},        {42, INT64_MIN},        {42, -12},
-        {INT64_MAX, 0}, {INT64_MAX, 42}, {INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MIN}, {INT64_MAX, -12},
-        {INT64_MIN, 0}, {INT64_MIN, 42}, {INT64_MIN, INT64_MAX}, {INT64_MIN, INT64_MIN}, {INT64_MIN, -12},
-        {-12, 0},       {-12, 42},       {-12, INT64_MAX},       {-12, INT64_MIN},       {-12, -12},
+        {0, 0},          {0, 42},          {0, INTMAX_MAX},          {0, INTMAX_MIN},          {0, -12},
+        {42, 0},         {42, 42},         {42, INTMAX_MAX},         {42, INTMAX_MIN},         {42, -12},
+        {INTMAX_MAX, 0}, {INTMAX_MAX, 42}, {INTMAX_MAX, INTMAX_MAX}, {INTMAX_MAX, INTMAX_MIN}, {INTMAX_MAX, -12},
+        {INTMAX_MIN, 0}, {INTMAX_MIN, 42}, {INTMAX_MIN, INTMAX_MAX}, {INTMAX_MIN, INTMAX_MIN}, {INTMAX_MIN, -12},
+        {-12, 0},        {-12, 42},        {-12, INTMAX_MAX},        {-12, INTMAX_MIN},        {-12, -12},
     };
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
         _testCase(jobj, i, testRows[i]);
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_sec_object.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_sec_object.c
index e0ceab5..a664395 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_sec_object.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_create_sec_object.c
@@ -39,28 +39,28 @@ void safuTestSafuJsonAddNewTimestampErrCreateSecObject(void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };
 
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_nsec_array.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_nsec_array.c
index f55ad4d..625a737 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_nsec_array.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_nsec_array.c
@@ -53,11 +53,11 @@ void safuTestSafuJsonAddNewTimestampErrInsertNSecArray(void **state) {
     assert_non_null(jobj);
 
     const struct timespec testRows[] = {
-        {0, 0},         {0, 42},         {0, INT64_MAX},         {0, INT64_MIN},         {0, -12},
-        {42, 0},        {42, 42},        {42, INT64_MAX},        {42, INT64_MIN},        {42, -12},
-        {INT64_MAX, 0}, {INT64_MAX, 42}, {INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MIN}, {INT64_MAX, -12},
-        {INT64_MIN, 0}, {INT64_MIN, 42}, {INT64_MIN, INT64_MAX}, {INT64_MIN, INT64_MIN}, {INT64_MIN, -12},
-        {-12, 0},       {-12, 42},       {-12, INT64_MAX},       {-12, INT64_MIN},       {-12, -12},
+        {0, 0},          {0, 42},          {0, INTMAX_MAX},          {0, INTMAX_MIN},          {0, -12},
+        {42, 0},         {42, 42},         {42, INTMAX_MAX},         {42, INTMAX_MIN},         {42, -12},
+        {INTMAX_MAX, 0}, {INTMAX_MAX, 42}, {INTMAX_MAX, INTMAX_MAX}, {INTMAX_MAX, INTMAX_MIN}, {INTMAX_MAX, -12},
+        {INTMAX_MIN, 0}, {INTMAX_MIN, 42}, {INTMAX_MIN, INTMAX_MAX}, {INTMAX_MIN, INTMAX_MIN}, {INTMAX_MIN, -12},
+        {-12, 0},        {-12, 42},        {-12, INTMAX_MAX},        {-12, INTMAX_MIN},        {-12, -12},
     };
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
         _testCase(jobj, i, testRows[i]);
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_nsec_object.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_nsec_object.c
index 1e4fabe..edf228f 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_nsec_object.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_nsec_object.c
@@ -58,28 +58,28 @@ void safuTestSafuJsonAddNewTimestampErrInsertNSecObject(void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };
 
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_sec_array.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_sec_array.c
index da562c8..d5aaba6 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_sec_array.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_sec_array.c
@@ -45,11 +45,11 @@ void safuTestSafuJsonAddNewTimestampErrInsertSecArray(void **state) {
     assert_non_null(jobj);
 
     const struct timespec testRows[] = {
-        {0, 0},         {0, 42},         {0, INT64_MAX},         {0, INT64_MIN},         {0, -12},
-        {42, 0},        {42, 42},        {42, INT64_MAX},        {42, INT64_MIN},        {42, -12},
-        {INT64_MAX, 0}, {INT64_MAX, 42}, {INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MIN}, {INT64_MAX, -12},
-        {INT64_MIN, 0}, {INT64_MIN, 42}, {INT64_MIN, INT64_MAX}, {INT64_MIN, INT64_MIN}, {INT64_MIN, -12},
-        {-12, 0},       {-12, 42},       {-12, INT64_MAX},       {-12, INT64_MIN},       {-12, -12},
+        {0, 0},          {0, 42},          {0, INTMAX_MAX},          {0, INTMAX_MIN},          {0, -12},
+        {42, 0},         {42, 42},         {42, INTMAX_MAX},         {42, INTMAX_MIN},         {42, -12},
+        {INTMAX_MAX, 0}, {INTMAX_MAX, 42}, {INTMAX_MAX, INTMAX_MAX}, {INTMAX_MAX, INTMAX_MIN}, {INTMAX_MAX, -12},
+        {INTMAX_MIN, 0}, {INTMAX_MIN, 42}, {INTMAX_MIN, INTMAX_MAX}, {INTMAX_MIN, INTMAX_MIN}, {INTMAX_MIN, -12},
+        {-12, 0},        {-12, 42},        {-12, INTMAX_MAX},        {-12, INTMAX_MIN},        {-12, -12},
     };
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
         _testCase(jobj, i, testRows[i]);
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_sec_object.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_sec_object.c
index 8bf9a32..09ee770 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_sec_object.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_insert_sec_object.c
@@ -50,28 +50,28 @@ void safuTestSafuJsonAddNewTimestampErrInsertSecObject(void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };
 
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_new_array_array.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_new_array_array.c
index a6bf613..972e1f3 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_new_array_array.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_new_array_array.c
@@ -29,11 +29,11 @@ void safuTestSafuJsonAddNewTimestampErrNewArrayArray(void **state) {
     assert_non_null(jobj);
 
     const struct timespec testRows[] = {
-        {0, 0},         {0, 42},         {0, INT64_MAX},         {0, INT64_MIN},         {0, -12},
-        {42, 0},        {42, 42},        {42, INT64_MAX},        {42, INT64_MIN},        {42, -12},
-        {INT64_MAX, 0}, {INT64_MAX, 42}, {INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MIN}, {INT64_MAX, -12},
-        {INT64_MIN, 0}, {INT64_MIN, 42}, {INT64_MIN, INT64_MAX}, {INT64_MIN, INT64_MIN}, {INT64_MIN, -12},
-        {-12, 0},       {-12, 42},       {-12, INT64_MAX},       {-12, INT64_MIN},       {-12, -12},
+        {0, 0},          {0, 42},          {0, INTMAX_MAX},          {0, INTMAX_MIN},          {0, -12},
+        {42, 0},         {42, 42},         {42, INTMAX_MAX},         {42, INTMAX_MIN},         {42, -12},
+        {INTMAX_MAX, 0}, {INTMAX_MAX, 42}, {INTMAX_MAX, INTMAX_MAX}, {INTMAX_MAX, INTMAX_MIN}, {INTMAX_MAX, -12},
+        {INTMAX_MIN, 0}, {INTMAX_MIN, 42}, {INTMAX_MIN, INTMAX_MAX}, {INTMAX_MIN, INTMAX_MIN}, {INTMAX_MIN, -12},
+        {-12, 0},        {-12, 42},        {-12, INTMAX_MAX},        {-12, INTMAX_MIN},        {-12, -12},
     };
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
         _testCase(jobj, i, testRows[i]);
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_new_array_object.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_new_array_object.c
index fcf74ee..7a2cc9f 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_new_array_object.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_new_array_object.c
@@ -34,28 +34,28 @@ void safuTestSafuJsonAddNewTimestampErrNewArrayObject(void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };
 
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_no_timespec_object.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_no_timespec_object.c
index bad3461..72f741d 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_no_timespec_object.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_err_no_timespec_object.c
@@ -25,11 +25,11 @@ void safuTestSafuJsonAddNewTimestampErrNoTimespecObject(void **state) {
     assert_non_null(jobj);
 
     const char *testRows[] = {
-        "zero,zero",     "zero,some",        "zero/max",          "zero|min",        "zero minus",
-        "stuff-nothing", "stuff_stuff",      "stuff, Max",        "stuff MINIMUM",   "somthing and somthing negativ",
-        "Maximum:0",     "Maximum|fortytwo", "Maximum+Maximum",   "MaximumMinimum",  "Maximum|minus",
-        "Mini/zero",     "Mini fortytwo",    "Mini|Maximum",      "Mini*2",          "Mini\\Negativ",
-        "negativ!zero",  "negativ fortytwo", "negativ!INT64_MAX", "negativ Minimum", "negativ!negativ",
+        "zero,zero",     "zero,some",        "zero/max",           "zero|min",        "zero minus",
+        "stuff-nothing", "stuff_stuff",      "stuff, Max",         "stuff MINIMUM",   "somthing and somthing negativ",
+        "Maximum:0",     "Maximum|fortytwo", "Maximum+Maximum",    "MaximumMinimum",  "Maximum|minus",
+        "Mini/zero",     "Mini fortytwo",    "Mini|Maximum",       "Mini*2",          "Mini\\Negativ",
+        "negativ!zero",  "negativ fortytwo", "negativ!INTMAX_MAX", "negativ Minimum", "negativ!negativ",
     };
 
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_success_array.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_success_array.c
index 5b51184..0ecc635 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_success_array.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_success_array.c
@@ -61,11 +61,11 @@ void safuTestSafuJsonAddNewTimestampSuccessArray(void **state) {
     assert_non_null(jobj);
 
     const struct timespec testRows[] = {
-        {0, 0},         {0, 42},         {0, INT64_MAX},         {0, INT64_MIN},         {0, -12},
-        {42, 0},        {42, 42},        {42, INT64_MAX},        {42, INT64_MIN},        {42, -12},
-        {INT64_MAX, 0}, {INT64_MAX, 42}, {INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MIN}, {INT64_MAX, -12},
-        {INT64_MIN, 0}, {INT64_MIN, 42}, {INT64_MIN, INT64_MAX}, {INT64_MIN, INT64_MIN}, {INT64_MIN, -12},
-        {-12, 0},       {-12, 42},       {-12, INT64_MAX},       {-12, INT64_MIN},       {-12, -12},
+        {0, 0},          {0, 42},          {0, INTMAX_MAX},          {0, INTMAX_MIN},          {0, -12},
+        {42, 0},         {42, 42},         {42, INTMAX_MAX},         {42, INTMAX_MIN},         {42, -12},
+        {INTMAX_MAX, 0}, {INTMAX_MAX, 42}, {INTMAX_MAX, INTMAX_MAX}, {INTMAX_MAX, INTMAX_MIN}, {INTMAX_MAX, -12},
+        {INTMAX_MIN, 0}, {INTMAX_MIN, 42}, {INTMAX_MIN, INTMAX_MAX}, {INTMAX_MIN, INTMAX_MIN}, {INTMAX_MIN, -12},
+        {-12, 0},        {-12, 42},        {-12, INTMAX_MAX},        {-12, INTMAX_MIN},        {-12, -12},
     };
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
         _testCase(jobj, i, testRows[i]);
diff --git a/test/utest/safu/json/safuJsonAddNewTimestamp/case_success_object.c b/test/utest/safu/json/safuJsonAddNewTimestamp/case_success_object.c
index 96e78e5..b9c4324 100644
--- a/test/utest/safu/json/safuJsonAddNewTimestamp/case_success_object.c
+++ b/test/utest/safu/json/safuJsonAddNewTimestamp/case_success_object.c
@@ -62,28 +62,28 @@ void safuTestSafuJsonAddNewTimestampSuccessObject(void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };
 
diff --git a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_array_failed_array.c b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_array_failed_array.c
index d77cc82..05db026 100644
--- a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_array_failed_array.c
+++ b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_array_failed_array.c
@@ -29,28 +29,28 @@ void safuTestSafuJsonGetTimestampErrGetArrayFailedArray(void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };
 
diff --git a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_array_failed_object.c b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_array_failed_object.c
index b329e26..11817fe 100644
--- a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_array_failed_object.c
+++ b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_array_failed_object.c
@@ -28,28 +28,28 @@ void safuTestSafuJsonGetTimestampErrGetArrayFailedObject(void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };
 
diff --git a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_nsecs_failed_array.c b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_nsecs_failed_array.c
index f80eb80..6e4e11c 100644
--- a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_nsecs_failed_array.c
+++ b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_nsecs_failed_array.c
@@ -37,11 +37,11 @@ void safuTestSafuJsonGetTimestampErrGetNSecsFailedArray(void **state) {
     assert_non_null(jobj);
 
     const struct timespec testRows[] = {
-        {0, 0},         {0, 42},         {0, INT64_MAX},         {0, INT64_MIN},         {0, -12},
-        {42, 0},        {42, 42},        {42, INT64_MAX},        {42, INT64_MIN},        {42, -12},
-        {INT64_MAX, 0}, {INT64_MAX, 42}, {INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MIN}, {INT64_MAX, -12},
-        {INT64_MIN, 0}, {INT64_MIN, 42}, {INT64_MIN, INT64_MAX}, {INT64_MIN, INT64_MIN}, {INT64_MIN, -12},
-        {-12, 0},       {-12, 42},       {-12, INT64_MAX},       {-12, INT64_MIN},       {-12, -12},
+        {0, 0},          {0, 42},          {0, INTMAX_MAX},          {0, INTMAX_MIN},          {0, -12},
+        {42, 0},         {42, 42},         {42, INTMAX_MAX},         {42, INTMAX_MIN},         {42, -12},
+        {INTMAX_MAX, 0}, {INTMAX_MAX, 42}, {INTMAX_MAX, INTMAX_MAX}, {INTMAX_MAX, INTMAX_MIN}, {INTMAX_MAX, -12},
+        {INTMAX_MIN, 0}, {INTMAX_MIN, 42}, {INTMAX_MIN, INTMAX_MAX}, {INTMAX_MIN, INTMAX_MIN}, {INTMAX_MIN, -12},
+        {-12, 0},        {-12, 42},        {-12, INTMAX_MAX},        {-12, INTMAX_MIN},        {-12, -12},
     };
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
         safuJsonAddNewTimestamp(jobj, NULL, &testRows[i]);
diff --git a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_nsecs_failed_object.c b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_nsecs_failed_object.c
index 414f344..ad9d9fe 100644
--- a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_nsecs_failed_object.c
+++ b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_nsecs_failed_object.c
@@ -42,28 +42,28 @@ void safuTestSafuJsonGetTimestampErrGetNSecsFailedObject(void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };
 
diff --git a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_secs_failed_array.c b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_secs_failed_array.c
index fe92af9..975e235 100644
--- a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_secs_failed_array.c
+++ b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_secs_failed_array.c
@@ -30,11 +30,11 @@ void safuTestSafuJsonGetTimestampErrGetSecsFailedArray(void **state) {
     assert_non_null(jobj);
 
     const struct timespec testRows[] = {
-        {0, 0},         {0, 42},         {0, INT64_MAX},         {0, INT64_MIN},         {0, -12},
-        {42, 0},        {42, 42},        {42, INT64_MAX},        {42, INT64_MIN},        {42, -12},
-        {INT64_MAX, 0}, {INT64_MAX, 42}, {INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MIN}, {INT64_MAX, -12},
-        {INT64_MIN, 0}, {INT64_MIN, 42}, {INT64_MIN, INT64_MAX}, {INT64_MIN, INT64_MIN}, {INT64_MIN, -12},
-        {-12, 0},       {-12, 42},       {-12, INT64_MAX},       {-12, INT64_MIN},       {-12, -12},
+        {0, 0},          {0, 42},          {0, INTMAX_MAX},          {0, INTMAX_MIN},          {0, -12},
+        {42, 0},         {42, 42},         {42, INTMAX_MAX},         {42, INTMAX_MIN},         {42, -12},
+        {INTMAX_MAX, 0}, {INTMAX_MAX, 42}, {INTMAX_MAX, INTMAX_MAX}, {INTMAX_MAX, INTMAX_MIN}, {INTMAX_MAX, -12},
+        {INTMAX_MIN, 0}, {INTMAX_MIN, 42}, {INTMAX_MIN, INTMAX_MAX}, {INTMAX_MIN, INTMAX_MIN}, {INTMAX_MIN, -12},
+        {-12, 0},        {-12, 42},        {-12, INTMAX_MAX},        {-12, INTMAX_MIN},        {-12, -12},
     };
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
         safuJsonAddNewTimestamp(jobj, NULL, &testRows[i]);
diff --git a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_secs_failed_object.c b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_secs_failed_object.c
index ae34199..49a9a2e 100644
--- a/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_secs_failed_object.c
+++ b/test/utest/safu/json/safuJsonGetTimestamp/case_err_get_secs_failed_object.c
@@ -35,28 +35,28 @@ void safuTestSafuJsonGetTimestampErrGetSecsFailedObject(void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };
 
diff --git a/test/utest/safu/json/safuJsonGetTimestamp/case_err_no_full_timestamp_array.c b/test/utest/safu/json/safuJsonGetTimestamp/case_err_no_full_timestamp_array.c
index e3aada7..ae163fc 100644
--- a/test/utest/safu/json/safuJsonGetTimestamp/case_err_no_full_timestamp_array.c
+++ b/test/utest/safu/json/safuJsonGetTimestamp/case_err_no_full_timestamp_array.c
@@ -23,7 +23,7 @@ void safuTestSafuJsonGetTimestampErrNoFullTimestampArray(void **state) {
     assert_non_null(jobj);
 
     int64_t testRows[] = {
-        0, 42, INT64_MAX, INT64_MIN, -12,
+        0, 42, INTMAX_MAX, INTMAX_MIN, -12,
     };
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
         struct json_object *array = json_object_new_array();
diff --git a/test/utest/safu/json/safuJsonGetTimestamp/case_err_no_full_timestamp_object.c b/test/utest/safu/json/safuJsonGetTimestamp/case_err_no_full_timestamp_object.c
index 1ee4c06..eea94e2 100644
--- a/test/utest/safu/json/safuJsonGetTimestamp/case_err_no_full_timestamp_object.c
+++ b/test/utest/safu/json/safuJsonGetTimestamp/case_err_no_full_timestamp_object.c
@@ -26,7 +26,7 @@ void safuTestSafuJsonGetTimestampErrNoFullTimestampObject(void **state) {
         char *name;
         uint64_t time;
     } testRows[] = {
-        {"zero,zero", 0}, {"zero,some", 42}, {"zero/max", INT64_MAX}, {"zero|min", INT64_MIN}, {"zero minus", -12},
+        {"zero,zero", 0}, {"zero,some", 42}, {"zero/max", INTMAX_MAX}, {"zero|min", INTMAX_MIN}, {"zero minus", -12},
     };
 
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
diff --git a/test/utest/safu/json/safuJsonGetTimestamp/case_success_array.c b/test/utest/safu/json/safuJsonGetTimestamp/case_success_array.c
index 37cbbdb..9008c31 100644
--- a/test/utest/safu/json/safuJsonGetTimestamp/case_success_array.c
+++ b/test/utest/safu/json/safuJsonGetTimestamp/case_success_array.c
@@ -37,11 +37,11 @@ void safuTestSafuJsonGetTimestampSuccessArray(void **state) {
     assert_non_null(jobj);
 
     const struct timespec testRows[] = {
-        {0, 0},         {0, 42},         {0, INT64_MAX},         {0, INT64_MIN},         {0, -12},
-        {42, 0},        {42, 42},        {42, INT64_MAX},        {42, INT64_MIN},        {42, -12},
-        {INT64_MAX, 0}, {INT64_MAX, 42}, {INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MIN}, {INT64_MAX, -12},
-        {INT64_MIN, 0}, {INT64_MIN, 42}, {INT64_MIN, INT64_MAX}, {INT64_MIN, INT64_MIN}, {INT64_MIN, -12},
-        {-12, 0},       {-12, 42},       {-12, INT64_MAX},       {-12, INT64_MIN},       {-12, -12},
+        {0, 0},          {0, 42},          {0, INTMAX_MAX},          {0, INTMAX_MIN},          {0, -12},
+        {42, 0},         {42, 42},         {42, INTMAX_MAX},         {42, INTMAX_MIN},         {42, -12},
+        {INTMAX_MAX, 0}, {INTMAX_MAX, 42}, {INTMAX_MAX, INTMAX_MAX}, {INTMAX_MAX, INTMAX_MIN}, {INTMAX_MAX, -12},
+        {INTMAX_MIN, 0}, {INTMAX_MIN, 42}, {INTMAX_MIN, INTMAX_MAX}, {INTMAX_MIN, INTMAX_MIN}, {INTMAX_MIN, -12},
+        {-12, 0},        {-12, 42},        {-12, INTMAX_MAX},        {-12, INTMAX_MIN},        {-12, -12},
     };
     for (size_t i = 0; i < ARRAY_SIZE(testRows); i++) {
         safuJsonAddNewTimestamp(jobj, NULL, &testRows[i]);
diff --git a/test/utest/safu/json/safuJsonGetTimestamp/case_success_object.c b/test/utest/safu/json/safuJsonGetTimestamp/case_success_object.c
index 79477a8..43d2ed8 100644
--- a/test/utest/safu/json/safuJsonGetTimestamp/case_success_object.c
+++ b/test/utest/safu/json/safuJsonGetTimestamp/case_success_object.c
@@ -42,28 +42,28 @@ void safuTestSafuJsonGetTimestampSuccessObject(void **state) {
     } testRows[] = {
         {"zero,zero", {0, 0}},
         {"zero,some", {0, 42}},
-        {"zero/max", {0, INT64_MAX}},
-        {"zero|min", {0, INT64_MIN}},
+        {"zero/max", {0, INTMAX_MAX}},
+        {"zero|min", {0, INTMAX_MIN}},
         {"zero minus", {0, -12}},
         {"stuff-nothing", {42, 0}},
         {"stuff_stuff", {42, 42}},
-        {"stuff, Max", {42, INT64_MAX}},
-        {"stuff MINIMUM", {42, INT64_MIN}},
+        {"stuff, Max", {42, INTMAX_MAX}},
+        {"stuff MINIMUM", {42, INTMAX_MIN}},
         {"somthing and somthing negativ", {42, -12}},
-        {"Maximum:0", {INT64_MAX, 0}},
-        {"Maximum|fortytwo", {INT64_MAX, 42}},
-        {"Maximum+Maximum", {INT64_MAX, INT64_MAX}},
-        {"MaximumMinimum", {INT64_MAX, INT64_MIN}},
-        {"Maximum|minus", {INT64_MAX, -12}},
-        {"Mini/zero", {INT64_MIN, 0}},
-        {"Mini fortytwo", {INT64_MIN, 42}},
-        {"Mini|Maximum", {INT64_MIN, INT64_MAX}},
-        {"Mini*2", {INT64_MIN, INT64_MIN}},
-        {"Mini\\Negativ", {INT64_MIN, -12}},
+        {"Maximum:0", {INTMAX_MAX, 0}},
+        {"Maximum|fortytwo", {INTMAX_MAX, 42}},
+        {"Maximum+Maximum", {INTMAX_MAX, INTMAX_MAX}},
+        {"MaximumMinimum", {INTMAX_MAX, INTMAX_MIN}},
+        {"Maximum|minus", {INTMAX_MAX, -12}},
+        {"Mini/zero", {INTMAX_MIN, 0}},
+        {"Mini fortytwo", {INTMAX_MIN, 42}},
+        {"Mini|Maximum", {INTMAX_MIN, INTMAX_MAX}},
+        {"Mini*2", {INTMAX_MIN, INTMAX_MIN}},
+        {"Mini\\Negativ", {INTMAX_MIN, -12}},
         {"negativ!zero", {-12, 0}},
         {"negativ fortytwo", {-12, 42}},
-        {"negativ!INT64_MAX", {-12, INT64_MAX}},
-        {"negativ Minimum", {-12, INT64_MIN}},
+        {"negativ!INTMAX_MAX", {-12, INTMAX_MAX}},
+        {"negativ Minimum", {-12, INTMAX_MIN}},
         {"negativ!negativ", {-12, -12}},
     };