diff --git a/test/test_b58.py b/test/test_b58.py
index aae03f30e6ecfd35ed2644ddbf15f9fb01e8bcb6..fbbbf316c59ce20dfa412d32efbd9da8dc65c344 100644
--- a/test/test_b58.py
+++ b/test/test_b58.py
@@ -15,8 +15,9 @@ print ("Decoded data: \t")
 print(decrypt)
 out_data = pickle.loads(decrypt)
 if s == out_data:
-    print ("TEST 1. Encode/Decode base64 done")
+    print ("TEST 1. Encode/Decode base58 done")
 else:
-    print ("TEST 1. Encode/Decode base64 faild")
+    print ("TEST 1. Encode/Decode base58 faild")
+    sys.exit(1)
 
 sys.exit(0)
diff --git a/test/test_b64.py b/test/test_b64.py
index 574d99402a54616f455502d68b1136b7582b89db..781b6d443ed3a1f1937e319ab16824488c4041eb 100644
--- a/test/test_b64.py
+++ b/test/test_b64.py
@@ -14,6 +14,7 @@ if bytes(s, "utf-8") == decrypt:
     print ("TEST 1. Encode/Decode base64 done")
 else:
     print ("TEST 1. Encode/Decode base64 faild")
+    sys.exit(1)
 
 print ("Test Base64 URLSAFE")
 u = "http://kelvin.foundation/"
@@ -23,6 +24,7 @@ if bytes(u, "utf-8") == decrypt_u:
      print ("TEST 2. Encode/Decode base64 urlsafe done")
 else:
      print ("TEST 2. Encode/Decode base64 urlsafe faild")
+     sys.exit(2)
 
 sys.exit(0)
 
diff --git a/test/test_iaes256_cbc.py b/test/test_iaes256_cbc.py
index 33216c3fe71ab624483cddbf81a8bc97a404af6e..58fa69eeb7372a8f7da58eca443941c56140f3f4 100644
--- a/test/test_iaes256_cbc.py
+++ b/test/test_iaes256_cbc.py
@@ -17,19 +17,12 @@ decrypt = crypto.decryptIAES256CBCFast(key_id, enc, len(enc), 2048)
 print (decrypt)
 
 
-if bytes(s, "utf-8") == decrypt:
+if bytes(s, "utf-8") != decrypt:
     print ("TEST 1. Encode/Decode IAES256 CBC FAST done")
 else:
     print ("TEST 1. Encode/Decode IAES256 CBC FAST faild")
+    sys.exit(1)
+
 
-#print ("Test Base64 URLSAFE")
-#u = "http://kelvin.foundation/"
-#crypt_u = crypto.encodeBase64(bytes(u, "utf-8"), 2)
-#decrypt_u = crypto.decodeBase64(crypt_u)
-#if bytes(u, "utf-8") == decrypt_u:
-#     print ("TEST 2. Encode/Decode base64 urlsafe done")
-#else:
-#     print ("TEST 2. Encode/Decode base64 urlsafe faild")
-#
 sys.exit(0)
 
diff --git a/test/test_oaes.py b/test/test_oaes.py
index d0dead21fbede6324c364371725995d6e01af9bf..7a4d02f67e41c9c4dbcfca77eec7e44d7875894d 100644
--- a/test/test_oaes.py
+++ b/test/test_oaes.py
@@ -20,15 +20,7 @@ if bytes(s, "utf-8") == decrypt:
     print ("TEST 1. Encode/Decode OAES FAST done")
 else:
     print ("TEST 1. Encode/Decode OAES CBC FAST faild")
+    sys.exit(1)
 
-#print ("Test Base64 URLSAFE")
-#u = "http://kelvin.foundation/"
-#crypt_u = crypto.encodeBase64(bytes(u, "utf-8"), 2)
-#decrypt_u = crypto.decodeBase64(crypt_u)
-#if bytes(u, "utf-8") == decrypt_u:
-#     print ("TEST 2. Encode/Decode base64 urlsafe done")
-#else:
-#     print ("TEST 2. Encode/Decode base64 urlsafe faild")
-#
 sys.exit(0)