diff --git a/pkg/items/dummy.go b/pkg/items/dummy.go
index 29b2f59357b45febd23c59fb248877e0886f5bbc..206a0802b079efc08741dd54513a29d69f4c28a6 100644
--- a/pkg/items/dummy.go
+++ b/pkg/items/dummy.go
@@ -18,17 +18,21 @@ func (d *Dummy) Find(_ context.Context, _, _, _ string, _ *Filter, _ ...*FindOpt
 	return d.FindResult.Items, d.FindResult.Total, d.FindResult.Error
 }
 
-type DummyWithOptions struct {
-	Items
+type StubFindResult struct {
 	Total int
 }
 
-func (d *DummyWithOptions) Find(_ context.Context, _, _, _ string, _ *Filter, opts ...*FindOptions) ([]*Item, int, error) {
+type Stub struct {
+	Items
+	FindResult *StubFindResult
+}
+
+func (d *Stub) Find(_ context.Context, _, _, _ string, _ *Filter, opts ...*FindOptions) ([]*Item, int, error) {
 	fo := MergeFindOptions(opts...)
-	return make([]*Item, fo.Limit), d.Total, nil
+	return make([]*Item, fo.Limit), d.FindResult.Total, nil
 }
 
-func (d *DummyWithOptions) FindPublished(_ context.Context, _, _, _ string, _ *Filter, opts ...*FindPublishedOptions) ([]*Item, int, error) {
+func (d *Stub) FindPublished(_ context.Context, _, _, _ string, _ *Filter, opts ...*FindPublishedOptions) ([]*Item, int, error) {
 	fo := MergeFindPublishedOptions(opts...)
-	return make([]*Item, fo.Limit), d.Total, nil
+	return make([]*Item, fo.Limit), d.FindResult.Total, nil
 }
diff --git a/pkg/items/pagination_test.go b/pkg/items/pagination_test.go
index 6f36fc6d1cd7c4f9568cd68df1f81d2b7303ddcc..c401b21f244325c9c242682c702284d197846677 100644
--- a/pkg/items/pagination_test.go
+++ b/pkg/items/pagination_test.go
@@ -35,7 +35,7 @@ func TestBatchProcessor(t *testing.T) {
 	})
 
 	t.Run("With FindOptions", func(t *testing.T) {
-		itemssvc := &DummyWithOptions{Items: nil, Total: 1000}
+		itemssvc := &Stub{FindResult: &StubFindResult{Total: 1000}}
 		b := &BatchProcessor{
 			Items:        itemssvc,
 			SpaceID:      "sp",
@@ -51,13 +51,13 @@ func TestBatchProcessor(t *testing.T) {
 	})
 
 	t.Run("With FindPublishedOptions", func(t *testing.T) {
-		itemssvc := &DummyWithOptions{Items: nil, Total: 60}
+		itemssvc := &Stub{FindResult: &StubFindResult{Total: 60}}
 		b := &BatchProcessor{
-			Items:        itemssvc,
-			SpaceID:      "sp",
-			EnvID:        environments.DefaultEnvironment,
-			CollectionID: "col",
-			FindPublishedOptions:  &FindPublishedOptions{FindOptions: *options.New(0, 20)},
+			Items:                itemssvc,
+			SpaceID:              "sp",
+			EnvID:                environments.DefaultEnvironment,
+			CollectionID:         "col",
+			FindPublishedOptions: &FindPublishedOptions{FindOptions: *options.New(0, 20)},
 		}
 
 		var counter int