diff --git a/runtime/integration-tests/src/setup.rs b/runtime/integration-tests/src/setup.rs
index c273c3ae3..01cb0fadc 100644
--- a/runtime/integration-tests/src/setup.rs
+++ b/runtime/integration-tests/src/setup.rs
@@ -18,13 +18,23 @@
 
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 use frame_support::traits::{OnFinalize, OnIdle, OnInitialize};
-pub use frame_support::{assert_noop, assert_ok, traits::Currency};
+pub use frame_support::{
+	assert_noop, assert_ok,
+	traits::{Currency as PalletCurrency, Get},
+};
 pub use frame_system::RawOrigin;
 pub use parity_scale_codec::{Decode, Encode};
+pub use primitives::TradingPair;
 use runtime_common::evm_genesis;
+pub use runtime_common::{
+	cent, dollar, millicent, FixedRateOfAsset, MaxTipsOfPriority, ProxyType, Ratio, TipPerWeightStep, ACA, AUSD, DOT,
+	LDOT,
+};
+pub use xcm::v3::{prelude::*, Weight as XcmWeight};
+pub use xcm_executor::XcmExecutor;
 
 pub use module_support::{
-	mocks::MockAddressMapping, AddressMapping, CDPTreasury, DEXManager, Price, Rate, Ratio, RiskManager,
+	mocks::MockAddressMapping, AddressMapping, CDPTreasury, DEXManager, Price, Rate, RiskManager,
 };
 
 pub use cumulus_pallet_parachain_system::RelaychainDataProvider;
@@ -52,7 +62,6 @@ pub use xcm::v3::prelude::*;
 pub use mandala_imports::*;
 #[cfg(feature = "with-mandala-runtime")]
 mod mandala_imports {
-	pub use frame_support::traits::{Currency as PalletCurrency, Get};
 	pub use mandala_runtime::xcm_config::*;
 	use mandala_runtime::AlternativeFeeSurplus;
 	pub use mandala_runtime::{
@@ -68,15 +77,9 @@ mod mandala_imports {
 		TransactionPaymentPalletId, TreasuryAccount, TreasuryPalletId, UncheckedExtrinsic, Utility, Vesting,
 		XcmInterface, EVM, NFT,
 	};
-	pub use primitives::TradingPair;
-	pub use runtime_common::{
-		cent, dollar, millicent, FixedRateOfAsset, MaxTipsOfPriority, ProxyType, Ratio, TipPerWeightStep, ACA, AUSD,
-		DOT, LDOT,
-	};
-	pub use sp_runtime::traits::AccountIdConversion;
+	use primitives::TradingPair;
+	use runtime_common::{ACA, AUSD, DOT, LDOT};
 	use sp_runtime::Percent;
-	pub use xcm::v3::{prelude::*, Weight as XcmWeight};
-	pub use xcm_executor::XcmExecutor;
 
 	parameter_types! {
 		pub EnabledTradingPairs: Vec<TradingPair> = vec![
@@ -104,7 +107,7 @@ mod mandala_imports {
 pub use karura_imports::*;
 #[cfg(feature = "with-karura-runtime")]
 mod karura_imports {
-	pub use frame_support::parameter_types;
+	use frame_support::parameter_types;
 	pub use karura_runtime::xcm_config::*;
 	use karura_runtime::AlternativeFeeSurplus;
 	pub use karura_runtime::{
@@ -112,20 +115,16 @@ mod karura_imports {
 		AccountId, AggregatedDex, AssetRegistry, AuctionManager, Aura, Authority, AuthoritysOriginId, Balance,
 		Balances, BlockNumber, CDPEnginePalletId, CDPTreasuryPalletId, CdpEngine, CdpTreasury, CreateClassDeposit,
 		CreateTokenDeposit, Currencies, CurrencyId, DataDepositPerByte, DefaultDebitExchangeRate, DefaultExchangeRate,
-		Dex, EmergencyShutdown, EvmAccounts, ExistentialDeposits, FinancialCouncil, Get, GetNativeCurrencyId, Homa,
-		Honzon, IdleScheduler, KaruraFoundationAccounts, Loans, MaxTipsOfPriority, MinimumDebitValue, MultiLocation,
-		NativeTokenExistentialDeposit, NetworkId, NftPalletId, OneDay, OriginCaller, ParachainAccount, ParachainInfo,
-		ParachainSystem, PolkadotXcm, Proxy, ProxyType, Ratio, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
-		Scheduler, Session, SessionManager, SevenDays, StableAsset, StableAssetPalletId, System, Timestamp,
-		TipPerWeightStep, TokenSymbol, Tokens, TransactionPayment, TransactionPaymentPalletId, TreasuryPalletId,
-		Utility, Vesting, XTokens, XcmInterface, EVM, NFT,
+		Dex, EmergencyShutdown, EvmAccounts, ExistentialDeposits, FinancialCouncil, GetNativeCurrencyId, Homa, Honzon,
+		IdleScheduler, KaruraFoundationAccounts, Loans, MinimumDebitValue, NativeTokenExistentialDeposit, NftPalletId,
+		OneDay, OriginCaller, ParachainAccount, ParachainInfo, ParachainSystem, PolkadotXcm, Proxy, Runtime,
+		RuntimeCall, RuntimeEvent, RuntimeOrigin, Scheduler, Session, SessionManager, SevenDays, StableAsset,
+		StableAssetPalletId, System, Timestamp, TokenSymbol, Tokens, TransactionPayment, TransactionPaymentPalletId,
+		TreasuryPalletId, Utility, Vesting, XTokens, XcmInterface, EVM, NFT,
 	};
-	pub use primitives::TradingPair;
-	pub use runtime_common::{cent, dollar, millicent, FixedRateOfAsset, KAR, KSM, KUSD, LKSM};
-	pub use sp_runtime::traits::AccountIdConversion;
-	use sp_runtime::Percent;
-	pub use xcm::v3::Weight as XcmWeight;
-	pub use xcm_executor::XcmExecutor;
+	use primitives::TradingPair;
+	use runtime_common::{KAR, KSM, KUSD, LKSM};
+	use sp_runtime::{traits::AccountIdConversion, Percent};
 
 	parameter_types! {
 		pub EnabledTradingPairs: Vec<TradingPair> = vec![
@@ -161,21 +160,18 @@ mod acala_imports {
 		AuthoritysOriginId, Balance, Balances, BlockNumber, CDPEnginePalletId, CDPTreasuryPalletId, CdpEngine,
 		CdpTreasury, CreateClassDeposit, CreateTokenDeposit, Currencies, CurrencyId, DataDepositPerByte,
 		DefaultDebitExchangeRate, DefaultExchangeRate, Dex, EmergencyShutdown, EvmAccounts, ExistentialDeposits,
-		FinancialCouncil, Get, GetNativeCurrencyId, Homa, Honzon, IdleScheduler, Loans, MaxTipsOfPriority,
-		MinimumDebitValue, MultiLocation, NativeTokenExistentialDeposit, NetworkId, NftPalletId, OneDay, OriginCaller,
-		ParachainAccount, ParachainInfo, ParachainSystem, PolkadotXcm, Proxy, ProxyType, Ratio, Runtime, RuntimeCall,
-		RuntimeEvent, RuntimeOrigin, Scheduler, Session, SessionManager, SevenDays, StableAsset, StableAssetPalletId,
-		System, Timestamp, TipPerWeightStep, TokenSymbol, Tokens, TransactionPayment, TransactionPaymentPalletId,
-		TreasuryPalletId, Utility, Vesting, XTokens, XcmInterface, EVM, LCDOT, NFT,
+		FinancialCouncil, GetNativeCurrencyId, Homa, Honzon, IdleScheduler, Loans, MinimumDebitValue,
+		NativeTokenExistentialDeposit, NftPalletId, OneDay, OriginCaller, ParachainAccount, ParachainInfo,
+		ParachainSystem, PolkadotXcm, Proxy, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, Scheduler, Session,
+		SessionManager, SevenDays, StableAsset, StableAssetPalletId, System, Timestamp, TokenSymbol, Tokens,
+		TransactionPayment, TransactionPaymentPalletId, TreasuryPalletId, Utility, Vesting, XTokens, XcmInterface, EVM,
+		NFT,
 	};
-	pub use frame_support::parameter_types;
-	use module_transaction_payment::BuyWeightRateOfTransactionFeePool;
-	pub use primitives::TradingPair;
-	pub use runtime_common::{cent, dollar, millicent, FixedRateOfAsset, ACA, AUSD, DOT, LDOT};
-	pub use sp_runtime::traits::AccountIdConversion;
+	use frame_support::parameter_types;
+	use primitives::TradingPair;
+	use runtime_common::{ACA, AUSD, DOT, LCDOT, LDOT};
+	use sp_runtime::traits::AccountIdConversion;
 	use sp_runtime::Percent;
-	pub use xcm::v3::Weight as XcmWeight;
-	pub use xcm_executor::XcmExecutor;
 
 	parameter_types! {
 		pub EnabledTradingPairs: Vec<TradingPair> = vec![