diff --git a/mempool/init_test.go b/mempool/init_test.go
new file mode 100644
index 0000000000..3104ea09e7
--- /dev/null
+++ b/mempool/init_test.go
@@ -0,0 +1,5 @@
+package mempool_test
+
+import (
+	_ "github.com/NethermindEth/juno/encoder/registry"
+)
diff --git a/mempool/mempool_test.go b/mempool/mempool_test.go
index fcf9ba0004..fd8801faeb 100644
--- a/mempool/mempool_test.go
+++ b/mempool/mempool_test.go
@@ -5,7 +5,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/NethermindEth/juno/blockchain"
 	"github.com/NethermindEth/juno/core"
 	"github.com/NethermindEth/juno/core/felt"
 	"github.com/NethermindEth/juno/db"
@@ -49,7 +48,6 @@ func TestMempool(t *testing.T) {
 	pool, closer, err := mempool.New(*testDB, state, 4)
 	defer closer()
 	require.NoError(t, err)
-	blockchain.RegisterCoreTypesToEncoder()
 
 	l := pool.Len()
 	assert.Equal(t, uint16(0), l)
@@ -118,7 +116,6 @@ func TestMempool(t *testing.T) {
 }
 
 func TestRestoreMempool(t *testing.T) {
-	blockchain.RegisterCoreTypesToEncoder()
 	mockCtrl := gomock.NewController(t)
 	t.Cleanup(mockCtrl.Finish)
 	state := mocks.NewMockStateHistoryReader(mockCtrl)
@@ -187,7 +184,6 @@ func TestWait(t *testing.T) {
 	state := mocks.NewMockStateHistoryReader(mockCtrl)
 	pool, _, err := mempool.New(testDB, state, 1024)
 	require.NoError(t, err)
-	blockchain.RegisterCoreTypesToEncoder()
 
 	select {
 	case <-pool.Wait():
@@ -196,22 +192,34 @@ func TestWait(t *testing.T) {
 	}
 
 	// One transaction.
+	state.EXPECT().ContractNonce(new(felt.Felt).SetUint64(1)).Return(new(felt.Felt).SetUint64(0), nil)
 	require.NoError(t, pool.Push(&mempool.BroadcastedTransaction{
 		Transaction: &core.InvokeTransaction{
 			TransactionHash: new(felt.Felt).SetUint64(1),
+			Nonce:           new(felt.Felt).SetUint64(1),
+			SenderAddress:   new(felt.Felt).SetUint64(1),
+			Version:         new(core.TransactionVersion).SetUint64(1),
 		},
 	}))
 	<-pool.Wait()
 
 	// Two transactions.
+	state.EXPECT().ContractNonce(new(felt.Felt).SetUint64(2)).Return(new(felt.Felt).SetUint64(0), nil)
 	require.NoError(t, pool.Push(&mempool.BroadcastedTransaction{
 		Transaction: &core.InvokeTransaction{
 			TransactionHash: new(felt.Felt).SetUint64(2),
+			Nonce:           new(felt.Felt).SetUint64(1),
+			SenderAddress:   new(felt.Felt).SetUint64(2),
+			Version:         new(core.TransactionVersion).SetUint64(1),
 		},
 	}))
+	state.EXPECT().ContractNonce(new(felt.Felt).SetUint64(3)).Return(new(felt.Felt).SetUint64(0), nil)
 	require.NoError(t, pool.Push(&mempool.BroadcastedTransaction{
 		Transaction: &core.InvokeTransaction{
 			TransactionHash: new(felt.Felt).SetUint64(3),
+			Nonce:           new(felt.Felt).SetUint64(1),
+			SenderAddress:   new(felt.Felt).SetUint64(3),
+			Version:         new(core.TransactionVersion).SetUint64(1),
 		},
 	}))
 	<-pool.Wait()