diff --git a/new-testing/testing_zcheck.c b/new-testing/testing_zcheck.c
index 4a2e6910c87f00f4463c7be46a23331f41a21703..66d2289aa5721e7d5147508f3140927834a6134e 100644
--- a/new-testing/testing_zcheck.c
+++ b/new-testing/testing_zcheck.c
@@ -22,7 +22,7 @@
 #include <chameleon.h>
 
 
-#if ! defined(CHAMELEON_SIMULATION)
+#if !defined(CHAMELEON_SIMULATION)
 
 #include <coreblas/cblas.h>
 #include <coreblas/lapacke.h>
@@ -1882,4 +1882,4 @@ int check_zgels( run_arg_list_t *args, cham_trans_t trans, CHAM_desc_t *descA, C
     return info_solution;
 }
 
-#endif // CHAMELEON_SIMULATION
+#endif /* defined(CHAMELEON_SIMULATION) */
diff --git a/new-testing/testing_zcheck.h b/new-testing/testing_zcheck.h
index 5fe892327ca50fc4173ec2aa4b0b0348dc6949ec..e03346267c6570edf8d1b2c7a685111942edbd34 100644
--- a/new-testing/testing_zcheck.h
+++ b/new-testing/testing_zcheck.h
@@ -62,7 +62,7 @@ static inline int check_zgeqrs        ( run_arg_list_t *args, cham_trans_t trans
 static inline int check_zgelqs        ( run_arg_list_t *args, cham_trans_t trans, CHAM_desc_t *descA, double Bnorm, CHAM_desc_t *descR ) { return 0; }
 static inline int check_zqc           ( run_arg_list_t *args, cham_side_t side, cham_trans_t trans, CHAM_desc_t *descC, CHAM_desc_t *descQ, CHAM_desc_t *descCC ) { return 0; }
 
-#else // !CHAMELEON_SIMULATION
+#else /* !defined(CHAMELEON_SIMULATION) */
 
 int check_zmatrices     ( run_arg_list_t *args, cham_uplo_t uplo, CHAM_desc_t *descA, CHAM_desc_t *descB );
 int check_znorm         ( run_arg_list_t *args, cham_mtxtype_t mtxtype, cham_normtype_t norm_type, cham_uplo_t uplo,
@@ -94,7 +94,7 @@ int check_zgeqrs        ( run_arg_list_t *args, cham_trans_t trans, CHAM_desc_t
 int check_zgelqs        ( run_arg_list_t *args, cham_trans_t trans, CHAM_desc_t *descA, double Bnorm, CHAM_desc_t *descR );
 int check_zqc           ( run_arg_list_t *args, cham_side_t side, cham_trans_t trans, CHAM_desc_t *descC, CHAM_desc_t *descQ, CHAM_desc_t *descCC );
 
-#endif // CHAMELEON_SIMULATION
+#endif /* defined(CHAMELEON_SIMULATION) */
 
 #endif
 
diff --git a/new-testing/values.c b/new-testing/values.c
index fc2b54702ab279380154a0c52a80172f3beff7e0..28f59bff5ae902ed5eccfaffe7fcd4882c88e7f4 100644
--- a/new-testing/values.c
+++ b/new-testing/values.c
@@ -568,18 +568,13 @@ char *sprint_string( val_t val, int human, int nbchar, char *str_in )
     return str_in+rc;
 }
 
-/*
- Rnd64seed is a global variable but it doesn't spoil thread safety. All matrix
- generating threads only read Rnd64seed. It is safe to set Rnd64seed before
- and after any calls to create_tile(). The only problem can be caused if
- Rnd64seed is changed during the matrix generation time.
- */
-
-//static unsigned long long int Rnd64seed = 100;
 #define Rnd64_A 6364136223846793005ULL
 #define Rnd64_C 1ULL
 #define RndF_Mul 5.4210108624275222e-20f
 
+/**
+ * @brief Generate a random number
+ */
 static inline unsigned long long int
 testing_Rnd64_jump(unsigned long long int n, unsigned long long int seed ) {
   unsigned long long int a_k, c_k, ran;