diff --git a/Tests/Svg.UnitTests/PassingTests.csv b/Tests/Svg.UnitTests/PassingTests.csv
index 9db568df89a3432bea39f9b11f04d239a1c70e61..f006057b4ab0a3aded165ae08fe9a6d98385970b 100644
--- a/Tests/Svg.UnitTests/PassingTests.csv
+++ b/Tests/Svg.UnitTests/PassingTests.csv
@@ -186,6 +186,7 @@ __issue-323-02
 __issue-323-03
 __issue-329-01
 __issue-338-01_stroke_width
+__issue-354-01
 __issue-385-01_Test_text-anchor-middle
 __issue-398-01
 __pull_request-373-01
diff --git a/Tests/W3CTestSuite/png/__issue-318-01.png b/Tests/W3CTestSuite/png/__issue-318-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..813fe88781e2907819761ec98b71b6f264459caa
Binary files /dev/null and b/Tests/W3CTestSuite/png/__issue-318-01.png differ
diff --git a/Tests/W3CTestSuite/png/__issue-354-01.png b/Tests/W3CTestSuite/png/__issue-354-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cd8bb86bc5d7eb49887903cead1ecff6f001f96
Binary files /dev/null and b/Tests/W3CTestSuite/png/__issue-354-01.png differ
diff --git a/Tests/W3CTestSuite/svg/__issue-318-01.svg b/Tests/W3CTestSuite/svg/__issue-318-01.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0c1c253015d3c72757710bcb5d48b791ecc489cf
--- /dev/null
+++ b/Tests/W3CTestSuite/svg/__issue-318-01.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="575" height="150" viewBox="0 0 575 150" xml:space="preserve">
+<desc>Created with Fabric.js 1.7.7</desc>
+<defs>
+</defs>
+<rect x="0" y="0" width="575" height="150" fill="lightgray"></rect>
+	<g transform="translate(82.76 38.58)">
+		<text font-family="Arial" font-size="32" font-weight="normal" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" >
+			<tspan x="-62.26" y="10.08" style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: ; opacity: 1;">T</tspan>
+			<tspan x="-42.71" y="10.08" style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: ; opacity: 1;">e</tspan>
+			<tspan x="-24.91" y="10.08" style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: ; opacity: 1;">s</tspan>
+			<tspan x="-8.91" y="10.08" style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: ; opacity: 1;">t</tspan>
+			<tspan x="-0.02" y="10.08" style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: ; opacity: 1;"> </tspan>
+			<tspan x="8.87" y="10.08" style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: ; opacity: 1;">#</tspan>
+			<tspan x="26.66" y="10.08" style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: ; opacity: 1;">1</tspan>
+			<tspan x="44.46" y="10.08" style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: ; opacity: 1;">2</tspan>
+		</text>
+	</g>
+	<g transform="translate(85.55 77.58)">
+		<text font-family="Arial" font-size="32" font-weight="normal" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" >
+			<tspan x="-64.05" y="10.08" fill="rgb(0,0,0)">Dodaj #1</tspan>
+		</text>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/Tests/W3CTestSuite/svg/__issue-354-01.svg b/Tests/W3CTestSuite/svg/__issue-354-01.svg
new file mode 100644
index 0000000000000000000000000000000000000000..96ab3554919ac73472b2b3e896058ae3d424a1ca
--- /dev/null
+++ b/Tests/W3CTestSuite/svg/__issue-354-01.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 50" width="100" height="50">
+  <text x="20" y="20" style="font: italic bold 15px/normal &quot;Fira Code&quot;; text-transform: uppercase;">Abc</text>
+  <text x="20" y="40" style="font-weight: bold; font-style: italic; font-size: 15px; font-family: &quot;Fira Code&quot;; text-transform: uppercase;">Def</text>
+</svg>
\ No newline at end of file