diff --git a/feature-utils/poly-import/utils/zipfile-mock.js b/feature-utils/poly-import/utils/zipfile-mock.js
index 1db2411d63..cd7ef61681 100644
--- a/feature-utils/poly-import/utils/zipfile-mock.js
+++ b/feature-utils/poly-import/utils/zipfile-mock.js
@@ -33,12 +33,18 @@ export class ZipFileEntryMock {
 }
 
 export class ZipFileMock {
-    constructor() {
+    constructor(
+        dataFilePairs = [["foo.json", { foo: "bar" }]],
+        name = "facebook-facebookuser.zip"
+    ) {
         this.id = "polypod://de71f571-d90a-45e0-b007-d8f059e0541b";
         this.time = new Date("2021-09-20T16:37:36.243Z");
-        this.name = "facebook-facebookuser.zip";
+        this.name = name;
         this.size = MINIMUM_FILE_SIZE;
         this._entriesPathHash = new Map();
+        dataFilePairs.forEach(([path, dataset]) =>
+            this.addJsonEntry(path, dataset)
+        );
     }
 
     async getEntries() {
diff --git a/features/facebookImport/test/ministory/json-file-names-analysis.test.js b/features/facebookImport/test/ministory/json-file-names-analysis.test.js
index e738751cad..26b4065dd7 100644
--- a/features/facebookImport/test/ministory/json-file-names-analysis.test.js
+++ b/features/facebookImport/test/ministory/json-file-names-analysis.test.js
@@ -11,12 +11,13 @@ const commonJsonFiles = commonStructure
     });
 
 async function analyzeZipWithFiles(files) {
-    const zipFile = new ZipFileMock();
+    const dataFilePairs = [];
     if (files.length > 0) {
         files.forEach((jsonPath) => {
-            zipFile.addJsonEntry(jsonPath, { foo: "bar" });
+            dataFilePairs.push([jsonPath, { foo: "bar" }]);
         });
     }
+    const zipFile = new ZipFileMock(dataFilePairs);
     const { analysisResult } = await runAnalysisForExport(
         JSONFileNamesAnalysis,
         zipFile
diff --git a/features/facebookImport/test/ministory/report-metadata.test.js b/features/facebookImport/test/ministory/report-metadata.test.js
index 6f56887f05..f82f9489f4 100644
--- a/features/facebookImport/test/ministory/report-metadata.test.js
+++ b/features/facebookImport/test/ministory/report-metadata.test.js
@@ -7,13 +7,12 @@ import ReportMetadataReport from "../../src/views/ministories/reportMetadata";
 import { createInteractedWithAdvertisersDataset } from "../datasets/interacted-with-advertisers-data";
 import { createLanguageSettingsData } from "../datasets/language-and-locale-data";
 import { createOffFacebookEventsSimpleData } from "../datasets/off-facebook-events-data";
-import { MINIMUM_FILE_SIZE } from "@polypoly-eu/poly-import";
+import { MINIMUM_FILE_SIZE, ZipFileMock } from "@polypoly-eu/poly-import";
 import { runAnalysisForExport } from "../utils/analyses-execution";
 import {
     expectActiveAnalysis,
     expectAnalysisSuccessStatus,
 } from "../utils/analysis-assertions";
-import { createMockedZip } from "../utils/data-creation";
 
 describe("Report metadata analysis", () => {
     const preferedLanguage = {
@@ -26,7 +25,7 @@ describe("Report metadata analysis", () => {
     let jsonReport = null;
 
     beforeAll(async () => {
-        const zipFile = createMockedZip([
+        const zipFile = new ZipFileMock([
             [
                 OFF_FACEBOOK_EVENTS_FILE_PATH,
                 createOffFacebookEventsSimpleData(),
diff --git a/features/facebookImport/test/utils/data-creation.js b/features/facebookImport/test/utils/data-creation.js
index df4b12e9c6..76cb79b90f 100644
--- a/features/facebookImport/test/utils/data-creation.js
+++ b/features/facebookImport/test/utils/data-creation.js
@@ -1,9 +1,7 @@
 import { ZipFileMock } from "@polypoly-eu/poly-import";
 
 export function createMockedZip(datasets) {
-    let zipFile = new ZipFileMock();
-    datasets.forEach(([path, dataset]) => zipFile.addJsonEntry(path, dataset));
-    return zipFile;
+    return new ZipFileMock(datasets);
 }
 
 export function zipWithWrongDatasetKey(filePath) {