diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 83058c6..4f31399 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,6 +17,7 @@ jobs:
   release:
     name: Update documentation
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v3
       - uses: spenserblack/actions-wiki@v0.3.0
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 97323c7..e3bb098 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,6 +11,7 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fb42b71..8fa34ba 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,12 +1,5 @@
 name: Test
 on:
-  push:
-    branches:
-      - main
-      - next
-    paths-ignore:
-      - "docs/**"
-      - "**/*.md"
   pull_request:
     paths-ignore:
       - "docs/**"
@@ -16,6 +9,7 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/docs/Batch.md b/docs/Batch.md
new file mode 100644
index 0000000..c91d313
--- /dev/null
+++ b/docs/Batch.md
@@ -0,0 +1,223 @@
+Contains all information about a given Batch
+
+# Fields
+
+| Name             | Type                    | Description                                                                                                                                                                   |
+| ---------------- | ----------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `id`             | `string`                | The ID of the batch.                                                                                                                                                          |
+| `companyId`      | `string`                | The ID of the company the batch belongs to.                                                                                                                                   |
+| `Name`           | `string`                | The name of the batch.                                                                                                                                                        |
+| `billingId`      | `string` \| `undefined` | The ID assigned to the batch by the customer.                                                                                                                                 |
+| `finish`         | `string`                | The finish of the batch. Can be `GLOSSY` or `MATT`.                                                                                                                           |
+| `isBillable`     | `boolean`               | Whether the batch is billable. True when an live API key is used, false when a test API key is used.                                                                          |
+| `templateId`     | `string`                | The ID of the template the batch is based on.                                                                                                                                 |
+| `estimatedPrice` | `number`                | The estimated price of the batch.                                                                                                                                             |
+| `status`         | `string`                | The status of the batch. Can be `batch_created`, `batch_needs_approval`, `batch_user_ready`, `batch_ready_to_schedule`, `batch_scheduling`, `batch_scheduled` or `batch_sent` |
+| `orders`         | `object`                | An object containing the orders of the batch. With keys 'processing', 'success', 'failed' and 'cancelled'                                                                     |
+| `createdAt`      | `string`                | The date the batch was created.                                                                                                                                               |
+| `updatedAt`      | `string`                | The date the batch was last updated.                                                                                                                                          |
+
+# Methods
+
+## `.getTemplate()`
+
+Get the template the batch is based on. Uses [`PrintOne.getTemplate()`](./PrintOne#gettemplateid).
+
+**Returns: [`Promise<Template>`](./Template)**
+
+**Example**
+
+```js
+const batch = await client.getbatch("example-batch-id");
+const template = await batch.getTemplate();
+```
+
+---
+
+## `.refresh()`
+
+Refresh the batch data to get the latest information
+
+**Returns: `Promise<void>`**
+
+**Example**
+
+```js
+const batch: Batch;
+await batch.refresh();
+```
+
+---
+
+## [`.getOrders([options])`](./PrintOne#getordersoptions)
+
+Get all orders in the batch.
+
+**Parameters**
+
+| Name                            | Type                          | Default          | Description                                                                                                                        |
+| ------------------------------- | ----------------------------- | ---------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
+| `options.limit`                 | `number`                      | `10`             | The maximum number of batchs to return.                                                                                            |
+| `options.page`                  | `number`                      | `1`              | The page of batchs to return.                                                                                                      |
+| `options.sortBy`                | [`sort`](./Filtering#Sorting) | `createdAt:DESC` | The field(s) to sort the batchs by. Can be `createdAt`, `anonymizedAt`, `updatedAt`, `friendlyStatus` or `sendDate`                |
+| `options.filter.friendlyStatus` | `string` \| `string[]`        | `undefined`      | The friendly status(es) of the batch(s) to filter by. Can be `Processing`, `Success`, `Sent`, `Scheduled`, `Cancelled` or `Failed` |
+| `options.filter.billingId`      | `string` \| `string[]`        | `undefined`      | The billing ID(s) of the batch(s) to filter by.                                                                                    |
+| `options.filter.format`         | `string` \| `string[]`        | `undefined`      | The format(s) of the batch(s) to filter by. Can be `POSTCARD_A5`, `POSTCARD_A6`, `POSTCARD_SQ14` or `GREETINGCARD_SQ15`            |
+| `options.filter.finish`         | `string` \| `string[]`        | `undefined`      | The finish(es) of the batch(s) to filter by. Can be `GLOSSY` or `MATTE`                                                            |
+| `options.filter.isBillable`     | `boolean`                     | `undefined`      | Whether the batch(s) are live batch or test batchs.                                                                                |
+| `options.filter.createdAt`      | [`date`](./Filtering#Date)    | `undefined`      | The date(s) the batch(s) were created on.                                                                                          |
+
+**Returns: [`Promise<PaginatedResponse<Order>>`](./Order)**
+
+**Example**
+
+```js
+const orders = await batch.getOrders({
+  limit: 20,
+  page: 1,
+  sortBy: "createdAt:ASC",
+  filter: {
+    friendlyStatus: "Success",
+    format: Format.POSTCARD_A5,
+    finish: Finish.GLOSSY,
+    isBillable: true,
+    createdAt: {
+      from: "2020-01-01",
+      to: "2020-01-31",
+    },
+  },
+});
+```
+
+---
+
+## [`.getOrder(orderId)`](./PrintOne#getorderorderid)
+
+Get a specific order in the batch.
+
+**Parameters**
+
+| Name      | Type     | Description          |
+| --------- | -------- | -------------------- |
+| `orderId` | `string` | The ID of the order. |
+
+**Returns: [`Promise<Order>`](./Order)**
+
+**Example**
+
+```js
+const order = await batch.getOrder("example-order-id");
+```
+
+---
+
+## `.createOrder(data)`
+
+Create a new order in the batch.
+
+**Parameters**
+
+| Name             | Type                         | Description                       |
+| ---------------- | ---------------------------- | --------------------------------- |
+| `data.recipient` | [`Address`](./Order#Address) | The recipient of the order.       |
+| `mergeVariables` | `object`                     | The merge variables of the order. |
+
+**Returns: [`Promise<Order>`](./Order)**
+
+**Example**
+
+```js
+const order = await batch.createOrder({
+  recipient: {
+    name: "John Doe",
+    address: "123 Main St",
+    city: "Anytown",
+    postalCode: "1221AH",
+    country: "Nederland",
+  },
+  mergeVariables: {
+    name: "John Doe",
+  },
+});
+```
+
+---
+
+## `.update(data)`
+
+Update the batch.
+
+**Parameters**
+
+| Name         | Type                | Description                                 |
+| ------------ | ------------------- | ------------------------------------------- |
+| `data.ready` | `Date` \| `boolean` | Whether the batch is ready to be scheduled. |
+
+**Returns: `Promise<void>`**
+
+**Example**
+
+```js
+await batch.update({
+  ready: true,
+});
+```
+
+---
+
+## `.createCsvOrder(data)`
+
+Create a new csv order.
+
+**Parameters**
+
+| Name   | Type     | Description                                                                                       |
+| ------ | -------- | ------------------------------------------------------------------------------------------------- |
+| `data` | `object` | The data to create the order with. See [`CsvOrder`](./CsvOrder#createcsvorderdata) for more info. |
+
+**Returns: [`Promise<CsvOrder>`](./CsvOrder)**
+
+**Example**
+
+```js
+const batch: Batch;
+
+const order = await batch.createCsvOrder({
+  mapping: {
+    recipient: {
+      city: "{{City}}",
+      name: "{{FirstName}} {{LastName}}",
+      address: "{{Street}} {{HouseNr}}",
+      country: "{{Country}}",
+      postalCode: "{{ZIP}}",
+    },
+    mergeVariables: {
+      name: "{{FirstName}}",
+      coupon: "{{Coupon}}",
+    },
+  },
+  file: file,
+});
+```
+
+---
+
+## `.getCsvOrder(id)`
+
+Get a csv order by its ID.
+
+**Parameters**
+
+| Name | Type     | Description                     |
+| ---- | -------- | ------------------------------- |
+| `id` | `string` | The ID of the csv order to get. |
+
+**Returns: [`Promise<CsvOrder>`](./CsvOrder)**
+
+**Example**
+
+```js
+const batch: Batch;
+
+const csvOrder = await batch.getCsvOrder("example-order-id");
+```
diff --git a/jest.config.js b/jest.config.js
index 5bde419..20fd4bb 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -31,4 +31,5 @@ module.exports = {
       statements: 100,
     },
   },
+  testSequencer: "./testSequencer.js",
 };
diff --git a/package-lock.json b/package-lock.json
index d3578ce..2308cce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,8 @@
       "version": "1.2.1",
       "license": "MIT",
       "dependencies": {
-        "axios": "^1.6.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "axios": "^1.6.7",
         "debug": "^4.3.4"
       },
       "devDependencies": {
@@ -26,14 +27,14 @@
         "@typescript-eslint/parser": "^6.18.1",
         "@under_koen/bsm": "^1.3.3",
         "eslint": "^8.52.0",
-        "eslint-config-prettier": "^9.0.0",
+        "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-no-relative-import-paths": "^1.5.3",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-sort-keys-fix": "^1.1.2",
         "eslint-plugin-unused-imports": "^3.0.0",
         "jest": "^29.7.0",
         "jest-extended": "^4.0.2",
-        "prettier": "^3.0.3",
+        "prettier": "^3.2.4",
         "prettier-package-json": "^2.8.0",
         "rimraf": "^5.0.5",
         "semantic-release": "^22.0.6",
@@ -68,7 +69,6 @@
       "version": "7.22.13",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
       "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
-      "dev": true,
       "dependencies": {
         "@babel/highlight": "^7.22.13",
         "chalk": "^2.4.2"
@@ -81,7 +81,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -93,7 +92,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -107,7 +105,6 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -115,14 +112,12 @@
     "node_modules/@babel/code-frame/node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
     "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -131,7 +126,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -140,7 +134,6 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -362,7 +355,6 @@
       "version": "7.22.20",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
       "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -394,7 +386,6 @@
       "version": "7.22.20",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
       "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
@@ -408,7 +399,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -420,7 +410,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -434,7 +423,6 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -442,14 +430,12 @@
     "node_modules/@babel/highlight/node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
     "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -458,7 +444,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -467,7 +452,6 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -1044,7 +1028,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
       "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -1061,7 +1044,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1277,7 +1259,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
       "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "dev": true,
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
       },
@@ -1303,7 +1284,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
       "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
-      "dev": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -1318,7 +1298,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
       "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
-      "dev": true,
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
@@ -1333,7 +1312,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1377,7 +1355,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
       "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -2206,8 +2183,7 @@
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
     },
     "node_modules/@sindresorhus/is": {
       "version": "3.1.2",
@@ -2305,7 +2281,6 @@
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
       "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
-      "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -2313,14 +2288,12 @@
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
-      "dev": true
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
       "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
-      "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
@@ -2329,7 +2302,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
       "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
-      "dev": true,
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
@@ -2360,7 +2332,6 @@
       "version": "20.9.0",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz",
       "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==",
-      "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -2392,14 +2363,12 @@
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
-      "dev": true
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
     },
     "node_modules/@types/yargs": {
       "version": "17.0.31",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.31.tgz",
       "integrity": "sha512-bocYSx4DI8TmdlvxqGpVNXOgCNR1Jj0gNPhhAY+iz1rgKDAaYrAYdFYnhDV1IFuiuVc9HkOwyDcFxaTElF3/wg==",
-      "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
@@ -2407,8 +2376,7 @@
     "node_modules/@types/yargs-parser": {
       "version": "21.0.3",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
-      "dev": true
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "6.21.0",
@@ -2770,7 +2738,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -2791,7 +2758,6 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -3008,7 +2974,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -3064,7 +3029,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dev": true,
       "dependencies": {
         "node-int64": "^0.4.0"
       }
@@ -3130,7 +3094,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -3155,7 +3118,6 @@
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
       "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -3220,14 +3182,12 @@
     "node_modules/collect-v8-coverage": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-      "dev": true
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
     },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -3238,8 +3198,7 @@
     "node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
@@ -3702,9 +3661,9 @@
       }
     },
     "node_modules/eslint-config-prettier": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz",
-      "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
       "dev": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
@@ -4039,7 +3998,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
       "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-      "dev": true,
       "dependencies": {
         "bser": "2.1.1"
       }
@@ -4075,7 +4033,6 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -4254,7 +4211,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -4427,8 +4383,7 @@
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
@@ -4461,7 +4416,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -4748,7 +4702,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
       "engines": {
         "node": ">=0.12.0"
       }
@@ -5287,7 +5240,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
       "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/graceful-fs": "^4.1.3",
@@ -5340,7 +5292,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
       "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
-      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
         "@jest/types": "^29.6.3",
@@ -5360,7 +5311,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -5400,7 +5350,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
       "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
-      "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -5565,7 +5514,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
       "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -5657,7 +5605,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
       "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
-      "dev": true,
       "dependencies": {
         "@types/node": "*",
         "jest-util": "^29.7.0",
@@ -5672,7 +5619,6 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -5686,8 +5632,7 @@
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -5963,7 +5908,6 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
       "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dev": true,
       "dependencies": {
         "tmpl": "1.0.5"
       }
@@ -6027,8 +5971,7 @@
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
     "node_modules/merge2": {
       "version": "1.4.1",
@@ -6043,7 +5986,6 @@
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
       "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
       "dependencies": {
         "braces": "^3.0.2",
         "picomatch": "^2.3.1"
@@ -6166,8 +6108,7 @@
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
-      "dev": true
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
     },
     "node_modules/node-releases": {
       "version": "2.0.13",
@@ -6194,7 +6135,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9828,7 +9768,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -10008,9 +9947,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
-      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -10046,7 +9985,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -10060,7 +9998,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -10170,8 +10107,7 @@
     "node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/read-pkg": {
       "version": "8.1.0",
@@ -10993,7 +10929,6 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
       "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-      "dev": true,
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -11005,7 +10940,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -11133,7 +11067,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -11246,8 +11179,7 @@
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
@@ -11262,7 +11194,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -11408,8 +11339,7 @@
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
     },
     "node_modules/unicode-emoji-modifier-base": {
       "version": "1.0.0",
@@ -11544,7 +11474,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
       "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dev": true,
       "dependencies": {
         "makeerror": "1.0.12"
       }
diff --git a/package.json b/package.json
index 2c14236..ffd5a55 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
   },
   "types": "lib/index.d.ts",
   "dependencies": {
-    "axios": "^1.6.6",
+    "@jest/test-sequencer": "^29.7.0",
+    "axios": "^1.6.7",
     "debug": "^4.3.4"
   },
   "devDependencies": {
@@ -43,14 +44,14 @@
     "@typescript-eslint/parser": "^6.18.1",
     "@under_koen/bsm": "^1.3.3",
     "eslint": "^8.52.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-no-relative-import-paths": "^1.5.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-sort-keys-fix": "^1.1.2",
     "eslint-plugin-unused-imports": "^3.0.0",
     "jest": "^29.7.0",
     "jest-extended": "^4.0.2",
-    "prettier": "^3.0.3",
+    "prettier": "^3.2.4",
     "prettier-package-json": "^2.8.0",
     "rimraf": "^5.0.5",
     "semantic-release": "^22.0.6",
diff --git a/package.scripts.js b/package.scripts.js
index 6f5f7d7..c67e9e8 100644
--- a/package.scripts.js
+++ b/package.scripts.js
@@ -17,6 +17,7 @@ module.exports = {
     },
     test: {
       $env: "file:.env",
+      _ci: "jest --runInBand --forceExit --detectOpenHandles",
       _default: "jest",
       coverage: "bsm ~ -- --coverage",
     },
diff --git a/src/AxiosHttpHandler.ts b/src/AxiosHttpHandler.ts
index 24f4c65..f1a085c 100644
--- a/src/AxiosHttpHandler.ts
+++ b/src/AxiosHttpHandler.ts
@@ -71,6 +71,7 @@ export class AxiosHTTPHandler extends HttpHandler<
 
   /**
    * Performs a POST request.
+   * @param url The url to perform the request to
    * @param data The data to send with the request
    * @param options The options for the request
    */
@@ -93,6 +94,31 @@ export class AxiosHTTPHandler extends HttpHandler<
     return response.data;
   }
 
+  /**
+   * Performs a PATCH request.
+   * @param url The url to perform the request to
+   * @param data The data to send with the request
+   * @param options The options for the request
+   */
+  public async PATCH<T>(
+    url: string,
+    data: unknown,
+    options: AxiosRequestConfig = {},
+  ): Promise<T> {
+    const response = await this.client.request<T>({
+      method: "PATCH",
+      url: url,
+      data: data,
+      ...options,
+    });
+
+    this.debug(`PATCH ${response.request.path}`);
+
+    this.handleErrors(response);
+
+    return response.data;
+  }
+
   /**
    * Performs a DELETE request.
    * @param url The url to perform the request to
diff --git a/src/HttpHandler.ts b/src/HttpHandler.ts
index 274fb92..dfa7982 100644
--- a/src/HttpHandler.ts
+++ b/src/HttpHandler.ts
@@ -34,6 +34,7 @@ export abstract class HttpHandler<RequestOptions, Response> {
 
   /**
    * Performs a POST request.
+   * @param url The url to perform the request to
    * @param data The data to send with the request
    * @param options The options for the request
    */
@@ -43,6 +44,18 @@ export abstract class HttpHandler<RequestOptions, Response> {
     options?: RequestOptions,
   ): Promise<T>;
 
+  /**
+   * Performs a PATCH request.
+   * @param url The url to perform the request to
+   * @param data The data to send with the request
+   * @param options The options for the request
+   */
+  public abstract PATCH<T>(
+    url: string,
+    data: unknown,
+    options?: RequestOptions,
+  ): Promise<T>;
+
   /**
    * Performs a DELETE request.
    * @param url The url to perform the request to
diff --git a/src/PrintOne.ts b/src/PrintOne.ts
index ee626cd..b0d8636 100644
--- a/src/PrintOne.ts
+++ b/src/PrintOne.ts
@@ -7,9 +7,12 @@ import {
   containsFilterToQuery,
   DateFilter,
   dateFilterToQuery,
+  EqualsFilter,
+  equalsFilterToQuery,
   InFilter,
   inFilterToQuery,
   invertedFilterToQuery,
+  mapInFilter,
   PaginationOptions,
   sortToQuery,
 } from "./utils";
@@ -26,6 +29,10 @@ import { Format } from "./enums/Format";
 import { AxiosHTTPHandler } from "./AxiosHttpHandler";
 import { CreateCsvOrder, CsvOrder } from "./models/CsvOrder";
 import { ICsvOrder } from "./models/_interfaces/ICsvOrder";
+import { Batch, CreateBatch } from "./models/Batch";
+import { IBatch } from "./models/_interfaces/IBatch";
+import { BatchStatus } from "./enums/BatchStatus";
+import { stringify } from "ts-jest";
 
 export type RequestHandler = new (
   token: string,
@@ -65,6 +72,7 @@ export type OrderPaginatedQuery = PaginationOptions<
     createdAt?: DateFilter;
     anonymizedAt?: DateFilter | boolean;
     csvId?: InFilter;
+    batchId?: EqualsFilter;
   };
 };
 
@@ -243,6 +251,7 @@ export class PrintOne {
 
   /**
    * Create an order
+   * @param data The order data
    */
   public async createOrder(data: CreateOrder): Promise<Order> {
     const template = data.templateId ?? data.template;
@@ -318,10 +327,11 @@ export class PrintOne {
   /**
    * Get an order by its id.
    * @param { string } id The id of the order.
+   * @param basePath The basePath to use for this request
    * @throws { PrintOneError } If the order could not be found.
    */
-  public async getOrder(id: string): Promise<Order> {
-    const data = await this.client.GET<IOrder>(`orders/${id}`);
+  public async getOrder(id: string, basePath = "orders"): Promise<Order> {
+    const data = await this.client.GET<IOrder>(`${basePath}/${id}`);
 
     return new Order(this.protected, data);
   }
@@ -333,10 +343,12 @@ export class PrintOne {
    * @param options.page The page to return.
    * @param options.sortBy The fields to sort by, can be "createdAt", "anonymizedAt", "updatedAt", "friendlyStatus", "sendDate".
    * @param options.filter The filters to apply.
+   * @param basePath The basePath to use for this request
    * @throws { PrintOneError } If the order could not be found.
    */
   public async getOrders(
     options: OrderPaginatedQuery = {},
+    basePath = "orders",
   ): Promise<PaginatedResponse<Order>> {
     let params = {
       ...sortToQuery(options),
@@ -346,6 +358,7 @@ export class PrintOne {
       // ...inFilterToQuery("finish", options.filter?.finish),
       ...dateFilterToQuery("createdAt", options.filter?.createdAt),
       ...inFilterToQuery("csvOrderId", options.filter?.csvId),
+      ...equalsFilterToQuery("batchId", options.filter?.batchId),
     };
 
     if (typeof options.filter?.isBillable === "boolean") {
@@ -372,7 +385,7 @@ export class PrintOne {
       };
     }
 
-    const data = await this.client.GET<IPaginatedResponse<IOrder>>("orders", {
+    const data = await this.client.GET<IPaginatedResponse<IOrder>>(basePath, {
       params,
     });
 
@@ -382,4 +395,128 @@ export class PrintOne {
       (data) => new Order(this.protected, data),
     );
   }
+
+  /**
+   * Create a batch
+   * @param data The batch data
+   */
+  public async createBatch(data: CreateBatch): Promise<Batch> {
+    const ready =
+      data.ready instanceof Date ? data.ready.toISOString() : data.ready;
+    const templateId =
+      typeof data.template === "string" ? data.template : data.template.id;
+
+    const response = await this.client.POST<IBatch>("batches", {
+      name: data.name,
+      billingId: data.billingId,
+      templateId: templateId,
+      finish: data.finish,
+      ready: ready ? ready : null,
+    });
+
+    return new Batch(this.protected, response);
+  }
+
+  /**
+   * Get a batch by its id.
+   * @param { string } id The id of the batch.
+   * @throws { PrintOneError } If the batch could not be found.
+   */
+  public async getBatch(id: string): Promise<Batch> {
+    const data = await this.client.GET<IBatch>(`batches/${id}`);
+
+    return new Batch(this.protected, data);
+  }
+
+  /**
+   * Get all batches.
+   * @param { PaginationOptions } options The options to use for pagination
+   * @param options.limit The maximum amount of batches to return.
+   * @param options.page The page to return.
+   * @param options.sortBy The fields to sort by, can be "createdAt", "updatedAt".
+   * @param options.filter The filters to apply.
+   * @throws { PrintOneError } If the batch could not be found.
+   */
+  public async getBatches(
+    options: PaginationOptions<
+      "createdAt" | "updatedAt" | "billingId" | "sendDate" | "name"
+    > & {
+      filter?: {
+        billingId?: InFilter;
+        name?: InFilter;
+        createdAt?: DateFilter;
+        updatedAt?: DateFilter;
+        sendDate?: DateFilter | boolean;
+        finish?: InFilter;
+        templates?: InFilter<string | Template>;
+        format?: InFilter;
+        status?: InFilter<BatchStatus>;
+        isBillable?: boolean;
+      };
+    } = {},
+  ): Promise<PaginatedResponse<Batch>> {
+    let params = {
+      ...sortToQuery(options),
+      ...inFilterToQuery("billingId", options.filter?.billingId),
+      ...inFilterToQuery("name", options.filter?.name),
+      ...dateFilterToQuery("createdAt", options.filter?.createdAt),
+      ...dateFilterToQuery("updatedAt", options.filter?.updatedAt),
+      ...inFilterToQuery("finish", options.filter?.finish),
+      ...inFilterToQuery("format", options.filter?.format),
+      ...inFilterToQuery(
+        "status",
+        mapInFilter(options.filter?.status, (v) => v.toUpperCase()),
+      ),
+    };
+
+    if (typeof options.filter?.isBillable === "boolean") {
+      params = {
+        ...params,
+        "filter.isBillable": `$eq:${options.filter.isBillable}`,
+      };
+    }
+
+    if (options.filter?.templates) {
+      if (!Array.isArray(options.filter.templates)) {
+        options.filter.templates = [options.filter.templates];
+      }
+
+      params = {
+        ...params,
+        ...inFilterToQuery(
+          "templateId",
+          options.filter.templates.map((template) =>
+            typeof template === "string" ? template : template.id,
+          ),
+        ),
+      };
+    }
+
+    if (typeof options.filter?.sendDate === "boolean") {
+      params = {
+        ...params,
+        ...invertedFilterToQuery(
+          "sendDate",
+          options.filter.sendDate,
+          "$null",
+          true,
+        ),
+      };
+    } else {
+      params = {
+        ...params,
+        ...dateFilterToQuery("sendDate", options.filter?.sendDate),
+      };
+    }
+
+    const data = await this.client.GET<IPaginatedResponse<IBatch>>("batches", {
+      params: params,
+    });
+
+    return PaginatedResponse.safe(
+      this.protected,
+      data,
+      (data) => new Batch(this.protected, data),
+    );
+  }
 }
diff --git a/src/enums/BatchStatus.ts b/src/enums/BatchStatus.ts
new file mode 100644
index 0000000..d06d35f
--- /dev/null
+++ b/src/enums/BatchStatus.ts
@@ -0,0 +1,19 @@
+export const BatchStatus: {
+  batch_created: "batch_created";
+  batch_needs_approval: "batch_needs_approval";
+  batch_user_ready: "batch_user_ready";
+  batch_ready_to_schedule: "batch_ready_to_schedule";
+  batch_scheduling: "batch_scheduling";
+  batch_scheduled: "batch_scheduled";
+  batch_sent: "batch_sent";
+} = {
+  batch_created: "batch_created",
+  batch_needs_approval: "batch_needs_approval",
+  batch_user_ready: "batch_user_ready",
+  batch_ready_to_schedule: "batch_ready_to_schedule",
+  batch_scheduling: "batch_scheduling",
+  batch_scheduled: "batch_scheduled",
+  batch_sent: "batch_sent",
+};
+
+export type BatchStatus = (typeof BatchStatus)[keyof typeof BatchStatus];
diff --git a/src/index.ts b/src/index.ts
index e4b366d..911a9a5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -14,6 +14,7 @@ export * from "./models/PaginatedResponse";
 export * from "./models/Preview";
 export * from "./models/PreviewDetails";
 export * from "./models/Template";
+export * from "./models/Batch";
 
 // Enums
 export * from "./enums/CsvStatus";
diff --git a/src/models/Batch.ts b/src/models/Batch.ts
new file mode 100644
index 0000000..bb1434d
--- /dev/null
+++ b/src/models/Batch.ts
@@ -0,0 +1,206 @@
+import { OrderPaginatedQuery, Protected } from "../PrintOne";
+import { IBatch } from "./_interfaces/IBatch";
+import { Finish } from "../enums/Finish";
+import { BatchStatus } from "../enums/BatchStatus";
+import { Template } from "./Template";
+import { PaginatedResponse } from "./PaginatedResponse";
+import { Order } from "./Order";
+import { Address } from "./Address";
+import { IOrder } from "./_interfaces/IOrder";
+import { Format } from "../enums/Format";
+import { CreateBatchCsvOrder, CsvOrder } from "./CsvOrder";
+import { ICsvOrder } from "./_interfaces/ICsvOrder";
+
+export type CreateBatch = {
+  name: string;
+  billingId?: string;
+  template: string | Template;
+  finish: Finish;
+  ready?: Date | boolean;
+};
+
+export type CreateBatchOrder = {
+  recipient: Address;
+  mergeVariables?: Record<string, string>;
+  autoGenNextBatch?: boolean;
+};
+
+export class Batch {
+  private _data: IBatch;
+
+  constructor(
+    private readonly _protected: Protected,
+    _data: IBatch,
+  ) {
+    this._data = _data;
+  }
+
+  public get id(): string {
+    return this._data.id;
+  }
+
+  public get companyId(): string {
+    return this._data.companyId;
+  }
+
+  public get name(): string {
+    return this._data.name;
+  }
+
+  public get billingId(): string | undefined {
+    return this._data.billingId;
+  }
+
+  public get finish(): Finish {
+    return this._data.finish as Finish;
+  }
+
+  public get format(): Format {
+    return this._data.format as Format;
+  }
+
+  public get isBillable(): boolean {
+    return this._data.isBillable;
+  }
+
+  public get templateId(): string {
+    return this._data.templateId;
+  }
+
+  public get estimatedPrice(): number {
+    return this._data.estimatedPrice;
+  }
+
+  public get sendDate(): Date | undefined {
+    return this._data.sendDate ? new Date(this._data.sendDate) : undefined;
+  }
+
+  public get status(): BatchStatus {
+    return this._data.status as BatchStatus;
+  }
+
+  public get orders(): {
+    processing: number;
+    success: number;
+    failed: number;
+    cancelled: number;
+  } {
+    return this._data.orders;
+  }
+
+  public get createdAt(): Date {
+    return new Date(this._data.createdAt);
+  }
+
+  public get updatedAt(): Date {
+    return new Date(this._data.updatedAt);
+  }
+
+  /**
+   * Refreshes the batch data, can be used to poll for status changes.
+   */
+  public async refresh(): Promise<void> {
+    this._data = await this._protected.client.GET<IBatch>(
+      `/batches/${this.id}`,
+    );
+  }
+
+  /**
+   * Get the template of the batch
+   * @throws { PrintOneError } If the template could not be fetched.
+   */
+  public async getTemplate(): Promise<Template> {
+    return this._protected.printOne.getTemplate(this.templateId);
+  }
+
+  /**
+   * Get a single order from the batch
+   */
+  public async getOrder(orderId: string): Promise<Order> {
+    return this._protected.printOne.getOrder(
+      orderId,
+      `batches/${this.id}/orders`,
+    );
+  }
+
+  /**
+   * Get all orders from a csv order
+   */
+  public async getOrders(
+    args: Omit<OrderPaginatedQuery, "filter"> & {
+      filter?: Omit<OrderPaginatedQuery["filter"], "batchId">;
+    } = {},
+  ): Promise<PaginatedResponse<Order>> {
+    return this._protected.printOne.getOrders(
+      args,
+      `batches/${this.id}/orders`,
+    );
+  }
+
+  /**
+   * Create a new order in the batch
+   */
+  public async createOrder(order: CreateBatchOrder): Promise<Order> {
+    const data = await this._protected.client.POST<IOrder>(
+      `/batches/${this.id}/orders`,
+      {
+        recipient: order.recipient,
+        mergeVariables: order.mergeVariables,
+        autoGenNextBatch: order.autoGenNextBatch,
+      },
+    );
+
+    return new Order(this._protected, data);
+  }
+
+  public async createCsvOrder(data: CreateBatchCsvOrder): Promise<CsvOrder> {
+    const formData = new FormData();
+    formData.append(
+      "file",
+      new Blob([data.file], { type: "text/csv" }),
+      "upload.csv",
+    );
+    formData.append("mapping", JSON.stringify(data.mapping));
+
+    const response = await this._protected.client.POST<{ id: string }>(
+      `/batches/${this.id}/orders/csv`,
+      formData,
+      {
+        headers: {
+          "Content-Type": "multipart/form-data",
+        },
+      },
+    );
+
+    const id = response.id;
+    const csvInfo = await this._protected.client.GET<ICsvOrder>(
+      `batches/${this.id}/orders/csv/${id}`,
+    );
+
+    return new CsvOrder(this._protected, csvInfo);
+  }
+
+  /**
+   * Get a csv order by its id.
+   * @param { string } id The id of the csv order.
+   * @param basePath The basePath to use for this request
+   * @throws { PrintOneError } If the order could not be found.
+   */
+  public async getCsvOrder(id: string): Promise<CsvOrder> {
+    return this._protected.printOne.getCsvOrder(id, `batches/${this.id}`);
+  }
+
+  /**
+   * Update the batch
+   *
+   * <i>Note: Only the `ready` field can be updated.</i>
+   */
+  public async update(data: { ready: Date | boolean }): Promise<void> {
+    this._data = await this._protected.client.PATCH<IBatch>(
+      `/batches/${this.id}`,
+      {
+        ready: data.ready === false ? null : data.ready,
+      },
+    );
+  }
+}
diff --git a/src/models/CsvOrder.ts b/src/models/CsvOrder.ts
index e78f0f5..4faa571 100644
--- a/src/models/CsvOrder.ts
+++ b/src/models/CsvOrder.ts
@@ -28,6 +28,8 @@ export type CreateCsvOrder = {
     }
 );
 
+export type CreateBatchCsvOrder = Pick<CreateCsvOrder, "file" | "mapping">;
+
 export class CsvOrder {
   private _data: ICsvOrder;
 
@@ -127,7 +129,7 @@ export class CsvOrder {
   public async getOrders(
     args: Omit<OrderPaginatedQuery, "filter"> & {
       filter?: Omit<OrderPaginatedQuery["filter"], "csvId">;
-    },
+    } = {},
   ): Promise<PaginatedResponse<Order>> {
     return this._protected.printOne.getOrders({
       ...args,
diff --git a/src/models/Order.ts b/src/models/Order.ts
index d3a1e2a..c1e527d 100644
--- a/src/models/Order.ts
+++ b/src/models/Order.ts
@@ -120,6 +120,14 @@ export class Order {
       : undefined;
   }
 
+  public get csvOrderId(): string | null {
+    return this._data.csvOrderId;
+  }
+
+  public get batchId(): string | undefined {
+    return this._data.batchId;
+  }
+
   /**
    * Get the template of the order
    * @throws { PrintOneError } If the template could not be fetched.
@@ -133,7 +141,9 @@ export class Order {
    * @throws { PrintOneError } If the order could not be refreshed.
    */
   public async refresh(): Promise<void> {
-    this._data = await this._protected.client.GET<IOrder>(`orders/${this.id}`);
+    this._data = await this._protected.client.GET<IOrder>(
+      `${this.urlPrefix}orders/${this.id}`,
+    );
   }
 
   /**
@@ -177,8 +187,12 @@ export class Order {
     }
 
     this._data = await this._protected.client.POST<IOrder>(
-      `orders/${this.id}/cancel`,
+      `${this.urlPrefix}orders/${this.id}/cancel`,
       {},
     );
   }
+
+  protected get urlPrefix(): string {
+    return this.batchId ? `batches/${this.batchId}/` : "";;
+  }
 }
diff --git a/src/models/_interfaces/IBatch.ts b/src/models/_interfaces/IBatch.ts
new file mode 100644
index 0000000..8c11411
--- /dev/null
+++ b/src/models/_interfaces/IBatch.ts
@@ -0,0 +1,21 @@
+export type IBatch = {
+  id: string;
+  companyId: string;
+  name: string;
+  billingId: string;
+  finish: string;
+  format: string;
+  isBillable: boolean;
+  templateId: string;
+  estimatedPrice: number;
+  sendDate: string | null;
+  status: string;
+  orders: {
+    processing: number;
+    success: number;
+    failed: number;
+    cancelled: number;
+  };
+  createdAt: string;
+  updatedAt: string;
+};
diff --git a/src/models/_interfaces/IOrder.ts b/src/models/_interfaces/IOrder.ts
index 5bec8ab..082732b 100644
--- a/src/models/_interfaces/IOrder.ts
+++ b/src/models/_interfaces/IOrder.ts
@@ -20,4 +20,6 @@ export type IOrder = {
   createdAt: string;
   updatedAt: string;
   anonymizedAt: string | null;
+  csvOrderId: string | null;
+  batchId?: string;
 };
diff --git a/src/utils.ts b/src/utils.ts
index 4db0559..aa241c7 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -43,6 +43,21 @@ export function sortToQuery<T extends string>(
   return query;
 }
 
+export function mapInFilter<T extends string, R extends string>(
+  values: undefined | InFilter<T>,
+  mapper: (value: T) => R,
+): undefined | InFilter<R> {
+  if (values === undefined) {
+    return undefined;
+  }
+
+  if (typeof values === "string") {
+    return mapper(values);
+  } else {
+    return values.map(mapper);
+  }
+}
+
 export type InFilter<T = string> = T | T[];
 
 export function inFilterToQuery(
@@ -148,3 +163,18 @@ export function dateFilterToQuery(
 
   return query;
 }
+
+export type EqualsFilter<T = string> = T | null;
+
+export function equalsFilterToQuery(
+  field: string,
+  value: undefined | EqualsFilter,
+): Record<string, unknown> {
+  if (value === undefined) {
+    return {};
+  }
+
+  return {
+    [`filter.${field}`]: value === null ? "$null" : `$eq:${value}`,
+  };
+}
diff --git a/test/Batch.spec.ts b/test/Batch.spec.ts
new file mode 100644
index 0000000..e7a0403
--- /dev/null
+++ b/test/Batch.spec.ts
@@ -0,0 +1,450 @@
+import {
+  Batch,
+  CreateBatchCsvOrder,
+  CsvOrder,
+  Finish,
+  Format,
+  Order,
+  PaginatedResponse,
+  Template,
+} from "../src";
+import { client } from "./client";
+import { BatchStatus } from "../src/enums/BatchStatus";
+import * as fs from "fs";
+import * as path from "path";
+import { sleep } from "../src/utils";
+
+let batch: Batch = null as unknown as Batch;
+let template: Template = null as unknown as Template;
+
+beforeAll(async function () {
+  template = await client.createTemplate({
+    name: `Test Order ${new Date().toISOString().replaceAll(":", "-")}`,
+    format: Format.POSTCARD_SQ15,
+    labels: ["library-unit-test"],
+    pages: ["page1", "page2"],
+  });
+});
+
+beforeEach(async function () {
+  batch = await client.createBatch({
+    template: template,
+    name: `Test Batch ${new Date().toISOString().replaceAll(":", "-")}`,
+    finish: Finish.GLOSSY,
+  });
+});
+
+async function addOrders(count: number): Promise<void> {
+  await Promise.all(
+    Array.from(Array(count)).map(() =>
+      batch.createOrder({
+        recipient: {
+          name: "John Doe",
+          address: "123 Main Street",
+          postalCode: "1234 AB",
+          city: "Anytown",
+          country: "Nederland",
+        },
+      }),
+    ),
+  );
+}
+
+describe("createOrder", function () {
+  it("should create an order to the batch", async function () {
+    // arrange
+
+    // act
+    const order = await batch.createOrder({
+      recipient: {
+        name: "John Doe",
+        address: "123 Main Street",
+        postalCode: "1234 AB",
+        city: "Anytown",
+        country: "Nederland",
+      },
+    });
+
+    // assert
+    expect(order).toBeDefined();
+    expect(order).toBeInstanceOf(Order);
+    expect((await batch.getOrders()).meta.total).toEqual(1);
+  });
+
+  it("should return status needs approval with 300+ orders", async function () {
+    // arrange
+    await addOrders(300);
+
+    // act
+    await batch.refresh();
+
+    // assert
+    expect(batch.status).toEqual(BatchStatus.batch_needs_approval);
+    expect(
+      batch.orders.processing + batch.orders.success + batch.orders.failed,
+    ).toEqual(300);
+  }, 20000);
+});
+
+describe("createCsvOrder", function () {
+  let file: ArrayBuffer = null as unknown as ArrayBuffer;
+
+  const mapping: CreateBatchCsvOrder["mapping"] = {
+    recipient: {
+      name: "{{FirstName}} {{LastName}}",
+      addressLine2: "Financial Dpt.",
+      address: "{{Street}} {{HouseNr}}",
+      postalCode: "{{ZIP}}",
+      city: "{{City}}",
+      country: "{{Country}}",
+    },
+  };
+
+  beforeAll(() => {
+    file = fs.readFileSync(path.join(__dirname, "assets/test.csv"));
+  });
+
+  it("should create a csv order with all fields", async function () {
+    // arrange
+
+    // act
+    const csvOrder = await batch.createCsvOrder({
+      mapping: mapping,
+      file: file,
+    });
+
+    // assert
+    expect(csvOrder).toBeDefined();
+    expect(csvOrder).toEqual(expect.any(CsvOrder));
+
+    expect(csvOrder.id).toEqual(expect.any(String));
+    expect(csvOrder.status).toEqual(expect.any(String));
+    expect(csvOrder.createdAt).toEqual(expect.any(Date));
+    expect(csvOrder.updatedAt).toEqual(expect.any(Date));
+    // if sendDate is undefined, it should be today
+    expect(csvOrder.sendDate.getDay()).toEqual(new Date().getDay());
+    expect(csvOrder.friendlyStatus).toEqual(expect.any(String));
+    expect(csvOrder.sender).toEqual(undefined);
+    expect(csvOrder.format).toEqual(expect.any(String));
+    expect(csvOrder.recipientMapping).toEqual(mapping.recipient);
+    expect(csvOrder.templateId).toEqual(template.id);
+    expect(csvOrder.mergeVariableMapping).toStrictEqual({});
+    expect(csvOrder.billingId).toEqual(
+      expect.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));
+    expect(csvOrder.estimatedOrderCount).toEqual(expect.any(Number));
+    expect(csvOrder.failedOrderCount).toEqual(expect.any(Number));
+    expect(csvOrder.processedOrderCount).toEqual(expect.any(Number));
+    expect(csvOrder.totalOrderCount).toEqual(expect.any(Number));
+  });
+});
+
+describe("getCsvOrder", function () {
+  let csvOrderId: string = null as unknown as string;
+  const mapping: CreateBatchCsvOrder["mapping"] = {
+    recipient: {
+      name: "{{FirstName}} {{LastName}}",
+      address: "{{Street}} {{HouseNr}}",
+      postalCode: "{{ZIP}}",
+      city: "{{City}}",
+      country: "{{Country}}",
+    },
+  };
+
+  beforeAll(async () => {
+    const file = fs.readFileSync(path.join(__dirname, "assets/test.csv"));
+
+    const csvOrder = await batch.createCsvOrder({
+      mapping: mapping,
+      file: file,
+    });
+
+    csvOrderId = csvOrder.id;
+  });
+
+  it("should get a csv order with all fields", async function () {
+    // arrange
+
+    // act
+    const csvOrder = await batch.getCsvOrder(csvOrderId);
+
+    // assert
+    expect(csvOrder).toBeDefined();
+    expect(csvOrder.id).toEqual(expect.any(String));
+    expect(csvOrder.status).toEqual(expect.any(String));
+    expect(csvOrder.createdAt).toEqual(expect.any(Date));
+    expect(csvOrder.updatedAt).toEqual(expect.any(Date));
+    // if sendDate is undefined, it should be today
+    expect(csvOrder.sendDate.getDay()).toEqual(new Date().getDay());
+    expect(csvOrder.friendlyStatus).toEqual(expect.any(String));
+    expect(csvOrder.sender).toEqual(undefined);
+    expect(csvOrder.recipientMapping).toEqual(mapping.recipient);
+    expect(csvOrder.templateId).toEqual(template.id);
+    expect(csvOrder.mergeVariableMapping).toStrictEqual({});
+    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));
+    expect(csvOrder.estimatedOrderCount).toEqual(expect.any(Number));
+    expect(csvOrder.failedOrderCount).toEqual(expect.any(Number));
+    expect(csvOrder.processedOrderCount).toEqual(expect.any(Number));
+    expect(csvOrder.totalOrderCount).toEqual(expect.any(Number));
+  });
+});
+
+describe("update", function () {
+  describe("ready", function () {
+    it("should update the batch to ready", async function () {
+      // arrange
+
+      // act
+      await batch.update({
+        ready: true,
+      });
+
+      // assert
+      expect(batch.status).toEqual(BatchStatus.batch_user_ready);
+      expect(batch.sendDate).toBeInstanceOf(Date);
+    });
+
+    it("should update the batch to be ready in the future", async function () {
+      // arrange
+      const date = new Date();
+      date.setDate(date.getDate() + 36);
+
+      // act
+      await batch.update({
+        ready: date,
+      });
+
+      // assert
+      expect(batch.status).toEqual(BatchStatus.batch_user_ready);
+      expect(batch.sendDate).toBeInstanceOf(Date);
+      expect(batch.sendDate?.getDay()).toEqual(date.getDay());
+    });
+
+    it("should update the batch to not ready", async function () {
+      // arrange
+      await batch.update({
+        ready: true,
+      });
+
+      // act
+      await batch.update({
+        ready: false,
+      });
+
+      // assert
+      expect(batch.status).toEqual(BatchStatus.batch_created);
+      expect(batch.sendDate).toBeUndefined();
+    });
+
+    it("should update the updatedAt date", async function () {
+      // arrange
+      const updatedAt = batch.updatedAt;
+
+      // act
+      await batch.update({
+        ready: true,
+      });
+
+      // assert
+      expect(batch.updatedAt).toBeAfterOrEqualTo(updatedAt);
+    });
+
+    it("should get status ready to sent with 300+ orders", async function () {
+      // arrange
+      await addOrders(300);
+
+      // act
+      await batch.update({
+        ready: true,
+      });
+
+      // assert
+      expect(batch.status).toEqual(BatchStatus.batch_ready_to_schedule);
+    }, 20000);
+  });
+});
+
+describe("getTemplate", function () {
+  it("should return the template", async function () {
+    // arrange
+
+    // act
+    const result = await batch.getTemplate();
+
+    // assert
+    expect(result).toBeDefined();
+    expect(result).toBeInstanceOf(Template);
+    expect(result.id).toEqual(template.id);
+  });
+});
+
+describe("refresh", function () {
+  it("should refresh the batch data", async function () {
+    // arrange
+    const batch2 = await client.getBatch(batch.id);
+    await batch2.update({ ready: true });
+
+    // act
+    await batch.refresh();
+
+    // assert
+    expect(batch.status).toEqual(BatchStatus.batch_user_ready);
+  });
+});
+
+describe("getOrder", function () {
+  it("should return the order", async function () {
+    // arrange
+    const order = await batch.createOrder({
+      recipient: {
+        name: "John Doe",
+        address: "123 Main Street",
+        postalCode: "1234 AB",
+        city: "Anytown",
+        country: "Nederland",
+      },
+    });
+
+    // act
+    const result = await batch.getOrder(order.id);
+
+    // assert
+    expect(result).toBeDefined();
+    expect(result).toBeInstanceOf(Order);
+    expect(result.id).toEqual(order.id);
+    expect(result.batchId).toEqual(batch.id);
+  });
+
+  it("should not return an non batch order", async function () {
+    // arrange
+    const order = await client.createOrder({
+      recipient: {
+        name: "John Doe",
+        address: "123 Main Street",
+        postalCode: "1234 AB",
+        city: "Anytown",
+        country: "Nederland",
+      },
+      template: template,
+    });
+
+    // act
+    const result = batch.getOrder(order.id);
+
+    // assert
+    await expect(result).toReject();
+  });
+
+  it("should not return an order from another batch", async function () {
+    // arrange
+    const batch2 = await client.createBatch({
+      template: template,
+      name: `Test Batch ${new Date().toISOString().replaceAll(":", "-")}`,
+      finish: Finish.GLOSSY,
+    });
+    const order = await batch2.createOrder({
+      recipient: {
+        name: "John Doe",
+        address: "123 Main Street",
+        postalCode: "1234 AB",
+        city: "Anytown",
+        country: "Nederland",
+      },
+    });
+
+    // act
+    const result = batch.getOrder(order.id);
+
+    // assert
+    await expect(result).toReject();
+  });
+
+  it("should not return a non existing order", async function () {
+    // arrange
+
+    // act
+    const result = batch.getOrder("non-existing");
+
+    // assert
+    await expect(result).toReject();
+  });
+});
+
+describe("getOrders", function () {
+  it("should return the orders", async function () {
+    // arrange
+    await addOrders(5);
+
+    // act
+    const result = await batch.getOrders();
+
+    // assert
+    expect(result).toBeDefined();
+    expect(result).toBeInstanceOf(PaginatedResponse);
+    expect(result.data).toBeArrayOfSize(5);
+  });
+
+  it("should return the orders with a filter", async function () {
+    // arrange
+    await addOrders(5);
+
+    // act
+    const result = await batch.getOrders({
+      limit: 1,
+    });
+
+    // assert
+    expect(result).toBeDefined();
+    expect(result).toBeInstanceOf(PaginatedResponse);
+    expect(result.data).toBeArrayOfSize(1);
+  });
+});
+
+describe('BatchOrder', function () {
+  it('should be able to cancel Order', async function() {
+    // arrange
+    const order = await batch.createOrder({
+      recipient: {
+        name: "John Doe",
+        address: "123 Main Street",
+        postalCode: "1234 AB",
+        city: "Anytown",
+        country: "Nederland",
+      },
+    });
+
+    // act
+    await order.cancel();
+
+    // assert
+    expect(order.status).toEqual('order_cancelled');
+  })
+
+  it('should be able to refresh Order', async function () {
+    // arrange
+    const order = await batch.createOrder({
+      recipient: {
+        name: "John Doe",
+        address: "123 Main Street",
+        postalCode: "1234 AB",
+        city: "Anytown",
+        country: "Nederland",
+      },
+    });
+
+    // act
+    while (order.status === "order_created") {
+      await order.refresh();
+      await sleep(1000);
+    }
+
+    // assert
+    expect(order.status).not.toEqual("order_created");
+  }, 30000);
+})
diff --git a/test/CustomHttpHandler.spec.ts b/test/CustomHttpHandler.spec.ts
index 3586c9c..9044161 100644
--- a/test/CustomHttpHandler.spec.ts
+++ b/test/CustomHttpHandler.spec.ts
@@ -1,5 +1,6 @@
-import PrintOne, { CustomFile, Preview, Protected } from "../src";
+import PrintOne, { Batch, CustomFile, Preview, Protected } from "../src";
 import { HttpHandler } from "../src/HttpHandler";
+import { IBatch } from "../src/models/_interfaces/IBatch";
 
 class CustomHttpHandler extends HttpHandler<unknown, unknown> {
   public override GET<T>(): Promise<T> {
@@ -8,6 +9,9 @@ class CustomHttpHandler extends HttpHandler<unknown, unknown> {
   public override GETBuffer(): Promise<Uint8Array> {
     return Promise.reject(new Error("Custom GETBuffer request handler"));
   }
+  public override PATCH<T>(): Promise<T> {
+    return Promise.reject(new Error("Custom PATCH request handler"));
+  }
   public override POST<T>(): Promise<T> {
     return Promise.reject(new Error("Custom POST request handler"));
   }
@@ -70,4 +74,13 @@ describe("custom HttpHandler is used when provided to PrintOne instance", () =>
       "Custom DELETE request handler",
     );
   });
+
+  it("custom PATCH method should be called", async () => {
+    const batch = new Batch(printOne.protected, {} as unknown as IBatch);
+    await expect(
+      batch.update({
+        ready: true,
+      }),
+    ).rejects.toThrow("Custom PATCH request handler");
+  });
 });
diff --git a/test/PrintOne.spec.ts b/test/PrintOne.spec.ts
index 03e113b..e4927b5 100644
--- a/test/PrintOne.spec.ts
+++ b/test/PrintOne.spec.ts
@@ -17,6 +17,8 @@ import "jest-extended";
 import * as fs from "fs";
 import * as path from "path";
 import { client } from "./client";
+import { Batch } from "../src/models/Batch";
+import { BatchStatus } from "../src/enums/BatchStatus";
 
 let template: Template = null as unknown as Template;
 
@@ -48,6 +50,15 @@ afterAll(async function () {
   }
 });
 
+const exampleAddress: Address = {
+  name: "Test",
+  address: "Test 1",
+  addressLine2: undefined,
+  postalCode: "1234 AB",
+  city: "Test",
+  country: "NL",
+};
+
 describe("getSelf", function () {
   it("should return a company", async function () {
     // arrange
@@ -531,15 +542,6 @@ describe("getTemplate", function () {
 });
 
 describe("createOrder", function () {
-  const exampleAddress: Address = {
-    name: "Test",
-    address: "Test 1",
-    addressLine2: undefined,
-    postalCode: "1234 AB",
-    city: "Test",
-    country: "NL",
-  };
-
   it("should create an order", async function () {
     // arrange
 
@@ -901,16 +903,26 @@ describe("getOrder", function () {
     // if sendDate is undefined, it should be today
     expect(order.sendDate.getDay()).toEqual(new Date().getDay());
     expect(order.friendlyStatus).toEqual(expect.any(String));
-    expect(order.sender).toEqual(undefined);
+    expect(order.sender).toEqual(
+      expect.toBeOneOf([undefined, expect.any(Object)]),
+    );
     expect(order.recipient).toEqual(expect.any(Object));
     expect(order.templateId).toEqual(expect.any(String));
     expect(order.mergeVariables).toEqual(expect.any(Object));
-    expect(order.billingId).toEqual(undefined);
+    expect(order.billingId).toEqual(
+      expect.toBeOneOf([undefined, expect.any(String)]),
+    );
     expect(order.finish).toEqual(expect.any(String));
     expect(order.companyId).toEqual(expect.any(String));
     expect(order.isBillable).toEqual(expect.any(Boolean));
     expect(order.errors).toEqual(expect.any(Array));
     expect(order.definitiveCountryId).toEqual(expect.any(String));
+    expect(order.csvOrderId).toEqual(
+      expect.toBeOneOf([expect.any(String), null]),
+    );
+    expect(order.batchId).toEqual(
+      expect.toBeOneOf([expect.any(String), undefined]),
+    );
   });
 
   it("should throw an error when the order does not exist", async function () {
@@ -977,7 +989,9 @@ describe("getOrders", function () {
     expect(order.recipient).toEqual(expect.any(Object));
     expect(order.templateId).toEqual(expect.any(String));
     expect(order.mergeVariables).toEqual(expect.any(Object));
-    expect(order.billingId).toEqual(undefined);
+    expect(order.billingId).toEqual(
+      expect.toBeOneOf([undefined, expect.any(String)]),
+    );
     expect(order.finish).toEqual(expect.any(String));
     expect(order.companyId).toEqual(expect.any(String));
     expect(order.isBillable).toEqual(expect.any(Boolean));
@@ -1243,6 +1257,47 @@ describe("getOrders", function () {
     expect(order.anonymizedAt).toBeBetween(from, to);
   });
 
+  it("should apply the batchId filter (null)", async function () {
+    // arrange
+
+    // act
+    const orders = await client.getOrders({
+      limit: 1,
+      filter: {
+        batchId: null,
+      },
+    });
+    const order = orders.data[0];
+
+    // assert
+    expect(order).toBeDefined();
+  });
+
+  it("should apply the batchId filter (batchId)", async function () {
+    // arrange
+    const batch = await client.createBatch({
+      name: "Test batch",
+      finish: Finish.GLOSSY,
+      template: template,
+    });
+    const batchOrder = await batch.createOrder({
+      recipient: exampleAddress,
+    });
+
+    // act
+    const orders = await client.getOrders({
+      limit: 1,
+      filter: {
+        batchId: batch.id,
+      },
+    });
+    const order = orders.data[0];
+
+    // assert
+    expect(order).toBeDefined();
+    expect(order.id).toEqual(batchOrder.id);
+  });
+
   describe("sortby", function () {
     it("should sort by createdAt", async function () {
       // arrange
@@ -1286,7 +1341,7 @@ describe("getOrders", function () {
       expect(order2).toBeDefined();
       expect(order2.createdAt).toEqual(expect.any(Date));
 
-      expect(order.createdAt.getTime()).toBeGreaterThan(
+      expect(order.createdAt.getTime()).toBeGreaterThanOrEqual(
         order2.createdAt.getTime(),
       );
     });
@@ -1318,3 +1373,554 @@ describe("getOrders", function () {
     });
   });
 });
+
+describe("createBatch", function () {
+  it("should create an batch", async function () {
+    // arrange
+
+    // act
+    const batch = await client.createBatch({
+      name: "Test batch",
+      finish: Finish.GLOSSY,
+      template: template,
+    });
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch).toEqual(expect.any(Batch));
+  });
+
+  it("should create an batch with all fields", async function () {
+    // arrange
+
+    // act
+    const batch = await client.createBatch({
+      name: "Test batch",
+      finish: Finish.GLOSSY,
+      template: template,
+    });
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.id).toEqual(expect.any(String));
+    expect(batch.companyId).toEqual(expect.any(String));
+    expect(batch.name).toEqual("Test batch");
+    expect(batch.status).toEqual(BatchStatus.batch_created);
+    expect(batch.createdAt).toEqual(expect.any(Date));
+    expect(batch.updatedAt).toEqual(expect.any(Date));
+    expect(batch.finish).toEqual(Finish.GLOSSY);
+    expect(batch.format).toEqual(Format.POSTCARD_SQ15);
+    expect(batch.templateId).toEqual(template.id);
+    expect(batch.isBillable).toEqual(expect.any(Boolean));
+    expect(batch.estimatedPrice).toEqual(0);
+    expect(batch.sendDate).toEqual(
+      expect.toBeOneOf([undefined, expect.any(Date)]),
+    );
+    expect(batch.orders).toStrictEqual({
+      processing: 0,
+      success: 0,
+      failed: 0,
+      cancelled: 0,
+    });
+  });
+
+  it("should create an batch with a ready date", async function () {
+    // arrange
+    const sendDate = new Date();
+    sendDate.setDate(sendDate.getDate() + 10);
+
+    // act
+    const batch = await client.createBatch({
+      name: "Test batch",
+      finish: Finish.GLOSSY,
+      template: template,
+      ready: sendDate,
+    });
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.sendDate?.getDay()).toEqual(sendDate.getDay());
+  });
+
+  it("should create an batch that is ready", async function () {
+    // arrange
+    const sendDate = new Date();
+    sendDate.setDate(sendDate.getDate() + 10);
+
+    // act
+    const batch = await client.createBatch({
+      name: "Test batch",
+      finish: Finish.GLOSSY,
+      template: template,
+      ready: true,
+    });
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.status).toEqual(BatchStatus.batch_user_ready);
+    expect(batch.sendDate).toBeBefore(new Date());
+  });
+
+  it("should create an batch with a billing id", async function () {
+    // arrange
+    const billingId = "test";
+
+    // act
+    const batch = await client.createBatch({
+      name: "Test batch",
+      finish: Finish.GLOSSY,
+      template: template,
+      billingId: billingId,
+    });
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.billingId).toEqual(billingId);
+  });
+
+  it("should create an batch with templateId", async function () {
+    // arrange
+    const templateId = template.id;
+
+    // act
+    const batch = await client.createBatch({
+      name: "Test batch",
+      finish: Finish.GLOSSY,
+      template: templateId,
+    });
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.templateId).toEqual(templateId);
+  });
+});
+
+describe("getBatch", function () {
+  let batchId: string = null as unknown as string;
+
+  // global arrange
+  beforeAll(async function () {
+    const batch = await client.createBatch({
+      name: "Test batch",
+      template: template,
+      finish: Finish.GLOSSY,
+    });
+    batchId = batch.id;
+  });
+
+  it("should return an batch", async function () {
+    // arrange
+
+    // act
+    const batch = await client.getBatch(batchId);
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch).toEqual(expect.any(Batch));
+  });
+
+  it("should return an batch with all fields", async function () {
+    // arrange
+
+    // act
+    const batch = await client.getBatch(batchId);
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.id).toEqual(expect.any(String));
+    expect(batch.companyId).toEqual(expect.any(String));
+    expect(batch.name).toEqual(expect.any(String));
+    expect(batch.status).toEqual(expect.any(String));
+    expect(batch.createdAt).toEqual(expect.any(Date));
+    expect(batch.updatedAt).toEqual(expect.any(Date));
+    expect(batch.finish).toEqual(expect.any(String));
+    expect(batch.templateId).toEqual(expect.any(String));
+    expect(batch.isBillable).toEqual(expect.any(Boolean));
+    expect(batch.estimatedPrice).toEqual(expect.any(Number));
+    expect(batch.sendDate).toEqual(
+      expect.toBeOneOf([undefined, expect.any(Date)]),
+    );
+    expect(batch.orders).toEqual(expect.any(Object));
+  });
+
+  it("should throw an error when the batch does not exist", async function () {
+    // arrange
+
+    // act
+    const promise = client.getBatch("test");
+
+    // assert
+    await expect(promise).rejects.toThrow(/not found/);
+  });
+});
+
+describe("getBatches", function () {
+  it("should return a paginated response", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches();
+
+    // assert
+    expect(batches).toBeDefined();
+    expect(batches).toEqual(expect.any(PaginatedResponse));
+
+    expect(batches.data).toBeDefined();
+    expect(batches.data.length).toBeGreaterThanOrEqual(1);
+
+    expect(batches.meta.total).toBeGreaterThanOrEqual(1);
+    expect(batches.meta.page).toEqual(1);
+    // Default page size is 10
+    expect(batches.meta.pageSize).toBeGreaterThanOrEqual(10);
+    expect(batches.meta.pages).toBeGreaterThanOrEqual(1);
+  });
+
+  it("should return a batch", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches({ limit: 1 });
+    const batch = batches.data[0];
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch).toEqual(expect.any(Batch));
+  });
+
+  it("should return a batch with all fields", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches({ limit: 1 });
+    const batch = batches.data[0];
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.id).toEqual(expect.any(String));
+    expect(batch.companyId).toEqual(expect.any(String));
+    expect(batch.name).toEqual(expect.any(String));
+    expect(batch.status).toEqual(expect.any(String));
+    expect(batch.createdAt).toEqual(expect.any(Date));
+    expect(batch.updatedAt).toEqual(expect.any(Date));
+    expect(batch.finish).toEqual(expect.any(String));
+    expect(batch.templateId).toEqual(expect.any(String));
+    expect(batch.isBillable).toEqual(expect.any(Boolean));
+    expect(batch.estimatedPrice).toEqual(expect.any(Number));
+    expect(batch.sendDate).toEqual(
+      expect.toBeOneOf([undefined, expect.any(Date)]),
+    );
+    expect(batch.orders).toEqual(expect.any(Object));
+  });
+
+  it("should apply the billingId filter", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        billingId: "test",
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No batches found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.billingId).toEqual("test");
+  });
+
+  it("should apply the isBillable filter", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        isBillable: true,
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No orders found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.isBillable).toEqual(true);
+  });
+
+  it("should apply the name filter", async function () {
+    // arrange
+    const batchName = (await client.getBatches()).data[1]?.name ?? "test";
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        name: batchName,
+      },
+    });
+    const batch = batches.data[0];
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.name).toEqual(batchName);
+  });
+
+  it("should apply the createdAt filter", async function () {
+    // arrange
+    const from = new Date();
+    from.setDate(from.getDay() - 31);
+    const to = new Date();
+    to.setDate(to.getDay() - 10);
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        createdAt: {
+          from,
+          to,
+        },
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No batches found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.createdAt).toBeBetween(from, to);
+  });
+
+  it("should apply the updatedAt filter", async function () {
+    // arrange
+    const from = new Date();
+    from.setDate(from.getDay() - 31);
+    const to = new Date();
+    to.setDate(to.getDay() - 10);
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        updatedAt: {
+          from,
+          to,
+        },
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No batches found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.updatedAt).toBeBetween(from, to);
+  });
+
+  it("should apply the sendDate filter (true)", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        sendDate: true,
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No batches found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.sendDate).toEqual(expect.any(Date));
+  });
+
+  it("should apply the sendDate filter (false)", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        sendDate: false,
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No batches found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.sendDate).toEqual(undefined);
+  });
+
+  it("should apply the sendDate filter", async function () {
+    // arrange
+    const from = new Date();
+    from.setDate(1);
+    from.setMonth(from.getMonth() - 9);
+    const to = new Date();
+    to.setDate(31);
+    to.setMonth(from.getMonth() - 9);
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        sendDate: {
+          from,
+          to,
+        },
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No batches found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.sendDate).toBeBetween(from, to);
+  });
+
+  it("should apply the finish filter", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        finish: Finish.GLOSSY,
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No batches found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.finish).toEqual(Finish.GLOSSY);
+  });
+
+  it("should apply the templates filter (Template)", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        templates: template.id,
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No batches found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.templateId).toEqual(template.id);
+  });
+
+  it("should apply the templates filter (templateId)", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        templates: template,
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No batches found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.templateId).toEqual(template.id);
+  });
+
+  it("should use the status filter", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        status: [BatchStatus.batch_created, BatchStatus.batch_user_ready],
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No batches found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.status).toEqual(
+      expect.toBeOneOf([
+        BatchStatus.batch_created,
+        BatchStatus.batch_user_ready,
+      ]),
+    );
+  });
+
+  it("should use the status filter (single)", async function () {
+    // arrange
+
+    // act
+    const batches = await client.getBatches({
+      limit: 1,
+      filter: {
+        status: [BatchStatus.batch_user_ready],
+      },
+    });
+    const batch = batches.data[0];
+
+    if (batch === undefined) {
+      console.warn("No batches found, skipping test");
+      return;
+    }
+
+    // assert
+    expect(batch).toBeDefined();
+    expect(batch.status).toEqual(
+      expect.toBeOneOf([BatchStatus.batch_user_ready]),
+    );
+  });
+});
diff --git a/testSequencer.js b/testSequencer.js
new file mode 100644
index 0000000..d0b200b
--- /dev/null
+++ b/testSequencer.js
@@ -0,0 +1,18 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const Sequencer = require("@jest/test-sequencer").default;
+
+class CustomSequencer extends Sequencer {
+  sort(tests) {
+    tests = [...tests];
+
+    // Run Batch last
+    const batch = tests.filter((test) =>
+      test.path.toLowerCase().includes("batch"),
+    );
+    tests = tests.filter((test) => !test.path.toLowerCase().includes("batch"));
+
+    return [...tests, ...batch];
+  }
+}
+
+module.exports = CustomSequencer;