diff --git a/test/test_b58.py b/test/test_b58.py
index fbbbf316c59ce20dfa412d32efbd9da8dc65c344..ff02326fd15342cec3a9bb331f48a3351341637f 100644
--- a/test/test_b58.py
+++ b/test/test_b58.py
@@ -1,4 +1,4 @@
-import libdap_crypto_python_module as crypto
+import libTPO
 import pickle
 import sys
 
@@ -7,10 +7,10 @@ s = """Test! I will crush Base58!"""
 base_in = pickle.dumps(s)
 print ("Input data: "+s)
 print (base_in)
-crypt = crypto.encodeBase58(base_in)
+crypt = libTPO.Crypto.encodeBase58(base_in)
 print ("Encrypted data: \t")
 print(crypt)
-decrypt = crypto.decodeBase58(crypt)
+decrypt = libTPO.Crypto.decodeBase58(crypt)
 print ("Decoded data: \t")
 print(decrypt)
 out_data = pickle.loads(decrypt)
diff --git a/test/test_b64.py b/test/test_b64.py
index 781b6d443ed3a1f1937e319ab16824488c4041eb..a4270ebbc22ed2288d5c7af76fae0b7cf214c4a7 100644
--- a/test/test_b64.py
+++ b/test/test_b64.py
@@ -1,13 +1,13 @@
-import libdap_crypto_python_module as crypto
+import libTPO
 import sys
 
 print ("Start test crypto b64")
 s = "Test! I will crush Base64!"
 print ("Input data: "+s)
-crypt = crypto.encodeBase64(bytes(s, "utf-8"),1)
+crypt = libTPO.Crypto.encodeBase64(bytes(s, "utf-8"), libTPO.CryptoDataType.DAP_ENC_DATA_TYPE_B64())
 print ("Encrypted data: \t")
 print(crypt)
-decrypt = crypto.decodeBase64(crypt, 1)
+decrypt = libTPO.Crypto.decodeBase64(crypt, libTPO.CryptoDataType.DAP_ENC_DATA_TYPE_B64())
 print ("Decoded data: \t")
 print(decrypt)
 if bytes(s, "utf-8") == decrypt:
@@ -18,8 +18,8 @@ else:
 
 print ("Test Base64 URLSAFE")
 u = "http://kelvin.foundation/"
-crypt_u = crypto.encodeBase64(bytes(u, "utf-8"), 2)
-decrypt_u = crypto.decodeBase64(crypt_u)
+crypt_u = libTPO.Crypto.encodeBase64(bytes(u, "utf-8"), libTPO.CryptoDataType.DAP_ENC_DATA_TYPE_B64_URLSAFE())
+decrypt_u = libTPO.Crypto.decodeBase64(crypt_u, libTPO.CryptoDataType.DAP_ENC_DATA_TYPE_B64_URLSAFE())
 if bytes(u, "utf-8") == decrypt_u:
      print ("TEST 2. Encode/Decode base64 urlsafe done")
 else:
diff --git a/test/test_oaes.py b/test/test_oaes.py
index 7a4d02f67e41c9c4dbcfca77eec7e44d7875894d..2c36e8e0bbd69239cfe5530368f68a0ce034e09a 100644
--- a/test/test_oaes.py
+++ b/test/test_oaes.py
@@ -1,20 +1,17 @@
-import libdap_crypto_python_module as crypto
+import libTPO
 import sys
 
 print ("Start test crypto OAES")
 s = "Test! I will crush OAES!"
-print ("Input data: "+s)
 kex_buff = bytes("114151400014314485131FGXVGHcJFIH", "utf-8")
 size_kex_buff = len(kex_buff)
 seed = bytes(112771128)
 seed_size = len(seed)
-crypto.init()
-key_id = crypto.generateNewKey(1, kex_buff, size_kex_buff, seed, seed_size, 32)
+libTPO.init()
+key = libTPO.Crypto.generateNewKey(libTPO.CryptoKeyType.DAP_ENC_KEY_TYPE_OAES(), kex_buff, size_kex_buff, seed, seed_size, 32)
 source = bytes(s, "utf-8")
-enc = crypto.encryptOAESFast(key_id, source, len(source), 2048)
-decrypt = crypto.decryptOAESFast(key_id, enc, len(enc), 2048)
-print (decrypt)
-
+enc = libTPO.Crypto.encryptOAESFast(key, source, len(source), 2048)
+decrypt = libTPO.Crypto.decryptOAESFast(key, enc, len(enc), 2048)
 
 if bytes(s, "utf-8") == decrypt:
     print ("TEST 1. Encode/Decode OAES FAST done")