diff --git a/__tests__/files/gmail-outlook/01/r_htmlContent.html b/__tests__/files/gmail-outlook/one/01/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/01/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/01/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/01/r_plainContent.data b/__tests__/files/gmail-outlook/one/01/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/01/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/01/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/01/s_htmlContent.html b/__tests__/files/gmail-outlook/one/01/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/01/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/01/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/01/s_plainContent.data b/__tests__/files/gmail-outlook/one/01/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/01/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/01/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/02/r_htmlContent.html b/__tests__/files/gmail-outlook/one/02/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/02/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/02/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/02/r_plainContent.data b/__tests__/files/gmail-outlook/one/02/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/02/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/02/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/02/s_htmlContent.html b/__tests__/files/gmail-outlook/one/02/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/02/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/02/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/02/s_plainContent.data b/__tests__/files/gmail-outlook/one/02/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/02/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/02/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/03/r_htmlContent.html b/__tests__/files/gmail-outlook/one/03/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/03/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/03/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/03/r_plainContent.data b/__tests__/files/gmail-outlook/one/03/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/03/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/03/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/03/s_htmlContent.html b/__tests__/files/gmail-outlook/one/03/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/03/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/03/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/03/s_plainContent.data b/__tests__/files/gmail-outlook/one/03/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/03/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/03/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/04/r_htmlContent.html b/__tests__/files/gmail-outlook/one/04/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/04/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/04/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/04/r_plainContent.data b/__tests__/files/gmail-outlook/one/04/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/04/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/04/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/04/s_htmlContent.html b/__tests__/files/gmail-outlook/one/04/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/04/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/04/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/04/s_plainContent.data b/__tests__/files/gmail-outlook/one/04/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/04/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/04/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/05/r_htmlContent.html b/__tests__/files/gmail-outlook/one/05/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/05/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/05/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/05/r_plainContent.data b/__tests__/files/gmail-outlook/one/05/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/05/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/05/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/05/s_htmlContent.html b/__tests__/files/gmail-outlook/one/05/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/05/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/05/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/05/s_plainContent.data b/__tests__/files/gmail-outlook/one/05/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/05/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/05/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/06/r_htmlContent.html b/__tests__/files/gmail-outlook/one/06/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/06/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/06/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/06/r_plainContent.data b/__tests__/files/gmail-outlook/one/06/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/06/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/06/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/06/s_htmlContent.html b/__tests__/files/gmail-outlook/one/06/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/06/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/06/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/06/s_plainContent.data b/__tests__/files/gmail-outlook/one/06/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/06/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/06/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/07/r_htmlContent.html b/__tests__/files/gmail-outlook/one/07/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/07/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/07/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/07/r_plainContent.data b/__tests__/files/gmail-outlook/one/07/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/07/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/07/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/07/s_htmlContent.html b/__tests__/files/gmail-outlook/one/07/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/07/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/07/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/07/s_plainContent.data b/__tests__/files/gmail-outlook/one/07/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/07/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/07/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/08/r_htmlContent.html b/__tests__/files/gmail-outlook/one/08/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/08/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/08/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/08/r_plainContent.data b/__tests__/files/gmail-outlook/one/08/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/08/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/08/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/08/s_htmlContent.html b/__tests__/files/gmail-outlook/one/08/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/08/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/08/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/08/s_plainContent.data b/__tests__/files/gmail-outlook/one/08/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/08/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/08/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/10/r_htmlContent.html b/__tests__/files/gmail-outlook/one/10/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/10/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/10/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/10/r_plainContent.data b/__tests__/files/gmail-outlook/one/10/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/10/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/10/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/10/s_htmlContent.html b/__tests__/files/gmail-outlook/one/10/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/10/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/10/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/10/s_plainContent.data b/__tests__/files/gmail-outlook/one/10/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/10/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/10/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/20forward/r_htmlContent.html b/__tests__/files/gmail-outlook/one/20forward/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/20forward/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/20forward/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/20forward/r_plainContent.data b/__tests__/files/gmail-outlook/one/20forward/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/20forward/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/20forward/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/20forward/s_htmlContent.html b/__tests__/files/gmail-outlook/one/20forward/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/20forward/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/20forward/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/20forward/s_plainContent.data b/__tests__/files/gmail-outlook/one/20forward/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/20forward/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/20forward/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/20reply/r_htmlContent.html b/__tests__/files/gmail-outlook/one/20reply/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/20reply/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/20reply/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/20reply/r_plainContent.data b/__tests__/files/gmail-outlook/one/20reply/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/20reply/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/20reply/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/20reply/s_htmlContent.html b/__tests__/files/gmail-outlook/one/20reply/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/20reply/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/20reply/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/20reply/s_plainContent.data b/__tests__/files/gmail-outlook/one/20reply/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/20reply/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/20reply/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/21forward/s_htmlContent.html b/__tests__/files/gmail-outlook/one/21forward/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/21forward/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/21forward/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/21forward/s_plainContent.data b/__tests__/files/gmail-outlook/one/21forward/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/21forward/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/21forward/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/21reply/r_htmlContent.html b/__tests__/files/gmail-outlook/one/21reply/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/21reply/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/21reply/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/21reply/r_plainContent.data b/__tests__/files/gmail-outlook/one/21reply/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/21reply/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/21reply/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/21reply/s_htmlContent.html b/__tests__/files/gmail-outlook/one/21reply/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/21reply/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/21reply/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/21reply/s_plainContent.data b/__tests__/files/gmail-outlook/one/21reply/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/21reply/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/21reply/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/22reply/r_htmlContent.html b/__tests__/files/gmail-outlook/one/22reply/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/22reply/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/22reply/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/22reply/r_plainContent.data b/__tests__/files/gmail-outlook/one/22reply/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/22reply/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/22reply/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/22reply/s_htmlContent.html b/__tests__/files/gmail-outlook/one/22reply/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/22reply/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/22reply/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/22reply/s_plainContent.data b/__tests__/files/gmail-outlook/one/22reply/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/22reply/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/22reply/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/23forward/s_htmlContent.html b/__tests__/files/gmail-outlook/one/23forward/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/23forward/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/23forward/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/23forward/s_plainContent.data b/__tests__/files/gmail-outlook/one/23forward/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/23forward/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/23forward/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/23reply/r_htmlContent.html b/__tests__/files/gmail-outlook/one/23reply/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/23reply/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/23reply/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/23reply/r_plainContent.data b/__tests__/files/gmail-outlook/one/23reply/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/23reply/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/23reply/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/23reply/s_htmlContent.html b/__tests__/files/gmail-outlook/one/23reply/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/23reply/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/23reply/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/23reply/s_plainContent.data b/__tests__/files/gmail-outlook/one/23reply/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/23reply/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/23reply/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/24forward/s_htmlContent.html b/__tests__/files/gmail-outlook/one/24forward/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/24forward/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/24forward/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/24forward/s_plainContent.data b/__tests__/files/gmail-outlook/one/24forward/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/24forward/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/24forward/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/24reply/r_htmlContent.html b/__tests__/files/gmail-outlook/one/24reply/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/24reply/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/24reply/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/24reply/r_plainContent.data b/__tests__/files/gmail-outlook/one/24reply/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/24reply/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/24reply/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/24reply/s_htmlContent.html b/__tests__/files/gmail-outlook/one/24reply/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/24reply/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/24reply/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/24reply/s_plainContent.data b/__tests__/files/gmail-outlook/one/24reply/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/24reply/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/24reply/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/25reply/r_htmlContent.html b/__tests__/files/gmail-outlook/one/25reply/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/25reply/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/25reply/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/25reply/r_plainContent.data b/__tests__/files/gmail-outlook/one/25reply/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/25reply/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/25reply/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/25reply/s_htmlContent.html b/__tests__/files/gmail-outlook/one/25reply/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/25reply/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/25reply/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/25reply/s_plainContent.data b/__tests__/files/gmail-outlook/one/25reply/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/25reply/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/25reply/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/26reply/r_htmlContent.html b/__tests__/files/gmail-outlook/one/26reply/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/26reply/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/26reply/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/26reply/r_plainContent.data b/__tests__/files/gmail-outlook/one/26reply/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/26reply/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/26reply/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/26reply/s_htmlContent.html b/__tests__/files/gmail-outlook/one/26reply/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/26reply/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/26reply/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/26reply/s_plainContent.data b/__tests__/files/gmail-outlook/one/26reply/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/26reply/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/26reply/s_plainContent.data
diff --git a/__tests__/files/gmail-outlook/27reply/r_htmlContent.html b/__tests__/files/gmail-outlook/one/27reply/r_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/27reply/r_htmlContent.html
rename to __tests__/files/gmail-outlook/one/27reply/r_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/27reply/r_plainContent.data b/__tests__/files/gmail-outlook/one/27reply/r_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/27reply/r_plainContent.data
rename to __tests__/files/gmail-outlook/one/27reply/r_plainContent.data
diff --git a/__tests__/files/gmail-outlook/27reply/s_htmlContent.html b/__tests__/files/gmail-outlook/one/27reply/s_htmlContent.html
similarity index 100%
rename from __tests__/files/gmail-outlook/27reply/s_htmlContent.html
rename to __tests__/files/gmail-outlook/one/27reply/s_htmlContent.html
diff --git a/__tests__/files/gmail-outlook/27reply/s_plainContent.data b/__tests__/files/gmail-outlook/one/27reply/s_plainContent.data
similarity index 100%
rename from __tests__/files/gmail-outlook/27reply/s_plainContent.data
rename to __tests__/files/gmail-outlook/one/27reply/s_plainContent.data
diff --git a/__tests__/html-gmail-outlook.test.ts b/__tests__/html-gmail-outlook.test.ts
new file mode 100644
index 0000000000000000000000000000000000000000..d8ca81d2a7b40cb6c96df703020e30fd9f912f2e
--- /dev/null
+++ b/__tests__/html-gmail-outlook.test.ts
@@ -0,0 +1,33 @@
+import { EMAIL_VENDORS } from "../src";
+
+const path = require("path");
+import { describe } from "@jest/globals";
+import { createDescribeHtmlTestCases } from "./utils";
+
+const TESTS_GLOBAL_PATH = "/files/gmail-outlook";
+const testsPath = path.resolve(__dirname, `.${TESTS_GLOBAL_PATH}`);
+
+describe("[HTML] GMail-Outlook", () => {
+  const describeFunction = createDescribeHtmlTestCases(
+    testsPath,
+    EMAIL_VENDORS.GMAIL
+  );
+
+  describe(
+    "One",
+    describeFunction("one", [
+      "02",
+      "03",
+      "04",
+      "20forward",
+      "20reply",
+      "21reply",
+      "22reply",
+      "23reply",
+      "24reply",
+      "25reply",
+      "26reply",
+      "27reply",
+    ])
+  );
+});
diff --git a/__tests__/plain-gmail-outlook.test.ts b/__tests__/plain-gmail-outlook.test.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f40d1f6a3c6c22ed1eff002e7ac9d4fa21a36f91
--- /dev/null
+++ b/__tests__/plain-gmail-outlook.test.ts
@@ -0,0 +1,27 @@
+import { describe } from "@jest/globals";
+import { createDescribePlainTestCases } from "./utils";
+const path = require("path");
+
+const TESTS_GLOBAL_PATH = "/files/gmail-outlook";
+
+const testsPath = path.resolve(__dirname, `.${TESTS_GLOBAL_PATH}`);
+
+describe("[Plain] Gmail-Outlook normalization", () => {
+  const describeFunction = createDescribePlainTestCases(testsPath);
+  describe(
+    "One",
+    describeFunction("one", [
+      "02",
+      "04",
+      "20forward",
+      "20reply",
+      "21reply",
+      "22reply",
+      "23reply",
+      "24reply",
+      "25reply",
+      "26reply",
+      "27reply",
+    ])
+  );
+});
diff --git a/__tests__/plain-outlook-outlook.test.ts b/__tests__/plain-outlook-outlook.test.ts
index d71f0f07c088a9b5ce69166103ed888f06ef21a4..b4d729e076f256e96a4f2fead44ae4f98c944d4e 100644
--- a/__tests__/plain-outlook-outlook.test.ts
+++ b/__tests__/plain-outlook-outlook.test.ts
@@ -2,8 +2,6 @@ import { describe } from "@jest/globals";
 import { createDescribePlainTestCases } from "./utils";
 const path = require("path");
 
-// Test cases from https://code.vereign.com/alexey.lunin/outlook-files-upload
-
 const TESTS_GLOBAL_PATH = "/files/outlook-outlook";
 
 const testsPath = path.resolve(__dirname, `.${TESTS_GLOBAL_PATH}`);