diff --git a/CHANGELOG.md b/CHANGELOG.md
index f63325d..1c9c443 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* 2026-07-09 - AB#172: Ensure testing AutoMapper profiles are vaild.
 * 2026-06-30 - AB#185: Update CD workflow to add GitHub Packages as NuGet source.
 * 2026-06-30 - AB#185: Add CI/CD workflows  and tests plus README update.
 * 2026-06-29 - AB#185: Make README visible in Solution Explorer
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/CommandButtonParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/CommandButtonParametersTest.cs
index 4f37076..1ca5b4e 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/CommandButtonParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/CommandButtonParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration;
 using LogicBuilder.App.Spa.Forms.Parameters;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using LogicBuilder.Forms.Parameters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -217,7 +218,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateDefinitionParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateDefinitionParametersTest.cs
index 3c4573d..504cfe0 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateDefinitionParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateDefinitionParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -67,7 +68,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateTemplateFieldsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateTemplateFieldsParametersTest.cs
index ab7e636..4424370 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateTemplateFieldsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateTemplateFieldsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -46,7 +47,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateTemplateParametersTest.cs
index 5a900e5..f6d717f 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/AggregateTemplateParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -56,7 +57,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CellListTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CellListTemplateParametersTest.cs
index 8399056..703d7dd 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CellListTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CellListTemplateParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -67,7 +68,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CellTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CellTemplateParametersTest.cs
index 473653b..2ab19b0 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CellTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CellTemplateParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -42,7 +43,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ColumnSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ColumnSettingsParametersTest.cs
index 8a82244..d182d7d 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ColumnSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ColumnSettingsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -103,7 +104,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CommandColumnParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CommandColumnParametersTest.cs
index 886bdcf..eefaab5 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CommandColumnParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/CommandColumnParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -64,7 +65,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ConditionGroupParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ConditionGroupParametersTest.cs
index 2468c1e..fb00b0e 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ConditionGroupParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ConditionGroupParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
@@ -76,7 +77,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ConditionParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ConditionParametersTest.cs
index 9f75f03..7bd7967 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ConditionParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ConditionParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -73,7 +74,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ContentTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ContentTemplateParametersTest.cs
index 0c92613..58ac342 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ContentTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ContentTemplateParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -46,7 +47,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DataRequestStateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DataRequestStateParametersTest.cs
index b26b8fc..d8d5790 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DataRequestStateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DataRequestStateParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -80,7 +81,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailDropDownTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailDropDownTemplateParametersTest.cs
index c987b4c..8eb5cd0 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailDropDownTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailDropDownTemplateParametersTest.cs
@@ -109,6 +109,7 @@ private static void Initialize()
                 cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
                 cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFieldSettingParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFieldSettingParametersTest.cs
index f2aa5d1..1cedd0e 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFieldSettingParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFieldSettingParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -83,7 +84,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFieldTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFieldTemplateParametersTest.cs
index 407a959..949cd78 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFieldTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFieldTemplateParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -42,7 +43,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFormSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFormSettingsParametersTest.cs
index 3579e0f..a2db3f0 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFormSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailFormSettingsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -101,7 +102,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailGroupSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailGroupSettingsParametersTest.cs
index 72a77cb..c19cc11 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailGroupSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailGroupSettingsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -89,7 +90,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailGroupTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailGroupTemplateParametersTest.cs
index 68d8f73..debb022 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailGroupTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailGroupTemplateParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -42,7 +43,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailListSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailListSettingsParametersTest.cs
index 36c0888..874ec0d 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailListSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailListSettingsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -89,7 +90,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailListTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailListTemplateParametersTest.cs
index ceb1435..78a6acf 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailListTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DetailListTemplateParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -42,7 +43,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveArgumentParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveArgumentParametersTest.cs
index c97cd94..150e2ed 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveArgumentParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveArgumentParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -67,7 +68,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveDescriptionParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveDescriptionParametersTest.cs
index be47294..7abd493 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveDescriptionParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveDescriptionParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -78,7 +79,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveParametersTest.cs
index 921ec3c..c7d8fd5 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DirectiveParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -50,7 +51,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DomainRequestParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DomainRequestParametersTest.cs
index fa161ab..37e310d 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DomainRequestParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DomainRequestParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -55,7 +56,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DropDownTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DropDownTemplateParametersTest.cs
index a3b70b1..ac56465 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DropDownTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DropDownTemplateParametersTest.cs
@@ -109,6 +109,7 @@ private static void Initialize()
                 cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
                 cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DropdownSelectorControlSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DropdownSelectorControlSettingsParametersTest.cs
index c02b3eb..5ac8277 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DropdownSelectorControlSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/DropdownSelectorControlSettingsParametersTest.cs
@@ -129,6 +129,7 @@ private static void Initialize()
                 cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
                 cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/EditFormSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/EditFormSettingsParametersTest.cs
index f744a43..feddd94 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/EditFormSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/EditFormSettingsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -118,7 +119,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterDefinitionParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterDefinitionParametersTest.cs
index 88182ff..481378f 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterDefinitionParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterDefinitionParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -76,7 +77,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterGroupParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterGroupParametersTest.cs
index 5fba1e2..b7878b7 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterGroupParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterGroupParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -75,7 +76,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterTemplateParametersTest.cs
index c89331c..cd34e30 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FilterTemplateParametersTest.cs
@@ -106,6 +106,7 @@ private static void Initialize()
                 cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
                 cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupArraySettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupArraySettingsParametersTest.cs
index 19c103f..cbcee11 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupArraySettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupArraySettingsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -112,7 +113,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupBoxSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupBoxSettingsParametersTest.cs
index 5a17c36..4bb9464 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupBoxSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupBoxSettingsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -82,7 +83,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupSettingsParametersTest.cs
index 987d66c..2b702a7 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupSettingsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -110,7 +111,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupTemplateParametersTest.cs
index cc82285..3789e41 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormGroupTemplateParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -42,7 +43,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormRequestDetailsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormRequestDetailsParametersTest.cs
index fd7feb0..84103a1 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormRequestDetailsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormRequestDetailsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -84,7 +85,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormValidationSettingParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormValidationSettingParametersTest.cs
index 0077e60..6cce1c3 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormValidationSettingParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/FormValidationSettingParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -69,7 +70,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GridRequestDetailsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GridRequestDetailsParametersTest.cs
index f0ff83b..99b2e7d 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GridRequestDetailsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GridRequestDetailsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -70,7 +71,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GridSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GridSettingsParametersTest.cs
index dd1f7dd..ee87a49 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GridSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GridSettingsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -125,7 +126,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GroupParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GroupParametersTest.cs
index e4ff447..d5ee5c9 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GroupParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/GroupParametersTest.cs
@@ -2,6 +2,7 @@
 using LogicBuilder.App.Spa.Forms.Configuration;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -82,7 +83,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/HtmlPageSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/HtmlPageSettingsParametersTest.cs
index e5ec905..52bd490 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/HtmlPageSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/HtmlPageSettingsParametersTest.cs
@@ -2,6 +2,7 @@
 using LogicBuilder.App.Spa.Forms.Configuration;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -84,7 +85,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/InputFieldControlSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/InputFieldControlSettingsParametersTest.cs
index 996d45a..628e423 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/InputFieldControlSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/InputFieldControlSettingsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -96,7 +97,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ListFormSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ListFormSettingsParametersTest.cs
index c51ac08..e97798a 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ListFormSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ListFormSettingsParametersTest.cs
@@ -66,6 +66,7 @@ private static void Initialize()
                 cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
                 cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MessageTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MessageTemplateParametersTest.cs
index 985b753..b2366b0 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MessageTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MessageTemplateParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -48,7 +49,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MultiSelectFormControlSettingsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MultiSelectFormControlSettingsParametersTest.cs
index f156e04..995500d 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MultiSelectFormControlSettingsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MultiSelectFormControlSettingsParametersTest.cs
@@ -136,6 +136,7 @@ private static void Initialize()
                 cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
                 cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MultiSelectTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MultiSelectTemplateParametersTest.cs
index d6374c4..0849ce4 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MultiSelectTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/MultiSelectTemplateParametersTest.cs
@@ -107,6 +107,7 @@ private static void Initialize()
                 cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
                 cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/RequestDetailsParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/RequestDetailsParametersTest.cs
index aa68160..d2a3d0d 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/RequestDetailsParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/RequestDetailsParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -78,7 +79,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/SelectParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/SelectParametersTest.cs
index cb3c2b6..caa946c 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/SelectParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/SelectParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -67,7 +68,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/SortParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/SortParametersTest.cs
index c6c4d37..d9b6776 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/SortParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/SortParametersTest.cs
@@ -2,6 +2,7 @@
 using LogicBuilder.App.Spa.Forms.Configuration;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -68,7 +69,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/TextFieldTemplateParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/TextFieldTemplateParametersTest.cs
index d71b175..992360a 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/TextFieldTemplateParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/TextFieldTemplateParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -42,7 +43,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidationMessageParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidationMessageParametersTest.cs
index 7e9cf80..247b892 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidationMessageParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidationMessageParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -81,7 +82,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidationMethodParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidationMethodParametersTest.cs
index 54a847b..c539b4a 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidationMethodParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidationMethodParametersTest.cs
@@ -2,6 +2,7 @@
 using LogicBuilder.App.Spa.Forms.Configuration;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -47,7 +48,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidatorArgumentParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidatorArgumentParametersTest.cs
index 4cb4a9a..ea373c4 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidatorArgumentParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidatorArgumentParametersTest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -64,7 +65,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidatorDescriptionParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidatorDescriptionParametersTest.cs
index aa70e56..18cdc39 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidatorDescriptionParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/ValidatorDescriptionParametersTest.cs
@@ -2,6 +2,7 @@
 using LogicBuilder.App.Spa.Forms.Configuration;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -78,7 +79,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/VariableDirectivesParametersTest.cs b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/VariableDirectivesParametersTest.cs
index f3cf467..1d6bead 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/VariableDirectivesParametersTest.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles.Tests/Common/VariableDirectivesParametersTest.cs
@@ -2,6 +2,7 @@
 using LogicBuilder.App.Spa.Forms.Configuration;
 using LogicBuilder.App.Spa.Forms.Configuration.Common;
 using LogicBuilder.App.Spa.Forms.Parameters.Common;
+using LogicBuilder.EntityFrameworkCore.Mapping;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
@@ -86,7 +87,10 @@ private static void Initialize()
                 cfg.AddProfile<BaseClassMappings>();
                 cfg.AddProfile<ConnectorProfile>();
                 cfg.AddProfile<ParameterToDescriptorProfile>();
+                cfg.AddProfile<ExpansionParameterToDescriptorMappingProfile>();
+                cfg.AddProfile<ExpressionParameterToDescriptorMappingProfile>();
             }, NullLoggerFactory.Instance);
+            MapperConfiguration.AssertConfigurationIsValid();
 
             serviceProvider ??= new ServiceCollection()
                 .AddSingleton<AutoMapper.IConfigurationProvider>
diff --git a/LogicBuilder.App.Spa.AutoMapperProfiles/ParameterToDescriptorProfile.cs b/LogicBuilder.App.Spa.AutoMapperProfiles/ParameterToDescriptorProfile.cs
index f7214d3..0b4612c 100644
--- a/LogicBuilder.App.Spa.AutoMapperProfiles/ParameterToDescriptorProfile.cs
+++ b/LogicBuilder.App.Spa.AutoMapperProfiles/ParameterToDescriptorProfile.cs
@@ -34,7 +34,6 @@ public ParameterToDescriptorProfile()
             CreateMap<DomainRequestParameters, DomainRequestDescriptor>();
             CreateMap<DropdownSelectorControlSettingsParameters, DropdownSelectorControlSettingsDescriptor>();
             CreateMap<DropDownTemplateParameters, DropDownTemplateDescriptor>();
-            CreateMap<DummyConstructor, DummyConstructor>();
             CreateMap<EditFormSettingsParameters, EditFormSettingsDescriptor>();
             CreateMap<FilterDefinitionParameters, FilterDefinitionDescriptor>();
             CreateMap<FilterGroupParameters, FilterGroupDescriptor>();