diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindChangeTrackingQueryFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindChangeTrackingQueryFbTest.cs
index b029cade2..eace4c3b5 100644
--- a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindChangeTrackingQueryFbTest.cs
+++ b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindChangeTrackingQueryFbTest.cs
@@ -15,6 +15,7 @@
 
 //$Authors = Jiri Cincura (jiri@cincura.net)
 
+using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestModels.Northwind;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.TestModels.Northwind;
@@ -29,7 +30,7 @@ public NorthwindChangeTrackingQueryFbTest(NorthwindQueryFbFixture<NoopModelCusto
 	{ }
 
 	protected override NorthwindContext CreateNoTrackingContext()
-		=> new NorthwindRelationalContext(
+		=> new NorthwindFbContext(
 			new DbContextOptionsBuilder(Fixture.CreateOptions())
 				.UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking).Options);
 }
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindCompiledQueryFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindCompiledQueryFbTest.cs
index 58f2f4c1b..e78a4db6a 100644
--- a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindCompiledQueryFbTest.cs
+++ b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindCompiledQueryFbTest.cs
@@ -32,53 +32,4 @@ public class NorthwindCompiledQueryFbTest : NorthwindCompiledQueryTestBase<North
 	public NorthwindCompiledQueryFbTest(NorthwindQueryFbFixture<NoopModelCustomizer> fixture)
 		: base(fixture)
 	{ }
-
-	[Fact]
-	public override void Query_with_array_parameter()
-	{
-		var query = EF.CompileQuery(
-			(NorthwindContext context, string[] args)
-				=> context.Customers.Where(c => c.CustomerID == args[0]));
-
-		using (var context = CreateContext())
-		{
-			Assert.Equal(
-				CoreStrings.TranslationFailed("DbSet<Customer>()    .Where(c => c.CustomerID == __args[0])"),
-				Assert.Throws<InvalidOperationException>(
-					() => query(context, new[] { "ALFKI" }).First().CustomerID).Message.Replace("\r", "").Replace("\n", ""));
-		}
-
-		using (var context = CreateContext())
-		{
-			Assert.Equal(
-				CoreStrings.TranslationFailed("DbSet<Customer>()    .Where(c => c.CustomerID == __args[0])"),
-				Assert.Throws<InvalidOperationException>(
-					() => query(context, new[] { "ANATR" }).First().CustomerID).Message.Replace("\r", "").Replace("\n", ""));
-		}
-	}
-
-	[Fact]
-	public override async Task Query_with_array_parameter_async()
-	{
-		var query = EF.CompileAsyncQuery(
-						(NorthwindContext context, string[] args)
-							=> context.Customers.Where(c => c.CustomerID == args[0]));
-
-		using (var context = CreateContext())
-		{
-			Assert.Equal(
-				CoreStrings.TranslationFailed("DbSet<Customer>()    .Where(c => c.CustomerID == __args[0])"),
-				(await Assert.ThrowsAsync<InvalidOperationException>(
-					() => Enumerate(query(context, new[] { "ALFKI" })))).Message.Replace("\r", "").Replace("\n", ""));
-		}
-
-		using (var context = CreateContext())
-		{
-			Assert.Equal(
-				CoreStrings.TranslationFailed("DbSet<Customer>()    .Where(c => c.CustomerID == __args[0])"),
-				(await Assert.ThrowsAsync<InvalidOperationException>(
-					() => Enumerate(query(context, new[] { "ANATR" })))).Message.Replace("\r", "").Replace("\n", ""));
-		}
-	}
-
 }
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/TPCGearsOfWarQueryFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/TPCGearsOfWarQueryFbTest.cs
index d93eab640..0ad744cd8 100644
--- a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/TPCGearsOfWarQueryFbTest.cs
+++ b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/TPCGearsOfWarQueryFbTest.cs
@@ -416,22 +416,6 @@ public override Task Where_TimeOnly_subtract_TimeOnly(bool async)
 		return base.Where_TimeOnly_subtract_TimeOnly(async);
 	}
 
-	[Theory]
-	[MemberData(nameof(IsAsyncData))]
-	public override Task ToString_boolean_property_nullable(bool async)
-	{
-		return AssertQuery(async, (ISetSource ss) => from lh in ss.Set<LocustHorde>()
-													 select ((object)lh.Eradicated).ToString(), null, elementAsserter: (lhs, rhs) => { Assert.True(lhs.Equals(rhs, System.StringComparison.InvariantCultureIgnoreCase)); }, assertOrder: false, 0, "ToString_boolean_property_nullable");
-	}
-
-	[Theory]
-	[MemberData(nameof(IsAsyncData))]
-	public override Task ToString_boolean_property_non_nullable(bool async)
-	{
-		return AssertQuery(async, (ISetSource ss) => from w in ss.Set<Weapon>()
-													 select w.IsAutomatic.ToString(), null, elementAsserter: (lhs, rhs) => { Assert.True(lhs.Equals(rhs, System.StringComparison.InvariantCultureIgnoreCase)); }, assertOrder: false, 0, "ToString_boolean_property_non_nullable");
-	}
-
 	[Theory(Skip = "Different implicit ordering on Firebird.")]
 	[MemberData(nameof(IsAsyncData))]
 	public override Task Take_without_orderby_followed_by_orderBy_is_pushed_down1(bool async)
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/TPTGearsOfWarQueryFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/TPTGearsOfWarQueryFbTest.cs
index 3f0dc80d6..a17693e74 100644
--- a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/TPTGearsOfWarQueryFbTest.cs
+++ b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/TPTGearsOfWarQueryFbTest.cs
@@ -297,22 +297,6 @@ public override Task First_on_byte_array(bool async)
 		return base.First_on_byte_array(async);
 	}
 
-	[Theory]
-	[MemberData(nameof(IsAsyncData))]
-	public override Task ToString_boolean_property_nullable(bool async)
-	{
-		return AssertQuery(async, (ISetSource ss) => from lh in ss.Set<LocustHorde>()
-													 select ((object)lh.Eradicated).ToString(), null, elementAsserter: (lhs, rhs) => { Assert.True(lhs.Equals(rhs, System.StringComparison.InvariantCultureIgnoreCase)); }, assertOrder: false, 0, "ToString_boolean_property_nullable");
-	}
-
-	[Theory]
-	[MemberData(nameof(IsAsyncData))]
-	public override Task ToString_boolean_property_non_nullable(bool async)
-	{
-		return AssertQuery(async, (ISetSource ss) => from w in ss.Set<Weapon>()
-													 select w.IsAutomatic.ToString(), null, elementAsserter: (lhs, rhs) => { Assert.True(lhs.Equals(rhs, System.StringComparison.InvariantCultureIgnoreCase)); }, assertOrder: false, 0, "ToString_boolean_property_non_nullable");
-	}
-
 	[NotSupportedOnFirebirdTheory]
 	[MemberData(nameof(IsAsyncData))]
 	public override Task Where_TimeOnly_subtract_TimeOnly(bool async)