diff --git a/dot/mock_node_builder_test.go b/dot/mock_node_builder_test.go
index 2f52ae3118..25fa1250c6 100644
--- a/dot/mock_node_builder_test.go
+++ b/dot/mock_node_builder_test.go
@@ -76,18 +76,18 @@ func (mr *MocknodeBuilderIfaceMockRecorder) createBlockVerifier(st interface{})
 }
 
 // createCoreService mocks base method.
-func (m *MocknodeBuilderIface) createCoreService(config *config.Config, ks *keystore.GlobalKeystore, st *state.Service, net *network.Service, dh *digest.Handler) (*core.Service, error) {
+func (m *MocknodeBuilderIface) createCoreService(config *config.Config, ks *keystore.GlobalKeystore, st *state.Service, net *network.Service) (*core.Service, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "createCoreService", config, ks, st, net, dh)
+	ret := m.ctrl.Call(m, "createCoreService", config, ks, st, net)
 	ret0, _ := ret[0].(*core.Service)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // createCoreService indicates an expected call of createCoreService.
-func (mr *MocknodeBuilderIfaceMockRecorder) createCoreService(config, ks, st, net, dh interface{}) *gomock.Call {
+func (mr *MocknodeBuilderIfaceMockRecorder) createCoreService(config, ks, st, net interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "createCoreService", reflect.TypeOf((*MocknodeBuilderIface)(nil).createCoreService), config, ks, st, net, dh)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "createCoreService", reflect.TypeOf((*MocknodeBuilderIface)(nil).createCoreService), config, ks, st, net)
 }
 
 // createDigestHandler mocks base method.
diff --git a/dot/node.go b/dot/node.go
index 0ff83f2f1a..129dfaa06d 100644
--- a/dot/node.go
+++ b/dot/node.go
@@ -60,7 +60,7 @@ type nodeBuilderIface interface {
 	createBlockVerifier(st *state.Service) *babe.VerificationManager
 	createDigestHandler(st *state.Service) (*digest.Handler, error)
 	createCoreService(config *cfg.Config, ks *keystore.GlobalKeystore, st *state.Service, net *network.Service,
-		dh *digest.Handler) (*core.Service, error)
+	) (*core.Service, error)
 	createGRANDPAService(config *cfg.Config, st *state.Service, ks KeyStore,
 		net *network.Service, telemetryMailer Telemetry) (*grandpa.Service, error)
 	newSyncService(config *cfg.Config, st *state.Service, finalityGadget BlockJustificationVerifier,
@@ -367,7 +367,7 @@ func newNode(config *cfg.Config,
 	}
 	nodeSrvcs = append(nodeSrvcs, dh)
 
-	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, networkSrvc, dh)
+	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, networkSrvc)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create core service: %s", err)
 	}
diff --git a/dot/node_integration_test.go b/dot/node_integration_test.go
index aad81b1331..a8eedf2782 100644
--- a/dot/node_integration_test.go
+++ b/dot/node_integration_test.go
@@ -128,7 +128,7 @@ func TestNewNode(t *testing.T) {
 	m.EXPECT().createDigestHandler(gomock.AssignableToTypeOf(&state.Service{})).
 		Return(&digest.Handler{}, nil)
 	m.EXPECT().createCoreService(initConfig, ks, gomock.AssignableToTypeOf(&state.Service{}),
-		gomock.AssignableToTypeOf(&network.Service{}), &digest.Handler{}).
+		gomock.AssignableToTypeOf(&network.Service{})).
 		Return(&core.Service{}, nil)
 	m.EXPECT().createGRANDPAService(initConfig, gomock.AssignableToTypeOf(&state.Service{}),
 		ks.Gran, gomock.AssignableToTypeOf(&network.Service{}),
diff --git a/dot/services.go b/dot/services.go
index 300026fd44..c6200f86a8 100644
--- a/dot/services.go
+++ b/dot/services.go
@@ -246,7 +246,7 @@ func (nodeBuilder) createBABEServiceWithBuilder(config *cfg.Config, st *state.Se
 
 // createCoreService creates the core service from the provided core configuration
 func (nodeBuilder) createCoreService(config *cfg.Config, ks *keystore.GlobalKeystore,
-	st *state.Service, net *network.Service, dh *digest.Handler) (
+	st *state.Service, net *network.Service) (
 	*core.Service, error) {
 	logger.Debug("creating core service" +
 		asAuthority(config.Core.Role == common.AuthorityRole) +
diff --git a/dot/services_integration_test.go b/dot/services_integration_test.go
index c8bbfceeef..37d53a2aff 100644
--- a/dot/services_integration_test.go
+++ b/dot/services_integration_test.go
@@ -13,7 +13,6 @@ import (
 	cfg "github.com/ChainSafe/gossamer/config"
 
 	core "github.com/ChainSafe/gossamer/dot/core"
-	digest "github.com/ChainSafe/gossamer/dot/digest"
 	"github.com/ChainSafe/gossamer/dot/network"
 	rpc "github.com/ChainSafe/gossamer/dot/rpc"
 	"github.com/ChainSafe/gossamer/dot/state"
@@ -135,7 +134,6 @@ func Test_nodeBuilder_createCoreService(t *testing.T) {
 	type args struct {
 		ks  *keystore.GlobalKeystore
 		net *network.Service
-		dh  *digest.Handler
 	}
 	tests := []struct {
 		name      string
@@ -163,7 +161,7 @@ func Test_nodeBuilder_createCoreService(t *testing.T) {
 			stateSrvc := newStateService(t, ctrl)
 
 			builder := nodeBuilder{}
-			got, err := builder.createCoreService(config, tt.args.ks, stateSrvc, tt.args.net, tt.args.dh)
+			got, err := builder.createCoreService(config, tt.args.ks, stateSrvc, tt.args.net)
 
 			assert.ErrorIs(t, err, tt.err)
 
@@ -508,10 +506,8 @@ func TestCreateCoreService(t *testing.T) {
 	networkSrvc := &network.Service{}
 
 	builder := nodeBuilder{}
-	dh, err := builder.createDigestHandler(stateSrvc)
-	require.NoError(t, err)
 
-	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, networkSrvc, dh)
+	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, networkSrvc)
 	require.NoError(t, err)
 	require.NotNil(t, coreSrvc)
 }
@@ -554,16 +550,13 @@ func TestCreateSyncService(t *testing.T) {
 
 	ver := builder.createBlockVerifier(stateSrvc)
 
-	dh, err := builder.createDigestHandler(stateSrvc)
-	require.NoError(t, err)
-
 	networkService, err := network.NewService(&network.Config{
 		BlockState: stateSrvc.Block,
 		BasePath:   config.BasePath,
 	})
 	require.NoError(t, err)
 
-	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, networkService, dh)
+	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, networkService)
 	require.NoError(t, err)
 
 	_, err = builder.newSyncService(config, stateSrvc, &grandpa.Service{}, ver, coreSrvc, networkService, nil)
@@ -615,10 +608,7 @@ func TestCreateRPCService(t *testing.T) {
 	err = builder.loadRuntime(config, ns, stateSrvc, ks, networkSrvc)
 	require.NoError(t, err)
 
-	dh, err := builder.createDigestHandler(stateSrvc)
-	require.NoError(t, err)
-
-	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, networkSrvc, dh)
+	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, networkSrvc)
 	require.NoError(t, err)
 
 	systemInfo := &types.SystemInfo{
@@ -665,10 +655,7 @@ func TestCreateBABEService_Integration(t *testing.T) {
 	err = builder.loadRuntime(config, ns, stateSrvc, ks, &network.Service{})
 	require.NoError(t, err)
 
-	dh, err := builder.createDigestHandler(stateSrvc)
-	require.NoError(t, err)
-
-	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, &network.Service{}, dh)
+	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, &network.Service{})
 	require.NoError(t, err)
 
 	bs, err := builder.createBABEService(config, stateSrvc, ks.Babe, coreSrvc, nil)
@@ -774,10 +761,7 @@ func TestNewWebSocketServer(t *testing.T) {
 	err = builder.loadRuntime(config, ns, stateSrvc, ks, networkSrvc)
 	require.NoError(t, err)
 
-	dh, err := builder.createDigestHandler(stateSrvc)
-	require.NoError(t, err)
-
-	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, networkSrvc, dh)
+	coreSrvc, err := builder.createCoreService(config, ks, stateSrvc, networkSrvc)
 	require.NoError(t, err)
 
 	systemInfo := &types.SystemInfo{
diff --git a/dot/utils_test.go b/dot/utils_test.go
index 43e344b4cd..260615dfa3 100644
--- a/dot/utils_test.go
+++ b/dot/utils_test.go
@@ -31,7 +31,7 @@ func TestCreateJSONRawFile(t *testing.T) {
 			name: "working_example",
 			args: args{
 				bs: &BuildSpec{genesis: NewTestGenesis(t)},
-				fp: filepath.Join(t.TempDir(), "/test.json"),
+				fp: filepath.Join(t.TempDir(), "test.json"),
 			},
 			expectedHash: "f7f1b82c0ba16b20e36bfb462d7899af2c76728918f639f5c5ef0e91ff3e7077",
 		},
diff --git a/internal/pprof/server_test.go b/internal/pprof/server_test.go
index 5b809867e6..e9b92603fe 100644
--- a/internal/pprof/server_test.go
+++ b/internal/pprof/server_test.go
@@ -71,7 +71,7 @@ func Test_Server(t *testing.T) {
 	for _, pathToCheck := range pathsToCheck {
 		url := "http://" + serverAddress + "/" + pathToCheck
 
-		request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+		request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, http.NoBody)
 		require.NoError(t, err)
 
 		go func(client *http.Client, request *http.Request, results chan<- httpResult) {
diff --git a/lib/babe/verify_test.go b/lib/babe/verify_test.go
index 7e246d01ae..2fcf9695b3 100644
--- a/lib/babe/verify_test.go
+++ b/lib/babe/verify_test.go
@@ -231,8 +231,6 @@ func Test_verifier_verifyPrimarySlotWinner(t *testing.T) {
 	}
 
 	mockSlotState := NewMockSlotState(nil)
-	v := newVerifier(mockBlockState, mockSlotState, 1, vi, time.Second)
-	v1 := newVerifier(mockBlockState, mockSlotState, 1, vi1, time.Second)
 
 	output, proof, err := kp.VrfSign(makeTranscript(Randomness{}, uint64(1), 1))
 	assert.NoError(t, err)
@@ -252,7 +250,7 @@ func Test_verifier_verifyPrimarySlotWinner(t *testing.T) {
 	}{
 		{
 			name:     "Over threshold",
-			verifier: *v,
+			verifier: *newVerifier(mockBlockState, mockSlotState, 1, vi, time.Second),
 			args: args{
 				slot:      1,
 				vrfOutput: [32]byte{},
@@ -262,7 +260,7 @@ func Test_verifier_verifyPrimarySlotWinner(t *testing.T) {
 		},
 		{
 			name:     "VRF not verified",
-			verifier: *v1,
+			verifier: *newVerifier(mockBlockState, mockSlotState, 1, vi1, time.Second),
 			args: args{
 				slot:      1,
 				vrfOutput: [32]byte{},
@@ -271,7 +269,7 @@ func Test_verifier_verifyPrimarySlotWinner(t *testing.T) {
 		},
 		{
 			name:     "VRF verified",
-			verifier: *v1,
+			verifier: *newVerifier(mockBlockState, mockSlotState, 1, vi1, time.Second),
 			args: args{
 				slot:      1,
 				vrfOutput: output,
@@ -281,9 +279,10 @@ func Test_verifier_verifyPrimarySlotWinner(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			b := &tt.verifier
-			res, err := b.verifyPrimarySlotWinner(tt.args.authorityIndex, tt.args.slot, tt.args.vrfOutput, tt.args.vrfProof)
+			res, err := tt.verifier.verifyPrimarySlotWinner(tt.args.authorityIndex, tt.args.slot,
+				tt.args.vrfOutput, tt.args.vrfProof)
 			if tt.expErr != nil {
 				assert.EqualError(t, err, tt.expErr.Error())
 			} else {
@@ -363,9 +362,6 @@ func Test_verifier_verifyPreRuntimeDigest(t *testing.T) {
 		secondarySlots: true,
 	}
 
-	vVRFSec := newVerifier(mockBlockState, mockSlotState, 1, viVRFSec, testSlotDuration)
-	vVRFSec2 := newVerifier(mockBlockState, mockSlotState, 1, viVRFSec2, testSlotDuration)
-
 	//BabeSecondaryPlainPreDigest case
 	secDigest := types.BabeSecondaryPlainPreDigest{AuthorityIndex: 0, SlotNumber: uint64(1)}
 	prd, err := secDigest.ToPreRuntimeDigest()
@@ -383,9 +379,6 @@ func Test_verifier_verifyPreRuntimeDigest(t *testing.T) {
 		secondarySlots: true,
 	}
 
-	vSec := newVerifier(mockBlockState, mockSlotState, 1, viSec, testSlotDuration)
-	vSec2 := newVerifier(mockBlockState, mockSlotState, 1, viSec2, testSlotDuration)
-
 	type args struct {
 		digest *types.PreRuntimeDigest
 	}
@@ -433,33 +426,33 @@ func Test_verifier_verifyPreRuntimeDigest(t *testing.T) {
 		},
 		{
 			name:     "BabeSecondaryPlainPreDigest SecondarySlot false",
-			verifier: *vSec,
+			verifier: *newVerifier(mockBlockState, mockSlotState, 1, viSec, testSlotDuration),
 			args:     args{prd},
 			expErr:   ErrBadSlotClaim,
 		},
 		{
 			name:     "BabeSecondaryPlainPreDigest invalid claim",
-			verifier: *vSec2,
+			verifier: *newVerifier(mockBlockState, mockSlotState, 1, viSec2, testSlotDuration),
 			args:     args{prd},
 			expErr:   errors.New("invalid secondary slot claim"),
 		},
 		{
 			name:     "BabeSecondaryVRFPreDigest SecondarySlot false",
-			verifier: *vVRFSec,
+			verifier: *newVerifier(mockBlockState, mockSlotState, 1, viVRFSec, testSlotDuration),
 			args:     args{babePRD},
 			expErr:   ErrBadSlotClaim,
 		},
 		{
 			name:     "BabeSecondaryVRFPreDigest invalid claim",
-			verifier: *vVRFSec2,
+			verifier: *newVerifier(mockBlockState, mockSlotState, 1, viVRFSec2, testSlotDuration),
 			args:     args{babePRD},
 			expErr:   errors.New("invalid secondary slot claim"),
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			b := &tt.verifier
-			res, err := b.verifyPreRuntimeDigest(tt.args.digest)
+			res, err := tt.verifier.verifyPreRuntimeDigest(tt.args.digest)
 			if tt.expErr != nil {
 				assert.EqualError(t, err, tt.expErr.Error())
 			} else {
@@ -668,9 +661,9 @@ func Test_verifier_verifyAuthorshipRight(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			b := &tt.verifier
-			err := b.verifyAuthorshipRight(tt.header)
+			err := tt.verifier.verifyAuthorshipRight(tt.header)
 			if tt.expErr != nil {
 				assert.EqualError(t, err, tt.expErr.Error())
 			} else {