diff --git a/api/groups/eventsGroup.go b/api/groups/eventsGroup.go
index bc5d1c3..a394c7e 100644
--- a/api/groups/eventsGroup.go
+++ b/api/groups/eventsGroup.go
@@ -88,7 +88,7 @@ func checkEventsGroupArgs(args ArgsEventsGroup) error {
 func getPayloadVersion(c *gin.Context) uint32 {
 	version, err := strconv.Atoi(c.GetHeader(payloadVersionHeaderKey))
 	if err != nil {
-		log.Warn("failed to parse version header, used default version")
+		log.Debug("failed to parse version header, used default version")
 		return common.PayloadV0
 	}
 
diff --git a/process/payloadHandler.go b/process/payloadHandler.go
index 9818317..310c472 100644
--- a/process/payloadHandler.go
+++ b/process/payloadHandler.go
@@ -16,8 +16,8 @@ var ErrInvalidPayloadType = errors.New("invalid payload type")
 var ErrInvalidPayloadVersion = errors.New("invalid payload version")
 
 type payloadHandler struct {
-	dp      map[uint32]DataProcessor
-	actions map[string]func(marshalledData []byte, version uint32) error
+	dataProcessors map[uint32]DataProcessor
+	actions        map[string]func(marshalledData []byte, version uint32) error
 }
 
 // NewPayloadHandler will create a new instance of events indexer
@@ -27,7 +27,7 @@ func NewPayloadHandler(dataProcessors map[uint32]DataProcessor) (*payloadHandler
 	}
 
 	payloadIndexer := &payloadHandler{
-		dp: dataProcessors,
+		dataProcessors: dataProcessors,
 	}
 	payloadIndexer.initActionsMap()
 
@@ -59,7 +59,7 @@ func (ph *payloadHandler) ProcessPayload(payload []byte, topic string, version u
 }
 
 func (ph *payloadHandler) saveBlock(marshalledData []byte, version uint32) error {
-	dataProcessor, ok := ph.dp[version]
+	dataProcessor, ok := ph.dataProcessors[version]
 	if !ok {
 		log.Warn("invalid provided version", "version", version)
 		return ErrInvalidPayloadType
@@ -69,7 +69,7 @@ func (ph *payloadHandler) saveBlock(marshalledData []byte, version uint32) error
 }
 
 func (ph *payloadHandler) revertIndexedBlock(marshalledData []byte, version uint32) error {
-	dataProcessor, ok := ph.dp[version]
+	dataProcessor, ok := ph.dataProcessors[version]
 	if !ok {
 		log.Warn("invalid provided version", "version", version)
 		return ErrInvalidPayloadType
@@ -79,7 +79,7 @@ func (ph *payloadHandler) revertIndexedBlock(marshalledData []byte, version uint
 }
 
 func (ph *payloadHandler) finalizedBlock(marshalledData []byte, version uint32) error {
-	dataProcessor, ok := ph.dp[version]
+	dataProcessor, ok := ph.dataProcessors[version]
 	if !ok {
 		log.Warn("invalid provided version", "version", version)
 		return ErrInvalidPayloadType
diff --git a/process/preprocess/basePreProcessor_test.go b/process/preprocess/basePreProcessor_test.go
index 312f86a..b944f8e 100644
--- a/process/preprocess/basePreProcessor_test.go
+++ b/process/preprocess/basePreProcessor_test.go
@@ -3,11 +3,20 @@ package preprocess_test
 import (
 	"testing"
 
+	"github.com/multiversx/mx-chain-core-go/core/mock"
 	"github.com/multiversx/mx-chain-notifier-go/common"
+	"github.com/multiversx/mx-chain-notifier-go/mocks"
 	"github.com/multiversx/mx-chain-notifier-go/process/preprocess"
 	"github.com/stretchr/testify/require"
 )
 
+func createMockEventsDataPreProcessorArgs() preprocess.ArgsEventsPreProcessor {
+	return preprocess.ArgsEventsPreProcessor{
+		Marshaller: &mock.MarshalizerMock{},
+		Facade:     &mocks.FacadeStub{},
+	}
+}
+
 func TestNewBaseEventsPreProcessor(t *testing.T) {
 	t.Parallel()
 
diff --git a/process/preprocess/dataPreProcessor_test.go b/process/preprocess/dataPreProcessor_test.go
deleted file mode 100644
index 9f6d632..0000000
--- a/process/preprocess/dataPreProcessor_test.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package preprocess_test
-
-import (
-	"testing"
-
-	"github.com/multiversx/mx-chain-core-go/core/mock"
-	"github.com/multiversx/mx-chain-notifier-go/mocks"
-	"github.com/multiversx/mx-chain-notifier-go/process/preprocess"
-)
-
-func createMockEventsDataPreProcessorArgs() preprocess.ArgsEventsPreProcessor {
-	return preprocess.ArgsEventsPreProcessor{
-		Marshaller: &mock.MarshalizerMock{},
-		Facade:     &mocks.FacadeStub{},
-	}
-}
-
-func TestNewEventsDataPreProcessor(t *testing.T) {
-	t.Parallel()
-
-}
diff --git a/process/preprocess/eventsPreProcessorV0.go b/process/preprocess/eventsPreProcessorV0.go
index 4444282..fdcea6f 100644
--- a/process/preprocess/eventsPreProcessorV0.go
+++ b/process/preprocess/eventsPreProcessorV0.go
@@ -112,7 +112,7 @@ func (d *eventsPreProcessorV0) RevertIndexedBlock(marshalledData []byte) error {
 	return nil
 }
 
-// FinalizedBlock will handler the finalized block event
+// FinalizedBlock will handle the finalized block event
 func (d *eventsPreProcessorV0) FinalizedBlock(marshalledData []byte) error {
 	finalizedBlock := &data.FinalizedBlock{}
 	err := d.marshaller.Unmarshal(finalizedBlock, marshalledData)
diff --git a/process/preprocess/eventsPreProcessorV1.go b/process/preprocess/eventsPreProcessorV1.go
index 89477ca..e6a25fe 100644
--- a/process/preprocess/eventsPreProcessorV1.go
+++ b/process/preprocess/eventsPreProcessorV1.go
@@ -114,7 +114,7 @@ func (d *eventsPreProcessorV1) RevertIndexedBlock(marshalledData []byte) error {
 	return nil
 }
 
-// FinalizedBlock will handler the finalized block event
+// FinalizedBlock will handle the finalized block event
 func (d *eventsPreProcessorV1) FinalizedBlock(marshalledData []byte) error {
 	finalizedBlock := &outport.FinalizedBlock{}
 	err := d.marshaller.Unmarshal(finalizedBlock, marshalledData)
diff --git a/process/preprocess/interface.go b/process/preprocess/interface.go
index e809486..318ed10 100644
--- a/process/preprocess/interface.go
+++ b/process/preprocess/interface.go
@@ -5,7 +5,7 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data/block"
 )
 
-// EmptyBlockCreatorContainer defines the behavior of a empty block creator container
+// EmptyBlockCreatorContainer defines the behavior of an empty block creator container
 type EmptyBlockCreatorContainer interface {
 	Add(headerType core.HeaderType, creator block.EmptyBlockCreator) error
 	Get(headerType core.HeaderType) (block.EmptyBlockCreator, error)
diff --git a/tools/data.go b/tools/testData.go
similarity index 100%
rename from tools/data.go
rename to tools/testData.go