diff --git a/client/tests/integration/upgrade.rs b/client/tests/integration/upgrade.rs
index bd5a3221dac..9d7c01bd745 100644
--- a/client/tests/integration/upgrade.rs
+++ b/client/tests/integration/upgrade.rs
@@ -386,7 +386,7 @@ fn migration_should_cause_upgrade_event() {
 fn define_custom_parameter() -> Result<()> {
     use executor_custom_data_model::parameters::DomainLimits;
 
-    let (_rt, _peer, client) = <PeerBuilder>::new().with_port(10_996).start_with_runtime();
+    let (_rt, _peer, client) = <PeerBuilder>::new().with_port(11_325).start_with_runtime();
     wait_for_genesis_committed(&vec![client.clone()], 0);
 
     let long_domain_name = "0".repeat(2_usize.pow(5)).parse::<DomainId>()?;
diff --git a/configs/swarm/executor.wasm b/configs/swarm/executor.wasm
index 3496b3d4d09..2fb1146f22d 100644
Binary files a/configs/swarm/executor.wasm and b/configs/swarm/executor.wasm differ
diff --git a/core/src/queue.rs b/core/src/queue.rs
index d3ac864685b..1d8d1985ab1 100644
--- a/core/src/queue.rs
+++ b/core/src/queue.rs
@@ -419,7 +419,9 @@ pub mod tests {
         time_source: &TimeSource,
     ) -> AcceptedTransaction {
         let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
-        let fail_isi = Unregister::domain("dummy".parse().unwrap());
+        // Random name needed so all transactions will be different
+        let domain_name = format!("dummy{}", rand::random::<u64>());
+        let fail_isi = Unregister::domain(domain_name.parse().unwrap());
         let instructions = [fail_isi];
         let tx =
             TransactionBuilder::new_with_time_source(chain_id.clone(), account_id, time_source)
diff --git a/core/src/smartcontracts/isi/query.rs b/core/src/smartcontracts/isi/query.rs
index 4702533ad8c..aac7f524214 100644
--- a/core/src/smartcontracts/isi/query.rs
+++ b/core/src/smartcontracts/isi/query.rs
@@ -333,12 +333,10 @@ mod tests {
             .is_none());
 
         let mut store = Metadata::default();
-        store
-            .insert(
-                Name::from_str("Bytes").expect("Valid"),
-                vec![1_u32, 2_u32, 3_u32],
-            )
-            .unwrap();
+        store.insert(
+            Name::from_str("Bytes").expect("Valid"),
+            vec![1_u32, 2_u32, 3_u32],
+        );
         let asset_id = AssetId::new(asset_definition_id, account.id().clone());
         let asset = Asset::new(asset_id, AssetValue::Store(store));
 
diff --git a/default_executor/src/lib.rs b/default_executor/src/lib.rs
index dcad8250ea7..665e07696ea 100644
--- a/default_executor/src/lib.rs
+++ b/default_executor/src/lib.rs
@@ -6,8 +6,6 @@ extern crate alloc;
 #[cfg(not(test))]
 extern crate panic_halt;
 
-use alloc::borrow::ToOwned as _;
-
 use iroha_executor::{debug::dbg_panic, prelude::*, DataModelBuilder};
 use lol_alloc::{FreeListAllocator, LockedAllocator};
 
diff --git a/tools/parity_scale_cli/samples/domain.bin b/tools/parity_scale_cli/samples/domain.bin
index 6242172300d..848687cb30e 100644
--- a/tools/parity_scale_cli/samples/domain.bin
+++ b/tools/parity_scale_cli/samples/domain.bin
@@ -1 +1 @@
-(wonderland
Ð/ipfs/Qme7ss3ARVgxv6rXqVPiikMJ8u2NLgmgszg13pYrDKEoiuPIs_Jabberwocky_alive4{"Bool":true}
\ No newline at end of file
+(wonderland
Ð/ipfs/Qme7ss3ARVgxv6rXqVPiikMJ8u2NLgmgszg13pYrDKEoiuPIs_Jabberwocky_alivetrue
\ No newline at end of file
diff --git a/tools/parity_scale_cli/samples/domain.json b/tools/parity_scale_cli/samples/domain.json
index f1b0151bdfe..0ebf2effd81 100644
--- a/tools/parity_scale_cli/samples/domain.json
+++ b/tools/parity_scale_cli/samples/domain.json
@@ -2,8 +2,6 @@
     "id": "wonderland",
     "logo": "/ipfs/Qme7ss3ARVgxv6rXqVPiikMJ8u2NLgmgszg13pYrDKEoiu",
     "metadata": {
-        "Is_Jabberwocky_alive": {
-            "Bool": true
-        }
+        "Is_Jabberwocky_alive": true
     }
 }
diff --git a/tools/parity_scale_cli/src/main.rs b/tools/parity_scale_cli/src/main.rs
index bd162df8b47..06ff793d7d4 100644
--- a/tools/parity_scale_cli/src/main.rs
+++ b/tools/parity_scale_cli/src/main.rs
@@ -314,12 +314,10 @@ mod tests {
     #[test]
     fn decode_account_sample() {
         let mut metadata = Metadata::default();
-        metadata
-            .insert(
-                "hat".parse().expect("Valid"),
-                "white".parse::<JsonString>().expect("Valid"),
-            )
-            .expect("Valid");
+        metadata.insert(
+            "hat".parse().expect("Valid"),
+            "white".parse::<JsonString>().expect("Valid"),
+        );
         let account = Account::new(ALICE_ID.clone()).with_metadata(metadata);
 
         decode_sample("account.bin", String::from("NewAccount"), &account);
@@ -328,9 +326,7 @@ mod tests {
     #[test]
     fn decode_domain_sample() {
         let mut metadata = Metadata::default();
-        metadata
-            .insert("Is_Jabberwocky_alive".parse().expect("Valid"), true)
-            .expect("Valid");
+        metadata.insert("Is_Jabberwocky_alive".parse().expect("Valid"), true);
         let domain = Domain::new("wonderland".parse().expect("Valid"))
             .with_logo(
                 IpfsPath::from_str("/ipfs/Qme7ss3ARVgxv6rXqVPiikMJ8u2NLgmgszg13pYrDKEoiu")