diff --git a/operator/duties/attester_test.go b/operator/duties/attester_test.go
index cbdc497757..6ad3274410 100644
--- a/operator/duties/attester_test.go
+++ b/operator/duties/attester_test.go
@@ -14,6 +14,8 @@ import (
 	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"github.com/ssvlabs/ssv/operator/duties/dutystore"
 	"github.com/ssvlabs/ssv/operator/duties/mocks"
+	"github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon"
+	"github.com/ssvlabs/ssv/protocol/v2/types"
 )
 
 func setupAttesterDutiesMock(s *Scheduler, dutiesMap *hashmap.Map[phase0.Epoch, []*eth2apiv1.AttesterDuty]) (chan struct{}, chan []*spectypes.BeaconDuty) {
@@ -27,7 +29,7 @@ func setupAttesterDutiesMock(s *Scheduler, dutiesMap *hashmap.Map[phase0.Epoch,
 			return duties, nil
 		}).AnyTimes()
 
-	getIndices := func(epoch phase0.Epoch) []phase0.ValidatorIndex {
+	getIndices := func(epoch phase0.Epoch) []*types.SSVShare {
 		uniqueIndices := make(map[phase0.ValidatorIndex]bool)
 
 		duties, _ := dutiesMap.Get(epoch)
@@ -35,12 +37,15 @@ func setupAttesterDutiesMock(s *Scheduler, dutiesMap *hashmap.Map[phase0.Epoch,
 			uniqueIndices[d.ValidatorIndex] = true
 		}
 
-		indices := make([]phase0.ValidatorIndex, 0, len(uniqueIndices))
+		shares := make([]*types.SSVShare, 0, len(uniqueIndices))
 		for index := range uniqueIndices {
-			indices = append(indices, index)
+			share := &types.SSVShare{
+				Metadata: types.Metadata{BeaconMetadata: &beacon.ValidatorMetadata{Index: index}},
+			}
+			shares = append(shares, share)
 		}
 
-		return indices
+		return shares
 	}
 	s.ValidatorProvider.(*mocks.MockValidatorProvider).EXPECT().SelfParticipatingValidators(gomock.Any()).DoAndReturn(getIndices).AnyTimes()
 	s.ValidatorProvider.(*mocks.MockValidatorProvider).EXPECT().ParticipatingValidators(gomock.Any()).DoAndReturn(getIndices).AnyTimes()
@@ -69,7 +74,7 @@ func TestScheduler_Attester_Same_Slot(t *testing.T) {
 	scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, handler, currentSlot)
 	fetchDutiesCall, executeDutiesCall := setupAttesterDutiesMock(scheduler, dutiesMap)
 	startFn()
-
+	handler.fetchCurrentEpoch = true
 	dutiesMap.Set(phase0.Epoch(0), []*eth2apiv1.AttesterDuty{
 		{
 			PubKey:         phase0.BLSPubKey{1, 2, 3},
@@ -106,7 +111,7 @@ func TestScheduler_Attester_Diff_Slots(t *testing.T) {
 	scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, handler, currentSlot)
 	fetchDutiesCall, executeDutiesCall := setupAttesterDutiesMock(scheduler, dutiesMap)
 	startFn()
-
+	handler.fetchCurrentEpoch = true
 	dutiesMap.Set(phase0.Epoch(0), []*eth2apiv1.AttesterDuty{
 		{
 			PubKey:         phase0.BLSPubKey{1, 2, 3},
diff --git a/operator/duties/scheduler.go b/operator/duties/scheduler.go
index e11e04a289..5a503f893c 100644
--- a/operator/duties/scheduler.go
+++ b/operator/duties/scheduler.go
@@ -16,9 +16,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prysmaticlabs/prysm/v4/async/event"
 	"github.com/sourcegraph/conc/pool"
-	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"go.uber.org/zap"
 
+	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"github.com/ssvlabs/ssv/beacon/goclient"
 	"github.com/ssvlabs/ssv/logging"
 	"github.com/ssvlabs/ssv/logging/fields"
diff --git a/operator/duties/sync_committee_test.go b/operator/duties/sync_committee_test.go
index dfaec39cd7..5722730979 100644
--- a/operator/duties/sync_committee_test.go
+++ b/operator/duties/sync_committee_test.go
@@ -8,10 +8,10 @@ import (
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/cornelk/hashmap"
-	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 
+	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"github.com/ssvlabs/ssv/operator/duties/dutystore"
 	"github.com/ssvlabs/ssv/operator/duties/mocks"
 	mocknetwork "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon/mocks"
@@ -73,7 +73,7 @@ func setupSyncCommitteeDutiesMock(s *Scheduler, dutiesMap *hashmap.Map[uint64, [
 		return indices
 	}
 
-	getDutiesBool := func(epoch phase0.Epoch, wait bool) []phase0.ValidatorIndex {
+	getDutiesBool := func(epoch phase0.Epoch) []phase0.ValidatorIndex {
 		return getDuties(epoch)
 	}