diff --git a/src/encrypting/encryption.rs b/src/encrypting/encryption.rs
index 5b74130..94a2a27 100644
--- a/src/encrypting/encryption.rs
+++ b/src/encrypting/encryption.rs
@@ -25,7 +25,8 @@ pub fn private_key_from_sring (pk: String) -> PrivateKey {
     return imported
 }
 
-pub fn generate () -> (String, String, KeyPair) {
+
+pub fn generate_kp () -> (String, String, KeyPair) {
     let rand_ctx            = ntru::rand::init(&RNG_DEFAULT).unwrap();
     let kp                  = ntru::generate_key_pair(&DEFAULT_PARAMS_256_BITS, &rand_ctx).unwrap();
     // extracting public and private key from kp
@@ -34,22 +35,34 @@ pub fn generate () -> (String, String, KeyPair) {
     // getting pub and priv key params for exporting
     let pub_key_params      = KeyPair::get_params(&kp).unwrap();
     let private_key_params  = PrivateKey::get_params(&private_key).unwrap();
-    // exporting 
+    // exporting
     let pub_key_exported:       Box<[u8]>       = PublicKey::export(&pub_key, &pub_key_params);
     let private_key_exported:   Box<[u8]>       = PrivateKey::export(&private_key, &private_key_params);
     // converting to string
     let pub_key_string                          = u8_to_string(&pub_key_exported);
     let private_key_string                      = u8_to_string(&private_key_exported);
-    
     return (pub_key_string, private_key_string, kp )
 }
 
-pub fn encrypt_message (msg:String, key: PublicKey ) -> String {
+pub fn kp_from_string (public: String,private: String) -> KeyPair {
+    let pub_key = public_key_from_sring(public);
+    let priv_key = private_key_from_sring(private);
+    
+    let keypair = KeyPair::new(priv_key, pub_key);
 
+    return keypair;
+
+}
+
+pub fn encrypt_message (msg:String, key: &PublicKey ) -> String {
+
+    // to bytes
     let _msg = msg.into_bytes();
+    //encrypting
     let rand_ctx = ntru::rand::init(&RNG_DEFAULT).unwrap();
     let encrypted = ntru::encrypt(&_msg, &key, &DEFAULT_PARAMS_256_BITS,
                               &rand_ctx).unwrap();
+    //to string
     let message = u8_to_string(&encrypted);
     return message
 }
@@ -62,27 +75,4 @@ pub fn decrypt_message(msg: String, kp: &KeyPair) -> String {
 }
 
 
-pub fn test () {
-    let (public, private, key_pair) = generate();
-
-
-    let initial_pub     = KeyPair::get_public(&key_pair);
-    let initial_priv    = KeyPair::get_private(&key_pair);
-
-    let final_pub   =  public_key_from_sring(public);
-    let final_priv  =  private_key_from_sring(private);
-
-    let bo0 = initial_pub  == &final_pub;
-    let bo1 = initial_priv == &final_priv;
-    /*
-    print!("Pub : {}, Priv : {}", bo0, bo1);
-
-    assert_eq!(initial_pub, &final_pub);
-    assert_eq!(initial_priv, &final_priv);
-*/
-    let encrypted_message = encrypt_message(String::from("hello god"), final_pub);
-    let decrypted_message = decrypt_message(encrypted_message, &key_pair);
-    print!("Msg was decrypted: {}", decrypted_message);
-
-}
 
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..8f21d0c
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod encrypting;
+pub use encrypting::*;
diff --git a/src/main.rs b/src/main.rs
index a0bf4d2..e7f871b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,10 +1,8 @@
 mod cli;
 mod encrypting;
-mod tests;
 
 
 fn main() {
-    encrypting::encryption::test();
 /*
     let (one, two) = keys;
 
diff --git a/src/tests/encrypting_tests.rs b/src/tests/encrypting_tests.rs
deleted file mode 100644
index fa15a15..0000000
--- a/src/tests/encrypting_tests.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-
-pub fn main () {
-
-}
diff --git a/src/tests/mod.rs b/src/tests/mod.rs
deleted file mode 100644
index 2670ea7..0000000
--- a/src/tests/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod encrypting_tests;
-
diff --git a/tests/encrypting_tests.rs b/tests/encrypting_tests.rs
new file mode 100644
index 0000000..9327ba3
--- /dev/null
+++ b/tests/encrypting_tests.rs
@@ -0,0 +1,54 @@
+use hole::encrypting::encryption::*;
+use std::collections::HashMap;
+use ntru::types::{KeyPair, PrivateKey, PublicKey};
+
+
+#[test]
+fn it_converting_pubic_key () {
+    let (public, private, keypair) = generate_kp();
+
+    let initial_pub     = KeyPair::get_public(&keypair);
+    let final_pub   =  public_key_from_sring(public);
+
+    let pub_eq = initial_pub  == &final_pub;
+
+    assert_eq!(initial_pub, &final_pub);
+    
+}
+
+#[test] fn it_converting_private_key () {
+    let (public, private, keypair) = generate_kp();
+
+    let initial_priv    = KeyPair::get_private(&keypair);
+    let final_priv  =  private_key_from_sring(private);
+
+    let priv_eq = initial_priv == &final_priv;
+
+    assert_eq!(initial_priv, &final_priv);
+}
+
+#[test]
+fn it_making_same_keypair () {
+    let (public, private, keypair) = generate_kp();
+
+    let new_keypair = kp_from_string(public, private);
+    assert_eq!(new_keypair, keypair);
+    
+}
+
+#[test]
+fn it_making_correct_decrypt () {
+   let (_, _, keypair) = generate_kp();
+
+   let public = KeyPair::get_public(&keypair);
+
+
+   let msg = "👻: it's a ghost. Ghost is unexpectively bloodthirsty".to_string();
+   let my_msg = "👻: it's a ghost. Ghost is unexpectively bloodthirsty".to_string();
+ 
+
+   let enc_msg = encrypt_message(msg, public);
+   let dec_msg = decrypt_message(enc_msg, &keypair);
+   assert_eq!(my_msg, dec_msg) 
+}
+