diff --git a/client/balance_of_session/Cargo.toml b/client/balance_of_session/Cargo.toml
index 781f8fa1..344f848b 100644
--- a/client/balance_of_session/Cargo.toml
+++ b/client/balance_of_session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "balance_of_session"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 [dependencies]
diff --git a/client/balance_of_session/src/main.rs b/client/balance_of_session/src/main.rs
index cd409c67..b93e06a1 100644
--- a/client/balance_of_session/src/main.rs
+++ b/client/balance_of_session/src/main.rs
@@ -11,7 +11,7 @@ use casper_contract::{
     contract_api::{runtime, storage},
     unwrap_or_revert::UnwrapOrRevert,
 };
-use casper_types::{contracts::ContractHash, runtime_args, AddressableEntityHash, ApiError, Key};
+use casper_types::{runtime_args, AddressableEntityHash, ApiError, Key};
 
 const ENTRY_POINT_BALANCE_OF: &str = "balance_of";
 const ARG_NFT_CONTRACT_HASH: &str = "nft_contract_hash";
diff --git a/client/get_approved_session/Cargo.toml b/client/get_approved_session/Cargo.toml
index 96a9d1c9..a903246b 100644
--- a/client/get_approved_session/Cargo.toml
+++ b/client/get_approved_session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "get_approved_session"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 [dependencies]
diff --git a/client/get_approved_session/src/main.rs b/client/get_approved_session/src/main.rs
index 6334e52d..d1eceb4c 100644
--- a/client/get_approved_session/src/main.rs
+++ b/client/get_approved_session/src/main.rs
@@ -11,7 +11,7 @@ use casper_contract::{
     contract_api::{runtime, storage},
     unwrap_or_revert::UnwrapOrRevert,
 };
-use casper_types::{contracts::ContractHash, runtime_args, AddressableEntityHash, ApiError, Key};
+use casper_types::{runtime_args, AddressableEntityHash, ApiError, Key};
 
 const ENTRY_POINT_GET_APPROVED: &str = "get_approved";
 const ARG_NFT_CONTRACT_HASH: &str = "nft_contract_hash";
diff --git a/client/is_approved_for_all_session/Cargo.toml b/client/is_approved_for_all_session/Cargo.toml
index ad5e99bb..d1030819 100644
--- a/client/is_approved_for_all_session/Cargo.toml
+++ b/client/is_approved_for_all_session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "is_approved_for_all_session"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 [dependencies]
diff --git a/client/mint_session/Cargo.toml b/client/mint_session/Cargo.toml
index 9ff9a908..f1aab4d5 100644
--- a/client/mint_session/Cargo.toml
+++ b/client/mint_session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mint_session"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 [dependencies]
diff --git a/client/owner_of_session/Cargo.toml b/client/owner_of_session/Cargo.toml
index 0ba4c660..4fe41d0b 100644
--- a/client/owner_of_session/Cargo.toml
+++ b/client/owner_of_session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "owner_of_session"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 [dependencies]
diff --git a/client/owner_of_session/src/main.rs b/client/owner_of_session/src/main.rs
index 63dc36b8..3218cee8 100644
--- a/client/owner_of_session/src/main.rs
+++ b/client/owner_of_session/src/main.rs
@@ -11,7 +11,7 @@ use casper_contract::{
     contract_api::{runtime, storage},
     unwrap_or_revert::UnwrapOrRevert,
 };
-use casper_types::{contracts::ContractHash, runtime_args, AddressableEntityHash, ApiError, Key};
+use casper_types::{runtime_args, AddressableEntityHash, ApiError, Key};
 
 const ENTRY_POINT_OWNER_OF: &str = "owner_of";
 const ARG_NFT_CONTRACT_HASH: &str = "nft_contract_hash";
diff --git a/client/transfer_session/Cargo.toml b/client/transfer_session/Cargo.toml
index 53ad4cbe..65f1bb19 100644
--- a/client/transfer_session/Cargo.toml
+++ b/client/transfer_session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "transfer_session"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/client/transfer_session/src/main.rs b/client/transfer_session/src/main.rs
index 4c39c3e9..f2a260a4 100644
--- a/client/transfer_session/src/main.rs
+++ b/client/transfer_session/src/main.rs
@@ -6,7 +6,7 @@ extern crate alloc;
 use alloc::string::String;
 
 use casper_contract::{contract_api::runtime, unwrap_or_revert::UnwrapOrRevert};
-use casper_types::{contracts::ContractHash, runtime_args, AddressableEntityHash, ApiError, Key};
+use casper_types::{runtime_args, AddressableEntityHash, ApiError, Key};
 
 const ENTRY_POINT_TRANSFER: &str = "transfer";
 
diff --git a/client/updated_receipts/Cargo.toml b/client/updated_receipts/Cargo.toml
index e1eab5da..3cfe8792 100644
--- a/client/updated_receipts/Cargo.toml
+++ b/client/updated_receipts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "updated_receipts"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/contract/Cargo.toml b/contract/Cargo.toml
index bb6c5fbc..9c4a354d 100644
--- a/contract/Cargo.toml
+++ b/contract/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "contract"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 [dependencies]
diff --git a/contract/src/main.rs b/contract/src/main.rs
index 40d65db0..dac6c08f 100644
--- a/contract/src/main.rs
+++ b/contract/src/main.rs
@@ -1897,9 +1897,9 @@ pub extern "C" fn migrate() {
         .unwrap_or(EventsMode::NoEvents);
 
     if let Some(optional_events_mode) = optional_events_mode {
-        if optional_events_mode as u8 != current_events_mode as u8 {
+        if optional_events_mode != current_events_mode as u8 {
             runtime::put_key(EVENTS_MODE, storage::new_uref(optional_events_mode).into());
-            if let Some(_) = get_key(casper_event_standard::EVENTS_DICT) {
+            if get_key(casper_event_standard::EVENTS_DICT).is_some() {
                 utils::init_events();
             }
         }
diff --git a/contract/src/utils.rs b/contract/src/utils.rs
index fe0f9fe4..9a7a7ac5 100644
--- a/contract/src/utils.rs
+++ b/contract/src/utils.rs
@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use alloc::{
     borrow::ToOwned,
     format,
diff --git a/test-contracts/mangle_named_keys/Cargo.toml b/test-contracts/mangle_named_keys/Cargo.toml
index 530c1065..3aeffb36 100644
--- a/test-contracts/mangle_named_keys/Cargo.toml
+++ b/test-contracts/mangle_named_keys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mangle_named_keys"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/test-contracts/minting_contract/Cargo.toml b/test-contracts/minting_contract/Cargo.toml
index 674b9bf6..84dc99b7 100644
--- a/test-contracts/minting_contract/Cargo.toml
+++ b/test-contracts/minting_contract/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minting_contract"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/test-contracts/minting_contract/src/main.rs b/test-contracts/minting_contract/src/main.rs
index 69c7aa46..f48866c6 100644
--- a/test-contracts/minting_contract/src/main.rs
+++ b/test-contracts/minting_contract/src/main.rs
@@ -67,7 +67,7 @@ pub extern "C" fn mint() {
     }
     if reverse_lookup_enabled {
         runtime::call_contract::<(String, URef)>(
-            nft_contract_hash.into(),
+            nft_contract_hash,
             ENTRY_POINT_REGISTER_OWNER,
             runtime_args! {
                 ARG_TOKEN_OWNER => token_owner,
@@ -76,7 +76,7 @@ pub extern "C" fn mint() {
 
         let (collection_name, owned_tokens_dictionary_key, _token_id_string) =
             runtime::call_contract::<(String, Key, String)>(
-                nft_contract_hash.into(),
+                nft_contract_hash,
                 ENTRY_POINT_MINT,
                 runtime_args! {
                     ARG_TOKEN_HASH => token_hash,
@@ -88,7 +88,7 @@ pub extern "C" fn mint() {
         runtime::put_key(&collection_name, owned_tokens_dictionary_key)
     } else {
         runtime::call_contract::<()>(
-            nft_contract_hash.into(),
+            nft_contract_hash,
             ENTRY_POINT_MINT,
             runtime_args! {
                 ARG_TOKEN_HASH => token_hash,
@@ -110,7 +110,7 @@ pub extern "C" fn approve() {
     let spender_key = runtime::get_named_arg::<Key>(ARG_SPENDER);
 
     runtime::call_contract::<()>(
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -129,7 +129,7 @@ pub extern "C" fn revoke() {
     let token_id = runtime::get_named_arg::<u64>(ARG_TOKEN_ID);
 
     runtime::call_contract::<()>(
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REVOKE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -149,7 +149,7 @@ pub extern "C" fn transfer() {
     let target_token_owner = runtime::get_named_arg::<Key>(ARG_TARGET_KEY);
 
     let (collection_name, owned_tokens_dictionary_key) = runtime::call_contract::<(String, Key)>(
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_TRANSFER,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -171,7 +171,7 @@ pub extern "C" fn burn() {
     let token_id = runtime::get_named_arg::<u64>(ARG_TOKEN_ID);
 
     runtime::call_contract::<()>(
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_BURN,
         runtime_args! {
             ARG_TOKEN_ID => token_id
@@ -189,7 +189,7 @@ pub extern "C" fn metadata() {
     let metadata: String = if runtime::get_named_arg::<bool>(ARG_IS_HASH_IDENTIFIER_MODE) {
         let token_hash = runtime::get_named_arg::<String>(ARG_TOKEN_HASH);
         runtime::call_contract::<String>(
-            nft_contract_hash.into(),
+            nft_contract_hash,
             ENTRY_POINT_METADATA,
             runtime_args! {
                 ARG_TOKEN_HASH => token_hash
@@ -198,7 +198,7 @@ pub extern "C" fn metadata() {
     } else {
         let token_id = runtime::get_named_arg::<u64>(ARG_TOKEN_ID);
         runtime::call_contract::<String>(
-            nft_contract_hash.into(),
+            nft_contract_hash,
             ENTRY_POINT_METADATA,
             runtime_args! {
                 ARG_TOKEN_ID => token_id
@@ -218,7 +218,7 @@ pub extern "C" fn register_contract() {
     let token_owner = runtime::get_named_arg::<Key>(ARG_TOKEN_OWNER);
 
     runtime::call_contract::<(String, URef)>(
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_owner
diff --git a/test-contracts/transfer_filter_contract/Cargo.toml b/test-contracts/transfer_filter_contract/Cargo.toml
index 9d62143f..47c36586 100644
--- a/test-contracts/transfer_filter_contract/Cargo.toml
+++ b/test-contracts/transfer_filter_contract/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "transfer_filter_contract"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 362337ec..5555e1cd 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tests"
-version = "1.5.1"
+version = "2.0.0"
 edition = "2021"
 
 [dev-dependencies]
diff --git a/tests/src/acl.rs b/tests/src/acl.rs
index 4e1463b5..057c8831 100644
--- a/tests/src/acl.rs
+++ b/tests/src/acl.rs
@@ -301,7 +301,7 @@ fn should_disallow_unlisted_account_from_minting() {
 
     let mint_session_call = ExecuteRequestBuilder::contract_call_by_hash(
         account_user_1,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         mint_runtime_args,
     )
@@ -555,7 +555,7 @@ fn should_allow_mixed_account_contract_to_mint() {
 
     let mint_session_call = ExecuteRequestBuilder::contract_call_by_hash(
         account_user_1,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         mint_runtime_args,
     )
@@ -697,7 +697,7 @@ fn should_disallow_unlisted_account_from_minting_with_mixed_account_contract() {
 
     let mint_session_call = ExecuteRequestBuilder::contract_call_by_hash(
         account_user_1,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         mint_runtime_args,
     )
@@ -771,7 +771,7 @@ fn should_disallow_listed_account_from_minting_with_nftholder_contract() {
 
     let mint_session_call = ExecuteRequestBuilder::contract_call_by_hash(
         account_user_1,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         mint_runtime_args,
     )
@@ -1131,7 +1131,7 @@ fn should_be_able_to_update_whitelist_for_minting_with_deprecated_arg_contract_w
 
     let update_whitelist_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_VARIABLES,
         runtime_args! {
             ARG_CONTRACT_WHITELIST => vec![minting_contract_hash]
@@ -1246,7 +1246,7 @@ fn should_be_able_to_update_whitelist_for_minting() {
 
     let update_whitelist_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_VARIABLES,
         runtime_args! {
             ARG_ACL_WHITELIST => vec![Key::from(minting_contract_hash)]
diff --git a/tests/src/burn.rs b/tests/src/burn.rs
index 77ee231b..c3c3ce23 100644
--- a/tests/src/burn.rs
+++ b/tests/src/burn.rs
@@ -67,7 +67,7 @@ fn should_burn_minted_token(reporting: OwnerReverseLookupMode) {
         let token_page = support::get_token_page_by_id(
             &builder,
             &nft_contract_key,
-            &*DEFAULT_ACCOUNT_KEY,
+            &DEFAULT_ACCOUNT_KEY,
             token_id,
         );
 
@@ -80,7 +80,7 @@ fn should_burn_minted_token(reporting: OwnerReverseLookupMode) {
 
         let minting_request = ExecuteRequestBuilder::contract_call_by_hash(
             *DEFAULT_ACCOUNT_ADDR,
-            nft_contract_hash.into(),
+            nft_contract_hash,
             ENTRY_POINT_MINT,
             mint_runtime_args,
         )
@@ -177,7 +177,7 @@ fn should_not_burn_previously_burnt_token() {
     builder.exec(mint_session_call).expect_success().commit();
 
     let token_page =
-        support::get_token_page_by_id(&builder, &nft_contract_key, &*DEFAULT_ACCOUNT_KEY, 0u64);
+        support::get_token_page_by_id(&builder, &nft_contract_key, &DEFAULT_ACCOUNT_KEY, 0u64);
 
     assert!(token_page[0]);
 
@@ -286,13 +286,13 @@ fn should_return_expected_error_burning_of_others_users_token() {
     builder.exec(mint_session_call).expect_success().commit();
 
     let token_page =
-        support::get_token_page_by_id(&builder, &nft_contract_key, &*DEFAULT_ACCOUNT_KEY, 0u64);
+        support::get_token_page_by_id(&builder, &nft_contract_key, &DEFAULT_ACCOUNT_KEY, 0u64);
 
     assert!(token_page[0]);
 
     let incorrect_burn_request = ExecuteRequestBuilder::contract_call_by_hash(
         account_user_1,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_BURN,
         runtime_args! {
             ARG_TOKEN_ID => 0u64,
@@ -489,7 +489,7 @@ fn should_let_account_operator_burn_tokens_with_operator_burn_mode() {
 
     let burn_request = ExecuteRequestBuilder::contract_call_by_hash(
         operator,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_BURN,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -508,7 +508,7 @@ fn should_let_account_operator_burn_tokens_with_operator_burn_mode() {
 
     let approve_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -521,7 +521,7 @@ fn should_let_account_operator_burn_tokens_with_operator_burn_mode() {
 
     let burn_request = ExecuteRequestBuilder::contract_call_by_hash(
         operator,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_BURN,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -632,7 +632,7 @@ fn should_let_contract_operator_burn_tokens_with_operator_burn_mode() {
 
     let approve_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -759,7 +759,7 @@ fn should_let_package_operator_burn_tokens_with_contract_package_mode_and_operat
 
     let approve_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -849,7 +849,7 @@ fn should_burn_token_in_hash_identifier_mode() {
 
     let burn_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_BURN,
         runtime_args! {
             ARG_TOKEN_HASH => token_hash,
diff --git a/tests/src/costs.rs b/tests/src/costs.rs
index ec12e7cf..e50d2647 100644
--- a/tests/src/costs.rs
+++ b/tests/src/costs.rs
@@ -123,7 +123,7 @@ fn transfer_costs_should_remain_stable() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => Key::Account(AccountHash::new([9u8;32]))
diff --git a/tests/src/events.rs b/tests/src/events.rs
index 4964aa3f..b62e34bf 100644
--- a/tests/src/events.rs
+++ b/tests/src/events.rs
@@ -141,7 +141,7 @@ fn should_record_cep47_dictionary_style_transfer_token_event_in_hash_identifier_
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => owner
@@ -298,7 +298,7 @@ fn should_record_cep47_dictionary_style_metadata_update_event_for_nft721_using_t
 
     let update_metadata_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        get_nft_contract_hash(&builder).into(),
+        get_nft_contract_hash(&builder),
         ENTRY_POINT_SET_TOKEN_METADATA,
         update_metadata_runtime_args,
     )
@@ -387,7 +387,7 @@ fn should_cep47_dictionary_style_burn_event() {
     builder.exec(mint_session_call).expect_success().commit();
 
     let token_page =
-        get_token_page_by_id(&builder, &nft_contract_key, &*DEFAULT_ACCOUNT_KEY, token_id);
+        get_token_page_by_id(&builder, &nft_contract_key, &DEFAULT_ACCOUNT_KEY, token_id);
 
     assert!(token_page[0]);
 
@@ -425,7 +425,7 @@ fn should_cep47_dictionary_style_burn_event() {
         &builder,
         &nft_contract_key,
         TOKEN_COUNT,
-        &*DEFAULT_ACCOUNT_ADDR.to_string(),
+        &DEFAULT_ACCOUNT_ADDR.to_string(),
     );
 
     let expected_balance = 0u64;
@@ -502,7 +502,7 @@ fn should_cep47_dictionary_style_approve_event_in_hash_identifier_mode() {
 
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_HASH => token_hash.clone(),
@@ -589,7 +589,7 @@ fn should_cep47_dictionary_style_approvall_for_all_event() {
 
     let set_approve_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -680,7 +680,7 @@ fn should_cep47_dictionary_style_revoked_for_all_event() {
 
     let set_approve_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -771,7 +771,7 @@ fn should_not_have_events_dicts_in_no_events_mode() {
 
     // Check dict from EventsMode::CEP47
     let contract = builder
-        .get_entity_with_named_keys_by_entity_hash(contract_hash.into())
+        .get_entity_with_named_keys_by_entity_hash(contract_hash)
         .expect("should have contract");
     let named_keys = contract.named_keys();
     let events = named_keys.get(EVENTS);
diff --git a/tests/src/metadata.rs b/tests/src/metadata.rs
index b9d9aa02..495b8238 100644
--- a/tests/src/metadata.rs
+++ b/tests/src/metadata.rs
@@ -66,7 +66,7 @@ fn should_prevent_update_in_immutable_mode() {
 
     let update_token_metadata_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        support::get_nft_contract_hash(&builder).into(),
+        support::get_nft_contract_hash(&builder),
         ENTRY_POINT_SET_TOKEN_METADATA,
         runtime_args! {
             ARG_TOKEN_HASH => token_hash,
@@ -141,7 +141,7 @@ fn should_prevent_update_for_invalid_metadata() {
 
     let update_token_metadata_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        support::get_nft_contract_hash(&builder).into(),
+        support::get_nft_contract_hash(&builder),
         ENTRY_POINT_SET_TOKEN_METADATA,
         runtime_args! {
             ARG_TOKEN_ID => 0u64,
@@ -205,7 +205,7 @@ fn should_prevent_metadata_update_by_non_owner_key() {
 
     let update_token_metadata_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        support::get_nft_contract_hash(&builder).into(),
+        support::get_nft_contract_hash(&builder),
         ENTRY_POINT_SET_TOKEN_METADATA,
         runtime_args! {
             ARG_TOKEN_ID => 0u64,
@@ -318,7 +318,7 @@ fn should_allow_update_for_valid_metadata_based_on_kind(
 
     let update_metadata_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        support::get_nft_contract_hash(&builder).into(),
+        support::get_nft_contract_hash(&builder),
         ENTRY_POINT_SET_TOKEN_METADATA,
         update_metadata_runtime_args,
     )
diff --git a/tests/src/mint.rs b/tests/src/mint.rs
index 9aacf47c..13c458bc 100644
--- a/tests/src/mint.rs
+++ b/tests/src/mint.rs
@@ -164,7 +164,7 @@ fn entry_points_with_ret_should_return_correct_value() {
 
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -780,7 +780,7 @@ fn should_set_approval_for_all() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -1291,7 +1291,7 @@ fn should_approve_in_hash_identifier_mode() {
 
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_HASH => token_hash.clone(),
@@ -1333,7 +1333,7 @@ fn should_mint_without_returning_receipts_and_flat_gas_cost() {
 
     let mint_session_call = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         runtime_args! {
             ARG_NFT_CONTRACT_HASH => nft_contract_key,
@@ -1349,7 +1349,7 @@ fn should_mint_without_returning_receipts_and_flat_gas_cost() {
 
     let mint_session_call = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         runtime_args! {
             ARG_NFT_CONTRACT_HASH => nft_contract_key,
@@ -1365,7 +1365,7 @@ fn should_mint_without_returning_receipts_and_flat_gas_cost() {
 
     let mint_session_call = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         runtime_args! {
             ARG_NFT_CONTRACT_HASH => nft_contract_key,
@@ -1432,7 +1432,7 @@ fn should_maintain_page_table_despite_invoking_register_owner() {
     // and ensure that the page table doesn't mutate.
     let register_call = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => *DEFAULT_ACCOUNT_KEY
@@ -1473,7 +1473,7 @@ fn should_prevent_mint_to_unregistered_owner() {
 
     let mint_session_call = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         runtime_args! {
             ARG_NFT_CONTRACT_HASH => nft_contract_key,
@@ -1682,7 +1682,7 @@ fn should_mint_with_transfer_only_reporting() {
 
     let minting_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         mint_runtime_args,
     )
@@ -1724,7 +1724,7 @@ fn should_approve_all_in_hash_identifier_mode() {
 
     let mint_session_call = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         runtime_args! {
             ARG_NFT_CONTRACT_HASH => nft_contract_key,
@@ -1738,7 +1738,7 @@ fn should_approve_all_in_hash_identifier_mode() {
 
     let mint_session_call = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         runtime_args! {
             ARG_NFT_CONTRACT_HASH => nft_contract_key,
@@ -1752,7 +1752,7 @@ fn should_approve_all_in_hash_identifier_mode() {
 
     let approval_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
diff --git a/tests/src/set_variables.rs b/tests/src/set_variables.rs
index caeb815c..453195a7 100644
--- a/tests/src/set_variables.rs
+++ b/tests/src/set_variables.rs
@@ -43,7 +43,7 @@ fn only_installer_should_be_able_to_toggle_allow_minting() {
     // Red test
     let other_user_set_variables_request = ExecuteRequestBuilder::contract_call_by_hash(
         other_user_account,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_VARIABLES,
         runtime_args! { ARG_ALLOW_MINTING => true },
     )
@@ -72,7 +72,7 @@ fn only_installer_should_be_able_to_toggle_allow_minting() {
     // Green test
     let installer_set_variables_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_VARIABLES,
         runtime_args! { ARG_ALLOW_MINTING => true },
     )
@@ -121,7 +121,7 @@ fn installer_should_be_able_to_toggle_acl_package_mode() {
     // Installer account should be able to change ACL package mode
     let installer_set_variables_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_VARIABLES,
         runtime_args! { ARG_ACL_PACKAGE_MODE => true },
     )
@@ -173,7 +173,7 @@ fn installer_should_be_able_to_toggle_package_operator_mode() {
     // Installer account should be able to change package operator mode
     let installer_set_variables_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_VARIABLES,
         runtime_args! { ARG_PACKAGE_OPERATOR_MODE => true },
     )
@@ -225,7 +225,7 @@ fn installer_should_be_able_to_toggle_operator_burn_mode() {
     // Installer account should be able to change package operator mode
     let installer_set_variables_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_VARIABLES,
         runtime_args! { ARG_OPERATOR_BURN_MODE => true },
     )
diff --git a/tests/src/transfer.rs b/tests/src/transfer.rs
index 41cf95db..dd4f6260 100644
--- a/tests/src/transfer.rs
+++ b/tests/src/transfer.rs
@@ -80,7 +80,7 @@ fn should_dissallow_transfer_with_minter_or_assigned_ownership_mode() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -94,7 +94,7 @@ fn should_dissallow_transfer_with_minter_or_assigned_ownership_mode() {
 
     let transfer_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_TRANSFER,
         runtime_args! {
             ARG_SOURCE_KEY => *DEFAULT_ACCOUNT_KEY,
@@ -166,7 +166,7 @@ fn should_transfer_token_from_sender_to_receiver() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -274,7 +274,7 @@ fn approve_token_for_transfer_should_add_entry_to_approved_dictionary(
     if let Some(operator) = operator {
         let approval_all_request = ExecuteRequestBuilder::contract_call_by_hash(
             *DEFAULT_ACCOUNT_ADDR,
-            nft_contract_hash.into(),
+            nft_contract_hash,
             ENTRY_POINT_SET_APPROVALL_FOR_ALL,
             runtime_args! {
                 ARG_APPROVE_ALL => true,
@@ -292,7 +292,7 @@ fn approve_token_for_transfer_should_add_entry_to_approved_dictionary(
 
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         approving_account,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -374,7 +374,7 @@ fn revoke_token_for_transfer_should_remove_entry_to_approved_dictionary(
     if let Some(operator) = operator {
         let approval_all_request = ExecuteRequestBuilder::contract_call_by_hash(
             *DEFAULT_ACCOUNT_ADDR,
-            nft_contract_hash.into(),
+            nft_contract_hash,
             ENTRY_POINT_SET_APPROVALL_FOR_ALL,
             runtime_args! {
                 ARG_APPROVE_ALL => true,
@@ -392,7 +392,7 @@ fn revoke_token_for_transfer_should_remove_entry_to_approved_dictionary(
 
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         approving_account,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -416,7 +416,7 @@ fn revoke_token_for_transfer_should_remove_entry_to_approved_dictionary(
 
     let revoke_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REVOKE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -494,7 +494,7 @@ fn should_dissallow_approving_when_ownership_mode_is_minter_or_assigned() {
 
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -550,7 +550,7 @@ fn should_be_able_to_transfer_token(
     if let Some(operator) = operator {
         let approval_all_request = ExecuteRequestBuilder::contract_call_by_hash(
             *DEFAULT_ACCOUNT_ADDR,
-            nft_contract_hash.into(),
+            nft_contract_hash,
             ENTRY_POINT_SET_APPROVALL_FOR_ALL,
             runtime_args! {
                 ARG_APPROVE_ALL => true,
@@ -569,7 +569,7 @@ fn should_be_able_to_transfer_token(
     // Approve spender
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         approving_account,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -597,7 +597,7 @@ fn should_be_able_to_transfer_token(
 
     let register_owner = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => to_account
@@ -686,7 +686,7 @@ fn should_dissallow_same_approved_account_to_transfer_token_twice() {
     // Approve spender
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -715,7 +715,7 @@ fn should_dissallow_same_approved_account_to_transfer_token_twice() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => to_account
@@ -745,7 +745,7 @@ fn should_dissallow_same_approved_account_to_transfer_token_twice() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => to_other_account
@@ -816,7 +816,7 @@ fn should_disallow_to_transfer_token_using_revoked_hash(
     if let Some(operator) = operator {
         let approval_all_request = ExecuteRequestBuilder::contract_call_by_hash(
             *DEFAULT_ACCOUNT_ADDR,
-            nft_contract_hash.into(),
+            nft_contract_hash,
             ENTRY_POINT_SET_APPROVALL_FOR_ALL,
             runtime_args! {
                 ARG_APPROVE_ALL => true,
@@ -835,7 +835,7 @@ fn should_disallow_to_transfer_token_using_revoked_hash(
     // Approve spender
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         approving_account,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -861,7 +861,7 @@ fn should_disallow_to_transfer_token_using_revoked_hash(
     // Create to_account and transfer minted token using account
     let register_owner = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => *ACCOUNT_2_KEY
@@ -874,7 +874,7 @@ fn should_disallow_to_transfer_token_using_revoked_hash(
     // Revoke approval
     let revoke_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REVOKE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -971,7 +971,7 @@ fn should_be_able_to_approve_with_deprecated_operator_argument() {
     // Approve spender
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -1067,7 +1067,7 @@ fn should_transfer_between_contract_to_account() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => *DEFAULT_ACCOUNT_KEY
@@ -1211,7 +1211,7 @@ fn should_transfer_token_in_hash_identifier_mode() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => Key::Account(AccountHash::new([3u8;32]))
@@ -1286,7 +1286,7 @@ fn should_not_allow_non_approved_contract_to_transfer() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -1323,7 +1323,7 @@ fn should_not_allow_non_approved_contract_to_transfer() {
 
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -1385,7 +1385,7 @@ fn transfer_should_correctly_track_page_table_entries() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => *ACCOUNT_1_KEY
@@ -1499,7 +1499,7 @@ fn should_transfer_token_from_sender_to_receiver_with_transfer_only_reporting()
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_owner_key
@@ -1516,7 +1516,7 @@ fn should_transfer_token_from_sender_to_receiver_with_transfer_only_reporting()
 
     let minting_request = ExecuteRequestBuilder::contract_call_by_hash(
         token_owner,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_MINT,
         mint_runtime_args,
     )
@@ -1537,7 +1537,7 @@ fn should_transfer_token_from_sender_to_receiver_with_transfer_only_reporting()
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -1630,7 +1630,7 @@ fn disallow_owner_to_approve_itself() {
 
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -1686,7 +1686,7 @@ fn disallow_operator_to_approve_itself() {
 
     let approval_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -1698,7 +1698,7 @@ fn disallow_operator_to_approve_itself() {
 
     let approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         operator,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         runtime_args! {
             ARG_TOKEN_ID => token_id,
@@ -1750,7 +1750,7 @@ fn disallow_owner_to_approve_for_all_itself() {
 
     let approval_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -1789,7 +1789,7 @@ fn check_transfers_with_transfer_filter_contract_modes() {
     let transfer_filter_contract_set_return_value_request =
         ExecuteRequestBuilder::contract_call_by_hash(
             *DEFAULT_ACCOUNT_ADDR,
-            transfer_filter_contract_hash.into(),
+            transfer_filter_contract_hash,
             "set_return_value",
             runtime_args! {
                 ARG_FILTER_CONTRACT_RETURN_VALUE => TransferFilterContractResult::DenyTransfer as u8
@@ -1843,7 +1843,7 @@ fn check_transfers_with_transfer_filter_contract_modes() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -1880,7 +1880,7 @@ fn check_transfers_with_transfer_filter_contract_modes() {
     let transfer_filter_contract_set_return_value_request =
         ExecuteRequestBuilder::contract_call_by_hash(
             *DEFAULT_ACCOUNT_ADDR,
-            transfer_filter_contract_hash.into(),
+            transfer_filter_contract_hash,
             "set_return_value",
             runtime_args! {
                 ARG_FILTER_CONTRACT_RETURN_VALUE => TransferFilterContractResult::ProceedTransfer as u8
@@ -1994,7 +1994,7 @@ fn should_disallow_transfer_from_contract_with_package_operator_mode_without_ope
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -2077,7 +2077,7 @@ fn should_disallow_transfer_from_contract_without_package_operator_mode_with_pac
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -2100,7 +2100,7 @@ fn should_disallow_transfer_from_contract_without_package_operator_mode_with_pac
 
     let set_approve_for_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -2182,7 +2182,7 @@ fn should_allow_transfer_from_contract_with_package_operator_mode_with_operator(
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -2205,7 +2205,7 @@ fn should_allow_transfer_from_contract_with_package_operator_mode_with_operator(
 
     let set_approve_for_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -2290,7 +2290,7 @@ fn should_disallow_package_operator_to_approve_without_package_operator_mode() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -2305,7 +2305,7 @@ fn should_disallow_package_operator_to_approve_without_package_operator_mode() {
 
     let set_approve_for_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -2401,7 +2401,7 @@ fn should_allow_package_operator_to_approve_with_package_operator_mode() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -2415,7 +2415,7 @@ fn should_allow_package_operator_to_approve_with_package_operator_mode() {
 
     let set_approve_for_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -2464,7 +2464,7 @@ fn should_allow_package_operator_to_approve_with_package_operator_mode() {
 
     let approved_transfer_request = ExecuteRequestBuilder::contract_call_by_hash(
         spender,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_TRANSFER,
         transfer_runtime_arguments,
     )
@@ -2534,7 +2534,7 @@ fn should_allow_account_to_approve_spender_with_package_operator() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -2548,7 +2548,7 @@ fn should_allow_account_to_approve_spender_with_package_operator() {
 
     let set_approve_for_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -2573,7 +2573,7 @@ fn should_allow_account_to_approve_spender_with_package_operator() {
 
     let approved_approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         approve_runtime_arguments,
     )
@@ -2593,7 +2593,7 @@ fn should_allow_account_to_approve_spender_with_package_operator() {
 
     let approved_transfer_request = ExecuteRequestBuilder::contract_call_by_hash(
         *ACCOUNT_2_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_TRANSFER,
         transfer_runtime_arguments,
     )
@@ -2663,7 +2663,7 @@ fn should_allow_package_operator_to_revoke_with_package_operator_mode() {
 
     let register_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_REGISTER_OWNER,
         runtime_args! {
             ARG_TOKEN_OWNER => token_receiver_key
@@ -2677,7 +2677,7 @@ fn should_allow_package_operator_to_revoke_with_package_operator_mode() {
 
     let set_approve_for_all_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_SET_APPROVALL_FOR_ALL,
         runtime_args! {
             ARG_APPROVE_ALL => true,
@@ -2703,7 +2703,7 @@ fn should_allow_package_operator_to_revoke_with_package_operator_mode() {
 
     let approved_approve_request = ExecuteRequestBuilder::contract_call_by_hash(
         *DEFAULT_ACCOUNT_ADDR,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_APPROVE,
         approve_runtime_arguments,
     )
@@ -2744,7 +2744,7 @@ fn should_allow_package_operator_to_revoke_with_package_operator_mode() {
 
     let non_approved_transfer_request = ExecuteRequestBuilder::contract_call_by_hash(
         spender,
-        nft_contract_hash.into(),
+        nft_contract_hash,
         ENTRY_POINT_TRANSFER,
         transfer_runtime_arguments,
     )
diff --git a/tests/src/upgrade.rs b/tests/src/upgrade.rs
index 443f90bd..5bac8a9a 100644
--- a/tests/src/upgrade.rs
+++ b/tests/src/upgrade.rs
@@ -9,7 +9,7 @@ use casper_types::{
 use contract::{
     constants::{
         ARG_COLLECTION_NAME, ARG_EVENTS_MODE, ARG_NAMED_KEY_CONVENTION, ARG_TOKEN_META_DATA,
-        ARG_TOKEN_OWNER, COLLECTION_NAME,
+        ARG_TOKEN_OWNER,
     },
     modalities::{EventsMode, NamedKeyConventionMode},
 };
diff --git a/tests/src/utility/installer_request_builder.rs b/tests/src/utility/installer_request_builder.rs
index 1a0de95a..3edd0732 100644
--- a/tests/src/utility/installer_request_builder.rs
+++ b/tests/src/utility/installer_request_builder.rs
@@ -1,3 +1,4 @@
+#![allow(dead_code)]
 use casper_engine_test_support::{ExecuteRequest, ExecuteRequestBuilder};
 use casper_types::{
     account::AccountHash, bytesrepr::Bytes, contracts::ContractHash, CLValue, Key, RuntimeArgs,
diff --git a/tests/src/utility/support.rs b/tests/src/utility/support.rs
index 224dfce5..e3822c90 100644
--- a/tests/src/utility/support.rs
+++ b/tests/src/utility/support.rs
@@ -1,3 +1,4 @@
+#![allow(unused)]
 use super::{
     constants::{
         ACCOUNT_1_PUBLIC_KEY, ACCOUNT_2_PUBLIC_KEY, ACCOUNT_3_PUBLIC_KEY, CONTRACT_PACKAGE,