diff --git a/test/EFCore.Jet.FunctionalTests/FindJetTest.cs b/test/EFCore.Jet.FunctionalTests/FindJetTest.cs
index e1f4f58..4fb4699 100644
--- a/test/EFCore.Jet.FunctionalTests/FindJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/FindJetTest.cs
@@ -82,14 +82,14 @@ ORDER BY `i3`.`Id`, `s`.`IntKeyId`, `s`.`Id`, `s`.`Owned1IntKeyId`, `s`.`Owned1I
             base.Returns_null_for_int_key_not_in_store();
 
             AssertSql(
-                """
+                $"""
 @__p_0='99'
 
 SELECT `i3`.`Id`, `i3`.`Foo`, `s`.`IntKeyId`, `s`.`Id`, `s`.`Prop`, `s`.`NestedOwned_Prop`, `s`.`Owned1IntKeyId`, `s`.`Owned1Id`, `s`.`Id0`, `s`.`Prop0`, `i3`.`OwnedReference_Prop`, `i3`.`OwnedReference_NestedOwned_Prop`, `i2`.`Owned1IntKeyId`, `i2`.`Id`, `i2`.`Prop`
 FROM ((
     SELECT TOP 1 `i`.`Id`, `i`.`Foo`, `i`.`OwnedReference_Prop`, `i`.`OwnedReference_NestedOwned_Prop`
     FROM `IntKey` AS `i`
-    WHERE `i`.`Id` = @__p_0
+    WHERE `i`.`Id` = {AssertSqlHelper.Parameter("@__p_0")}
 ) AS `i3`
 LEFT JOIN (
     SELECT `i0`.`IntKeyId`, `i0`.`Id`, `i0`.`Prop`, `i0`.`NestedOwned_Prop`, `i1`.`Owned1IntKeyId`, `i1`.`Owned1Id`, `i1`.`Id` AS `Id0`, `i1`.`Prop` AS `Prop0`
diff --git a/test/EFCore.Jet.FunctionalTests/JetValueGenerationScenariosTestBase.cs b/test/EFCore.Jet.FunctionalTests/JetValueGenerationScenariosTestBase.cs
index d045f60..4770114 100644
--- a/test/EFCore.Jet.FunctionalTests/JetValueGenerationScenariosTestBase.cs
+++ b/test/EFCore.Jet.FunctionalTests/JetValueGenerationScenariosTestBase.cs
@@ -1316,7 +1316,7 @@ END");
             {
                 Id = IntSentinel,
                 Name = "Two Unicorns",
-                CreatedOn = new DateTime(1969, 8, 3, 0, 10, 0)
+                CreatedOn = new DateTime(1973, 8, 3, 0, 10, 0)
             });
 
         // The property 'CreatedOn' on entity type 'Blog' is defined to be read-only before it is
diff --git a/test/EFCore.Jet.FunctionalTests/Query/ComplexNavigationsQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/ComplexNavigationsQueryJetTest.cs
index 25b1b76..2c5a2a1 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/ComplexNavigationsQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/ComplexNavigationsQueryJetTest.cs
@@ -4367,7 +4367,7 @@ WHERE `l0`.`Id` IS NOT NULL AND `l1`.`OneToMany_Optional_Inverse3Id` IS NOT NULL
             await base.GroupJoin_SelectMany_DefaultIfEmpty_with_predicate_using_closure(async);
 
             AssertSql(
-                """
+                $"""
 @__prm_0='10'
 
 SELECT `l`.`Id` AS `Id1`, `l1`.`Id` AS `Id2`
@@ -4375,7 +4375,7 @@ FROM `LevelOne` AS `l`
 LEFT JOIN (
     SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
     FROM `LevelTwo` AS `l0`
-    WHERE `l0`.`Id` <> @__prm_0
+    WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm_0")}
 ) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`
 """);
         }
@@ -4385,7 +4385,7 @@ LEFT JOIN (
             await base.GroupJoin_SelectMany_with_predicate_using_closure(async);
 
             AssertSql(
-                """
+                $"""
 @__prm_0='10'
 
 SELECT `l`.`Id` AS `Id1`, `l1`.`Id` AS `Id2`
@@ -4393,7 +4393,7 @@ FROM `LevelOne` AS `l`
 INNER JOIN (
     SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
     FROM `LevelTwo` AS `l0`
-    WHERE `l0`.`Id` <> @__prm_0
+    WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm_0")}
 ) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`
 """);
         }
@@ -4403,7 +4403,7 @@ INNER JOIN (
             await base.GroupJoin_SelectMany_DefaultIfEmpty_with_predicate_using_closure_nested(async);
 
             AssertSql(
-                """
+                $"""
 @__prm1_0='10'
 @__prm2_1='20'
 
@@ -4412,12 +4412,12 @@ FROM (`LevelOne` AS `l`
 LEFT JOIN (
     SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
     FROM `LevelTwo` AS `l0`
-    WHERE `l0`.`Id` <> @__prm1_0
+    WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm1_0")}
 ) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`)
 LEFT JOIN (
     SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`
     FROM `LevelThree` AS `l2`
-    WHERE `l2`.`Id` <> @__prm2_1
+    WHERE `l2`.`Id` <> {AssertSqlHelper.Parameter("@__prm2_1")}
 ) AS `l3` ON `l1`.`Id` = `l3`.`Level2_Optional_Id`
 """);
         }
@@ -4427,7 +4427,7 @@ LEFT JOIN (
             await base.GroupJoin_SelectMany_with_predicate_using_closure_nested(async);
 
             AssertSql(
-                """
+                $"""
 @__prm1_0='10'
 @__prm2_1='20'
 
@@ -4436,12 +4436,12 @@ FROM (`LevelOne` AS `l`
 INNER JOIN (
     SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
     FROM `LevelTwo` AS `l0`
-    WHERE `l0`.`Id` <> @__prm1_0
+    WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm1_0")}
 ) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`)
 LEFT JOIN (
     SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`
     FROM `LevelThree` AS `l2`
-    WHERE `l2`.`Id` <> @__prm2_1
+    WHERE `l2`.`Id` <> {AssertSqlHelper.Parameter("@__prm2_1")}
 ) AS `l3` ON `l1`.`Id` = `l3`.`Level2_Optional_Id`
 WHERE `l1`.`Id` IS NOT NULL AND `l3`.`Level2_Optional_Id` IS NOT NULL
 """);
diff --git a/test/EFCore.Jet.FunctionalTests/Query/ComplexTypeQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/ComplexTypeQueryJetTest.cs
index 5fcd46c..5976bca 100644
--- a/test/EFCore.Jet.FunctionalTests/Query/ComplexTypeQueryJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/Query/ComplexTypeQueryJetTest.cs
@@ -607,7 +607,7 @@ WHERE `v`.`ShippingAddress_AddressLine1` = '804 S. Lakeshore Road' AND `v`.`Ship
         await base.Struct_complex_type_equals_parameter(async);
 
         AssertSql(
-            """
+            $"""
 @__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road' (Size = 255)
 @__entity_equality_address_0_ZipCode='38654' (Nullable = true)
 @__entity_equality_address_0_Country_Code='US' (Size = 255)
@@ -615,7 +615,7 @@ WHERE `v`.`ShippingAddress_AddressLine1` = '804 S. Lakeshore Road' AND `v`.`Ship
 
 SELECT `v`.`Id`, `v`.`Name`, `v`.`BillingAddress_AddressLine1`, `v`.`BillingAddress_AddressLine2`, `v`.`BillingAddress_ZipCode`, `v`.`BillingAddress_Country_Code`, `v`.`BillingAddress_Country_FullName`, `v`.`ShippingAddress_AddressLine1`, `v`.`ShippingAddress_AddressLine2`, `v`.`ShippingAddress_ZipCode`, `v`.`ShippingAddress_Country_Code`, `v`.`ShippingAddress_Country_FullName`
 FROM `ValuedCustomer` AS `v`
-WHERE `v`.`ShippingAddress_AddressLine1` = @__entity_equality_address_0_AddressLine1 AND `v`.`ShippingAddress_AddressLine2` IS NULL AND `v`.`ShippingAddress_ZipCode` = @__entity_equality_address_0_ZipCode AND `v`.`ShippingAddress_Country_Code` = @__entity_equality_address_0_Country_Code AND `v`.`ShippingAddress_Country_FullName` = @__entity_equality_address_0_Country_FullName
+WHERE `v`.`ShippingAddress_AddressLine1` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_AddressLine1")} AND `v`.`ShippingAddress_AddressLine2` IS NULL AND `v`.`ShippingAddress_ZipCode` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_ZipCode")} AND `v`.`ShippingAddress_Country_Code` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_Country_Code")} AND `v`.`ShippingAddress_Country_FullName` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_Country_FullName")}
 """);
     }
 
@@ -631,7 +631,7 @@ WHERE `v`.`ShippingAddress_AddressLine1` = @__entity_equality_address_0_AddressL
         await base.Contains_over_struct_complex_type(async);
 
         AssertSql(
-            """
+            $"""
 @__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road' (Size = 255)
 @__entity_equality_address_0_ZipCode='38654' (Nullable = true)
 @__entity_equality_address_0_Country_Code='US' (Size = 255)
@@ -642,7 +642,7 @@ FROM `ValuedCustomer` AS `v`
 WHERE EXISTS (
     SELECT 1
     FROM `ValuedCustomer` AS `v0`
-    WHERE `v0`.`ShippingAddress_AddressLine1` = @__entity_equality_address_0_AddressLine1 AND `v0`.`ShippingAddress_AddressLine2` IS NULL AND `v0`.`ShippingAddress_ZipCode` = @__entity_equality_address_0_ZipCode AND `v0`.`ShippingAddress_Country_Code` = @__entity_equality_address_0_Country_Code AND `v0`.`ShippingAddress_Country_FullName` = @__entity_equality_address_0_Country_FullName)
+    WHERE `v0`.`ShippingAddress_AddressLine1` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_AddressLine1")} AND `v0`.`ShippingAddress_AddressLine2` IS NULL AND `v0`.`ShippingAddress_ZipCode` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_ZipCode")} AND `v0`.`ShippingAddress_Country_Code` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_Country_Code")} AND `v0`.`ShippingAddress_Country_FullName` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_Country_FullName")})
 """);
     }
 
diff --git a/test/EFCore.Jet.FunctionalTests/TPTTableSplittingJetTest.cs b/test/EFCore.Jet.FunctionalTests/TPTTableSplittingJetTest.cs
index e171849..c3a2a55 100644
--- a/test/EFCore.Jet.FunctionalTests/TPTTableSplittingJetTest.cs
+++ b/test/EFCore.Jet.FunctionalTests/TPTTableSplittingJetTest.cs
@@ -165,7 +165,7 @@ VALUES ({AssertSqlHelper.Parameter("@p0")}, {AssertSqlHelper.Parameter("@p1")});
 @p0='repairman' (Size = 255)
 @p1='Trek Pro Fit Madone 6 Series' (Nullable = false) (Size = 255)
 
-UPDATE `Vehicles` SET `Operator_Name` = @p0
+UPDATE `Vehicles` SET `Operator_Name` = {AssertSqlHelper.Parameter("@p0")}
 WHERE `Name` = {AssertSqlHelper.Parameter("@p1")};
 SELECT @@ROWCOUNT;
 """,