diff --git a/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryTaggingQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryTaggingQueryJetTest.cs
index 0286744..bc02bdf 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryTaggingQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryTaggingQueryJetTest.cs
@@ -26,11 +26,11 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
             base.Single_query_tag();
 
             AssertSql(
-                $@"-- Yanni
-
+                """
 SELECT TOP 1 `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM `Customers` AS `c`
-ORDER BY `c`.`CustomerID`");
+ORDER BY `c`.`CustomerID`
+""");
         }
 
         public override void Single_query_multiple_tags()
@@ -38,13 +38,11 @@ ORDER BY `c`.`CustomerID`");
             base.Single_query_multiple_tags();
 
             AssertSql(
-                $@"-- Yanni
-
--- Enya
-
+                """
 SELECT TOP 1 `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM `Customers` AS `c`
-ORDER BY `c`.`CustomerID`");
+ORDER BY `c`.`CustomerID`
+""");
         }
 
         public override void Tags_on_subquery()
@@ -52,10 +50,7 @@ ORDER BY `c`.`CustomerID`");
             base.Tags_on_subquery();
 
             AssertSql(
-                $@"-- Yanni
-
--- Laurel
-
+                """
 SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM `Customers` AS `c`,
 (
@@ -63,7 +58,8 @@ FROM `Customers` AS `c`,
     FROM `Orders` AS `o`
     ORDER BY `o`.`OrderID`
 ) AS `t`
-WHERE `c`.`CustomerID` = 'ALFKI'");
+WHERE `c`.`CustomerID` = 'ALFKI'
+""");
         }
 
         public override void Duplicate_tags()
@@ -71,11 +67,11 @@ WHERE `c`.`CustomerID` = 'ALFKI'");
             base.Duplicate_tags();
 
             AssertSql(
-                $@"-- Yanni
-
+                """
 SELECT TOP 1 `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM `Customers` AS `c`
-ORDER BY `c`.`CustomerID`");
+ORDER BY `c`.`CustomerID`
+""");
         }
 
         public override void Tag_on_include_query()
@@ -83,8 +79,7 @@ ORDER BY `c`.`CustomerID`");
             base.Tag_on_include_query();
 
             AssertSql(
-                $@"-- Yanni
-
+                """
 SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT TOP 1 `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
@@ -92,7 +87,8 @@ FROM (
     ORDER BY `c`.`CustomerID`
 ) AS `t`
 LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CustomerID`, `o`.`OrderID`");
+ORDER BY `t`.`CustomerID`
+""");
         }
 
         public override void Tag_on_scalar_query()
@@ -100,11 +96,11 @@ ORDER BY `t`.`CustomerID`, `o`.`OrderID`");
             base.Tag_on_scalar_query();
 
             AssertSql(
-                $@"-- Yanni
-
+                """
 SELECT TOP 1 `o`.`OrderDate`
 FROM `Orders` AS `o`
-ORDER BY `o`.`OrderID`");
+ORDER BY `o`.`OrderID`
+""");
         }
 
         public override void Single_query_multiline_tag()
@@ -112,13 +108,11 @@ ORDER BY `o`.`OrderID`");
             base.Single_query_multiline_tag();
 
             AssertSql(
-                $@"-- Yanni
--- AND
--- Laurel
-
+                """
 SELECT TOP 1 `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM `Customers` AS `c`
-ORDER BY `c`.`CustomerID`");
+ORDER BY `c`.`CustomerID`
+""");
         }
 
         public override void Single_query_multiple_multiline_tag()
@@ -126,18 +120,11 @@ ORDER BY `c`.`CustomerID`");
             base.Single_query_multiple_multiline_tag();
 
             AssertSql(
-                $@"-- Yanni
--- AND
--- Laurel
-
--- Yet
--- Another
--- Multiline
--- Tag
-
+                """
 SELECT TOP 1 `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM `Customers` AS `c`
-ORDER BY `c`.`CustomerID`");
+ORDER BY `c`.`CustomerID`
+""");
         }
 
         public override void Single_query_multiline_tag_with_empty_lines()
@@ -145,15 +132,11 @@ ORDER BY `c`.`CustomerID`");
             base.Single_query_multiline_tag_with_empty_lines();
 
             AssertSql(
-                $@"-- Yanni
--- 
--- AND
--- 
--- Laurel
-
+                """
 SELECT TOP 1 `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM `Customers` AS `c`
-ORDER BY `c`.`CustomerID`");
+ORDER BY `c`.`CustomerID`
+""");
         }
 
         private void AssertSql(params string[] expected)