diff --git a/src/type/text2d.js b/src/type/text2d.js
index 5283aec65f..4c97b4af6d 100644
--- a/src/type/text2d.js
+++ b/src/type/text2d.js
@@ -518,12 +518,16 @@ function text2d(p5, fn) {
 
     // adjust the bounding boxes based on horiz. text alignment
     if (lines.length > 1) {
-      boxes.forEach(bb => bb.x += this._xAlignOffset(textAlign, width));
+      // Call the 2D mode version: the WebGL mode version does additional
+      // alignment adjustments to account for how WebGL renders text.
+      boxes.forEach(bb => bb.x += p5.Renderer2D.prototype._xAlignOffset.call(this, textAlign, width));
     }
 
     // adjust the bounding boxes based on vert. text alignment
     if (typeof height !== 'undefined') {
-      this._yAlignOffset(boxes, height);
+      // Call the 2D mode version: the WebGL mode version does additional
+      // alignment adjustments to account for how WebGL renders text.
+      p5.Renderer2D.prototype._yAlignOffset.call(this, boxes, height);
     }
 
     // get the bounds for the text block
@@ -1224,11 +1228,11 @@ function text2d(p5, fn) {
           case fn.LEFT:
             adjustedX = x;
             break;
-          case fn._CTX_MIDDLE:
-            adjustedX = x + (adjustedW - widths[i]) / 2;
+          case fn.CENTER:
+            adjustedX = x + (adjustedW - widths[i]) / 2 - adjustedW / 2 + (width || 0) / 2;
             break;
           case fn.RIGHT:
-            adjustedX = x + adjustedW - widths[i];
+            adjustedX = x + adjustedW - widths[i] - adjustedW + (width || 0);
             break;
           case fn.END:
             throw new Error('textBounds: END not yet supported for textAlign');
@@ -1255,10 +1259,10 @@ function text2d(p5, fn) {
         case fn.BASELINE:
           break;
         case fn._CTX_MIDDLE:
-          yOff = -totalHeight / 2 + textSize;
+          yOff = -totalHeight / 2 + textSize + (height || 0) / 2;
           break;
         case fn.BOTTOM:
-          yOff = -(totalHeight - textSize);
+          yOff = -(totalHeight - textSize) + (height || 0);
           break;
         default:
           console.warn(`${textBaseline} is not supported in WebGL mode.`); // FES?
diff --git a/src/webgl/text.js b/src/webgl/text.js
index 0f75bcb42d..241f18b509 100644
--- a/src/webgl/text.js
+++ b/src/webgl/text.js
@@ -665,7 +665,7 @@ function text(p5, fn){
       console.log(
         'WEBGL: only Opentype (.otf) and Truetype (.ttf) fonts are supported'
       );
-      return p;
+      return;
     }
 
     this.push(); // fix to #803
diff --git a/test/unit/visual/cases/typography.js b/test/unit/visual/cases/typography.js
index 3bf1332344..ec07943dfd 100644
--- a/test/unit/visual/cases/typography.js
+++ b/test/unit/visual/cases/typography.js
@@ -128,235 +128,265 @@ visualSuite("Typography", function () {
   });
 
   visualSuite("textAlign", function () {
-    visualTest("all alignments with single word", function (p5, screenshot) {
-      const alignments = [
-        { alignX: p5.LEFT, alignY: p5.TOP },
-        { alignX: p5.CENTER, alignY: p5.TOP },
-        { alignX: p5.RIGHT, alignY: p5.TOP },
-        { alignX: p5.LEFT, alignY: p5.CENTER },
-        { alignX: p5.CENTER, alignY: p5.CENTER },
-        { alignX: p5.RIGHT, alignY: p5.CENTER },
-        { alignX: p5.LEFT, alignY: p5.BOTTOM },
-        { alignX: p5.CENTER, alignY: p5.BOTTOM },
-        { alignX: p5.RIGHT, alignY: p5.BOTTOM },
-      ];
-
-      p5.createCanvas(300, 300);
-      p5.textSize(60);
-      alignments.forEach((alignment) => {
-        p5.background(255);
-        p5.textAlign(alignment.alignX, alignment.alignY);
-        p5.text("Single Line", p5.width / 2, p5.height / 2);
-        const bb = p5.textBounds("Single Line", p5.width / 2, p5.height / 2);
-        p5.push();
-        p5.noFill();
-        p5.stroke("red");
-        p5.rect(bb.x, bb.y, bb.w, bb.h);
-        p5.pop();
-        screenshot();
-      })
-    });
-
-    visualTest("all alignments with single line", function (p5, screenshot) {
-      const alignments = [
-        { alignX: p5.LEFT, alignY: p5.TOP },
-        { alignX: p5.CENTER, alignY: p5.TOP },
-        { alignX: p5.RIGHT, alignY: p5.TOP },
-        { alignX: p5.LEFT, alignY: p5.CENTER },
-        { alignX: p5.CENTER, alignY: p5.CENTER },
-        { alignX: p5.RIGHT, alignY: p5.CENTER },
-        { alignX: p5.LEFT, alignY: p5.BOTTOM },
-        { alignX: p5.CENTER, alignY: p5.BOTTOM },
-        { alignX: p5.RIGHT, alignY: p5.BOTTOM },
-      ];
-
-      p5.createCanvas(300, 300);
-      p5.textSize(45);
-      alignments.forEach((alignment) => {
-        p5.background(255);
-        p5.textAlign(alignment.alignX, alignment.alignY);
-        p5.text("Single Line", p5.width / 2, p5.height / 2);
-        const bb = p5.textBounds("Single Line", p5.width / 2, p5.height / 2);
-        p5.push();
-        p5.noFill();
-        p5.stroke("red");
-        p5.rect(bb.x, bb.y, bb.w, bb.h);
-        p5.pop();
-        screenshot();
-      });
-    });
-
-    visualTest("all alignments with multi-lines and wrap word",
-      function (p5, screenshot) {
-        const alignments = [
-          { alignX: p5.LEFT, alignY: p5.TOP },
-          { alignX: p5.CENTER, alignY: p5.TOP },
-          { alignX: p5.RIGHT, alignY: p5.TOP },
-          { alignX: p5.LEFT, alignY: p5.CENTER },
-          { alignX: p5.CENTER, alignY: p5.CENTER },
-          { alignX: p5.RIGHT, alignY: p5.CENTER },
-          { alignX: p5.LEFT, alignY: p5.BOTTOM },
-          { alignX: p5.CENTER, alignY: p5.BOTTOM },
-          { alignX: p5.RIGHT, alignY: p5.BOTTOM },
-        ];
-
-        p5.createCanvas(150, 100);
-        p5.textSize(20);
-        p5.textWrap(p5.WORD);
-
-        let xPos = 20;
-        let yPos = 20;
-        const boxWidth = 100;
-        const boxHeight = 60;
-
-        alignments.forEach((alignment, i) => {
-          p5.background(255);
-          p5.push();
-          p5.textAlign(alignment.alignX, alignment.alignY);
-
-          p5.noFill();
-          p5.strokeWeight(2);
-          p5.stroke(200);
-          p5.rect(xPos, yPos, boxWidth, boxHeight);
-
-          p5.fill(0);
-          p5.noStroke();
-          p5.text(
-            "A really long text that should wrap automatically as it reaches the end of the box",
-            xPos,
-            yPos,
-            boxWidth,
-            boxHeight
-          );
-          const bb = p5.textBounds(
-            "A really long text that should wrap automatically as it reaches the end of the box",
-            xPos,
-            yPos,
-            boxWidth,
-            boxHeight
+    for (const mode of ['2d', 'webgl']) {
+      visualSuite(`${mode} mode`, () => {
+        visualTest("all alignments with single word", async function (p5, screenshot) {
+          const alignments = [
+            { alignX: p5.LEFT, alignY: p5.TOP },
+            { alignX: p5.CENTER, alignY: p5.TOP },
+            { alignX: p5.RIGHT, alignY: p5.TOP },
+            { alignX: p5.LEFT, alignY: p5.CENTER },
+            { alignX: p5.CENTER, alignY: p5.CENTER },
+            { alignX: p5.RIGHT, alignY: p5.CENTER },
+            { alignX: p5.LEFT, alignY: p5.BOTTOM },
+            { alignX: p5.CENTER, alignY: p5.BOTTOM },
+            { alignX: p5.RIGHT, alignY: p5.BOTTOM },
+          ];
+
+          p5.createCanvas(300, 300, mode === 'webgl' ? p5.WEBGL : undefined);
+          if (mode === 'webgl') p5.translate(-p5.width/2, -p5.height/2);
+          p5.textSize(60);
+          const font = await p5.loadFont(
+            '/unit/assets/Inconsolata-Bold.ttf'
           );
-          p5.noFill();
-          p5.stroke("red");
-          p5.rect(bb.x, bb.y, bb.w, bb.h);
-          p5.pop();
-
-          screenshot();
+          p5.textFont(font);
+          alignments.forEach((alignment) => {
+            p5.background(255);
+            p5.textAlign(alignment.alignX, alignment.alignY);
+            p5.text("Single Line", p5.width / 2, p5.height / 2);
+            const bb = p5.textBounds("Single Line", p5.width / 2, p5.height / 2);
+            p5.push();
+            p5.noFill();
+            p5.stroke("red");
+            p5.rect(bb.x, bb.y, bb.w, bb.h);
+            p5.pop();
+            screenshot();
+          })
         });
-      }
-    );
-
-    visualTest(
-      "all alignments with multi-lines and wrap char",
-      function (p5, screenshot) {
-        const alignments = [
-          { alignX: p5.LEFT, alignY: p5.TOP },
-          { alignX: p5.CENTER, alignY: p5.TOP },
-          { alignX: p5.RIGHT, alignY: p5.TOP },
-          { alignX: p5.LEFT, alignY: p5.CENTER },
-          { alignX: p5.CENTER, alignY: p5.CENTER },
-          { alignX: p5.RIGHT, alignY: p5.CENTER },
-          { alignX: p5.LEFT, alignY: p5.BOTTOM },
-          { alignX: p5.CENTER, alignY: p5.BOTTOM },
-          { alignX: p5.RIGHT, alignY: p5.BOTTOM },
-        ];
-
-        p5.createCanvas(150, 100);
-        p5.textSize(20);
-        p5.textWrap(p5.CHAR);
-
-        let xPos = 20;
-        let yPos = 20;
-        const boxWidth = 100;
-        const boxHeight = 60;
-
-        alignments.forEach((alignment, i) => {
-          p5.background(255);
-          p5.push();
-          p5.textAlign(alignment.alignX, alignment.alignY);
-
-          p5.noFill();
-          p5.strokeWeight(2);
-          p5.stroke(200);
-          p5.rect(xPos, yPos, boxWidth, boxHeight);
-
-          p5.fill(0);
-          p5.noStroke();
-          p5.text(
-            "A really long text that should wrap automatically as it reaches the end of the box",
-            xPos,
-            yPos,
-            boxWidth,
-            boxHeight
-          );
-          const bb = p5.textBounds(
-            "A really long text that should wrap automatically as it reaches the end of the box",
-            xPos,
-            yPos,
-            boxWidth,
-            boxHeight
-          );
-          p5.noFill();
-          p5.stroke("red");
-          p5.rect(bb.x, bb.y, bb.w, bb.h);
-          p5.pop();
 
-          screenshot();
-        });
-      }
-    );
-
-    visualTest(
-      "all alignments with multi-line manual text",
-      function (p5, screenshot) {
-        const alignments = [
-          { alignX: p5.LEFT, alignY: p5.TOP },
-          { alignX: p5.CENTER, alignY: p5.TOP },
-          { alignX: p5.RIGHT, alignY: p5.TOP },
-          { alignX: p5.LEFT, alignY: p5.CENTER },
-          { alignX: p5.CENTER, alignY: p5.CENTER },
-          { alignX: p5.RIGHT, alignY: p5.CENTER },
-          { alignX: p5.LEFT, alignY: p5.BOTTOM },
-          { alignX: p5.CENTER, alignY: p5.BOTTOM },
-          { alignX: p5.RIGHT, alignY: p5.BOTTOM },
-        ];
-
-        p5.createCanvas(150, 100);
-        p5.textSize(20);
-
-        let xPos = 20;
-        let yPos = 20;
-        const boxWidth = 100;
-        const boxHeight = 60;
-
-        alignments.forEach((alignment, i) => {
-          p5.background(255);
-          p5.push();
-          p5.textAlign(alignment.alignX, alignment.alignY);
-
-          p5.noFill();
-          p5.stroke(200);
-          p5.strokeWeight(2);
-          p5.rect(xPos, yPos, boxWidth, boxHeight);
-
-          p5.fill(0);
-          p5.noStroke();
-          p5.text("Line 1\nLine 2\nLine 3", xPos, yPos, boxWidth, boxHeight);
-          const bb = p5.textBounds(
-            "Line 1\nLine 2\nLine 3",
-            xPos,
-            yPos,
-            boxWidth,
-            boxHeight
+        visualTest("all alignments with single line", async function (p5, screenshot) {
+          const alignments = [
+            { alignX: p5.LEFT, alignY: p5.TOP },
+            { alignX: p5.CENTER, alignY: p5.TOP },
+            { alignX: p5.RIGHT, alignY: p5.TOP },
+            { alignX: p5.LEFT, alignY: p5.CENTER },
+            { alignX: p5.CENTER, alignY: p5.CENTER },
+            { alignX: p5.RIGHT, alignY: p5.CENTER },
+            { alignX: p5.LEFT, alignY: p5.BOTTOM },
+            { alignX: p5.CENTER, alignY: p5.BOTTOM },
+            { alignX: p5.RIGHT, alignY: p5.BOTTOM },
+          ];
+
+          p5.createCanvas(300, 300, mode === 'webgl' ? p5.WEBGL : undefined);
+          if (mode === 'webgl') p5.translate(-p5.width/2, -p5.height/2);
+          p5.textSize(45);
+          const font = await p5.loadFont(
+            '/unit/assets/Inconsolata-Bold.ttf'
           );
-          p5.noFill();
-          p5.stroke("red");
-          p5.rect(bb.x, bb.y, bb.w, bb.h);
-          p5.pop();
-
-          screenshot();
+          p5.textFont(font);
+          alignments.forEach((alignment) => {
+            p5.background(255);
+            p5.textAlign(alignment.alignX, alignment.alignY);
+            p5.text("Single Line", p5.width / 2, p5.height / 2);
+            const bb = p5.textBounds("Single Line", p5.width / 2, p5.height / 2);
+            p5.push();
+            p5.noFill();
+            p5.stroke("red");
+            p5.rect(bb.x, bb.y, bb.w, bb.h);
+            p5.pop();
+            screenshot();
+          });
         });
-      }
-    );
+
+        visualTest("all alignments with multi-lines and wrap word",
+          async function (p5, screenshot) {
+            const alignments = [
+              { alignX: p5.LEFT, alignY: p5.TOP },
+              { alignX: p5.CENTER, alignY: p5.TOP },
+              { alignX: p5.RIGHT, alignY: p5.TOP },
+              { alignX: p5.LEFT, alignY: p5.CENTER },
+              { alignX: p5.CENTER, alignY: p5.CENTER },
+              { alignX: p5.RIGHT, alignY: p5.CENTER },
+              { alignX: p5.LEFT, alignY: p5.BOTTOM },
+              { alignX: p5.CENTER, alignY: p5.BOTTOM },
+              { alignX: p5.RIGHT, alignY: p5.BOTTOM },
+            ];
+
+            p5.createCanvas(150, 100, mode === 'webgl' ? p5.WEBGL : undefined);
+            if (mode === 'webgl') p5.translate(-p5.width/2, -p5.height/2);
+            p5.textSize(20);
+            p5.textWrap(p5.WORD);
+            const font = await p5.loadFont(
+              '/unit/assets/Inconsolata-Bold.ttf'
+            );
+            p5.textFont(font);
+
+            let xPos = 20;
+            let yPos = 20;
+            const boxWidth = 100;
+            const boxHeight = 60;
+
+            alignments.forEach((alignment, i) => {
+              p5.background(255);
+              p5.push();
+              p5.textAlign(alignment.alignX, alignment.alignY);
+
+              p5.noFill();
+              p5.strokeWeight(2);
+              p5.stroke(200);
+              p5.rect(xPos, yPos, boxWidth, boxHeight);
+
+              p5.fill(0);
+              p5.noStroke();
+              p5.text(
+                "A really long text that should wrap automatically as it reaches the end of the box",
+                xPos,
+                yPos,
+                boxWidth,
+                boxHeight
+              );
+              const bb = p5.textBounds(
+                "A really long text that should wrap automatically as it reaches the end of the box",
+                xPos,
+                yPos,
+                boxWidth,
+                boxHeight
+              );
+              p5.noFill();
+              p5.stroke("red");
+              p5.rect(bb.x, bb.y, bb.w, bb.h);
+              p5.pop();
+
+              screenshot();
+            });
+          }
+        );
+
+        visualTest(
+          "all alignments with multi-lines and wrap char",
+          async function (p5, screenshot) {
+            const alignments = [
+              { alignX: p5.LEFT, alignY: p5.TOP },
+              { alignX: p5.CENTER, alignY: p5.TOP },
+              { alignX: p5.RIGHT, alignY: p5.TOP },
+              { alignX: p5.LEFT, alignY: p5.CENTER },
+              { alignX: p5.CENTER, alignY: p5.CENTER },
+              { alignX: p5.RIGHT, alignY: p5.CENTER },
+              { alignX: p5.LEFT, alignY: p5.BOTTOM },
+              { alignX: p5.CENTER, alignY: p5.BOTTOM },
+              { alignX: p5.RIGHT, alignY: p5.BOTTOM },
+            ];
+
+            p5.createCanvas(150, 100, mode === 'webgl' ? p5.WEBGL : undefined);
+            if (mode === 'webgl') p5.translate(-p5.width/2, -p5.height/2);
+            p5.textSize(20);
+            p5.textWrap(p5.CHAR);
+            const font = await p5.loadFont(
+              '/unit/assets/Inconsolata-Bold.ttf'
+            );
+            p5.textFont(font);
+
+            let xPos = 20;
+            let yPos = 20;
+            const boxWidth = 100;
+            const boxHeight = 60;
+
+            alignments.forEach((alignment, i) => {
+              p5.background(255);
+              p5.push();
+              p5.textAlign(alignment.alignX, alignment.alignY);
+
+              p5.noFill();
+              p5.strokeWeight(2);
+              p5.stroke(200);
+              p5.rect(xPos, yPos, boxWidth, boxHeight);
+
+              p5.fill(0);
+              p5.noStroke();
+              p5.text(
+                "A really long text that should wrap automatically as it reaches the end of the box",
+                xPos,
+                yPos,
+                boxWidth,
+                boxHeight
+              );
+              const bb = p5.textBounds(
+                "A really long text that should wrap automatically as it reaches the end of the box",
+                xPos,
+                yPos,
+                boxWidth,
+                boxHeight
+              );
+              p5.noFill();
+              p5.stroke("red");
+              p5.rect(bb.x, bb.y, bb.w, bb.h);
+              p5.pop();
+
+              screenshot();
+            });
+          }
+        );
+
+        visualTest(
+          "all alignments with multi-line manual text",
+          async function (p5, screenshot) {
+            const alignments = [
+              { alignX: p5.LEFT, alignY: p5.TOP },
+              { alignX: p5.CENTER, alignY: p5.TOP },
+              { alignX: p5.RIGHT, alignY: p5.TOP },
+              { alignX: p5.LEFT, alignY: p5.CENTER },
+              { alignX: p5.CENTER, alignY: p5.CENTER },
+              { alignX: p5.RIGHT, alignY: p5.CENTER },
+              { alignX: p5.LEFT, alignY: p5.BOTTOM },
+              { alignX: p5.CENTER, alignY: p5.BOTTOM },
+              { alignX: p5.RIGHT, alignY: p5.BOTTOM },
+            ];
+
+            p5.createCanvas(150, 100, mode === 'webgl' ? p5.WEBGL : undefined);
+            if (mode === 'webgl') p5.translate(-p5.width/2, -p5.height/2);
+            p5.textSize(20);
+
+            const font = await p5.loadFont(
+              '/unit/assets/Inconsolata-Bold.ttf'
+            );
+            p5.textFont(font);
+
+            let xPos = 20;
+            let yPos = 20;
+            const boxWidth = 100;
+            const boxHeight = 60;
+
+            alignments.forEach((alignment, i) => {
+              p5.background(255);
+              p5.push();
+              p5.textAlign(alignment.alignX, alignment.alignY);
+
+              p5.noFill();
+              p5.stroke(200);
+              p5.strokeWeight(2);
+              p5.rect(xPos, yPos, boxWidth, boxHeight);
+
+              p5.fill(0);
+              p5.noStroke();
+              p5.text("Line 1\nLine 2\nLine 3", xPos, yPos, boxWidth, boxHeight);
+              const bb = p5.textBounds(
+                "Line 1\nLine 2\nLine 3",
+                xPos,
+                yPos,
+                boxWidth,
+                boxHeight
+              );
+              p5.noFill();
+              p5.stroke("red");
+              p5.rect(bb.x, bb.y, bb.w, bb.h);
+              p5.pop();
+
+              screenshot();
+            });
+          }
+        );
+      });
+    }
   });
 
   visualSuite("textStyle", function () {
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/000.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/000.png
new file mode 100644
index 0000000000..65fe692c5f
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/000.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/001.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/001.png
new file mode 100644
index 0000000000..cd50d79636
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/001.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/002.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/002.png
new file mode 100644
index 0000000000..5cc24cf1e8
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/002.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/003.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/003.png
new file mode 100644
index 0000000000..46668250ed
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/003.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/004.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/004.png
new file mode 100644
index 0000000000..47dc26976f
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/004.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/005.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/005.png
new file mode 100644
index 0000000000..c6bc09365c
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/005.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/006.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/006.png
new file mode 100644
index 0000000000..0b478046d5
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/006.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/007.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/007.png
new file mode 100644
index 0000000000..8166bd360e
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/007.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/008.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/008.png
new file mode 100644
index 0000000000..0084c70136
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/008.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/metadata.json b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/metadata.json
similarity index 100%
rename from test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/metadata.json
rename to test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-line manual text/metadata.json
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/000.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/000.png
new file mode 100644
index 0000000000..8c532567f2
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/000.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/001.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/001.png
new file mode 100644
index 0000000000..8c532567f2
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/001.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/002.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/002.png
new file mode 100644
index 0000000000..8c532567f2
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/002.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/003.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/003.png
new file mode 100644
index 0000000000..aa31ca421c
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/003.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/004.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/004.png
new file mode 100644
index 0000000000..aa31ca421c
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/004.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/005.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/005.png
new file mode 100644
index 0000000000..aa31ca421c
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/005.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/006.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/006.png
new file mode 100644
index 0000000000..24c31bf9f0
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/006.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/007.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/007.png
new file mode 100644
index 0000000000..24c31bf9f0
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/007.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/008.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/008.png
new file mode 100644
index 0000000000..24c31bf9f0
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/008.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/metadata.json b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/metadata.json
similarity index 100%
rename from test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/metadata.json
rename to test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap char/metadata.json
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/000.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/000.png
new file mode 100644
index 0000000000..625cff297e
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/000.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/001.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/001.png
new file mode 100644
index 0000000000..0c8e6cc5f4
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/001.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/002.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/002.png
new file mode 100644
index 0000000000..107b414cf1
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/002.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/003.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/003.png
new file mode 100644
index 0000000000..66b399acab
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/003.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/004.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/004.png
new file mode 100644
index 0000000000..b7c16ef103
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/004.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/005.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/005.png
new file mode 100644
index 0000000000..13d890b939
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/005.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/006.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/006.png
new file mode 100644
index 0000000000..998744baee
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/006.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/007.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/007.png
new file mode 100644
index 0000000000..88b1067dae
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/007.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/008.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/008.png
new file mode 100644
index 0000000000..e8ec79f527
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/008.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/metadata.json b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/metadata.json
similarity index 100%
rename from test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/metadata.json
rename to test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with multi-lines and wrap word/metadata.json
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/000.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/000.png
new file mode 100644
index 0000000000..12ef9095ea
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/000.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/001.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/001.png
new file mode 100644
index 0000000000..b15fc433da
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/001.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/002.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/002.png
new file mode 100644
index 0000000000..167a0e0b89
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/002.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/003.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/003.png
new file mode 100644
index 0000000000..0a6d247b8f
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/003.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/004.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/004.png
new file mode 100644
index 0000000000..2cede116be
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/004.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/005.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/005.png
new file mode 100644
index 0000000000..5b8e47a3fb
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/005.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/006.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/006.png
new file mode 100644
index 0000000000..b073f4f280
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/006.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/007.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/007.png
new file mode 100644
index 0000000000..31ff320e6d
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/007.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/008.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/008.png
new file mode 100644
index 0000000000..a28d50a1a7
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/008.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/metadata.json b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/metadata.json
similarity index 100%
rename from test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/metadata.json
rename to test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single line/metadata.json
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/000.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/000.png
new file mode 100644
index 0000000000..17cd52e212
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/000.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/001.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/001.png
new file mode 100644
index 0000000000..73543ad5ca
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/001.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/002.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/002.png
new file mode 100644
index 0000000000..950fed450f
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/002.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/003.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/003.png
new file mode 100644
index 0000000000..0a0cf124ca
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/003.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/004.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/004.png
new file mode 100644
index 0000000000..291357ab16
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/004.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/005.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/005.png
new file mode 100644
index 0000000000..1550ac57ec
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/005.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/006.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/006.png
new file mode 100644
index 0000000000..be4b764ade
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/006.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/007.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/007.png
new file mode 100644
index 0000000000..146c39bbd9
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/007.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/008.png b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/008.png
new file mode 100644
index 0000000000..537831c815
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/008.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/metadata.json b/test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/metadata.json
similarity index 100%
rename from test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/metadata.json
rename to test/unit/visual/screenshots/Typography/textAlign/2d mode/all alignments with single word/metadata.json
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/000.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/000.png
deleted file mode 100644
index 405ffd2249..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/000.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/001.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/001.png
deleted file mode 100644
index 4b26841128..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/001.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/002.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/002.png
deleted file mode 100644
index 8e906c72f4..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/002.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/003.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/003.png
deleted file mode 100644
index 9bc8ab64d6..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/003.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/004.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/004.png
deleted file mode 100644
index 0236f7df2a..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/004.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/005.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/005.png
deleted file mode 100644
index 9ee9f49dc4..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/005.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/006.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/006.png
deleted file mode 100644
index 0ef34ba8ec..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/006.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/007.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/007.png
deleted file mode 100644
index 7e95f34fe4..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/007.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/008.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/008.png
deleted file mode 100644
index 6daa6ae1c6..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-line manual text/008.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/000.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/000.png
deleted file mode 100644
index 20ab4c025a..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/000.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/001.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/001.png
deleted file mode 100644
index 76ba8db037..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/001.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/002.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/002.png
deleted file mode 100644
index 40eda0c1f7..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/002.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/003.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/003.png
deleted file mode 100644
index eda083ec24..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/003.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/004.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/004.png
deleted file mode 100644
index f251dc928f..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/004.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/005.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/005.png
deleted file mode 100644
index faefb039b6..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/005.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/006.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/006.png
deleted file mode 100644
index 7837c2c495..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/006.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/007.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/007.png
deleted file mode 100644
index 0ba619dc0a..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/007.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/008.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/008.png
deleted file mode 100644
index 1b1861fa7e..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap char/008.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/000.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/000.png
deleted file mode 100644
index d8a0da4b85..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/000.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/001.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/001.png
deleted file mode 100644
index 1c540c99dc..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/001.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/002.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/002.png
deleted file mode 100644
index 92e32adce1..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/002.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/003.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/003.png
deleted file mode 100644
index e9bdde8ff1..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/003.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/004.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/004.png
deleted file mode 100644
index fcf4642cd1..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/004.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/005.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/005.png
deleted file mode 100644
index 484c4b634e..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/005.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/006.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/006.png
deleted file mode 100644
index 6804067da3..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/006.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/007.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/007.png
deleted file mode 100644
index 56dec541d8..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/007.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/008.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/008.png
deleted file mode 100644
index 5ab23c9c77..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with multi-lines and wrap word/008.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/000.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/000.png
deleted file mode 100644
index 0879a4c9b6..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/000.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/001.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/001.png
deleted file mode 100644
index 1ebfd9099d..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/001.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/002.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/002.png
deleted file mode 100644
index 3c54c775a6..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/002.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/003.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/003.png
deleted file mode 100644
index e9a560412e..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/003.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/004.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/004.png
deleted file mode 100644
index 63415e8e91..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/004.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/005.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/005.png
deleted file mode 100644
index de2df43fd0..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/005.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/006.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/006.png
deleted file mode 100644
index ff0525cf0b..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/006.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/007.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/007.png
deleted file mode 100644
index 67d7f637f0..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/007.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/008.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/008.png
deleted file mode 100644
index f039042b66..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single line/008.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/000.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/000.png
deleted file mode 100644
index 78d8d75e8f..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/000.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/001.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/001.png
deleted file mode 100644
index a897b53e4c..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/001.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/002.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/002.png
deleted file mode 100644
index 0a04e5faaa..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/002.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/003.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/003.png
deleted file mode 100644
index 4267318db5..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/003.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/004.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/004.png
deleted file mode 100644
index ec17f3e0ec..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/004.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/005.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/005.png
deleted file mode 100644
index cafd2ae4f6..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/005.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/006.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/006.png
deleted file mode 100644
index 5b6f270828..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/006.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/007.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/007.png
deleted file mode 100644
index 9b5098b9fe..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/007.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/008.png b/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/008.png
deleted file mode 100644
index b2a0aca247..0000000000
Binary files a/test/unit/visual/screenshots/Typography/textAlign/all alignments with single word/008.png and /dev/null differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/000.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/000.png
new file mode 100644
index 0000000000..339f1bd5d0
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/000.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/001.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/001.png
new file mode 100644
index 0000000000..90698c7f28
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/001.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/002.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/002.png
new file mode 100644
index 0000000000..a5a9490fe8
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/002.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/003.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/003.png
new file mode 100644
index 0000000000..1a9a110c48
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/003.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/004.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/004.png
new file mode 100644
index 0000000000..493cc85c51
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/004.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/005.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/005.png
new file mode 100644
index 0000000000..1524a41e81
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/005.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/006.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/006.png
new file mode 100644
index 0000000000..8e34453dbb
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/006.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/007.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/007.png
new file mode 100644
index 0000000000..b75b92977d
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/007.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/008.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/008.png
new file mode 100644
index 0000000000..12020de4a6
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/008.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/metadata.json b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/metadata.json
new file mode 100644
index 0000000000..5147b8612d
--- /dev/null
+++ b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 9
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/000.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/000.png
new file mode 100644
index 0000000000..a85c0d7e3f
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/000.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/001.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/001.png
new file mode 100644
index 0000000000..a85c0d7e3f
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/001.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/002.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/002.png
new file mode 100644
index 0000000000..a85c0d7e3f
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/002.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/003.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/003.png
new file mode 100644
index 0000000000..d3986bad49
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/003.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/004.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/004.png
new file mode 100644
index 0000000000..d3986bad49
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/004.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/005.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/005.png
new file mode 100644
index 0000000000..d3986bad49
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/005.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/006.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/006.png
new file mode 100644
index 0000000000..75490d5dad
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/006.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/007.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/007.png
new file mode 100644
index 0000000000..75490d5dad
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/007.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/008.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/008.png
new file mode 100644
index 0000000000..75490d5dad
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/008.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/metadata.json b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/metadata.json
new file mode 100644
index 0000000000..5147b8612d
--- /dev/null
+++ b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 9
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/000.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/000.png
new file mode 100644
index 0000000000..f571f42148
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/000.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/001.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/001.png
new file mode 100644
index 0000000000..462e6e8df6
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/001.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/002.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/002.png
new file mode 100644
index 0000000000..496c73d326
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/002.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/003.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/003.png
new file mode 100644
index 0000000000..2b72b85b6c
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/003.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/004.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/004.png
new file mode 100644
index 0000000000..174c540232
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/004.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/005.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/005.png
new file mode 100644
index 0000000000..3f4b37651c
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/005.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/006.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/006.png
new file mode 100644
index 0000000000..e2fe3738a2
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/006.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/007.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/007.png
new file mode 100644
index 0000000000..465d86afba
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/007.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/008.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/008.png
new file mode 100644
index 0000000000..e7987b1e45
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/008.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/metadata.json b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/metadata.json
new file mode 100644
index 0000000000..5147b8612d
--- /dev/null
+++ b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 9
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/000.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/000.png
new file mode 100644
index 0000000000..5f67b23cd0
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/000.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/001.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/001.png
new file mode 100644
index 0000000000..2d80d846ad
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/001.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/002.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/002.png
new file mode 100644
index 0000000000..9ee769a72c
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/002.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/003.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/003.png
new file mode 100644
index 0000000000..4929fd0907
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/003.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/004.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/004.png
new file mode 100644
index 0000000000..99f991da03
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/004.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/005.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/005.png
new file mode 100644
index 0000000000..c50b267675
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/005.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/006.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/006.png
new file mode 100644
index 0000000000..f2ea8e27ca
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/006.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/007.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/007.png
new file mode 100644
index 0000000000..846a1bf51a
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/007.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/008.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/008.png
new file mode 100644
index 0000000000..5cc2a7fea3
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/008.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/metadata.json b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/metadata.json
new file mode 100644
index 0000000000..5147b8612d
--- /dev/null
+++ b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 9
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/000.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/000.png
new file mode 100644
index 0000000000..23f2678a80
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/000.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/001.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/001.png
new file mode 100644
index 0000000000..4931c86268
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/001.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/002.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/002.png
new file mode 100644
index 0000000000..b321783592
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/002.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/003.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/003.png
new file mode 100644
index 0000000000..f4be694605
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/003.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/004.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/004.png
new file mode 100644
index 0000000000..0e5b6b0a03
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/004.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/005.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/005.png
new file mode 100644
index 0000000000..4638c4b353
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/005.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/006.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/006.png
new file mode 100644
index 0000000000..52c39dadb4
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/006.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/007.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/007.png
new file mode 100644
index 0000000000..0bf414478d
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/007.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/008.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/008.png
new file mode 100644
index 0000000000..aba3082227
Binary files /dev/null and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/008.png differ
diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/metadata.json b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/metadata.json
new file mode 100644
index 0000000000..5147b8612d
--- /dev/null
+++ b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 9
+}
\ No newline at end of file