diff --git a/src/test/struct/struct.c b/src/test/struct/struct.c
index c654a8b..fec56a3 100644
--- a/src/test/struct/struct.c
+++ b/src/test/struct/struct.c
@@ -19,7 +19,7 @@ struct testStructRec* cGetTestStructRec(long a, struct testStructRec* b) {
   return result;
 }
 
-int struct_testExpected(char *name, long expected, long result)
+int struct_testExpected_l(char *name, long expected, long result)
 {
   if (expected == result)
   {
@@ -33,13 +33,55 @@ int struct_testExpected(char *name, long expected, long result)
   }
 }
 
+int struct_testExpected_s(char *name, void* expected, void* result)
+{
+  if (expected == result)
+  {
+    succ_s(name, expected, result);
+    return 0;
+  }
+  else
+  {
+    err_s(name, expected, result);
+    return 1;
+  }
+}
+
+int struct_testExpected_f(char *name, double expected, double result)
+{
+  if (expected == result)
+  {
+    succ_f(name, expected, result);
+    return 0;
+  }
+  else
+  {
+    err_f(name, expected, result);
+    return 1;
+  }
+}
+
+int struct_testExpected_b(char *name, bool expected, bool result)
+{
+  if (expected == result)
+  {
+    succ_b(name, expected, result);
+    return 0;
+  }
+  else
+  {
+    err_b(name, expected, result);
+    return 1;
+  }
+}
+
 int testStructCreation() {
   printf("\nStruct creation tests\n");
   struct testStruct* result = getTestStruct(1, false, 23.3);
 
-  struct_testExpected("init field a", 1, result->a);
-  struct_testExpected("init field b", false, result->b);
-  struct_testExpected("init field c", 23.3, result->c);
+  struct_testExpected_l("init field a", 1, result->a);
+  struct_testExpected_b("init field b", false, result->b);
+  struct_testExpected_f("init field c", 23.3, result->c);
 
   free(result);
 
@@ -47,10 +89,10 @@ int testStructCreation() {
   struct testStructRec* innerStruct = getTestStructRec(20, NULL);
   struct testStructRec* resultRec = getTestStructRec(10, innerStruct);
 
-  struct_testExpected("init rec field a", 10, resultRec->a);
-  struct_testExpected("init rec field b", innerStruct, resultRec->b);
-  struct_testExpected("init inner field a", 20, resultRec->b->a);
-  struct_testExpected("init inner field b", NULL, resultRec->b->b);
+  struct_testExpected_l("init rec field a", 10, resultRec->a);
+  struct_testExpected_s("init rec field b", innerStruct, resultRec->b);
+  struct_testExpected_l("init inner field a", 20, resultRec->b->a);
+  struct_testExpected_s("init inner field b", NULL, resultRec->b->b);
 
   free(resultRec);
   free(innerStruct);
@@ -60,9 +102,9 @@ int testStructGet() {
   printf("\nStruct getter tests\n");
   struct testStruct* result = getTestStruct(1, false, 23.3);
 
-  struct_testExpected("get field a", 1, getStructFieldA(result));
-  struct_testExpected("get field b", false, getStructFieldB(result));
-  struct_testExpected("get field c", 23.3, getStructFieldC(result));
+  struct_testExpected_l("get field a", 1, getStructFieldA(result));
+  struct_testExpected_b("get field b", false, getStructFieldB(result));
+  struct_testExpected_f("get field c", 23.3, getStructFieldC(result));
 
   free(result);
 
@@ -70,10 +112,10 @@ int testStructGet() {
   struct testStructRec* innerStruct = getTestStructRec(1, NULL);
   struct testStructRec* resultRec = getTestStructRec(20, innerStruct);
 
-  struct_testExpected("get rec field a", 20, getStructFieldRecA(resultRec));
-  struct_testExpected("get rec field b", innerStruct, getStructFieldRecB(resultRec));
-  struct_testExpected("get inner field a", 1, getStructFieldRecA(getStructFieldRecB(resultRec)));
-  struct_testExpected("get inner field b", NULL, getStructFieldRecB(getStructFieldRecB(resultRec)));
+  struct_testExpected_l("get rec field a", 20, getStructFieldRecA(resultRec));
+  struct_testExpected_s("get rec field b", innerStruct, getStructFieldRecB(resultRec));
+  struct_testExpected_l("get inner field a", 1, getStructFieldRecA(getStructFieldRecB(resultRec)));
+  struct_testExpected_s("get inner field b", NULL, getStructFieldRecB(getStructFieldRecB(resultRec)));
 
   free(resultRec);
   free(innerStruct);