diff --git a/test/EFCore.AspNet.Specification.Tests/GrpcTestBase.cs b/test/EFCore.AspNet.Specification.Tests/GrpcTestBase.cs
index fd64f5ddc83..737e9b2f887 100644
--- a/test/EFCore.AspNet.Specification.Tests/GrpcTestBase.cs
+++ b/test/EFCore.AspNet.Specification.Tests/GrpcTestBase.cs
@@ -137,7 +137,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
     public abstract class GrpcFixtureBase : SharedStoreFixtureBase<GrpcContext>
     {
-        protected override string StoreName { get; } = "GrpcTest";
+        protected override string StoreName
+            => "GrpcTest";
 
         protected override void Seed(GrpcContext context)
         {
diff --git a/test/EFCore.InMemory.FunctionalTests/GraphUpdates/GraphUpdatesInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/GraphUpdates/GraphUpdatesInMemoryTest.cs
index e08236960a4..30a78affcad 100644
--- a/test/EFCore.InMemory.FunctionalTests/GraphUpdates/GraphUpdatesInMemoryTest.cs
+++ b/test/EFCore.InMemory.FunctionalTests/GraphUpdates/GraphUpdatesInMemoryTest.cs
@@ -174,7 +174,8 @@ await base.ExecuteWithStrategyInTransactionAsync(
 
     public class InMemoryFixture : GraphUpdatesFixtureBase
     {
-        protected override string StoreName { get; } = "GraphUpdatesTest";
+        protected override string StoreName
+            => "GraphUpdatesTest";
 
         protected override ITestStoreFactory TestStoreFactory
             => InMemoryTestStoreFactory.Instance;
diff --git a/test/EFCore.InMemory.FunctionalTests/GraphUpdates/ProxyGraphUpdatesInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/GraphUpdates/ProxyGraphUpdatesInMemoryTest.cs
index b73dba24e6a..cb982fedefd 100644
--- a/test/EFCore.InMemory.FunctionalTests/GraphUpdates/ProxyGraphUpdatesInMemoryTest.cs
+++ b/test/EFCore.InMemory.FunctionalTests/GraphUpdates/ProxyGraphUpdatesInMemoryTest.cs
@@ -121,7 +121,8 @@ protected override bool DoesChangeTracking
 
         public class ProxyGraphUpdatesWithLazyLoadingInMemoryFixture : ProxyGraphUpdatesInMemoryFixtureBase
         {
-            protected override string StoreName { get; } = "ProxyGraphLazyLoadingUpdatesTest";
+            protected override string StoreName
+                => "ProxyGraphLazyLoadingUpdatesTest";
 
             public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
                 => base.AddOptions(builder.UseLazyLoadingProxies());
@@ -151,7 +152,8 @@ protected override bool DoesChangeTracking
 
         public class ProxyGraphUpdatesWithChangeTrackingInMemoryFixture : ProxyGraphUpdatesInMemoryFixtureBase
         {
-            protected override string StoreName { get; } = "ProxyGraphChangeTrackingUpdatesTest";
+            protected override string StoreName
+                => "ProxyGraphChangeTrackingUpdatesTest";
 
             public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
                 => base.AddOptions(builder.UseChangeTrackingProxies());
@@ -177,7 +179,8 @@ protected override bool DoesChangeTracking
 
         public class ProxyGraphUpdatesWithChangeTrackingInMemoryFixture : ProxyGraphUpdatesInMemoryFixtureBase
         {
-            protected override string StoreName { get; } = "ProxyGraphLazyLoadingAndChangeTrackingUpdatesTest";
+            protected override string StoreName
+                => "ProxyGraphLazyLoadingAndChangeTrackingUpdatesTest";
 
             public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
                 => base.AddOptions(
diff --git a/test/EFCore.InMemory.FunctionalTests/UpdatesInMemoryWithSensitiveDataLoggingFixture.cs b/test/EFCore.InMemory.FunctionalTests/UpdatesInMemoryWithSensitiveDataLoggingFixture.cs
index 0779b0e5a2e..0a4b5e19b92 100644
--- a/test/EFCore.InMemory.FunctionalTests/UpdatesInMemoryWithSensitiveDataLoggingFixture.cs
+++ b/test/EFCore.InMemory.FunctionalTests/UpdatesInMemoryWithSensitiveDataLoggingFixture.cs
@@ -5,7 +5,8 @@ namespace Microsoft.EntityFrameworkCore;
 
 public class UpdatesInMemoryWithSensitiveDataLoggingFixture : UpdatesInMemoryFixtureBase
 {
-    protected override string StoreName { get; } = "UpdateTestSensitive";
+    protected override string StoreName
+        => "UpdateTestSensitive";
 
     protected override ITestStoreFactory TestStoreFactory
         => InMemoryTestStoreFactory.Instance;
diff --git a/test/EFCore.InMemory.FunctionalTests/UpdatesInMemoryWithoutSensitiveDataLoggingFixture.cs b/test/EFCore.InMemory.FunctionalTests/UpdatesInMemoryWithoutSensitiveDataLoggingFixture.cs
index cc392e02c79..1b401a83533 100644
--- a/test/EFCore.InMemory.FunctionalTests/UpdatesInMemoryWithoutSensitiveDataLoggingFixture.cs
+++ b/test/EFCore.InMemory.FunctionalTests/UpdatesInMemoryWithoutSensitiveDataLoggingFixture.cs
@@ -5,7 +5,8 @@ namespace Microsoft.EntityFrameworkCore;
 
 public class UpdatesInMemoryWithoutSensitiveDataLoggingFixture : UpdatesInMemoryFixtureBase
 {
-    protected override string StoreName { get; } = "UpdateTestInsensitive";
+    protected override string StoreName
+        => "UpdateTestInsensitive";
 
     protected override ITestStoreFactory TestStoreFactory
         => InMemoryTestStoreFactory.Instance;
diff --git a/test/EFCore.OData.FunctionalTests/Query/ComplexNavigationsODataQueryTestFixture.cs b/test/EFCore.OData.FunctionalTests/Query/ComplexNavigationsODataQueryTestFixture.cs
index 25fe9aa74b1..b23140662de 100644
--- a/test/EFCore.OData.FunctionalTests/Query/ComplexNavigationsODataQueryTestFixture.cs
+++ b/test/EFCore.OData.FunctionalTests/Query/ComplexNavigationsODataQueryTestFixture.cs
@@ -12,7 +12,8 @@ public class ComplexNavigationsODataQueryTestFixture : ComplexNavigationsQuerySq
 {
     private IHost _selfHostServer;
 
-    protected override string StoreName { get; } = "ODataComplexNavigations";
+    protected override string StoreName
+        => "ODataComplexNavigations";
 
     public ComplexNavigationsODataQueryTestFixture()
     {
diff --git a/test/EFCore.OData.FunctionalTests/Query/GearsOfWarODataQueryTestFixture.cs b/test/EFCore.OData.FunctionalTests/Query/GearsOfWarODataQueryTestFixture.cs
index 0bac03b2a4b..e62ff277de8 100644
--- a/test/EFCore.OData.FunctionalTests/Query/GearsOfWarODataQueryTestFixture.cs
+++ b/test/EFCore.OData.FunctionalTests/Query/GearsOfWarODataQueryTestFixture.cs
@@ -12,7 +12,8 @@ public class GearsOfWarODataQueryTestFixture : GearsOfWarQuerySqlServerFixture,
 {
     private IHost _selfHostServer;
 
-    protected override string StoreName { get; } = "ODataGearsOfWarQueryTest";
+    protected override string StoreName
+        => "ODataGearsOfWarQueryTest";
 
     public GearsOfWarODataQueryTestFixture()
     {
diff --git a/test/EFCore.OData.FunctionalTests/Query/NorthwindODataQueryTestFixture.cs b/test/EFCore.OData.FunctionalTests/Query/NorthwindODataQueryTestFixture.cs
index b9593cd82dd..79df1520331 100644
--- a/test/EFCore.OData.FunctionalTests/Query/NorthwindODataQueryTestFixture.cs
+++ b/test/EFCore.OData.FunctionalTests/Query/NorthwindODataQueryTestFixture.cs
@@ -15,7 +15,8 @@ public class NorthwindODataQueryTestFixture : NorthwindQuerySqlServerFixture<Noo
 {
     private IHost _selfHostServer;
 
-    protected override string StoreName { get; } = "ODataNorthwind";
+    protected override string StoreName
+        => "ODataNorthwind";
 
     public NorthwindODataQueryTestFixture()
     {
diff --git a/test/EFCore.Relational.Specification.Tests/EntitySplittingTestBase.cs b/test/EFCore.Relational.Specification.Tests/EntitySplittingTestBase.cs
index 2efa8854f68..1bac70fb7e9 100644
--- a/test/EFCore.Relational.Specification.Tests/EntitySplittingTestBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/EntitySplittingTestBase.cs
@@ -28,7 +28,7 @@ public virtual async Task Can_roundtrip()
 
             Assert.Empty(TestSqlLoggerFactory.Log.Where(l => l.Level == LogLevel.Warning));
         }
-        
+
         await using (var context = CreateContext())
         {
             var reading = await context.MeterReadings.SingleAsync();
@@ -38,7 +38,8 @@ public virtual async Task Can_roundtrip()
         }
     }
 
-    protected override string StoreName { get; } = "EntitySplittingTest";
+    protected override string StoreName
+        => "EntitySplittingTest";
 
     protected TestSqlLoggerFactory TestSqlLoggerFactory
         => (TestSqlLoggerFactory)ListLoggerFactory;
@@ -47,7 +48,7 @@ protected TestSqlLoggerFactory TestSqlLoggerFactory
 
     protected void AssertSql(params string[] expected)
         => TestSqlLoggerFactory.AssertBaseline(expected);
-    
+
     protected virtual void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.Entity<MeterReading>(
diff --git a/test/EFCore.Relational.Specification.Tests/Migrations/MigrationsInfrastructureTestBase.cs b/test/EFCore.Relational.Specification.Tests/Migrations/MigrationsInfrastructureTestBase.cs
index 9099e37e277..d22ed224728 100644
--- a/test/EFCore.Relational.Specification.Tests/Migrations/MigrationsInfrastructureTestBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/Migrations/MigrationsInfrastructureTestBase.cs
@@ -319,7 +319,8 @@ public abstract class
     public new RelationalTestStore TestStore
         => (RelationalTestStore)base.TestStore;
 
-    protected override string StoreName { get; } = "MigrationsTest";
+    protected override string StoreName
+        => "MigrationsTest";
 
     public EmptyMigrationsContext CreateEmptyContext()
         => new(
diff --git a/test/EFCore.Relational.Specification.Tests/Query/EntitySplittingQueryFixtureBase.cs b/test/EFCore.Relational.Specification.Tests/Query/EntitySplittingQueryFixtureBase.cs
index bebe89997f3..d7ceb341004 100644
--- a/test/EFCore.Relational.Specification.Tests/Query/EntitySplittingQueryFixtureBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/Query/EntitySplittingQueryFixtureBase.cs
@@ -13,7 +13,8 @@ protected EntitySplittingQueryFixtureBase()
     {
     }
 
-    protected override string StoreName { get; } = "EntitySplittingQueryTest";
+    protected override string StoreName
+        => "EntitySplittingQueryTest";
 
     public TestSqlLoggerFactory TestSqlLoggerFactory
        => (TestSqlLoggerFactory)ListLoggerFactory;
diff --git a/test/EFCore.Relational.Specification.Tests/Query/MappingQueryTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/MappingQueryTestBase.cs
index 34b56f4ee44..6a450b2a549 100644
--- a/test/EFCore.Relational.Specification.Tests/Query/MappingQueryTestBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/Query/MappingQueryTestBase.cs
@@ -89,7 +89,8 @@ protected enum ShipVia
     public abstract class MappingQueryFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
         protected abstract string DatabaseSchema { get; }
-        protected override string StoreName { get; } = "Northwind";
+        protected override string StoreName
+            => "Northwind";
 
         public TestSqlLoggerFactory TestSqlLoggerFactory
             => (TestSqlLoggerFactory)ListLoggerFactory;
diff --git a/test/EFCore.Relational.Specification.Tests/Query/NullSemanticsQueryFixtureBase.cs b/test/EFCore.Relational.Specification.Tests/Query/NullSemanticsQueryFixtureBase.cs
index 5f419d20cd9..dda90a98756 100644
--- a/test/EFCore.Relational.Specification.Tests/Query/NullSemanticsQueryFixtureBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/Query/NullSemanticsQueryFixtureBase.cs
@@ -87,7 +87,8 @@ public IReadOnlyDictionary<Type, object> GetEntityAsserters()
             },
         }.ToDictionary(e => e.Key, e => (object)e.Value);
 
-    protected override string StoreName { get; } = "NullSemanticsQueryTest";
+    protected override string StoreName
+        => "NullSemanticsQueryTest";
 
     public new RelationalTestStore TestStore
         => (RelationalTestStore)base.TestStore;
diff --git a/test/EFCore.Relational.Specification.Tests/Query/TPCGearsOfWarQueryRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/TPCGearsOfWarQueryRelationalFixture.cs
index fd03855e562..08922f2b496 100644
--- a/test/EFCore.Relational.Specification.Tests/Query/TPCGearsOfWarQueryRelationalFixture.cs
+++ b/test/EFCore.Relational.Specification.Tests/Query/TPCGearsOfWarQueryRelationalFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public abstract class TPCGearsOfWarQueryRelationalFixture : GearsOfWarQueryFixtureBase
 {
-    protected override string StoreName { get; } = "TPCGearsOfWarQueryTest";
+    protected override string StoreName
+        => "TPCGearsOfWarQueryTest";
 
     public new RelationalTestStore TestStore
         => (RelationalTestStore)base.TestStore;
diff --git a/test/EFCore.Relational.Specification.Tests/Query/TPCManyToManyQueryRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/TPCManyToManyQueryRelationalFixture.cs
index 9404d6c2436..b6bcaf216f1 100644
--- a/test/EFCore.Relational.Specification.Tests/Query/TPCManyToManyQueryRelationalFixture.cs
+++ b/test/EFCore.Relational.Specification.Tests/Query/TPCManyToManyQueryRelationalFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public abstract class TPCManyToManyQueryRelationalFixture : ManyToManyQueryRelationalFixture
 {
-    protected override string StoreName { get; } = "TPCManyToManyQueryTest";
+    protected override string StoreName
+        => "TPCManyToManyQueryTest";
 
     public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
         => base.AddOptions(builder).ConfigureWarnings(
diff --git a/test/EFCore.Relational.Specification.Tests/Query/TPCRelationshipsQueryRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/TPCRelationshipsQueryRelationalFixture.cs
index 30f07765c59..7d91ad497ef 100644
--- a/test/EFCore.Relational.Specification.Tests/Query/TPCRelationshipsQueryRelationalFixture.cs
+++ b/test/EFCore.Relational.Specification.Tests/Query/TPCRelationshipsQueryRelationalFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public abstract class TPCRelationshipsQueryRelationalFixture : InheritanceRelationshipsQueryRelationalFixture
 {
-    protected override string StoreName { get; } = "TPCRelationships";
+    protected override string StoreName
+        => "TPCRelationships";
 
     public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
         => base.AddOptions(builder).ConfigureWarnings(
diff --git a/test/EFCore.Relational.Specification.Tests/Query/TPTGearsOfWarQueryRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/TPTGearsOfWarQueryRelationalFixture.cs
index b6a64a0ea02..ab5638b8add 100644
--- a/test/EFCore.Relational.Specification.Tests/Query/TPTGearsOfWarQueryRelationalFixture.cs
+++ b/test/EFCore.Relational.Specification.Tests/Query/TPTGearsOfWarQueryRelationalFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public abstract class TPTGearsOfWarQueryRelationalFixture : GearsOfWarQueryFixtureBase
 {
-    protected override string StoreName { get; } = "TPTGearsOfWarQueryTest";
+    protected override string StoreName
+        => "TPTGearsOfWarQueryTest";
 
     public new RelationalTestStore TestStore
         => (RelationalTestStore)base.TestStore;
diff --git a/test/EFCore.Relational.Specification.Tests/Query/TPTManyToManyQueryRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/TPTManyToManyQueryRelationalFixture.cs
index 115e6224d0b..b38b4851006 100644
--- a/test/EFCore.Relational.Specification.Tests/Query/TPTManyToManyQueryRelationalFixture.cs
+++ b/test/EFCore.Relational.Specification.Tests/Query/TPTManyToManyQueryRelationalFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public abstract class TPTManyToManyQueryRelationalFixture : ManyToManyQueryRelationalFixture
 {
-    protected override string StoreName { get; } = "TPTManyToManyQueryTest";
+    protected override string StoreName
+        => "TPTManyToManyQueryTest";
 
     protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
     {
diff --git a/test/EFCore.Relational.Specification.Tests/Query/TPTRelationshipsQueryRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/TPTRelationshipsQueryRelationalFixture.cs
index dd7014cce56..6c21f75f854 100644
--- a/test/EFCore.Relational.Specification.Tests/Query/TPTRelationshipsQueryRelationalFixture.cs
+++ b/test/EFCore.Relational.Specification.Tests/Query/TPTRelationshipsQueryRelationalFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public abstract class TPTRelationshipsQueryRelationalFixture : InheritanceRelationshipsQueryRelationalFixture
 {
-    protected override string StoreName { get; } = "TPTRelationships";
+    protected override string StoreName
+        => "TPTRelationships";
 
     protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
     {
diff --git a/test/EFCore.Relational.Specification.Tests/TPTTableSplittingTestBase.cs b/test/EFCore.Relational.Specification.Tests/TPTTableSplittingTestBase.cs
index 0a03778b293..fa1b691a0d7 100644
--- a/test/EFCore.Relational.Specification.Tests/TPTTableSplittingTestBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/TPTTableSplittingTestBase.cs
@@ -17,7 +17,8 @@ public override Task Can_use_optional_dependents_with_shared_concurrency_tokens(
         // TODO: Issue #22060
         => Task.CompletedTask;
 
-    protected override string StoreName { get; } = "TPTTableSplittingTest";
+    protected override string StoreName
+        => "TPTTableSplittingTest";
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
diff --git a/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs b/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs
index 913404c7afc..88c826c9dbd 100644
--- a/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs
@@ -618,7 +618,8 @@ public virtual async Task No_warn_when_save_optional_dependent_at_least_one_none
         Assert.Empty(TestSqlLoggerFactory.Log.Where(l => l.Level == LogLevel.Warning));
     }
 
-    protected override string StoreName { get; } = "TableSplittingTest";
+    protected override string StoreName
+        => "TableSplittingTest";
 
     protected TestSqlLoggerFactory TestSqlLoggerFactory
         => (TestSqlLoggerFactory)ListLoggerFactory;
diff --git a/test/EFCore.Relational.Specification.Tests/TransactionTestBase.cs b/test/EFCore.Relational.Specification.Tests/TransactionTestBase.cs
index 162c94a0c2a..1ed6dc8f771 100644
--- a/test/EFCore.Relational.Specification.Tests/TransactionTestBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/TransactionTestBase.cs
@@ -1469,7 +1469,8 @@ protected DbContext CreateContext()
 
     public abstract class TransactionFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "TransactionTest";
+        protected override string StoreName
+            => "TransactionTest";
 
         protected override bool ShouldLogCategory(string logCategory)
             => logCategory == DbLoggerCategory.Database.Transaction.Name;
diff --git a/test/EFCore.Relational.Specification.Tests/Update/StoreValueGenerationFixtureBase.cs b/test/EFCore.Relational.Specification.Tests/Update/StoreValueGenerationFixtureBase.cs
index b35fea5b9ad..59a0d417965 100644
--- a/test/EFCore.Relational.Specification.Tests/Update/StoreValueGenerationFixtureBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/Update/StoreValueGenerationFixtureBase.cs
@@ -9,7 +9,8 @@ namespace Microsoft.EntityFrameworkCore.Update;
 
 public abstract class StoreValueGenerationFixtureBase : SharedStoreFixtureBase<StoreValueGenerationContext>
 {
-    protected override string StoreName { get; } = "StoreValueGenerationTest";
+    protected override string StoreName
+        => "StoreValueGenerationTest";
 
     protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
     {
diff --git a/test/EFCore.Specification.Tests/BuiltInDataTypesTestBase.cs b/test/EFCore.Specification.Tests/BuiltInDataTypesTestBase.cs
index e901b0b2b77..af483575e6d 100644
--- a/test/EFCore.Specification.Tests/BuiltInDataTypesTestBase.cs
+++ b/test/EFCore.Specification.Tests/BuiltInDataTypesTestBase.cs
@@ -2103,7 +2103,8 @@ public virtual void Can_insert_query_multiline_string()
 
     public abstract class BuiltInDataTypesFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "BuiltInDataTypes";
+        protected override string StoreName
+            => "BuiltInDataTypes";
 
         public virtual int LongStringLength
             => 9000;
diff --git a/test/EFCore.Specification.Tests/CompositeKeyEndToEndTestBase.cs b/test/EFCore.Specification.Tests/CompositeKeyEndToEndTestBase.cs
index d420661add7..4e912c33b0f 100644
--- a/test/EFCore.Specification.Tests/CompositeKeyEndToEndTestBase.cs
+++ b/test/EFCore.Specification.Tests/CompositeKeyEndToEndTestBase.cs
@@ -192,7 +192,8 @@ protected BronieContext CreateContext()
 
     public abstract class CompositeKeyEndToEndFixtureBase : SharedStoreFixtureBase<DbContext>
     {
-        protected override string StoreName { get; } = "CompositeKeyEndToEndTest";
+        protected override string StoreName
+            => "CompositeKeyEndToEndTest";
 
         protected override Type ContextType { get; } = typeof(BronieContext);
     }
diff --git a/test/EFCore.Specification.Tests/ConferencePlannerTestBase.cs b/test/EFCore.Specification.Tests/ConferencePlannerTestBase.cs
index fdc3a5ce142..998316659e7 100644
--- a/test/EFCore.Specification.Tests/ConferencePlannerTestBase.cs
+++ b/test/EFCore.Specification.Tests/ConferencePlannerTestBase.cs
@@ -723,7 +723,8 @@ protected virtual void UseTransaction(DatabaseFacade facade, IDbContextTransacti
 
     public abstract class ConferencePlannerFixtureBase : SharedStoreFixtureBase<ApplicationDbContext>
     {
-        protected override string StoreName { get; } = "ConferencePlanner";
+        protected override string StoreName
+            => "ConferencePlanner";
 
         protected override bool UsePooling
             => false;
diff --git a/test/EFCore.Specification.Tests/ConvertToProviderTypesTestBase.cs b/test/EFCore.Specification.Tests/ConvertToProviderTypesTestBase.cs
index f4d20eaae87..2a1221d3bed 100644
--- a/test/EFCore.Specification.Tests/ConvertToProviderTypesTestBase.cs
+++ b/test/EFCore.Specification.Tests/ConvertToProviderTypesTestBase.cs
@@ -35,7 +35,8 @@ public override void Object_to_string_conversion() { }
 
     public abstract class ConvertToProviderTypesFixtureBase : BuiltInDataTypesFixtureBase
     {
-        protected override string StoreName { get; } = "ConvertToProviderTypes";
+        protected override string StoreName
+            => "ConvertToProviderTypes";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Specification.Tests/CustomConvertersTestBase.cs b/test/EFCore.Specification.Tests/CustomConvertersTestBase.cs
index 870a0086f1e..2fcd805354e 100644
--- a/test/EFCore.Specification.Tests/CustomConvertersTestBase.cs
+++ b/test/EFCore.Specification.Tests/CustomConvertersTestBase.cs
@@ -801,7 +801,8 @@ public class Layout
 
     public abstract class CustomConvertersFixtureBase : BuiltInDataTypesFixtureBase
     {
-        protected override string StoreName { get; } = "CustomConverters";
+        protected override string StoreName
+            => "CustomConverters";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs b/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs
index 752dda35c20..cbacc4a29b6 100644
--- a/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs
+++ b/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs
@@ -2813,7 +2813,8 @@ public virtual void InverseProperty_with_case_sensitive_clr_property()
 
     public abstract class DataAnnotationFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "DataAnnotations";
+        protected override string StoreName
+            => "DataAnnotations";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Specification.Tests/FieldMappingTestBase.cs b/test/EFCore.Specification.Tests/FieldMappingTestBase.cs
index e5774af7b88..829cd1058fb 100644
--- a/test/EFCore.Specification.Tests/FieldMappingTestBase.cs
+++ b/test/EFCore.Specification.Tests/FieldMappingTestBase.cs
@@ -1970,7 +1970,8 @@ protected DbContext CreateContext()
 
     public abstract class FieldMappingFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "FieldMapping";
+        protected override string StoreName
+            => "FieldMapping";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Specification.Tests/FieldsOnlyLoadTestBase.cs b/test/EFCore.Specification.Tests/FieldsOnlyLoadTestBase.cs
index f2a005bf6af..cf074082023 100644
--- a/test/EFCore.Specification.Tests/FieldsOnlyLoadTestBase.cs
+++ b/test/EFCore.Specification.Tests/FieldsOnlyLoadTestBase.cs
@@ -4607,7 +4607,8 @@ public override void DetectChanges(IStateManager stateManager)
 
     public abstract class FieldsOnlyLoadFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "FieldsOnlyLoadTest";
+        protected override string StoreName
+            => "FieldsOnlyLoadTest";
 
         protected override IServiceCollection AddServices(IServiceCollection serviceCollection)
             => base.AddServices(serviceCollection.AddScoped<IChangeDetector, ChangeDetectorProxy>());
diff --git a/test/EFCore.Specification.Tests/FindTestBase.cs b/test/EFCore.Specification.Tests/FindTestBase.cs
index b7ff1feb958..68f0e18b332 100644
--- a/test/EFCore.Specification.Tests/FindTestBase.cs
+++ b/test/EFCore.Specification.Tests/FindTestBase.cs
@@ -768,7 +768,8 @@ protected DbContext CreateContext()
 
         public abstract class FindFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
         {
-            protected override string StoreName { get; } = "FindTest";
+            protected override string StoreName
+                => "FindTest";
 
             protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
             {
diff --git a/test/EFCore.Specification.Tests/KeysWithConvertersTestBase.cs b/test/EFCore.Specification.Tests/KeysWithConvertersTestBase.cs
index 40774bdc8a3..af732d5343c 100644
--- a/test/EFCore.Specification.Tests/KeysWithConvertersTestBase.cs
+++ b/test/EFCore.Specification.Tests/KeysWithConvertersTestBase.cs
@@ -6875,7 +6875,8 @@ public OwnedGenericComparableIntClassKey(int position)
 
     public abstract class KeysWithConvertersFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "KeysWithConverters";
+        protected override string StoreName
+            => "KeysWithConverters";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Specification.Tests/LazyLoadProxyTestBase.cs b/test/EFCore.Specification.Tests/LazyLoadProxyTestBase.cs
index 2de2046a11c..62ec396016e 100644
--- a/test/EFCore.Specification.Tests/LazyLoadProxyTestBase.cs
+++ b/test/EFCore.Specification.Tests/LazyLoadProxyTestBase.cs
@@ -2801,7 +2801,8 @@ public override void DetectChanges(IStateManager stateManager)
 
     public abstract class LoadFixtureBase : SharedStoreFixtureBase<DbContext>
     {
-        protected override string StoreName { get; } = "LazyLoadProxyTest";
+        protected override string StoreName
+            => "LazyLoadProxyTest";
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
             => base.AddOptions(builder.UseLazyLoadingProxies());
diff --git a/test/EFCore.Specification.Tests/LoadTestBase.cs b/test/EFCore.Specification.Tests/LoadTestBase.cs
index 0a74299921d..02df72f9019 100644
--- a/test/EFCore.Specification.Tests/LoadTestBase.cs
+++ b/test/EFCore.Specification.Tests/LoadTestBase.cs
@@ -6352,7 +6352,8 @@ public override void DetectChanges(IStateManager stateManager)
 
     public abstract class LoadFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "LoadTest";
+        protected override string StoreName
+            => "LoadTest";
 
         protected override IServiceCollection AddServices(IServiceCollection serviceCollection)
             => base.AddServices(serviceCollection.AddScoped<IChangeDetector, ChangeDetectorProxy>());
diff --git a/test/EFCore.Specification.Tests/ManyToManyFieldsLoadTestBase.cs b/test/EFCore.Specification.Tests/ManyToManyFieldsLoadTestBase.cs
index 547cd33831b..96e7e968134 100644
--- a/test/EFCore.Specification.Tests/ManyToManyFieldsLoadTestBase.cs
+++ b/test/EFCore.Specification.Tests/ManyToManyFieldsLoadTestBase.cs
@@ -1002,7 +1002,8 @@ protected virtual void RecordLog()
 
     public abstract class ManyToManyFieldsLoadFixtureBase : ManyToManyFieldsQueryFixtureBase
     {
-        protected override string StoreName { get; } = "ManyToManyFieldsLoadTest";
+        protected override string StoreName
+            => "ManyToManyFieldsLoadTest";
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
             => base.AddOptions(builder).ConfigureWarnings(
diff --git a/test/EFCore.Specification.Tests/ManyToManyTrackingTestBase.cs b/test/EFCore.Specification.Tests/ManyToManyTrackingTestBase.cs
index 1f06cc6b623..ab3d5b27280 100644
--- a/test/EFCore.Specification.Tests/ManyToManyTrackingTestBase.cs
+++ b/test/EFCore.Specification.Tests/ManyToManyTrackingTestBase.cs
@@ -5986,6 +5986,7 @@ public override ManyToManyContext CreateContext()
             return context;
         }
 
-        protected override string StoreName { get; } = "ManyToManyTracking";
+        protected override string StoreName
+            => "ManyToManyTracking";
     }
 }
diff --git a/test/EFCore.Specification.Tests/MusicStoreTestBase.cs b/test/EFCore.Specification.Tests/MusicStoreTestBase.cs
index afbe1b7dc62..223ec729bf0 100644
--- a/test/EFCore.Specification.Tests/MusicStoreTestBase.cs
+++ b/test/EFCore.Specification.Tests/MusicStoreTestBase.cs
@@ -762,7 +762,8 @@ public abstract class MusicStoreFixtureBase : SharedStoreFixtureBase<MusicStoreC
         public virtual IDisposable BeginTransaction(DbContext context)
             => context.Database.BeginTransaction();
 
-        protected override string StoreName { get; } = "MusicStore";
+        protected override string StoreName
+            => "MusicStore";
 
         protected override bool UsePooling
             => false;
diff --git a/test/EFCore.Specification.Tests/NotificationEntitiesTestBase.cs b/test/EFCore.Specification.Tests/NotificationEntitiesTestBase.cs
index e8b1cdad473..2b6295dc95f 100644
--- a/test/EFCore.Specification.Tests/NotificationEntitiesTestBase.cs
+++ b/test/EFCore.Specification.Tests/NotificationEntitiesTestBase.cs
@@ -110,7 +110,8 @@ protected DbContext CreateContext()
 
     public abstract class NotificationEntitiesFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "NotificationEntities";
+        protected override string StoreName
+            => "NotificationEntities";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Specification.Tests/OverzealousInitializationTestBase.cs b/test/EFCore.Specification.Tests/OverzealousInitializationTestBase.cs
index 793d2be3af3..758ac4f48fc 100644
--- a/test/EFCore.Specification.Tests/OverzealousInitializationTestBase.cs
+++ b/test/EFCore.Specification.Tests/OverzealousInitializationTestBase.cs
@@ -97,7 +97,8 @@ public abstract class OverzealousInitializationFixtureBase : SharedStoreFixtureB
         public virtual IDisposable BeginTransaction(DbContext context)
             => context.Database.BeginTransaction();
 
-        protected override string StoreName { get; } = "OverzealousInitialization";
+        protected override string StoreName
+            => "OverzealousInitialization";
 
         protected override void Seed(AlbumViewerContext context)
         {
diff --git a/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryFixtureBase.cs b/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryFixtureBase.cs
index 8c51fb8d944..aeb7b301174 100644
--- a/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryFixtureBase.cs
+++ b/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryFixtureBase.cs
@@ -9,7 +9,8 @@ public abstract class ComplexNavigationsQueryFixtureBase : SharedStoreFixtureBas
 {
     private ComplexNavigationsDefaultData _expectedData;
 
-    protected override string StoreName { get; } = "ComplexNavigations";
+    protected override string StoreName
+        => "ComplexNavigations";
 
     public Func<DbContext> GetContextCreator()
         => () => CreateContext();
diff --git a/test/EFCore.Specification.Tests/Query/ComplexNavigationsSharedTypeQueryFixtureBase.cs b/test/EFCore.Specification.Tests/Query/ComplexNavigationsSharedTypeQueryFixtureBase.cs
index 7dfee6aa3f1..4cdf229dd9e 100644
--- a/test/EFCore.Specification.Tests/Query/ComplexNavigationsSharedTypeQueryFixtureBase.cs
+++ b/test/EFCore.Specification.Tests/Query/ComplexNavigationsSharedTypeQueryFixtureBase.cs
@@ -10,7 +10,8 @@ public abstract class ComplexNavigationsSharedTypeQueryFixtureBase : ComplexNavi
 {
     private ComplexNavigationsWeakData _expectedData;
 
-    protected override string StoreName { get; } = "ComplexNavigationsOwned";
+    protected override string StoreName
+        => "ComplexNavigationsOwned";
 
     public override ISetSource GetExpectedData()
     {
diff --git a/test/EFCore.Specification.Tests/Query/CompositeKeysQueryFixtureBase.cs b/test/EFCore.Specification.Tests/Query/CompositeKeysQueryFixtureBase.cs
index f823de50a10..0bb8f787d34 100644
--- a/test/EFCore.Specification.Tests/Query/CompositeKeysQueryFixtureBase.cs
+++ b/test/EFCore.Specification.Tests/Query/CompositeKeysQueryFixtureBase.cs
@@ -9,7 +9,8 @@ public abstract class CompositeKeysQueryFixtureBase : SharedStoreFixtureBase<Com
 {
     private CompositeKeysDefaultData _expectedData;
 
-    protected override string StoreName { get; } = "CompositeKeys";
+    protected override string StoreName
+        => "CompositeKeys";
 
     public Func<DbContext> GetContextCreator()
         => () => CreateContext();
diff --git a/test/EFCore.Specification.Tests/Query/FunkyDataQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/FunkyDataQueryTestBase.cs
index 7eb996925dc..7daf08e434c 100644
--- a/test/EFCore.Specification.Tests/Query/FunkyDataQueryTestBase.cs
+++ b/test/EFCore.Specification.Tests/Query/FunkyDataQueryTestBase.cs
@@ -546,7 +546,8 @@ public IReadOnlyDictionary<Type, object> GetEntityAsserters()
                 }
             }.ToDictionary(e => e.Key, e => (object)e.Value);
 
-        protected override string StoreName { get; } = "FunkyDataQueryTest";
+        protected override string StoreName
+            => "FunkyDataQueryTest";
 
         public override FunkyDataContext CreateContext()
         {
diff --git a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryFixtureBase.cs b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryFixtureBase.cs
index e895cd1c319..78f2dd44f3b 100644
--- a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryFixtureBase.cs
+++ b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryFixtureBase.cs
@@ -9,7 +9,8 @@ public abstract class GearsOfWarQueryFixtureBase : SharedStoreFixtureBase<GearsO
 {
     private GearsOfWarData _expectedData;
 
-    protected override string StoreName { get; } = "GearsOfWarQueryTest";
+    protected override string StoreName
+        => "GearsOfWarQueryTest";
 
     public Func<DbContext> GetContextCreator()
         => () => CreateContext();
diff --git a/test/EFCore.Specification.Tests/Query/InheritanceQueryFixtureBase.cs b/test/EFCore.Specification.Tests/Query/InheritanceQueryFixtureBase.cs
index 3eba8e50fbb..cc2e12d7f29 100644
--- a/test/EFCore.Specification.Tests/Query/InheritanceQueryFixtureBase.cs
+++ b/test/EFCore.Specification.Tests/Query/InheritanceQueryFixtureBase.cs
@@ -9,7 +9,8 @@ public abstract class InheritanceQueryFixtureBase : SharedStoreFixtureBase<Inher
 {
     private readonly Dictionary<bool, ISetSource> _expectedDataCache = new();
 
-    protected override string StoreName { get; } = "InheritanceTest";
+    protected override string StoreName
+        => "InheritanceTest";
 
     protected virtual bool EnableFilters
         => false;
diff --git a/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryFixtureBase.cs b/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryFixtureBase.cs
index 0e662fdab83..2393c72a282 100644
--- a/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryFixtureBase.cs
+++ b/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryFixtureBase.cs
@@ -8,7 +8,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 public abstract class InheritanceRelationshipsQueryFixtureBase : SharedStoreFixtureBase<InheritanceRelationshipsContext>,
     IQueryFixtureBase
 {
-    protected override string StoreName { get; } = "InheritanceRelationships";
+    protected override string StoreName
+        => "InheritanceRelationships";
 
     public Func<DbContext> GetContextCreator()
         => () => CreateContext();
diff --git a/test/EFCore.Specification.Tests/Query/ManyToManyFieldsQueryFixtureBase.cs b/test/EFCore.Specification.Tests/Query/ManyToManyFieldsQueryFixtureBase.cs
index 1220bc383ba..08ef6b615ed 100644
--- a/test/EFCore.Specification.Tests/Query/ManyToManyFieldsQueryFixtureBase.cs
+++ b/test/EFCore.Specification.Tests/Query/ManyToManyFieldsQueryFixtureBase.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public abstract class ManyToManyFieldsQueryFixtureBase : SharedStoreFixtureBase<ManyToManyContext>, IQueryFixtureBase
 {
-    protected override string StoreName { get; } = "ManyToManyQueryTest";
+    protected override string StoreName
+        => "ManyToManyQueryTest";
 
     public Func<DbContext> GetContextCreator()
         => () => CreateContext();
diff --git a/test/EFCore.Specification.Tests/Query/ManyToManyQueryFixtureBase.cs b/test/EFCore.Specification.Tests/Query/ManyToManyQueryFixtureBase.cs
index 2fc3f31b989..c93bc01c9d4 100644
--- a/test/EFCore.Specification.Tests/Query/ManyToManyQueryFixtureBase.cs
+++ b/test/EFCore.Specification.Tests/Query/ManyToManyQueryFixtureBase.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public abstract class ManyToManyQueryFixtureBase : SharedStoreFixtureBase<ManyToManyContext>, IQueryFixtureBase
 {
-    protected override string StoreName { get; } = "ManyToManyQueryTest";
+    protected override string StoreName
+        => "ManyToManyQueryTest";
 
     public Func<DbContext> GetContextCreator()
         => () => CreateContext();
diff --git a/test/EFCore.Specification.Tests/Query/NorthwindQueryFixtureBase.cs b/test/EFCore.Specification.Tests/Query/NorthwindQueryFixtureBase.cs
index 64f4918f2b1..d5ece20b545 100644
--- a/test/EFCore.Specification.Tests/Query/NorthwindQueryFixtureBase.cs
+++ b/test/EFCore.Specification.Tests/Query/NorthwindQueryFixtureBase.cs
@@ -264,7 +264,8 @@ public IReadOnlyDictionary<Type, object> GetEntityAsserters()
             },
         }.ToDictionary(e => e.Key, e => (object)e.Value);
 
-    protected override string StoreName { get; } = "Northwind";
+    protected override string StoreName
+        => "Northwind";
 
     protected override bool UsePooling
         => typeof(TModelCustomizer) == typeof(NoopModelCustomizer);
diff --git a/test/EFCore.Specification.Tests/Query/NullKeysTestBase.cs b/test/EFCore.Specification.Tests/Query/NullKeysTestBase.cs
index abd330dbe3b..ccdd87a98f2 100644
--- a/test/EFCore.Specification.Tests/Query/NullKeysTestBase.cs
+++ b/test/EFCore.Specification.Tests/Query/NullKeysTestBase.cs
@@ -207,7 +207,8 @@ protected class WithAllNullableIntFk
 
     public abstract class NullKeysFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "NullKeysTest";
+        protected override string StoreName
+            => "NullKeysTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs
index e12c39cfb7c..375c73f15b7 100644
--- a/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs
+++ b/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs
@@ -1099,7 +1099,8 @@ public IReadOnlyDictionary<Type, object> GetEntityAsserters()
                 }
             }.ToDictionary(e => e.Key, e => (object)e.Value);
 
-        protected override string StoreName { get; } = "OwnedQueryTest";
+        protected override string StoreName
+            => "OwnedQueryTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Specification.Tests/Query/QueryFilterFuncletizationFixtureBase.cs b/test/EFCore.Specification.Tests/Query/QueryFilterFuncletizationFixtureBase.cs
index ca1c260c084..c88a23a6bf1 100644
--- a/test/EFCore.Specification.Tests/Query/QueryFilterFuncletizationFixtureBase.cs
+++ b/test/EFCore.Specification.Tests/Query/QueryFilterFuncletizationFixtureBase.cs
@@ -5,7 +5,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public abstract class QueryFilterFuncletizationFixtureBase : SharedStoreFixtureBase<QueryFilterFuncletizationContext>
 {
-    protected override string StoreName { get; } = "QueryFilterFuncletizationTest";
+    protected override string StoreName
+        => "QueryFilterFuncletizationTest";
 
     protected override bool UsePooling
         => false;
diff --git a/test/EFCore.Specification.Tests/StoreGeneratedFixupTestBase.cs b/test/EFCore.Specification.Tests/StoreGeneratedFixupTestBase.cs
index 28bc9a51f15..263808ebbff 100644
--- a/test/EFCore.Specification.Tests/StoreGeneratedFixupTestBase.cs
+++ b/test/EFCore.Specification.Tests/StoreGeneratedFixupTestBase.cs
@@ -4403,7 +4403,8 @@ protected DbContext CreateContext()
 
     public abstract class StoreGeneratedFixupFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "StoreGeneratedFixup";
+        protected override string StoreName
+            => "StoreGeneratedFixup";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Specification.Tests/StoreGeneratedTestBase.cs b/test/EFCore.Specification.Tests/StoreGeneratedTestBase.cs
index c263173dc4e..9a4a20f891c 100644
--- a/test/EFCore.Specification.Tests/StoreGeneratedTestBase.cs
+++ b/test/EFCore.Specification.Tests/StoreGeneratedTestBase.cs
@@ -4232,7 +4232,8 @@ protected DbContext CreateContext()
 
     public abstract class StoreGeneratedFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "StoreGeneratedTest";
+        protected override string StoreName
+            => "StoreGeneratedTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Specification.Tests/UpdatesFixtureBase.cs b/test/EFCore.Specification.Tests/UpdatesFixtureBase.cs
index 770f6a77854..39970ad935a 100644
--- a/test/EFCore.Specification.Tests/UpdatesFixtureBase.cs
+++ b/test/EFCore.Specification.Tests/UpdatesFixtureBase.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore;
 
 public abstract class UpdatesFixtureBase : SharedStoreFixtureBase<UpdatesContext>
 {
-    protected override string StoreName { get; } = "UpdateTest";
+    protected override string StoreName
+        => "UpdateTest";
 
     protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
     {
diff --git a/test/EFCore.Specification.Tests/WithConstructorsTestBase.cs b/test/EFCore.Specification.Tests/WithConstructorsTestBase.cs
index 20a7d167769..01198bfe473 100644
--- a/test/EFCore.Specification.Tests/WithConstructorsTestBase.cs
+++ b/test/EFCore.Specification.Tests/WithConstructorsTestBase.cs
@@ -1609,7 +1609,8 @@ public WithConstructorsContext(DbContextOptions options)
 
     public abstract class WithConstructorsFixtureBase : SharedStoreFixtureBase<WithConstructorsContext>
     {
-        protected override string StoreName { get; } = "WithConstructors";
+        protected override string StoreName
+            => "WithConstructors";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.SqlServer.FunctionalTests/BatchingTest.cs b/test/EFCore.SqlServer.FunctionalTests/BatchingTest.cs
index c450fc48f24..1ef458be032 100644
--- a/test/EFCore.SqlServer.FunctionalTests/BatchingTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/BatchingTest.cs
@@ -429,7 +429,8 @@ private class Comment
 
     public class BatchingTestFixture : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "BatchingTest";
+        protected override string StoreName
+            => "BatchingTest";
 
         public TestSqlLoggerFactory TestSqlLoggerFactory
             => (TestSqlLoggerFactory)ListLoggerFactory;
diff --git a/test/EFCore.SqlServer.FunctionalTests/CommandConfigurationTest.cs b/test/EFCore.SqlServer.FunctionalTests/CommandConfigurationTest.cs
index 25c059e3d37..20cba94e778 100644
--- a/test/EFCore.SqlServer.FunctionalTests/CommandConfigurationTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/CommandConfigurationTest.cs
@@ -90,7 +90,9 @@ private class KettleChips
 
     public class CommandConfigurationFixture : SharedStoreFixtureBase<DbContext>
     {
-        protected override string StoreName { get; } = "CommandConfiguration";
+        protected override string StoreName
+            => "CommandConfiguration";
+
         protected override Type ContextType { get; } = typeof(ChipsContext);
 
         protected override ITestStoreFactory TestStoreFactory
diff --git a/test/EFCore.SqlServer.FunctionalTests/EverythingIsBytesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/EverythingIsBytesSqlServerTest.cs
index 15f408d4334..4790efbeceb 100644
--- a/test/EFCore.SqlServer.FunctionalTests/EverythingIsBytesSqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/EverythingIsBytesSqlServerTest.cs
@@ -202,7 +202,8 @@ public override bool SupportsUnicodeToAnsiConversion
         public override bool SupportsLargeStringComparisons
             => true;
 
-        protected override string StoreName { get; } = "EverythingIsBytes";
+        protected override string StoreName
+            => "EverythingIsBytes";
 
         protected override ITestStoreFactory TestStoreFactory
             => SqlServerBytesTestStoreFactory.Instance;
diff --git a/test/EFCore.SqlServer.FunctionalTests/EverythingIsStringsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/EverythingIsStringsSqlServerTest.cs
index cd55cd1eace..fcdd03e508b 100644
--- a/test/EFCore.SqlServer.FunctionalTests/EverythingIsStringsSqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/EverythingIsStringsSqlServerTest.cs
@@ -201,7 +201,8 @@ public override bool SupportsLargeStringComparisons
         public override bool PreservesDateTimeKind
             => false;
 
-        protected override string StoreName { get; } = "EverythingIsStrings";
+        protected override string StoreName
+            => "EverythingIsStrings";
 
         protected override ITestStoreFactory TestStoreFactory
             => SqlServerStringsTestStoreFactory.Instance;
diff --git a/test/EFCore.SqlServer.FunctionalTests/ExecutionStrategyTest.cs b/test/EFCore.SqlServer.FunctionalTests/ExecutionStrategyTest.cs
index a9692d522a6..c3bb07040b8 100644
--- a/test/EFCore.SqlServer.FunctionalTests/ExecutionStrategyTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/ExecutionStrategyTest.cs
@@ -814,7 +814,8 @@ public class ExecutionStrategyFixture : SharedStoreFixtureBase<DbContext>
         protected override bool UsePooling
             => false;
 
-        protected override string StoreName { get; } = nameof(ExecutionStrategyTest);
+        protected override string StoreName
+            => nameof(ExecutionStrategyTest);
 
         public new RelationalTestStore TestStore
             => (RelationalTestStore)base.TestStore;
diff --git a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerClientCascadeTest.cs b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerClientCascadeTest.cs
index bb005c65d8f..ea56c07e4ef 100644
--- a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerClientCascadeTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerClientCascadeTest.cs
@@ -19,7 +19,8 @@ public class SqlServerFixture : GraphUpdatesSqlServerFixtureBase
         public override bool NoStoreCascades
             => true;
 
-        protected override string StoreName { get; } = "GraphClientCascadeUpdatesTest";
+        protected override string StoreName
+            => "GraphClientCascadeUpdatesTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerClientNoActionTest.cs b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerClientNoActionTest.cs
index 87e5526c899..84598096e05 100644
--- a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerClientNoActionTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerClientNoActionTest.cs
@@ -19,7 +19,8 @@ public class SqlServerFixture : GraphUpdatesSqlServerFixtureBase
         public override bool ForceClientNoAction
             => true;
 
-        protected override string StoreName { get; } = "GraphClientNoActionUpdatesTest";
+        protected override string StoreName
+            => "GraphClientNoActionUpdatesTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerHiLoTest.cs b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerHiLoTest.cs
index 1bd21fe09a5..97f143acaaf 100644
--- a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerHiLoTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerHiLoTest.cs
@@ -15,7 +15,8 @@ protected override void UseTransaction(DatabaseFacade facade, IDbContextTransact
 
     public class SqlServerFixture : GraphUpdatesSqlServerFixtureBase
     {
-        protected override string StoreName { get; } = "GraphHiLoUpdatesTest";
+        protected override string StoreName
+            => "GraphHiLoUpdatesTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerIdentityTest.cs b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerIdentityTest.cs
index 91877057915..b27856a0d10 100644
--- a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerIdentityTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerIdentityTest.cs
@@ -15,7 +15,8 @@ protected override void UseTransaction(DatabaseFacade facade, IDbContextTransact
 
     public class SqlServerFixture : GraphUpdatesSqlServerFixtureBase
     {
-        protected override string StoreName { get; } = "GraphIdentityUpdatesTest";
+        protected override string StoreName
+            => "GraphIdentityUpdatesTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerOwnedTest.cs b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerOwnedTest.cs
index 29042b41e7b..d89830b5f92 100644
--- a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerOwnedTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerOwnedTest.cs
@@ -36,7 +36,8 @@ protected override void UseTransaction(DatabaseFacade facade, IDbContextTransact
 
     public class SqlServerFixture : GraphUpdatesSqlServerFixtureBase
     {
-        protected override string StoreName { get; } = "GraphOwnedUpdatesTest";
+        protected override string StoreName
+            => "GraphOwnedUpdatesTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerTptIdentityTest.cs b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerTptIdentityTest.cs
index 85d1d75821a..4075838a92d 100644
--- a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerTptIdentityTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerTptIdentityTest.cs
@@ -15,7 +15,8 @@ protected override void UseTransaction(DatabaseFacade facade, IDbContextTransact
 
     public class SqlServerFixture : GraphUpdatesSqlServerFixtureBase
     {
-        protected override string StoreName { get; } = "GraphTptIdentityUpdatesTest";
+        protected override string StoreName
+            => "GraphTptIdentityUpdatesTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/ProxyGraphUpdatesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/ProxyGraphUpdatesSqlServerTest.cs
index f45389a8c86..07f232b58e2 100644
--- a/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/ProxyGraphUpdatesSqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/GraphUpdates/ProxyGraphUpdatesSqlServerTest.cs
@@ -41,7 +41,8 @@ protected override bool DoesChangeTracking
 
         public class ProxyGraphUpdatesWithLazyLoadingSqlServerFixture : ProxyGraphUpdatesSqlServerFixtureBase
         {
-            protected override string StoreName { get; } = "ProxyGraphLazyLoadingUpdatesTest";
+            protected override string StoreName
+                => "ProxyGraphLazyLoadingUpdatesTest";
 
             public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
                 => base.AddOptions(builder.UseLazyLoadingProxies());
@@ -78,7 +79,8 @@ protected override bool DoesChangeTracking
 
         public class ProxyGraphUpdatesWithChangeTrackingSqlServerFixture : ProxyGraphUpdatesSqlServerFixtureBase
         {
-            protected override string StoreName { get; } = "ProxyGraphChangeTrackingUpdatesTest";
+            protected override string StoreName
+                => "ProxyGraphChangeTrackingUpdatesTest";
 
             public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
                 => base.AddOptions(builder.UseChangeTrackingProxies());
@@ -111,7 +113,8 @@ protected override bool DoesChangeTracking
 
         public class ProxyGraphUpdatesWithChangeTrackingAndLazyLoadingSqlServerFixture : ProxyGraphUpdatesSqlServerFixtureBase
         {
-            protected override string StoreName { get; } = "ProxyGraphChangeTrackingAndLazyLoadingUpdatesTest";
+            protected override string StoreName
+                => "ProxyGraphChangeTrackingAndLazyLoadingUpdatesTest";
 
             public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
                 => base.AddOptions(builder.UseLazyLoadingProxies().UseChangeTrackingProxies());
diff --git a/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingGeneratedKeysSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingGeneratedKeysSqlServerTest.cs
index 4e5d992a951..9f3e8925af5 100644
--- a/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingGeneratedKeysSqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingGeneratedKeysSqlServerTest.cs
@@ -15,7 +15,8 @@ public ManyToManyTrackingGeneratedKeysSqlServerTest(ManyToManyTrackingGeneratedK
 
     public class ManyToManyTrackingGeneratedKeysSqlServerFixture : ManyToManyTrackingSqlServerFixtureBase
     {
-        protected override string StoreName { get; } = "ManyToManyTrackingGeneratedKeys";
+        protected override string StoreName
+            => "ManyToManyTrackingGeneratedKeys";
 
         public override bool UseGeneratedKeys
             => true;
diff --git a/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingProxyGeneratedKeysSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingProxyGeneratedKeysSqlServerTest.cs
index c7396e13213..5b17310a108 100644
--- a/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingProxyGeneratedKeysSqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingProxyGeneratedKeysSqlServerTest.cs
@@ -42,7 +42,8 @@ protected override bool RequiresDetectChanges
 
     public class ManyToManyTrackingProxyGeneratedKeysSqlServerFixture : ManyToManyTrackingSqlServerFixtureBase
     {
-        protected override string StoreName { get; } = "ManyToManyTrackingProxyGeneratedKeys";
+        protected override string StoreName
+            => "ManyToManyTrackingProxyGeneratedKeys";
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
             => base.AddOptions(builder).UseChangeTrackingProxies();
diff --git a/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingProxySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingProxySqlServerTest.cs
index a1e55de13a5..35f0c861847 100644
--- a/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingProxySqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingProxySqlServerTest.cs
@@ -39,7 +39,8 @@ protected override bool RequiresDetectChanges
 
     public class ManyToManyTrackingProxySqlServerFixture : ManyToManyTrackingSqlServerFixtureBase
     {
-        protected override string StoreName { get; } = "ManyToManyTrackingProxies";
+        protected override string StoreName
+            => "ManyToManyTrackingProxies";
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
             => base.AddOptions(builder).UseChangeTrackingProxies();
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/RawSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/RawSqlServerTest.cs
index 4b4777f8634..312d5ec08e3 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/RawSqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/RawSqlServerTest.cs
@@ -69,7 +69,8 @@ public class OrderSummary13346
         }
     }
 
-    protected override string StoreName { get; } = "RawSqlServerTest";
+    protected override string StoreName
+        => "RawSqlServerTest";
 
     protected TestSqlLoggerFactory TestSqlLoggerFactory
         => (TestSqlLoggerFactory)ListLoggerFactory;
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsQuerySqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsQuerySqlServerFixture.cs
index 2c499b8af51..d034c79dcb8 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsQuerySqlServerFixture.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsQuerySqlServerFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public class TemporalComplexNavigationsQuerySqlServerFixture : ComplexNavigationsQuerySqlServerFixture
 {
-    protected override string StoreName { get; } = "TemporalComplexNavigations";
+    protected override string StoreName
+        => "TemporalComplexNavigations";
 
     public DateTime ChangesDate { get; private set; }
 
@@ -35,7 +36,7 @@ protected override void Seed(ComplexNavigationsContext context)
             "LevelFour"
         };
 
-        // clean up intermittent history since in the Seed method we do fixup in multiple stages 
+        // clean up intermittent history since in the Seed method we do fixup in multiple stages
         foreach (var tableName in tableNames)
         {
             context.Database.ExecuteSqlRaw($"ALTER TABLE [{tableName}] SET (SYSTEM_VERSIONING = OFF)");
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsSharedTypeQuerySqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsSharedTypeQuerySqlServerFixture.cs
index 821a4ef3033..6ae643eef24 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsSharedTypeQuerySqlServerFixture.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsSharedTypeQuerySqlServerFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public class TemporalComplexNavigationsSharedTypeQuerySqlServerFixture : ComplexNavigationsSharedTypeQuerySqlServerFixture
 {
-    protected override string StoreName { get; } = "TemporalComplexNavigationsSharedType";
+    protected override string StoreName
+        => "TemporalComplexNavigationsSharedType";
 
     public DateTime ChangesDate { get; private set; }
 
@@ -61,7 +62,7 @@ protected override void Seed(ComplexNavigationsContext context)
 
         ChangesDate = new DateTime(2010, 1, 1);
 
-        // clean up intermittent history since in the Seed method we do fixup in multiple stages 
+        // clean up intermittent history since in the Seed method we do fixup in multiple stages
         var tableName = nameof(Level1);
 
         context.Database.ExecuteSqlRaw($"ALTER TABLE [{tableName}] SET (SYSTEM_VERSIONING = OFF)");
@@ -100,4 +101,3 @@ protected override void Seed(ComplexNavigationsContext context)
         context.Database.ExecuteSqlRaw($"ALTER TABLE [{tableName}] SET (SYSTEM_VERSIONING = ON (HISTORY_TABLE = [dbo].[{tableName + "History"}]))");
     }
 }
-
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalFiltersInheritanceQuerySqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalFiltersInheritanceQuerySqlServerFixture.cs
index 0f2f8a3eb11..204990b95b4 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalFiltersInheritanceQuerySqlServerFixture.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalFiltersInheritanceQuerySqlServerFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public class TemporalFiltersInheritanceQuerySqlServerFixture : FiltersInheritanceQuerySqlServerFixture
 {
-    protected override string StoreName { get; } = "TemporalFiltersInheritanceQueryTest";
+    protected override string StoreName
+        => "TemporalFiltersInheritanceQueryTest";
 
     public DateTime ChangesDate { get; private set; }
 
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerFixture.cs
index e1ca82a8fa8..69c44fee63f 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerFixture.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public class TemporalGearsOfWarQuerySqlServerFixture : GearsOfWarQuerySqlServerFixture
 {
-    protected override string StoreName { get; } = "TemporalGearsOfWarQueryTest";
+    protected override string StoreName
+        => "TemporalGearsOfWarQueryTest";
 
     public DateTime ChangesDate { get; private set; }
 
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalManyToManyQuerySqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalManyToManyQuerySqlServerFixture.cs
index c5acf212b5d..87abd54c2fe 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalManyToManyQuerySqlServerFixture.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalManyToManyQuerySqlServerFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public class TemporalManyToManyQuerySqlServerFixture : ManyToManyQueryFixtureBase
 {
-    protected override string StoreName { get; } = "TemporalManyToManyQueryTest";
+    protected override string StoreName
+        => "TemporalManyToManyQueryTest";
 
     public DateTime ChangesDate { get; private set; }
 
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalOwnedQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalOwnedQuerySqlServerTest.cs
index 649cdb04487..5c66998047a 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalOwnedQuerySqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalOwnedQuerySqlServerTest.cs
@@ -1234,7 +1234,8 @@ public class TemporalOwnedQuerySqlServerFixture : RelationalOwnedQueryFixture
         protected override ITestStoreFactory TestStoreFactory
             => SqlServerTestStoreFactory.Instance;
 
-        protected override string StoreName { get; } = "TemporalOwnedQueryTest";
+        protected override string StoreName
+            => "TemporalOwnedQueryTest";
 
         public DateTime ChangesDate { get; private set; }
 
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/UdfDbFunctionSqlServerTests.cs b/test/EFCore.SqlServer.FunctionalTests/Query/UdfDbFunctionSqlServerTests.cs
index c466e82aceb..468b9e6d5cf 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/UdfDbFunctionSqlServerTests.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/UdfDbFunctionSqlServerTests.cs
@@ -814,7 +814,8 @@ protected override void ClearLog()
 
     public class SqlServer : UdfFixtureBase
     {
-        protected override string StoreName { get; } = "UDFDbFunctionSqlServerTests";
+        protected override string StoreName
+            => "UDFDbFunctionSqlServerTests";
 
         protected override ITestStoreFactory TestStoreFactory
             => SqlServerTestStoreFactory.Instance;
diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs
index 7ecdc757ef7..8f07df62f18 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs
@@ -2456,7 +2456,8 @@ private void Test(
 
     public class SqlServerDatabaseModelFixture : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = nameof(SqlServerDatabaseModelFactoryTest);
+        protected override string StoreName
+            => nameof(SqlServerDatabaseModelFactoryTest);
 
         protected override ITestStoreFactory TestStoreFactory
             => SqlServerTestStoreFactory.Instance;
diff --git a/test/EFCore.SqlServer.FunctionalTests/SqlAzure/SqlAzureFixture.cs b/test/EFCore.SqlServer.FunctionalTests/SqlAzure/SqlAzureFixture.cs
index ef8757ad580..d479aa20566 100644
--- a/test/EFCore.SqlServer.FunctionalTests/SqlAzure/SqlAzureFixture.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/SqlAzure/SqlAzureFixture.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore.SqlAzure;
 
 public class SqlAzureFixture : SharedStoreFixtureBase<AdventureWorksContext>
 {
-    protected override string StoreName { get; } = "adventureworks";
+    protected override string StoreName
+        => "adventureworks";
 
     protected override ITestStoreFactory TestStoreFactory
         => SqlServerAdventureWorksTestStoreFactory.Instance;
diff --git a/test/EFCore.SqlServer.FunctionalTests/SqlServerQueryTriggersTest.cs b/test/EFCore.SqlServer.FunctionalTests/SqlServerQueryTriggersTest.cs
index ce5fd9f52c6..71147c1bf7a 100644
--- a/test/EFCore.SqlServer.FunctionalTests/SqlServerQueryTriggersTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/SqlServerQueryTriggersTest.cs
@@ -109,7 +109,9 @@ protected class Product
 
     public class SqlServerTriggersFixture : SharedStoreFixtureBase<DbContext>
     {
-        protected override string StoreName { get; } = "SqlServerQueryTriggers";
+        protected override string StoreName
+            => "SqlServerQueryTriggers";
+
         protected override Type ContextType { get; } = typeof(QueryTriggersContext);
 
         protected override ITestStoreFactory TestStoreFactory
diff --git a/test/EFCore.SqlServer.FunctionalTests/SqlServerTriggersTest.cs b/test/EFCore.SqlServer.FunctionalTests/SqlServerTriggersTest.cs
index ba68ce68328..17fc19a4dcc 100644
--- a/test/EFCore.SqlServer.FunctionalTests/SqlServerTriggersTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/SqlServerTriggersTest.cs
@@ -141,7 +141,9 @@ protected class ProductBackup
 
     public class SqlServerTriggersFixture : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "SqlServerTriggers";
+        protected override string StoreName
+            => "SqlServerTriggers";
+
         protected override Type ContextType { get; } = typeof(TriggersContext);
 
         protected override ITestStoreFactory TestStoreFactory
diff --git a/test/EFCore.SqlServer.FunctionalTests/SqlServerValueGenerationConflictTest.cs b/test/EFCore.SqlServer.FunctionalTests/SqlServerValueGenerationConflictTest.cs
index 1772947f643..8848f2c92bf 100644
--- a/test/EFCore.SqlServer.FunctionalTests/SqlServerValueGenerationConflictTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/SqlServerValueGenerationConflictTest.cs
@@ -133,7 +133,9 @@ public class Fred
 public class SqlServerValueGenerationStrategyFixture<TContext> : SharedStoreFixtureBase<DbContext>
     where TContext : DbContext
 {
-    protected override string StoreName { get; } = "SqlServerValueGenerationStrategy";
+    protected override string StoreName
+        => "SqlServerValueGenerationStrategy";
+
     protected override Type ContextType { get; } = typeof(TContext);
 
     protected override ITestStoreFactory TestStoreFactory
diff --git a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentitySqlServerTest.cs
index 6e4af4f06e4..714616dadae 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentitySqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentitySqlServerTest.cs
@@ -393,7 +393,8 @@ public class StoreValueGenerationIdentitySqlServerFixture : StoreValueGeneration
     {
         private string? _identityResetCommand;
 
-        protected override string StoreName { get; } = "StoreValueGenerationIdentityTest";
+        protected override string StoreName
+            => "StoreValueGenerationIdentityTest";
 
         protected override ITestStoreFactory TestStoreFactory
             => SqlServerTestStoreFactory.Instance;
diff --git a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentityTriggerSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentityTriggerSqlServerTest.cs
index cbc19b36929..9dfefef8574 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentityTriggerSqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentityTriggerSqlServerTest.cs
@@ -437,7 +437,8 @@ public class StoreValueGenerationIdentityWithTriggerSqlServerFixture : StoreValu
     {
         private string? _identityResetCommand;
 
-        protected override string StoreName { get; } = "StoreValueGenerationIdentityWithTriggerTest";
+        protected override string StoreName
+            => "StoreValueGenerationIdentityWithTriggerTest";
 
         protected override ITestStoreFactory TestStoreFactory
             => SqlServerTestStoreFactory.Instance;
diff --git a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceSqlServerTest.cs
index 28dcd2bed1d..9b4abd0327a 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceSqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceSqlServerTest.cs
@@ -371,7 +371,8 @@ protected override async Task Test(
 
     public class StoreValueGenerationSequenceSqlServerFixture : StoreValueGenerationFixtureBase
     {
-        protected override string StoreName { get; } = "StoreValueGenerationSequenceTest";
+        protected override string StoreName
+            => "StoreValueGenerationSequenceTest";
 
         protected override ITestStoreFactory TestStoreFactory
             => SqlServerTestStoreFactory.Instance;
diff --git a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceTriggerSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceTriggerSqlServerTest.cs
index 2f7ce975834..d0f673ca01e 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceTriggerSqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceTriggerSqlServerTest.cs
@@ -447,7 +447,8 @@ protected override async Task Test(
 
     public class StoreValueGenerationSequenceWithTriggerSqlServerFixture : StoreValueGenerationTriggerSqlServerFixture
     {
-        protected override string StoreName { get; } = "StoreValueGenerationSequenceWithTriggerTest";
+        protected override string StoreName
+            => "StoreValueGenerationSequenceWithTriggerTest";
 
         protected override ITestStoreFactory TestStoreFactory
             => SqlServerTestStoreFactory.Instance;
diff --git a/test/EFCore.Sqlite.FunctionalTests/AutoincrementTest.cs b/test/EFCore.Sqlite.FunctionalTests/AutoincrementTest.cs
index 7c662bd5f73..ce7984c7619 100644
--- a/test/EFCore.Sqlite.FunctionalTests/AutoincrementTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/AutoincrementTest.cs
@@ -42,7 +42,8 @@ private BatContext CreateContext()
 
     public class AutoincrementFixture : SharedStoreFixtureBase<DbContext>
     {
-        protected override string StoreName { get; } = "AutoincrementTest";
+        protected override string StoreName
+            => "AutoincrementTest";
 
         protected override ITestStoreFactory TestStoreFactory
             => SqliteTestStoreFactory.Instance;
diff --git a/test/EFCore.Sqlite.FunctionalTests/CommandConfigurationTest.cs b/test/EFCore.Sqlite.FunctionalTests/CommandConfigurationTest.cs
index 4d961e13bbc..a63a5f3a916 100644
--- a/test/EFCore.Sqlite.FunctionalTests/CommandConfigurationTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/CommandConfigurationTest.cs
@@ -27,7 +27,8 @@ protected DbContext CreateContext()
 
     public class CommandConfigurationTestFixture : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = "Empty";
+        protected override string StoreName
+            => "Empty";
 
         protected override ITestStoreFactory TestStoreFactory
             => SqliteTestStoreFactory.Instance;
diff --git a/test/EFCore.Sqlite.FunctionalTests/DefaultValuesTest.cs b/test/EFCore.Sqlite.FunctionalTests/DefaultValuesTest.cs
index 67864e10ea0..28c94ebbca2 100644
--- a/test/EFCore.Sqlite.FunctionalTests/DefaultValuesTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/DefaultValuesTest.cs
@@ -31,7 +31,8 @@ public void Can_use_SQLite_default_values()
         }
     }
 
-    protected override string StoreName { get; } = "DefaultKettleChips";
+    protected override string StoreName
+        => "DefaultKettleChips";
 
     protected override ITestStoreFactory TestStoreFactory
         => SqliteTestStoreFactory.Instance;
diff --git a/test/EFCore.Sqlite.FunctionalTests/F1SqliteFixture.cs b/test/EFCore.Sqlite.FunctionalTests/F1SqliteFixture.cs
index ee2d74cbdc5..5a74ca07dc2 100644
--- a/test/EFCore.Sqlite.FunctionalTests/F1SqliteFixture.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/F1SqliteFixture.cs
@@ -5,7 +5,8 @@ namespace Microsoft.EntityFrameworkCore;
 
 public class F1ULongSqliteFixture : F1SqliteFixtureBase<ulong?>
 {
-    protected override string StoreName { get; } = "F1ULongTest";
+    protected override string StoreName
+        => "F1ULongTest";
 }
 
 public class F1SqliteFixture : F1SqliteFixtureBase<byte[]>
diff --git a/test/EFCore.Sqlite.FunctionalTests/FieldMappingSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/FieldMappingSqliteTest.cs
index 624cc5806e5..24f40923754 100644
--- a/test/EFCore.Sqlite.FunctionalTests/FieldMappingSqliteTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/FieldMappingSqliteTest.cs
@@ -46,7 +46,8 @@ public EnforceFieldTest(EnforceFieldFixture fixture)
 
         public class EnforceFieldFixture : FieldMappingSqliteFixtureBase
         {
-            protected override string StoreName { get; } = "FieldMappingEnforceFieldTest";
+            protected override string StoreName
+                => "FieldMappingEnforceFieldTest";
 
             protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
             {
@@ -66,7 +67,8 @@ public EnforceFieldForQueryTest(EnforceFieldForQueryFixture fixture)
 
         public class EnforceFieldForQueryFixture : FieldMappingSqliteFixtureBase
         {
-            protected override string StoreName { get; } = "FieldMappingFieldQueryTest";
+            protected override string StoreName
+                => "FieldMappingFieldQueryTest";
 
             protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
             {
@@ -359,7 +361,8 @@ public override void Update_props_with_IReadOnlyCollection()
 
         public class EnforcePropertyFixture : FieldMappingSqliteFixtureBase
         {
-            protected override string StoreName { get; } = "FieldMappingEnforcePropertyTest";
+            protected override string StoreName
+                => "FieldMappingEnforcePropertyTest";
 
             protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
             {
diff --git a/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteChangedChangingNotificationsTest.cs b/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteChangedChangingNotificationsTest.cs
index b2363ed0b8b..4c3eaf1345c 100644
--- a/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteChangedChangingNotificationsTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteChangedChangingNotificationsTest.cs
@@ -16,7 +16,8 @@ protected override void UseTransaction(DatabaseFacade facade, IDbContextTransact
 
     public class SqliteFixture : GraphUpdatesSqliteFixtureBase
     {
-        protected override string StoreName { get; } = "GraphUpdatesChangedChangingTest";
+        protected override string StoreName
+            => "GraphUpdatesChangedChangingTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteChangedNotificationsTest.cs b/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteChangedNotificationsTest.cs
index 0e0fcf70a47..708a6efcfe6 100644
--- a/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteChangedNotificationsTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteChangedNotificationsTest.cs
@@ -16,7 +16,8 @@ protected override void UseTransaction(DatabaseFacade facade, IDbContextTransact
 
     public class SqliteFixture : GraphUpdatesSqliteFixtureBase
     {
-        protected override string StoreName { get; } = "GraphUpdatesChangedTest";
+        protected override string StoreName
+            => "GraphUpdatesChangedTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteFullWithOriginalsNotificationsTest.cs b/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteFullWithOriginalsNotificationsTest.cs
index 8a1f97055fb..17205bff1f9 100644
--- a/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteFullWithOriginalsNotificationsTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteFullWithOriginalsNotificationsTest.cs
@@ -16,7 +16,8 @@ protected override void UseTransaction(DatabaseFacade facade, IDbContextTransact
 
     public class SqliteFixture : GraphUpdatesSqliteFixtureBase
     {
-        protected override string StoreName { get; } = "GraphUpdatesFullWithOriginalsTest";
+        protected override string StoreName
+            => "GraphUpdatesFullWithOriginalsTest";
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {
diff --git a/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteSnapshotNotificationsTest.cs b/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteSnapshotNotificationsTest.cs
index 5ad89d48084..cbb5cf5a182 100644
--- a/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteSnapshotNotificationsTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/GraphUpdatesSqliteSnapshotNotificationsTest.cs
@@ -16,7 +16,8 @@ protected override void UseTransaction(DatabaseFacade facade, IDbContextTransact
 
     public class SqliteFixture : GraphUpdatesSqliteFixtureBase
     {
-        protected override string StoreName { get; } = "GraphUpdatesSnapshotTest";
+        protected override string StoreName
+            => "GraphUpdatesSnapshotTest";
 
         protected override bool AutoDetectChanges
             => true;
diff --git a/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/ProxyGraphUpdatesSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/ProxyGraphUpdatesSqliteTest.cs
index 731d8985fc2..5ebfcafa9ee 100644
--- a/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/ProxyGraphUpdatesSqliteTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/GraphUpdates/ProxyGraphUpdatesSqliteTest.cs
@@ -42,7 +42,8 @@ protected override bool DoesChangeTracking
 
         public class ProxyGraphUpdatesWithLazyLoadingSqliteFixture : ProxyGraphUpdatesSqliteFixtureBase
         {
-            protected override string StoreName { get; } = "ProxyGraphLazyLoadingUpdatesTest";
+            protected override string StoreName
+                => "ProxyGraphLazyLoadingUpdatesTest";
 
             public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
                 => base.AddOptions(builder.UseLazyLoadingProxies());
@@ -72,7 +73,8 @@ protected override bool DoesChangeTracking
 
         public class ProxyGraphUpdatesWithChangeTrackingSqliteFixture : ProxyGraphUpdatesSqliteFixtureBase
         {
-            protected override string StoreName { get; } = "ProxyGraphChangeTrackingUpdatesTest";
+            protected override string StoreName
+                => "ProxyGraphChangeTrackingUpdatesTest";
 
             public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
                 => base.AddOptions(builder.UseChangeTrackingProxies());
@@ -98,7 +100,8 @@ protected override bool DoesChangeTracking
 
         public class ProxyGraphUpdatesWithChangeTrackingAndLazyLoadingSqliteFixture : ProxyGraphUpdatesSqliteFixtureBase
         {
-            protected override string StoreName { get; } = "ProxyGraphChangeTrackingAndLazyLoadingUpdatesTest";
+            protected override string StoreName
+                => "ProxyGraphChangeTrackingAndLazyLoadingUpdatesTest";
 
             public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
                 => base.AddOptions(builder.UseChangeTrackingProxies().UseLazyLoadingProxies());
diff --git a/test/EFCore.Sqlite.FunctionalTests/ManyToManyLoadProxySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/ManyToManyLoadProxySqliteTest.cs
index 9f8920fa42b..f8f917b02f4 100644
--- a/test/EFCore.Sqlite.FunctionalTests/ManyToManyLoadProxySqliteTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/ManyToManyLoadProxySqliteTest.cs
@@ -16,7 +16,8 @@ protected override bool ExpectLazyLoading
 
     public class ManyToManyLoadProxySqliteFixture : ManyToManyLoadSqliteFixtureBase
     {
-        protected override string StoreName { get; } = "ManyToManyLoadProxies";
+        protected override string StoreName
+            => "ManyToManyLoadProxies";
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
             => base.AddOptions(builder).UseLazyLoadingProxies();
diff --git a/test/EFCore.Sqlite.FunctionalTests/Migrations/MigrationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Migrations/MigrationsSqliteTest.cs
index 9f28eee4a73..5c737f568bd 100644
--- a/test/EFCore.Sqlite.FunctionalTests/Migrations/MigrationsSqliteTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/Migrations/MigrationsSqliteTest.cs
@@ -1212,7 +1212,8 @@ protected virtual async Task AssertNotSupportedAsync(Func<Task> action, string?
 
     public class MigrationsSqliteFixture : MigrationsFixtureBase
     {
-        protected override string StoreName { get; } = nameof(MigrationsSqliteTest);
+        protected override string StoreName
+            => nameof(MigrationsSqliteTest);
 
         protected override ITestStoreFactory TestStoreFactory
             => SqliteTestStoreFactory.Instance;
diff --git a/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs b/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs
index 0a96bf7e3f9..aadc0e8d23e 100644
--- a/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs
+++ b/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs
@@ -930,7 +930,8 @@ CONSTRAINT MYFK FOREIGN KEY (ForeignKeyId) REFERENCES PrincipalTable(ImaginaryId
 
     public class SqliteDatabaseModelFixture : SharedStoreFixtureBase<PoolableDbContext>
     {
-        protected override string StoreName { get; } = nameof(SqliteDatabaseModelFactoryTest);
+        protected override string StoreName
+            => nameof(SqliteDatabaseModelFactoryTest);
 
         protected override ITestStoreFactory TestStoreFactory
             => SqliteTestStoreFactory.Instance;