diff --git a/evm/src/cpu/kernel/tests/mod.rs b/evm/src/cpu/kernel/tests/mod.rs
index e912388b..ab92c5a0 100644
--- a/evm/src/cpu/kernel/tests/mod.rs
+++ b/evm/src/cpu/kernel/tests/mod.rs
@@ -2,7 +2,7 @@ mod curve_ops;
 mod ecrecover;
 mod exp;
 mod rlp;
-mod type_0_txn;
+mod transaction_parsing;
 
 use std::str::FromStr;
 
diff --git a/evm/src/cpu/kernel/tests/rlp.rs b/evm/src/cpu/kernel/tests/rlp.rs
index fd790dcb..55dfc7e8 100644
--- a/evm/src/cpu/kernel/tests/rlp.rs
+++ b/evm/src/cpu/kernel/tests/rlp.rs
@@ -5,7 +5,6 @@ use ethereum_types::U256;
 
 use crate::cpu::kernel::aggregator::KERNEL;
 use crate::cpu::kernel::interpreter::Interpreter;
-use crate::memory::segments::Segment;
 
 #[test]
 fn test_decode_rlp_string_len_short() -> Result<()> {
diff --git a/evm/src/cpu/kernel/tests/transaction_parsing/mod.rs b/evm/src/cpu/kernel/tests/transaction_parsing/mod.rs
new file mode 100644
index 00000000..fb50625f
--- /dev/null
+++ b/evm/src/cpu/kernel/tests/transaction_parsing/mod.rs
@@ -0,0 +1 @@
+mod parse_type_0_txn;
diff --git a/evm/src/cpu/kernel/tests/type_0_txn.rs b/evm/src/cpu/kernel/tests/transaction_parsing/parse_type_0_txn.rs
similarity index 97%
rename from evm/src/cpu/kernel/tests/type_0_txn.rs
rename to evm/src/cpu/kernel/tests/transaction_parsing/parse_type_0_txn.rs
index 01e26423..8b725479 100644
--- a/evm/src/cpu/kernel/tests/type_0_txn.rs
+++ b/evm/src/cpu/kernel/tests/transaction_parsing/parse_type_0_txn.rs
@@ -1,5 +1,3 @@
-use std::str::FromStr;
-
 use anyhow::Result;
 use ethereum_types::U256;
 use hex_literal::hex;
@@ -7,7 +5,6 @@ use NormalizedTxnField::*;
 
 use crate::cpu::kernel::aggregator::KERNEL;
 use crate::cpu::kernel::interpreter::Interpreter;
-use crate::cpu::kernel::tests::rlp::set_rlp_memory;
 use crate::cpu::kernel::txn_fields::NormalizedTxnField;
 
 #[test]