diff --git a/tests/tests.c b/tests/tests.c
index c36e15a..33d8dd0 100644
--- a/tests/tests.c
+++ b/tests/tests.c
@@ -192,20 +192,20 @@ int test_1(){
 
 	printf("\n*** 3. Prover2\n\n");
 	printf("----> \tCertificate loading\n");
-	if ( cryptic_clsig_load_certificate_with_committed_value(param3,
+	if (cryptic_clsig_load_certificate_with_committed_value(param3,
 				cryptic_clsig_get_signature(param1),
 				cryptic_clsig_get_exponent(param1),
 				cryptic_clsig_get_blind(param1),
 				cryptic_clsig_get_quantities(param1), cryptic_clsig_get_nb_quantities(param1),
 				quantities, 2,
-				pdc->dlrep, pdc->vprime) == 1 ){
+				pdc->dlrep, pdc->vprime) == 0 ){
 		printf("\t****** VALID SIGNATURE\n");
 	} else {
 		printf("\t!!!!!! Bad signature\n");
 		return(-1);
 	}
 	goto_cleanup_if_fail_with_rc_with_warning_openssl(cryptic_clsig_randomize_signature(param3) == 0);
-	if ( cryptic_clsig_verify_signature_randomized(param3) == 1 ){
+	if (cryptic_clsig_verify_signature_randomized(param3) == 1 ){
 		printf("\t****** VALID Randomized SIGNATURE\n");
 	} else {
 		printf("\t!!!!!! Bad Randomized signature\n");
@@ -254,7 +254,7 @@ int test_1(){
 				cryptic_clsig_get_blind(param4),
 				cryptic_clsig_get_quantities(param4), cryptic_clsig_get_nb_quantities(param4),
 				quantities, 2,
-				pdc->dlrep, pdc->vprime) == 1 ){
+				pdc->dlrep, pdc->vprime) == 0 ){
 		printf("\t****** VALID SIGNATURE\n");
 	} else {
 		printf("\t!!!!!! Bad signature\n");
@@ -839,14 +839,21 @@ int main(int argc, char **argv) {
 	printf("------******------------------------------------------------------------------******------\n");
 	printf("----------------------------------------***********---------------------------------------\n");
 
+	int rc = CRYPTIC_ERROR_UNDEFINED;
+
 	cryptic_init();
 
 	//activ_CB();
-	test_1();
-	test_2();
-	test_3();
-
-	return(CRYPTIC_NO_ERROR);
+	rc = test_1();
+	if(rc != 0){
+		return(rc);
+	}
+	rc = test_2();
+	if(rc != 0){
+		return(rc);
+	}
+	rc = test_3();
+	return(rc);
 }
 
 static int MS_CALLBACK qrn_cb(int p, int n, BN_GENCB *arg){