diff --git a/mindee/documents/base.py b/mindee/documents/base.py
index ed83e00f..e4bae71e 100644
--- a/mindee/documents/base.py
+++ b/mindee/documents/base.py
@@ -34,7 +34,7 @@ def __init__(
         self,
         input_file: InputDocument,
         document_type: str,
-        api_prediction: dict,
+        api_prediction: TypeApiPrediction,
         page_n: Optional[int] = None,
     ):
         if input_file:
diff --git a/mindee/documents/custom_document.py b/mindee/documents/custom_document.py
index 4b4eae7b..04b39619 100644
--- a/mindee/documents/custom_document.py
+++ b/mindee/documents/custom_document.py
@@ -10,7 +10,7 @@ class CustomDocument(Document):
     def __init__(
         self,
         document_type: str,
-        api_prediction=None,
+        api_prediction: TypeApiPrediction,
         input_file=None,
         page_n: Optional[int] = None,
     ):
@@ -51,7 +51,7 @@ def __str__(self) -> str:
                 name,
                 " ".join([value["content"] for value in info["values"]]),
             )
-        custom_doc_str += "-----------------\n"
+        custom_doc_str += "----------------------"
         return custom_doc_str
 
     def _checklist(self) -> None:
diff --git a/tests/__init__.py b/tests/__init__.py
index e69de29b..76e943e7 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+RECEIPT_DATA_DIR = "./tests/data/receipt"
+INVOICE_DATA_DIR = "./tests/data/invoice"
+PASSPORT_DATA_DIR = "./tests/data/passport"
+CUSTOM_DATA_DIR = "./tests/data/custom"
diff --git a/tests/data/custom/response/complete.json b/tests/data/custom/response/complete.json
new file mode 100644
index 00000000..f1bd0196
--- /dev/null
+++ b/tests/data/custom/response/complete.json
@@ -0,0 +1,921 @@
+{
+  "api_request": {
+    "error": {},
+    "resources": [
+      "document"
+    ],
+    "status": "success",
+    "status_code": 201,
+    "url": "http://api.mindee.net/v1/products/ianare/field_test/v1/predict?global_orientation=true"
+  },
+  "document": {
+    "id": "72021a9a-bfa0-49ce-b24a-ce9a3584ac53",
+    "inference": {
+      "extras": {},
+      "finished_at": "2022-05-19T08:55:35+00:00",
+      "is_rotation_applied": true,
+      "pages": [
+        {
+          "extras": {},
+          "id": 0,
+          "orientation": {
+            "value": 0
+          },
+          "prediction": {
+            "date_normal": {
+              "confidence": 0.99,
+              "values": [
+                {
+                  "confidence": 0.99,
+                  "content": "2020-12-17",
+                  "polygon": [
+                    [
+                      0.834,
+                      0.177
+                    ],
+                    [
+                      0.927,
+                      0.177
+                    ],
+                    [
+                      0.927,
+                      0.186
+                    ],
+                    [
+                      0.835,
+                      0.187
+                    ]
+                  ]
+                }
+              ]
+            },
+            "date_us": {
+              "confidence": 0.97,
+              "values": [
+                {
+                  "confidence": 0.97,
+                  "content": "2020-12-17",
+                  "polygon": [
+                    [
+                      0.834,
+                      0.177
+                    ],
+                    [
+                      0.927,
+                      0.177
+                    ],
+                    [
+                      0.927,
+                      0.186
+                    ],
+                    [
+                      0.835,
+                      0.187
+                    ]
+                  ]
+                }
+              ]
+            },
+            "email": {
+              "confidence": 1.0,
+              "values": [
+                {
+                  "confidence": 0.9,
+                  "content": "jenny@example.com",
+                  "polygon": [
+                    [
+                      0.522,
+                      0.917
+                    ],
+                    [
+                      0.623,
+                      0.916
+                    ],
+                    [
+                      0.623,
+                      0.923
+                    ],
+                    [
+                      0.523,
+                      0.924
+                    ]
+                  ]
+                }
+              ]
+            },
+            "integer": {
+              "confidence": 0.76,
+              "values": [
+                {
+                  "confidence": 0.76,
+                  "content": "2100505343",
+                  "polygon": [
+                    [
+                      0.559,
+                      0.179
+                    ],
+                    [
+                      0.652,
+                      0.178
+                    ],
+                    [
+                      0.652,
+                      0.187
+                    ],
+                    [
+                      0.56,
+                      0.188
+                    ]
+                  ]
+                }
+              ]
+            },
+            "number": {
+              "confidence": 0.9,
+              "values": [
+                {
+                  "confidence": 0.9,
+                  "content": "2100505343",
+                  "polygon": [
+                    [
+                      0.559,
+                      0.179
+                    ],
+                    [
+                      0.652,
+                      0.178
+                    ],
+                    [
+                      0.652,
+                      0.187
+                    ],
+                    [
+                      0.56,
+                      0.188
+                    ]
+                  ]
+                }
+              ]
+            },
+            "phone": {
+              "confidence": 0.69,
+              "values": [
+                {
+                  "confidence": 0.69,
+                  "content": "8675309",
+                  "polygon": [
+                    [
+                      0.66,
+                      0.253
+                    ],
+                    [
+                      0.764,
+                      0.253
+                    ],
+                    [
+                      0.764,
+                      0.262
+                    ],
+                    [
+                      0.66,
+                      0.263
+                    ]
+                  ]
+                }
+              ]
+            },
+            "string_09": {
+              "confidence": 0.98,
+              "values": [
+                {
+                  "confidence": 0.98,
+                  "content": "10119",
+                  "polygon": [
+                    [
+                      0.084,
+                      0.202
+                    ],
+                    [
+                      0.129,
+                      0.202
+                    ],
+                    [
+                      0.129,
+                      0.21
+                    ],
+                    [
+                      0.085,
+                      0.211
+                    ]
+                  ]
+                }
+              ]
+            },
+            "string_all": {
+              "confidence": 1.0,
+              "values": [
+                {
+                  "confidence": 1.0,
+                  "content": "Jenny",
+                  "polygon": [
+                    [
+                      0.713,
+                      0.013
+                    ],
+                    [
+                      0.956,
+                      0.013
+                    ],
+                    [
+                      0.956,
+                      0.054
+                    ],
+                    [
+                      0.713,
+                      0.055
+                    ]
+                  ]
+                },
+                {
+                  "confidence": 1.0,
+                  "content": "is",
+                  "polygon": [
+                    [
+                      0.713,
+                      0.013
+                    ],
+                    [
+                      0.956,
+                      0.013
+                    ],
+                    [
+                      0.956,
+                      0.054
+                    ],
+                    [
+                      0.713,
+                      0.055
+                    ]
+                  ]
+                },
+                {
+                  "confidence": 1.0,
+                  "content": "great",
+                  "polygon": [
+                    [
+                      0.713,
+                      0.013
+                    ],
+                    [
+                      0.956,
+                      0.013
+                    ],
+                    [
+                      0.956,
+                      0.054
+                    ],
+                    [
+                      0.713,
+                      0.055
+                    ]
+                  ]
+                }
+              ]
+            },
+            "string_az": {
+              "confidence": 0.61,
+              "values": [
+                {
+                  "confidence": 0.61,
+                  "content": "Jenny",
+                  "polygon": [
+                    [
+                      0.713,
+                      0.013
+                    ],
+                    [
+                      0.956,
+                      0.013
+                    ],
+                    [
+                      0.956,
+                      0.054
+                    ],
+                    [
+                      0.713,
+                      0.055
+                    ]
+                  ]
+                }
+              ]
+            },
+            "url": {
+              "confidence": 0.0,
+              "values": []
+            }
+          }
+        },
+        {
+          "extras": {},
+          "id": 1,
+          "orientation": {
+            "value": 0
+          },
+          "prediction": {
+            "date_normal": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "date_us": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "email": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "integer": {
+              "confidence": 0.67,
+              "values": [
+                {
+                  "confidence": 0.67,
+                  "content": "2100505343",
+                  "polygon": [
+                    [
+                      0.56,
+                      0.181
+                    ],
+                    [
+                      0.652,
+                      0.181
+                    ],
+                    [
+                      0.652,
+                      0.191
+                    ],
+                    [
+                      0.56,
+                      0.191
+                    ]
+                  ]
+                }
+              ]
+            },
+            "number": {
+              "confidence": 0.86,
+              "values": [
+                {
+                  "confidence": 0.86,
+                  "content": "2100505343",
+                  "polygon": [
+                    [
+                      0.56,
+                      0.181
+                    ],
+                    [
+                      0.652,
+                      0.181
+                    ],
+                    [
+                      0.652,
+                      0.191
+                    ],
+                    [
+                      0.56,
+                      0.191
+                    ]
+                  ]
+                }
+              ]
+            },
+            "phone": {
+              "confidence": 0.64,
+              "values": [
+                {
+                  "confidence": 0.64,
+                  "content": "1231234",
+                  "polygon": [
+                    [
+                      0.701,
+                      0.181
+                    ],
+                    [
+                      0.774,
+                      0.181
+                    ],
+                    [
+                      0.774,
+                      0.189
+                    ],
+                    [
+                      0.702,
+                      0.191
+                    ]
+                  ]
+                }
+              ]
+            },
+            "string_09": {
+              "confidence": 0.98,
+              "values": [
+                {
+                  "confidence": 0.98,
+                  "content": "10119",
+                  "polygon": [
+                    [
+                      0.113,
+                      0.149
+                    ],
+                    [
+                      0.158,
+                      0.149
+                    ],
+                    [
+                      0.158,
+                      0.158
+                    ],
+                    [
+                      0.113,
+                      0.159
+                    ]
+                  ]
+                }
+              ]
+            },
+            "string_all": {
+              "confidence": 0.99,
+              "values": [
+                {
+                  "confidence": 0.99,
+                  "content": "Mindee",
+                  "polygon": [
+                    [
+                      0.715,
+                      0.018
+                    ],
+                    [
+                      0.956,
+                      0.015
+                    ],
+                    [
+                      0.956,
+                      0.053
+                    ],
+                    [
+                      0.716,
+                      0.057
+                    ]
+                  ]
+                },
+                {
+                  "confidence": 0.94,
+                  "content": "is",
+                  "polygon": [
+                    [
+                      0.715,
+                      0.018
+                    ],
+                    [
+                      0.956,
+                      0.015
+                    ],
+                    [
+                      0.956,
+                      0.053
+                    ],
+                    [
+                      0.716,
+                      0.057
+                    ]
+                  ]
+                },
+                {
+                  "confidence": 0.91,
+                  "content": "awesome",
+                  "polygon": [
+                    [
+                      0.715,
+                      0.018
+                    ],
+                    [
+                      0.956,
+                      0.015
+                    ],
+                    [
+                      0.956,
+                      0.053
+                    ],
+                    [
+                      0.716,
+                      0.057
+                    ]
+                  ]
+                }
+              ]
+            },
+            "string_az": {
+              "confidence": 0.67,
+              "values": [
+                {
+                  "confidence": 0.67,
+                  "content": "Mindee",
+                  "polygon": [
+                    [
+                      0.112,
+                      0.125
+                    ],
+                    [
+                      0.186,
+                      0.124
+                    ],
+                    [
+                      0.186,
+                      0.133
+                    ],
+                    [
+                      0.113,
+                      0.134
+                    ]
+                  ]
+                }
+              ]
+            },
+            "url": {
+              "confidence": 1.0,
+              "values": [
+                {
+                  "confidence": 1.0,
+                  "content": "developers.mindee.com/docs",
+                  "polygon": [
+                    [
+                      0.576,
+                      0.366
+                    ],
+                    [
+                      0.831,
+                      0.366
+                    ],
+                    [
+                      0.831,
+                      0.383
+                    ],
+                    [
+                      0.576,
+                      0.383
+                    ]
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "prediction": {
+        "date_normal": {
+          "confidence": 0.99,
+          "page_id": 0,
+          "values": [
+            {
+              "confidence": 0.99,
+              "content": "2020-12-17",
+              "polygon": [
+                [
+                  0.834,
+                  0.177
+                ],
+                [
+                  0.927,
+                  0.177
+                ],
+                [
+                  0.927,
+                  0.186
+                ],
+                [
+                  0.835,
+                  0.187
+                ]
+              ]
+            }
+          ]
+        },
+        "date_us": {
+          "confidence": 0.97,
+          "page_id": 0,
+          "values": [
+            {
+              "confidence": 0.97,
+              "content": "2020-12-17",
+              "polygon": [
+                [
+                  0.834,
+                  0.177
+                ],
+                [
+                  0.927,
+                  0.177
+                ],
+                [
+                  0.927,
+                  0.186
+                ],
+                [
+                  0.835,
+                  0.187
+                ]
+              ]
+            }
+          ]
+        },
+        "email": {
+          "confidence": 1.0,
+          "page_id": 0,
+          "values": [
+            {
+              "confidence": 1.0,
+              "content": "contact@mindee.com",
+              "polygon": [
+                [
+                  0.522,
+                  0.917
+                ],
+                [
+                  0.623,
+                  0.916
+                ],
+                [
+                  0.623,
+                  0.923
+                ],
+                [
+                  0.523,
+                  0.924
+                ]
+              ]
+            }
+          ]
+        },
+        "integer": {
+          "confidence": 0.76,
+          "page_id": 0,
+          "values": [
+            {
+              "confidence": 0.76,
+              "content": "2100505343",
+              "polygon": [
+                [
+                  0.559,
+                  0.179
+                ],
+                [
+                  0.652,
+                  0.178
+                ],
+                [
+                  0.652,
+                  0.187
+                ],
+                [
+                  0.56,
+                  0.188
+                ]
+              ]
+            }
+          ]
+        },
+        "number": {
+          "confidence": 0.9,
+          "page_id": 0,
+          "values": [
+            {
+              "confidence": 0.9,
+              "content": "2100505343",
+              "polygon": [
+                [
+                  0.559,
+                  0.179
+                ],
+                [
+                  0.652,
+                  0.178
+                ],
+                [
+                  0.652,
+                  0.187
+                ],
+                [
+                  0.56,
+                  0.188
+                ]
+              ]
+            }
+          ]
+        },
+        "phone": {
+          "confidence": 0.69,
+          "page_id": 0,
+          "values": [
+            {
+              "confidence": 0.69,
+              "content": "8675309",
+              "polygon": [
+                [
+                  0.66,
+                  0.253
+                ],
+                [
+                  0.764,
+                  0.253
+                ],
+                [
+                  0.764,
+                  0.262
+                ],
+                [
+                  0.66,
+                  0.263
+                ]
+              ]
+            }
+          ]
+        },
+        "string_09": {
+          "confidence": 0.98,
+          "page_id": 1,
+          "values": [
+            {
+              "confidence": 0.98,
+              "content": "10119",
+              "polygon": [
+                [
+                  0.113,
+                  0.149
+                ],
+                [
+                  0.158,
+                  0.149
+                ],
+                [
+                  0.158,
+                  0.158
+                ],
+                [
+                  0.113,
+                  0.159
+                ]
+              ]
+            }
+          ]
+        },
+        "string_all": {
+          "confidence": 0.99,
+          "values": [
+            {
+              "confidence": 0.99,
+              "content": "Mindee",
+              "polygon": [
+                [
+                  0.715,
+                  0.018
+                ],
+                [
+                  0.956,
+                  0.015
+                ],
+                [
+                  0.956,
+                  0.053
+                ],
+                [
+                  0.716,
+                  0.057
+                ]
+              ]
+            },
+            {
+              "confidence": 0.94,
+              "content": "is",
+              "polygon": [
+                [
+                  0.715,
+                  0.018
+                ],
+                [
+                  0.956,
+                  0.015
+                ],
+                [
+                  0.956,
+                  0.053
+                ],
+                [
+                  0.716,
+                  0.057
+                ]
+              ]
+            },
+            {
+              "confidence": 0.91,
+              "content": "awesome",
+              "polygon": [
+                [
+                  0.715,
+                  0.018
+                ],
+                [
+                  0.956,
+                  0.015
+                ],
+                [
+                  0.956,
+                  0.053
+                ],
+                [
+                  0.716,
+                  0.057
+                ]
+              ]
+            }
+          ]
+        },
+        "string_az": {
+          "confidence": 0.67,
+          "page_id": 1,
+          "values": [
+            {
+              "confidence": 0.67,
+              "content": "Mindee",
+              "polygon": [
+                [
+                  0.112,
+                  0.125
+                ],
+                [
+                  0.186,
+                  0.124
+                ],
+                [
+                  0.186,
+                  0.133
+                ],
+                [
+                  0.113,
+                  0.134
+                ]
+              ]
+            }
+          ]
+        },
+        "url": {
+          "confidence": 1.0,
+          "page_id": 1,
+          "values": [
+            {
+              "confidence": 1.0,
+              "content": "developers.mindee.com/docs",
+              "polygon": [
+                [
+                  0.576,
+                  0.366
+                ],
+                [
+                  0.831,
+                  0.366
+                ],
+                [
+                  0.831,
+                  0.383
+                ],
+                [
+                  0.576,
+                  0.383
+                ]
+              ]
+            }
+          ]
+        }
+      },
+      "processing_time": 8.079,
+      "product": {
+        "features": [
+          "string_all",
+          "string_az",
+          "string_09",
+          "number",
+          "integer",
+          "date_normal",
+          "date_us",
+          "phone",
+          "email",
+          "url"
+        ],
+        "name": "ianare/field_test",
+        "type": "constructed",
+        "version": "1.1"
+      },
+      "started_at": "2022-05-19T08:55:26+00:00"
+    },
+    "n_pages": 2,
+    "name": "0a8c49a9-b40a-4c62-98fa-d9412d9a3795.pdf"
+  }
+}
\ No newline at end of file
diff --git a/tests/data/custom/response/doc_to_string.txt b/tests/data/custom/response/doc_to_string.txt
new file mode 100644
index 00000000..7a8d3a7f
--- /dev/null
+++ b/tests/data/custom/response/doc_to_string.txt
@@ -0,0 +1,12 @@
+----- field_test -----
+date_normal: 2020-12-17
+date_us: 2020-12-17
+email: contact@mindee.com
+integer: 2100505343
+number: 2100505343
+phone: 8675309
+string_09: 10119
+string_all: Mindee is awesome
+string_az: Mindee
+url: developers.mindee.com/docs
+----------------------
diff --git a/tests/data/custom/response/empty.json b/tests/data/custom/response/empty.json
new file mode 100644
index 00000000..7c0d349a
--- /dev/null
+++ b/tests/data/custom/response/empty.json
@@ -0,0 +1,143 @@
+{
+  "api_request": {
+    "error": {},
+    "resources": [
+      "document"
+    ],
+    "status": "success",
+    "status_code": 201,
+    "url": "http://api.mindee.net/v1/products/ianare/field_test/v1/predict?global_orientation=true"
+  },
+  "document": {
+    "id": "37067c22-4cea-40d3-9809-b9ca1bfedd33",
+    "inference": {
+      "extras": {},
+      "finished_at": "2022-05-19T08:57:40+00:00",
+      "is_rotation_applied": true,
+      "pages": [
+        {
+          "extras": {},
+          "id": 0,
+          "orientation": {
+            "value": 0
+          },
+          "prediction": {
+            "date_normal": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "date_us": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "email": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "integer": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "number": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "phone": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "string_09": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "string_all": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "string_az": {
+              "confidence": 0.0,
+              "values": []
+            },
+            "url": {
+              "confidence": 0.0,
+              "values": []
+            }
+          }
+        }
+      ],
+      "prediction": {
+        "date_normal": {
+          "confidence": 0.0,
+          "page_id": 0,
+          "values": []
+        },
+        "date_us": {
+          "confidence": 0.0,
+          "page_id": 0,
+          "values": []
+        },
+        "email": {
+          "confidence": 0.0,
+          "page_id": 0,
+          "values": []
+        },
+        "integer": {
+          "confidence": 0.0,
+          "page_id": 0,
+          "values": []
+        },
+        "number": {
+          "confidence": 0.0,
+          "page_id": 0,
+          "values": []
+        },
+        "phone": {
+          "confidence": 0.0,
+          "page_id": 0,
+          "values": []
+        },
+        "string_09": {
+          "confidence": 0.0,
+          "page_id": 0,
+          "values": []
+        },
+        "string_all": {
+          "confidence": 0.0,
+          "page_id": 0,
+          "values": []
+        },
+        "string_az": {
+          "confidence": 0.0,
+          "page_id": 0,
+          "values": []
+        },
+        "url": {
+          "confidence": 0.0,
+          "page_id": 0,
+          "values": []
+        }
+      },
+      "processing_time": 0.593,
+      "product": {
+        "features": [
+          "string_all",
+          "string_az",
+          "string_09",
+          "number",
+          "integer",
+          "date_normal",
+          "date_us",
+          "phone",
+          "email",
+          "url"
+        ],
+        "name": "ianare/field_test",
+        "type": "constructed",
+        "version": "1.1"
+      },
+      "started_at": "2022-05-19T08:57:40+00:00"
+    },
+    "n_pages": 1,
+    "name": "hello.pdf"
+  }
+}
\ No newline at end of file
diff --git a/tests/data/custom/response/page0_to_string.txt b/tests/data/custom/response/page0_to_string.txt
new file mode 100644
index 00000000..40c5d031
--- /dev/null
+++ b/tests/data/custom/response/page0_to_string.txt
@@ -0,0 +1,12 @@
+----- field_test -----
+date_normal: 2020-12-17
+date_us: 2020-12-17
+email: jenny@example.com
+integer: 2100505343
+number: 2100505343
+phone: 8675309
+string_09: 10119
+string_all: Jenny is great
+string_az: Jenny
+url:
+----------------------
diff --git a/tests/data/custom/response/page1_to_string.txt b/tests/data/custom/response/page1_to_string.txt
new file mode 100644
index 00000000..7179e39e
--- /dev/null
+++ b/tests/data/custom/response/page1_to_string.txt
@@ -0,0 +1,12 @@
+----- field_test -----
+date_normal:
+date_us:
+email:
+integer: 2100505343
+number: 2100505343
+phone: 1231234
+string_09: 10119
+string_all: Mindee is awesome
+string_az: Mindee
+url: developers.mindee.com/docs
+----------------------
diff --git a/tests/data/invoices/invoice.pdf b/tests/data/invoice/invoice.pdf
similarity index 100%
rename from tests/data/invoices/invoice.pdf
rename to tests/data/invoice/invoice.pdf
diff --git a/tests/data/invoices/invoice_10p.pdf b/tests/data/invoice/invoice_10p.pdf
similarity index 100%
rename from tests/data/invoices/invoice_10p.pdf
rename to tests/data/invoice/invoice_10p.pdf
diff --git a/tests/data/invoices/invoice_10p.txt b/tests/data/invoice/invoice_10p.txt
similarity index 100%
rename from tests/data/invoices/invoice_10p.txt
rename to tests/data/invoice/invoice_10p.txt
diff --git a/tests/data/invoices/v3/invoice.json b/tests/data/invoice/response/complete.json
similarity index 100%
rename from tests/data/invoices/v3/invoice.json
rename to tests/data/invoice/response/complete.json
diff --git a/tests/data/invoice/response/doc_to_string.txt b/tests/data/invoice/response/doc_to_string.txt
new file mode 100644
index 00000000..e4d5b50d
--- /dev/null
+++ b/tests/data/invoice/response/doc_to_string.txt
@@ -0,0 +1,18 @@
+-----Invoice data-----
+Filename: None
+Invoice number: 0042004801351
+Total amount including taxes: 587.95
+Total amount excluding taxes: 489.97
+Invoice date: 2020-02-17
+Invoice due date: 2020-02-17
+Supplier name: TURNPIKE DESIGNS CO.
+Supplier address: 156 University Ave, Toronto ON, Canada M5H 2H7
+Customer name: JIRO DOI
+Customer company registration: FR00000000000; 111222333
+Customer address: 1954 Bloon Street West Toronto, ON, M6P 3K9 Canada
+Payment details: FR7640254025476501124705368;
+Company numbers: 501124705; FR33501124705
+Taxes: 97.98 20.0%
+Total taxes: 97.98
+Locale: fr; fr; EUR;
+----------------------
diff --git a/tests/data/invoices/v3/invoice_all_na.json b/tests/data/invoice/response/empty.json
similarity index 100%
rename from tests/data/invoices/v3/invoice_all_na.json
rename to tests/data/invoice/response/empty.json
diff --git a/tests/data/invoice/response/page0_to_string.txt b/tests/data/invoice/response/page0_to_string.txt
new file mode 100644
index 00000000..43f75827
--- /dev/null
+++ b/tests/data/invoice/response/page0_to_string.txt
@@ -0,0 +1,18 @@
+-----Invoice data-----
+Filename: None
+Invoice number: 0042004801351
+Total amount including taxes: 587.95
+Total amount excluding taxes: 489.97
+Invoice date: 2020-02-17
+Invoice due date: 2020-02-17
+Supplier name: 
+Supplier address: 
+Customer name: 
+Customer company registration: 
+Customer address: 
+Payment details: FR7640254025476501124705368;
+Company numbers: 501124705; FR33501124705
+Taxes: 97.98 20.0%
+Total taxes: 97.98
+Locale: fr; fr; EUR;
+----------------------
diff --git a/tests/data/passport/v1/passport.json b/tests/data/passport/response/complete.json
similarity index 97%
rename from tests/data/passport/v1/passport.json
rename to tests/data/passport/response/complete.json
index ac13692e..492ec016 100644
--- a/tests/data/passport/v1/passport.json
+++ b/tests/data/passport/response/complete.json
@@ -20,7 +20,7 @@
           "id": 0,
           "prediction": {
             "birth_date": {
-              "confidence": 1.0,
+              "confidence": 0.98,
               "polygon": [
                 [
                   0.341,
@@ -86,7 +86,7 @@
               "value": "GBR"
             },
             "expiry_date": {
-              "confidence": 1.0,
+              "confidence": 0.98,
               "polygon": [
                 [
                   0.34,
@@ -105,7 +105,7 @@
                   0.82
                 ]
               ],
-              "value": "2017-04-22"
+              "value": "2057-04-22"
             },
             "gender": {
               "confidence": 1.0,
@@ -154,7 +154,7 @@
               }
             ],
             "id_number": {
-              "confidence": 1.0,
+              "confidence": 0.98,
               "polygon": [
                 [
                   0.723,
@@ -272,7 +272,7 @@
       ],
       "prediction": {
         "birth_date": {
-          "confidence": 1.0,
+          "confidence": 0.98,
           "page_id": 0,
           "polygon": [
             [
@@ -341,7 +341,7 @@
           "value": "GBR"
         },
         "expiry_date": {
-          "confidence": 1.0,
+          "confidence": 0.98,
           "page_id": 0,
           "polygon": [
             [
@@ -361,7 +361,7 @@
               0.82
             ]
           ],
-          "value": "2017-04-22"
+          "value": "2057-04-22"
         },
         "gender": {
           "confidence": 1.0,
@@ -412,7 +412,7 @@
           }
         ],
         "id_number": {
-          "confidence": 1.0,
+          "confidence": 0.98,
           "page_id": 0,
           "polygon": [
             [
diff --git a/tests/data/passport/response/doc_to_string.txt b/tests/data/passport/response/doc_to_string.txt
new file mode 100644
index 00000000..0b7982bc
--- /dev/null
+++ b/tests/data/passport/response/doc_to_string.txt
@@ -0,0 +1,14 @@
+-----Passport data-----
+Filename: None
+Full name: HENERT PUDARSAN
+Given names: HENERT
+Surname: PUDARSAN
+Country: GBR
+ID Number: 707797979
+Issuance date: 2012-04-22
+Birth date: 1995-05-20
+Expiry date: 2057-04-22
+MRZ 1: P<GBRPUDARSAN<<HENERT<<<<<<<<<<<<<<<<<<<<<<<
+MRZ 2: 7077979792GBR9505209M1704224<<<<<<<<<<<<<<00
+MRZ: P<GBRPUDARSAN<<HENERT<<<<<<<<<<<<<<<<<<<<<<<7077979792GBR9505209M1704224<<<<<<<<<<<<<<00
+----------------------
diff --git a/tests/data/passport/v1/passport_all_na.json b/tests/data/passport/response/empty.json
similarity index 100%
rename from tests/data/passport/v1/passport_all_na.json
rename to tests/data/passport/response/empty.json
diff --git a/tests/data/passport/response/page0_to_string.txt b/tests/data/passport/response/page0_to_string.txt
new file mode 100644
index 00000000..796f3190
--- /dev/null
+++ b/tests/data/passport/response/page0_to_string.txt
@@ -0,0 +1,14 @@
+-----Passport data-----
+Filename: None
+Full name: HENERT PUDARSAN
+Given names: HENERT
+Surname: PUDARSAN
+Country: GBR
+ID Number: 707797979
+Issuance date: 2012-04-22
+Birth date: 1995-05-20
+Expiry date: 2057-04-22
+MRZ 1: P<GBRPUDARSAN<<HENERT<<<<<<<<<<<<<<<<<<<<<<<
+MRZ 2: 7077979792GBR9505209M1704224<<<<<<<<<<<<<<00
+MRZ: P<GBRPUDARSAN<<HENERT<<<<<<<<<<<<<<<<<<<<<<<7077979792GBR9505209M1704224<<<<<<<<<<<<<<00
+----------------------
\ No newline at end of file
diff --git a/tests/data/expense_receipts/receipt.jpg b/tests/data/receipt/receipt.jpg
similarity index 100%
rename from tests/data/expense_receipts/receipt.jpg
rename to tests/data/receipt/receipt.jpg
diff --git a/tests/data/expense_receipts/receipt.jpga b/tests/data/receipt/receipt.jpga
similarity index 100%
rename from tests/data/expense_receipts/receipt.jpga
rename to tests/data/receipt/receipt.jpga
diff --git a/tests/data/expense_receipts/receipt.txt b/tests/data/receipt/receipt.txt
similarity index 100%
rename from tests/data/expense_receipts/receipt.txt
rename to tests/data/receipt/receipt.txt
diff --git a/tests/data/expense_receipts/v3/receipt.json b/tests/data/receipt/response/complete.json
similarity index 100%
rename from tests/data/expense_receipts/v3/receipt.json
rename to tests/data/receipt/response/complete.json
diff --git a/tests/data/receipt/response/doc_to_string.txt b/tests/data/receipt/response/doc_to_string.txt
new file mode 100644
index 00000000..e13c20f9
--- /dev/null
+++ b/tests/data/receipt/response/doc_to_string.txt
@@ -0,0 +1,12 @@
+-----Receipt data-----
+Filename: None
+Total amount including taxes: 10.2
+Total amount excluding taxes: 8.5
+Date: 2016-02-26
+Category: food
+Time: 15:20
+Merchant name: CLACHAN
+Taxes: 1.7 20.0%
+Total taxes: 1.7
+Locale: en-GB; en; GB; GBP;
+----------------------
diff --git a/tests/data/expense_receipts/v3/receipt_all_na.json b/tests/data/receipt/response/empty.json
similarity index 94%
rename from tests/data/expense_receipts/v3/receipt_all_na.json
rename to tests/data/receipt/response/empty.json
index e53d2073..49483c4e 100644
--- a/tests/data/expense_receipts/v3/receipt_all_na.json
+++ b/tests/data/receipt/response/empty.json
@@ -20,8 +20,8 @@
           "id": 0,
           "prediction": {
             "category": {
-              "confidence": 0.46,
-              "value": "food"
+              "confidence": 0.0,
+              "value": null
             },
             "date": {
               "confidence": 0.0,
@@ -30,7 +30,7 @@
               "value": null
             },
             "locale": {
-              "confidence": 0.15,
+              "confidence": 0.0,
               "country": null,
               "currency": null,
               "language": null,
@@ -62,8 +62,8 @@
       ],
       "prediction": {
         "category": {
-          "confidence": 0.46,
-          "value": "food"
+          "confidence": 0.0,
+          "value": null
         },
         "date": {
           "confidence": 0.0,
diff --git a/tests/data/receipt/response/page0_to_string.txt b/tests/data/receipt/response/page0_to_string.txt
new file mode 100644
index 00000000..e13c20f9
--- /dev/null
+++ b/tests/data/receipt/response/page0_to_string.txt
@@ -0,0 +1,12 @@
+-----Receipt data-----
+Filename: None
+Total amount including taxes: 10.2
+Total amount excluding taxes: 8.5
+Date: 2016-02-26
+Category: food
+Time: 15:20
+Merchant name: CLACHAN
+Taxes: 1.7 20.0%
+Total taxes: 1.7
+Locale: en-GB; en; GB; GBP;
+----------------------
diff --git a/tests/data/response_dump.json b/tests/data/response_dump.json
deleted file mode 100644
index 621105df..00000000
--- a/tests/data/response_dump.json
+++ /dev/null
@@ -1 +0,0 @@
-{"api_request": {"error": {}, "resources": ["document"], "status": "success", "status_code": 201, "url": "http://api.mindee.net/v1/products/mindee/expense_receipts/v3/predict?include_mvision=True"}, "document": {"annotations": {"labels": []}, "id": "79b9ea7f-ab4f-429e-9631-98d29ba2a49d", "inference": {"finished_at": "2021-08-24T08:10:12+00:00", "pages": [{"id": 0, "prediction": {"category": {"confidence": 0.99, "value": "food"}, "date": {"confidence": 0.99, "polygon": [[0.479, 0.173], [0.613, 0.173], [0.613, 0.197], [0.479, 0.197]], "raw": "26-Feb-2016", "value": "2016-02-26"}, "locale": {"confidence": 0.82, "country": "GB", "currency": "GBP", "language": "en", "value": "en-GB"}, "orientation": {"confidence": 0.99, "degrees": 0}, "supplier": {"confidence": 0.71, "polygon": [[0.394, 0.068], [0.477, 0.068], [0.477, 0.087], [0.394, 0.087]], "value": "CLACHAN"}, "taxes": [{"code": "None", "confidence": 0.98, "polygon": [[0.19, 0.402], [0.698, 0.402], [0.698, 0.432], [0.19, 0.432]], "rate": 20.0, "value": 1.7}], "time": {"confidence": 0.99, "polygon": [[0.62, 0.173], [0.681, 0.173], [0.681, 0.191], [0.62, 0.191]], "raw": "15:20", "value": "15:20"}, "total_incl": {"confidence": 0.99, "polygon": [[0.549, 0.619], [0.715, 0.619], [0.715, 0.642], [0.549, 0.642]], "value": 10.2}}}], "prediction": {"category": {"confidence": 0.99, "value": "food"}, "date": {"confidence": 0.99, "page_id": 0, "polygon": [[0.479, 0.173], [0.613, 0.173], [0.613, 0.197], [0.479, 0.197]], "raw": "26-Feb-2016", "value": "2016-02-26"}, "locale": {"confidence": 0.82, "country": "GB", "currency": "GBP", "language": "en", "value": "en-GB"}, "supplier": {"confidence": 0.71, "page_id": 0, "polygon": [[0.394, 0.068], [0.477, 0.068], [0.477, 0.087], [0.394, 0.087]], "value": "CLACHAN"}, "taxes": [{"code": "None", "confidence": 0.98, "page_id": 0, "polygon": [[0.19, 0.402], [0.698, 0.402], [0.698, 0.432], [0.19, 0.432]], "rate": 20.0, "value": 1.7}], "time": {"confidence": 0.99, "page_id": 0, "polygon": [[0.62, 0.173], [0.681, 0.173], [0.681, 0.191], [0.62, 0.191]], "raw": "15:20", "value": "15:20"}, "total_incl": {"confidence": 0.99, "page_id": 0, "polygon": [[0.549, 0.619], [0.715, 0.619], [0.715, 0.642], [0.549, 0.642]], "value": 10.2}}, "processing_time": 1.099, "product": {"features": ["locale", "category", "date", "time", "total_incl", "taxes", "supplier", "orientation"], "name": "mindee/expense_receipts", "type": "standard", "version": "3.0"}, "started_at": "2021-08-24T08:10:11+00:00"}, "n_pages": 1, "name": "document", "ocr": {}}, "document_type": "receipt", "input_type": "path", "filename": "", "filepath": "./tests/data/expense_receipts/receipt.jpg", "file_extension": "image/jpeg"}
\ No newline at end of file
diff --git a/tests/documents/test_custom_doc.py b/tests/documents/test_custom_doc.py
new file mode 100644
index 00000000..61597905
--- /dev/null
+++ b/tests/documents/test_custom_doc.py
@@ -0,0 +1,33 @@
+import json
+
+import pytest
+
+from mindee.documents.custom_document import CustomDocument
+from tests import CUSTOM_DATA_DIR
+
+CUSTOM_FILE_PATH = f"{CUSTOM_DATA_DIR}/response/complete.json"
+CUSTOM_NA_FILE_PATH = f"{CUSTOM_DATA_DIR}/response/empty.json"
+
+
+@pytest.fixture
+def custom_doc_object():
+    json_data = json.load(open(CUSTOM_FILE_PATH))
+    return CustomDocument(
+        "field_test", json_data["document"]["inference"]["prediction"], page_n=None
+    )
+
+
+@pytest.fixture
+def invoice_pred():
+    json_data = json.load(open(CUSTOM_NA_FILE_PATH))
+    return json_data["document"]["inference"]["pages"][0]["prediction"]
+
+
+@pytest.fixture
+def custom_doc_object_all_na(invoice_pred):
+    return CustomDocument("field_test", invoice_pred)
+
+
+def test_constructor(custom_doc_object):
+    doc_str = open(f"{CUSTOM_DATA_DIR}/response/doc_to_string.txt").read().strip()
+    assert str(custom_doc_object) == doc_str
diff --git a/tests/documents/test_document.py b/tests/documents/test_document.py
index 28bf9596..44b222ec 100644
--- a/tests/documents/test_document.py
+++ b/tests/documents/test_document.py
@@ -12,7 +12,7 @@
 
 @pytest.fixture
 def dummy_file_input():
-    file_input = PathDocument("./tests/data/expense_receipts/receipt.jpg")
+    file_input = PathDocument("./tests/data/receipt/receipt.jpg")
     return file_input
 
 
diff --git a/tests/documents/test_financial_doc.py b/tests/documents/test_financial_doc.py
index 5415c4ac..e19d5acd 100644
--- a/tests/documents/test_financial_doc.py
+++ b/tests/documents/test_financial_doc.py
@@ -9,33 +9,33 @@
 
 @pytest.fixture
 def financial_doc_from_invoice_object():
-    invoice_json_repsonse = json.load(open(INVOICE_FILE_PATH))
+    json_data = json.load(open(INVOICE_FILE_PATH))
     return FinancialDocument(
-        invoice_json_repsonse["document"]["inference"]["prediction"], page_n=None
+        json_data["document"]["inference"]["prediction"], page_n=None
     )
 
 
 @pytest.fixture
 def financial_doc_from_receipt_object():
-    receipt_json_repsonse = json.load(open(RECEIPT_FILE_PATH))
+    json_data = json.load(open(RECEIPT_FILE_PATH))
     return FinancialDocument(
-        receipt_json_repsonse["document"]["inference"]["prediction"], page_n=None
+        json_data["document"]["inference"]["prediction"], page_n=None
     )
 
 
 @pytest.fixture
 def financial_doc_from_receipt_object_all_na():
-    json_repsonse = json.load(open(RECEIPT_NA_FILE_PATH))
+    json_data = json.load(open(RECEIPT_NA_FILE_PATH))
     return FinancialDocument(
-        json_repsonse["document"]["inference"]["pages"][0]["prediction"]
+        json_data["document"]["inference"]["pages"][0]["prediction"]
     )
 
 
 @pytest.fixture
 def financial_doc_from_invoice_object_all_na():
-    json_repsonse = json.load(open(INVOICE_NA_FILE_PATH))
+    json_data = json.load(open(INVOICE_NA_FILE_PATH))
     return FinancialDocument(
-        json_repsonse["document"]["inference"]["pages"][0]["prediction"]
+        json_data["document"]["inference"]["pages"][0]["prediction"]
     )
 
 
diff --git a/tests/documents/test_invoice.py b/tests/documents/test_invoice.py
index 62cc4255..e75853e1 100644
--- a/tests/documents/test_invoice.py
+++ b/tests/documents/test_invoice.py
@@ -3,15 +3,16 @@
 import pytest
 
 from mindee.documents.invoice import Invoice
+from tests import INVOICE_DATA_DIR
 
-INVOICE_FILE_PATH = "./tests/data/invoices/v3/invoice.json"
-INVOICE_NA_FILE_PATH = "./tests/data/invoices/v3/invoice_all_na.json"
+INVOICE_FILE_PATH = f"{INVOICE_DATA_DIR}/response/complete.json"
+INVOICE_NA_FILE_PATH = f"{INVOICE_DATA_DIR}/response/empty.json"
 
 
 @pytest.fixture
 def invoice_object():
-    json_repsonse = json.load(open(INVOICE_FILE_PATH))
-    return Invoice(json_repsonse["document"]["inference"]["prediction"], page_n=None)
+    json_data = json.load(open(INVOICE_FILE_PATH))
+    return Invoice(json_data["document"]["inference"]["prediction"], page_n=None)
 
 
 @pytest.fixture
@@ -21,8 +22,8 @@ def invoice_object_all_na(invoice_pred):
 
 @pytest.fixture
 def invoice_pred():
-    invoice_json = json.load(open(INVOICE_NA_FILE_PATH))
-    return invoice_json["document"]["inference"]["pages"][0]["prediction"]
+    json_data = json.load(open(INVOICE_NA_FILE_PATH))
+    return json_data["document"]["inference"]["pages"][0]["prediction"]
 
 
 # Technical tests
@@ -36,27 +37,8 @@ def test_constructor(invoice_object):
     assert invoice_object.invoice_date.confidence == 0.99
     assert invoice_object.invoice_number.value == "0042004801351"
     assert invoice_object.invoice_number.confidence == 0.95
-    assert (
-        str(invoice_object)
-        == """-----Invoice data-----
-Filename: None
-Invoice number: 0042004801351
-Total amount including taxes: 587.95
-Total amount excluding taxes: 489.97
-Invoice date: 2020-02-17
-Invoice due date: 2020-02-17
-Supplier name: TURNPIKE DESIGNS CO.
-Supplier address: 156 University Ave, Toronto ON, Canada M5H 2H7
-Customer name: JIRO DOI
-Customer company registration: FR00000000000; 111222333
-Customer address: 1954 Bloon Street West Toronto, ON, M6P 3K9 Canada
-Payment details: FR7640254025476501124705368;
-Company numbers: 501124705; FR33501124705
-Taxes: 97.98 20.0%
-Total taxes: 97.98
-Locale: fr; fr; EUR;
-----------------------"""
-    )
+    doc_str = open(f"{INVOICE_DATA_DIR}/response/doc_to_string.txt").read().strip()
+    assert str(invoice_object) == doc_str
 
 
 def test_all_na(invoice_object_all_na):
diff --git a/tests/documents/test_passport.py b/tests/documents/test_passport.py
index 9e8eaa9f..5f7a002e 100644
--- a/tests/documents/test_passport.py
+++ b/tests/documents/test_passport.py
@@ -3,40 +3,26 @@
 import pytest
 
 from mindee.documents.passport import Passport
+from tests import PASSPORT_DATA_DIR
 
 
 @pytest.fixture
 def passport_object():
-    json_repsonse = json.load(open("./tests/data/passport/v1/passport.json"))
-    return Passport(json_repsonse["document"]["inference"]["pages"][0]["prediction"])
+    json_data = json.load(open(f"{PASSPORT_DATA_DIR}/response/complete.json"))
+    return Passport(json_data["document"]["inference"]["pages"][0]["prediction"])
 
 
 @pytest.fixture
 def passport_object_all_na():
-    json_repsonse = json.load(open("./tests/data/passport/v1/passport_all_na.json"))
-    return Passport(json_repsonse["document"]["inference"]["pages"][0]["prediction"])
+    json_data = json.load(open(f"{PASSPORT_DATA_DIR}/response/empty.json"))
+    return Passport(json_data["document"]["inference"]["pages"][0]["prediction"])
 
 
 def test_constructor(passport_object):
-    assert passport_object.is_expired()
+    assert not passport_object.is_expired()
     assert passport_object.all_checks()
-    assert (
-        str(passport_object)
-        == """-----Passport data-----
-Filename: None
-Full name: HENERT PUDARSAN
-Given names: HENERT
-Surname: PUDARSAN
-Country: GBR
-ID Number: 707797979
-Issuance date: 2012-04-22
-Birth date: 1995-05-20
-Expiry date: 2017-04-22
-MRZ 1: P<GBRPUDARSAN<<HENERT<<<<<<<<<<<<<<<<<<<<<<<
-MRZ 2: 7077979792GBR9505209M1704224<<<<<<<<<<<<<<00
-MRZ: P<GBRPUDARSAN<<HENERT<<<<<<<<<<<<<<<<<<<<<<<7077979792GBR9505209M1704224<<<<<<<<<<<<<<00
-----------------------"""
-    )
+    doc_str = open(f"{PASSPORT_DATA_DIR}/response/page0_to_string.txt").read().strip()
+    assert str(passport_object) == doc_str
 
 
 def test_all_na(passport_object_all_na):
diff --git a/tests/documents/test_receipt.py b/tests/documents/test_receipt.py
index 02fb84c1..f2710d49 100644
--- a/tests/documents/test_receipt.py
+++ b/tests/documents/test_receipt.py
@@ -3,49 +3,37 @@
 import pytest
 
 from mindee.documents.receipt import Receipt
+from tests import RECEIPT_DATA_DIR
 
-RECEIPT_FILE_PATH = "./tests/data/expense_receipts/v3/receipt.json"
-RECEIPT_NA_FILE_PATH = "./tests/data/expense_receipts/v3/receipt_all_na.json"
+RECEIPT_FILE_PATH = f"{RECEIPT_DATA_DIR}/response/complete.json"
+RECEIPT_NA_FILE_PATH = f"{RECEIPT_DATA_DIR}/response/empty.json"
 
 
 @pytest.fixture
-def receipt_object():
-    json_response = json.load(open(RECEIPT_FILE_PATH))
-    return Receipt(json_response["document"]["inference"]["prediction"], page_n=None)
+def doc_object():
+    json_data = json.load(open(RECEIPT_FILE_PATH))
+    return Receipt(json_data["document"]["inference"]["prediction"], page_n=None)
 
 
 @pytest.fixture
 def receipt_object_all_na():
-    json_response = json.load(open(RECEIPT_NA_FILE_PATH))
-    return Receipt(json_response["document"]["inference"]["prediction"], page_n=None)
+    json_data = json.load(open(RECEIPT_NA_FILE_PATH))
+    return Receipt(json_data["document"]["inference"]["prediction"], page_n=None)
 
 
 @pytest.fixture
 def receipt_pred():
-    json_response = json.load(open(RECEIPT_NA_FILE_PATH))
-    return json_response["document"]["inference"]["pages"][0]["prediction"]
+    json_data = json.load(open(RECEIPT_NA_FILE_PATH))
+    return json_data["document"]["inference"]["pages"][0]["prediction"]
 
 
 # Technical tests
-def test_constructor(receipt_object):
-    assert receipt_object.date.value == "2016-02-26"
-    assert receipt_object.total_tax.value == 1.7
-    assert receipt_object.checklist["taxes_match_total_incl"] is True
-    assert (
-        str(receipt_object)
-        == """-----Receipt data-----
-Filename: None
-Total amount including taxes: 10.2
-Total amount excluding taxes: 8.5
-Date: 2016-02-26
-Category: food
-Time: 15:20
-Merchant name: CLACHAN
-Taxes: 1.7 20.0%
-Total taxes: 1.7
-Locale: en-GB; en; GB; GBP;
-----------------------"""
-    )
+def test_constructor(doc_object):
+    assert doc_object.date.value == "2016-02-26"
+    assert doc_object.total_tax.value == 1.7
+    assert doc_object.checklist["taxes_match_total_incl"] is True
+    doc_str = open(f"{RECEIPT_DATA_DIR}/response/doc_to_string.txt").read().strip()
+    assert str(doc_object) == doc_str
 
 
 def test_all_na(receipt_object_all_na):
diff --git a/tests/test_cli.py b/tests/test_cli.py
index ac227531..4ed73f80 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -33,7 +33,7 @@ def ots_doc(monkeypatch):
         input_type="path",
         output_type="summary",
         include_words=False,
-        path="./tests/data/invoices/invoice.pdf",
+        path="./tests/data/invoice/invoice.pdf",
     )
 
 
diff --git a/tests/test_client.py b/tests/test_client.py
index aa21cf7e..1ca0d6a6 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -2,6 +2,7 @@
 
 from mindee import Client, DocumentResponse
 from mindee.endpoints import HTTPException
+from tests import INVOICE_DATA_DIR, PASSPORT_DATA_DIR, RECEIPT_DATA_DIR
 from tests.utils import clear_envvars, dummy_envvars
 
 
@@ -62,45 +63,34 @@ def dummy_client_no_raise():
     )
 
 
-@pytest.fixture
-def response():
-    return DocumentResponse.load("./tests/data/expense_receipts/v3/receipt.json")
-
-
 def test_parse_path_without_token(empty_client):
     with pytest.raises(RuntimeError):
-        empty_client.doc_from_path("./tests/data/expense_receipts/receipt.jpg").parse(
-            "receipt"
-        )
+        empty_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpg").parse("receipt")
     with pytest.raises(RuntimeError):
-        empty_client.doc_from_path("./tests/data/invoices/invoice.pdf").parse("invoice")
+        empty_client.doc_from_path(f"{INVOICE_DATA_DIR}/invoice.pdf").parse("invoice")
     with pytest.raises(RuntimeError):
-        empty_client.doc_from_path("./tests/data/expense_receipts/receipt.jpg").parse(
+        empty_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpg").parse(
             "financial_doc"
         )
     with pytest.raises(RuntimeError):
-        empty_client.doc_from_path("./tests/data/passport/passport.jpeg").parse(
+        empty_client.doc_from_path(f"{PASSPORT_DATA_DIR}/passport.jpeg").parse(
             "passport"
         )
 
 
 def test_parse_path_with_env_token(env_client):
     with pytest.raises(HTTPException):
-        env_client.doc_from_path("./tests/data/expense_receipts/receipt.jpg").parse(
-            "receipt"
-        )
+        env_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpg").parse("receipt")
     with pytest.raises(HTTPException):
-        env_client.doc_from_path("./tests/data/invoices/invoice.pdf").parse("invoice")
+        env_client.doc_from_path(f"{INVOICE_DATA_DIR}/invoice.pdf").parse("invoice")
     with pytest.raises(HTTPException):
         env_client.doc_from_path(
-            "./tests/data/expense_receipts/receipt.jpg",
+            f"{RECEIPT_DATA_DIR}/receipt.jpg",
         ).parse("financial_doc")
     with pytest.raises(HTTPException):
-        env_client.doc_from_path("./tests/data/passport/passport.jpeg").parse(
-            "passport"
-        )
+        env_client.doc_from_path(f"{PASSPORT_DATA_DIR}/passport.jpeg").parse("passport")
     with pytest.raises(HTTPException):
-        env_client.doc_from_path("./tests/data/passport/passport.jpeg").parse("dummy")
+        env_client.doc_from_path(f"{PASSPORT_DATA_DIR}/passport.jpeg").parse("dummy")
 
 
 def test_duplicate_configs(dummy_client):
@@ -113,55 +103,41 @@ def test_duplicate_configs(dummy_client):
     )
     assert isinstance(client, Client)
     with pytest.raises(RuntimeError):
-        client.doc_from_path("./tests/data/expense_receipts/receipt.jpg").parse(
-            "receipt"
-        )
+        client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpg").parse("receipt")
     with pytest.raises(HTTPException):
-        client.doc_from_path("./tests/data/expense_receipts/receipt.jpg").parse(
+        client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpg").parse(
             "receipt", "dummy"
         )
 
 
 def test_parse_path_with_wrong_filetype(dummy_client):
     with pytest.raises(AssertionError):
-        dummy_client.doc_from_path("./tests/data/expense_receipts/receipt.jpga").parse(
-            "receipt"
-        )
+        dummy_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpga").parse("receipt")
     with pytest.raises(AssertionError):
-        dummy_client.doc_from_path("./tests/data/expense_receipts/receipt.jpga").parse(
-            "invoice"
-        )
+        dummy_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpga").parse("invoice")
     with pytest.raises(AssertionError):
         dummy_client.doc_from_path(
-            "./tests/data/expense_receipts/receipt.jpga",
+            f"{RECEIPT_DATA_DIR}/receipt.jpga",
         ).parse("financial_doc")
     with pytest.raises(AssertionError):
-        dummy_client.doc_from_path("./tests/data/expense_receipts/receipt.jpga").parse(
-            "passport"
-        )
+        dummy_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpga").parse("passport")
 
 
 def test_parse_path_with_wrong_token(dummy_client):
     with pytest.raises(HTTPException):
-        dummy_client.doc_from_path("./tests/data/expense_receipts/receipt.jpg").parse(
-            "receipt"
-        )
+        dummy_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpg").parse("receipt")
     with pytest.raises(HTTPException):
-        dummy_client.doc_from_path("./tests/data/expense_receipts/receipt.jpg").parse(
-            "invoice"
-        )
+        dummy_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpg").parse("invoice")
     with pytest.raises(HTTPException):
         dummy_client.doc_from_path(
-            "./tests/data/expense_receipts/receipt.jpg",
+            f"{RECEIPT_DATA_DIR}/receipt.jpg",
         ).parse("financial_doc")
     with pytest.raises(HTTPException):
-        dummy_client.doc_from_path("./tests/data/invoices/invoice.pdf").parse(
+        dummy_client.doc_from_path(f"{INVOICE_DATA_DIR}/invoice.pdf").parse(
             "financial_doc"
         )
     with pytest.raises(HTTPException):
-        dummy_client.doc_from_path("./tests/data/expense_receipts/receipt.jpg").parse(
-            "passport"
-        )
+        dummy_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpg").parse("passport")
 
 
 def test_response_load_failure():
@@ -171,14 +147,12 @@ def test_response_load_failure():
 
 def test_request_with_filepath(dummy_client):
     with pytest.raises(HTTPException):
-        dummy_client.doc_from_path("./tests/data/expense_receipts/receipt.jpg").parse(
-            "receipt"
-        )
+        dummy_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpg").parse("receipt")
 
 
 def test_request_without_raise_on_error(dummy_client_no_raise):
     result = dummy_client_no_raise.doc_from_path(
-        "./tests/data/expense_receipts/receipt.jpg"
+        f"{RECEIPT_DATA_DIR}/receipt.jpg"
     ).parse("receipt")
     assert result.receipt is None
     assert len(result.receipts) == 0
@@ -186,7 +160,7 @@ def test_request_without_raise_on_error(dummy_client_no_raise):
 
 def test_request_without_raise_on_error_include_words(dummy_client_no_raise):
     result = dummy_client_no_raise.doc_from_path(
-        "./tests/data/expense_receipts/receipt.jpg"
+        f"{RECEIPT_DATA_DIR}/receipt.jpg"
     ).parse("receipt", include_words=True)
     assert result.receipt is None
     assert len(result.receipts) == 0
@@ -211,13 +185,11 @@ def test_interface_version():
         version="1.1",
     )
     with pytest.raises(HTTPException):
-        fixed_client.doc_from_path("./tests/data/expense_receipts/receipt.jpg").parse(
-            "dummy"
-        )
+        fixed_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpg").parse("dummy")
 
 
 def test_keep_file_open(dummy_client):
-    doc = dummy_client.doc_from_path("./tests/data/expense_receipts/receipt.jpg")
+    doc = dummy_client.doc_from_path(f"{RECEIPT_DATA_DIR}/receipt.jpg")
     try:
         doc.parse("receipt", close_file=False)
     except HTTPException:
diff --git a/tests/test_inputs.py b/tests/test_inputs.py
index 4bfc380c..7e56272b 100644
--- a/tests/test_inputs.py
+++ b/tests/test_inputs.py
@@ -8,19 +8,19 @@
 def test_pdf_reconstruct_fail():
     with pytest.raises(AssertionError):
         PathDocument(
-            "./tests/data/invoices/invoice_10p.pdf",
+            "./tests/data/invoice/invoice_10p.pdf",
             cut_pdf=True,
             n_pdf_pages=4,
         )
 
 
 def test_pdf_reconstruct_ok():
-    input_file = PathDocument("./tests/data/invoices/invoice_10p.pdf")
+    input_file = PathDocument("./tests/data/invoice/invoice_10p.pdf")
     assert isinstance(input_file.file_object, io.BytesIO)
 
 
 def test_read_contents():
-    input_doc = PathDocument("./tests/data/invoices/invoice.pdf")
+    input_doc = PathDocument("./tests/data/invoice/invoice.pdf")
     contents = input_doc.read_contents(close_file=False)
     assert contents[0] == "invoice.pdf"
     assert isinstance(contents[1], bytes)
@@ -31,24 +31,24 @@ def test_read_contents():
 
 
 def test_pdf_reconstruct_no_cut():
-    input_file = PathDocument("./tests/data/invoices/invoice_10p.pdf", cut_pdf=False)
+    input_file = PathDocument("./tests/data/invoice/invoice_10p.pdf", cut_pdf=False)
     assert input_file.count_pdf_pages() == 10
     assert isinstance(input_file.file_object, io.BufferedReader)
 
 
 def test_pdf_reconstruct_check_n_pages():
     input_obj_3 = PathDocument(
-        "./tests/data/invoices/invoice_10p.pdf",
+        "./tests/data/invoice/invoice_10p.pdf",
         cut_pdf=True,
         n_pdf_pages=3,
     )
     input_obj_2 = PathDocument(
-        "./tests/data/invoices/invoice_10p.pdf",
+        "./tests/data/invoice/invoice_10p.pdf",
         cut_pdf=True,
         n_pdf_pages=2,
     )
     input_obj_1 = PathDocument(
-        "./tests/data/invoices/invoice_10p.pdf",
+        "./tests/data/invoice/invoice_10p.pdf",
         cut_pdf=True,
         n_pdf_pages=1,
     )
@@ -65,7 +65,7 @@ def test_pdf_reconstruct_check_n_pages():
 
 def test_input_from_path():
     input_obj_1 = PathDocument(
-        "./tests/data/invoices/invoice_10p.pdf",
+        "./tests/data/invoice/invoice_10p.pdf",
         cut_pdf=True,
         n_pdf_pages=1,
     )
@@ -73,13 +73,13 @@ def test_input_from_path():
 
 
 def test_input_from_file():
-    with open("./tests/data/invoices/invoice_10p.pdf", "rb") as fp:
+    with open("./tests/data/invoice/invoice_10p.pdf", "rb") as fp:
         input_obj_1 = FileDocument(fp, cut_pdf=True, n_pdf_pages=1)
     assert input_obj_1.count_pdf_pages() == 1
 
 
 def test_input_from_base64():
-    with open("./tests/data/invoices/invoice_10p.txt", "rt") as fp:
+    with open("./tests/data/invoice/invoice_10p.txt", "rt") as fp:
         input_obj_1 = Base64Document(
             fp.read(),
             filename="invoice_10p.pdf",
@@ -90,7 +90,7 @@ def test_input_from_base64():
 
 
 def test_input_from_bytes():
-    with open("./tests/data/invoices/invoice_10p.pdf", "rb") as fp:
+    with open("./tests/data/invoice/invoice_10p.pdf", "rb") as fp:
         input_obj_1 = BytesDocument(
             fp.read(),
             filename="invoice_10p.pdf",