diff --git a/test/Batch.spec.ts b/test/Batch.spec.ts
index 04b1d8c..2fe3087 100644
--- a/test/Batch.spec.ts
+++ b/test/Batch.spec.ts
@@ -182,7 +182,7 @@ describe("getCsvOrder", function () {
     expect(csvOrder.recipientMapping).toEqual(mapping.recipient);
     expect(csvOrder.templateId).toEqual(template.id);
     expect(csvOrder.mergeVariableMapping).toEqual(mapping.mergeVariables);
-    expect(csvOrder.billingId).toEqual(undefined);
+    expect(csvOrder.billingId).toBeOneOf([undefined, expect.any(String)]);
     expect(csvOrder.finish).toEqual(expect.any(String));
     expect(csvOrder.format).toEqual(expect.any(String));
     expect(csvOrder.isBillable).toEqual(expect.any(Boolean));
diff --git a/test/PrintOne.spec.ts b/test/PrintOne.spec.ts
index e273550..78fe30c 100644
--- a/test/PrintOne.spec.ts
+++ b/test/PrintOne.spec.ts
@@ -670,11 +670,11 @@ describe("createCsvOrder", function () {
   let file: ArrayBuffer = null as unknown as ArrayBuffer;
   const mapping: CreateCsvOrder["mapping"] = {
     recipient: {
-      city: "{{City}}",
       name: "{{FirstName}} {{LastName}}",
       address: "{{Street}} {{HouseNr}}",
-      country: "{{Country}}",
       postalCode: "{{ZIP}}",
+      city: "{{City}}",
+      country: "{{Country}}",
     },
   };
 
@@ -721,7 +721,7 @@ describe("createCsvOrder", function () {
     expect(csvOrder.recipientMapping).toEqual(mapping.recipient);
     expect(csvOrder.templateId).toEqual(template.id);
     expect(csvOrder.mergeVariableMapping).toEqual(mapping.mergeVariables);
-    expect(csvOrder.billingId).toEqual(undefined);
+    expect(csvOrder.billingId).toBeOneOf([undefined, expect.any(String)]);
     expect(csvOrder.finish).toEqual(expect.any(String));
     expect(csvOrder.format).toEqual(expect.any(String));
     expect(csvOrder.isBillable).toEqual(expect.any(Boolean));
@@ -845,7 +845,7 @@ describe("getCsvOrder", function () {
     expect(csvOrder.recipientMapping).toEqual(mapping.recipient);
     expect(csvOrder.templateId).toEqual(template.id);
     expect(csvOrder.mergeVariableMapping).toEqual(mapping.mergeVariables);
-    expect(csvOrder.billingId).toEqual(undefined);
+    expect(csvOrder.billingId).toBeOneOf([undefined, expect.any(String)]);
     expect(csvOrder.finish).toEqual(expect.any(String));
     expect(csvOrder.format).toEqual(expect.any(String));
     expect(csvOrder.isBillable).toEqual(expect.any(Boolean));