diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs
index 73cbde057..d62bae234 100644
--- a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs
+++ b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs
@@ -6,6 +6,7 @@ using JetBrains.Annotations;
 using Moq;
 using NUnit.Framework;
 using Orchard.ContentManagement.Aspects;
+using Orchard.ContentManagement.MetaData.Records;
 using Orchard.Core.Common;
 using Orchard.Core.Common.Handlers;
 using Orchard.Core.Common.Models;
@@ -46,6 +47,8 @@ namespace Orchard.Core.Tests.Common.Providers {
             get {
                 return new[] {
                                  typeof(ContentTypeRecord), 
+                                 typeof(ContentTypePartRecord), 
+                                 typeof(ContentTypePartNameRecord),
                                  typeof(ContentItemRecord), 
                                  typeof(ContentItemVersionRecord), 
                                  typeof(CommonRecord),
diff --git a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs
index 935cf521e..69bb981db 100644
--- a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs
+++ b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.ContentManagement.Handlers;
+using Orchard.ContentManagement.MetaData.Records;
 using Orchard.ContentManagement.Records;
 using Orchard.Core.Common.Models;
 using Orchard.Core.Common.Services;
@@ -180,9 +181,11 @@ namespace Orchard.Core.Tests.Common.Services {
             get {
                 return new[] {
                                  typeof(RoutableRecord), 
+                                 typeof(ContentTypeRecord),
+                                 typeof(ContentTypePartRecord), 
+                                 typeof(ContentTypePartNameRecord),
                                  typeof(ContentItemRecord), 
                                  typeof(ContentItemVersionRecord), 
-                                 typeof(ContentTypeRecord),
                                  typeof(CommonRecord),
                                  typeof(CommonVersionRecord),
                              };
diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs
index cf3d73786..e7a7955dd 100644
--- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs
+++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs
@@ -4,6 +4,7 @@ using Autofac;
 using Moq;
 using NUnit.Framework;
 using Orchard.ContentManagement;
+using Orchard.ContentManagement.MetaData.Records;
 using Orchard.ContentManagement.Records;
 using Orchard.Core.Scheduling.Models;
 using Orchard.Core.Scheduling.Services;
@@ -38,6 +39,8 @@ namespace Orchard.Core.Tests.Scheduling {
             get {
                 return new[] {
                                  typeof(ContentTypeRecord), 
+                                 typeof(ContentTypePartRecord), 
+                                 typeof(ContentTypePartNameRecord), 
                                  typeof(ContentItemRecord), 
                                  typeof(ContentItemVersionRecord), 
                                  typeof(ScheduledTaskRecord),
diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
index fe58b9a06..baf3063c3 100644
--- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
+++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
@@ -5,6 +5,7 @@ using Autofac;
 using Moq;
 using NUnit.Framework;
 using Orchard.ContentManagement;
+using Orchard.ContentManagement.MetaData.Records;
 using Orchard.ContentManagement.Records;
 using Orchard.Core.Scheduling.Models;
 using Orchard.Core.Scheduling.Services;
@@ -41,6 +42,8 @@ namespace Orchard.Core.Tests.Scheduling {
             get {
                 return new[] {
                                  typeof(ContentTypeRecord), 
+                                 typeof(ContentTypePartRecord), 
+                                 typeof(ContentTypePartNameRecord), 
                                  typeof(ContentItemRecord), 
                                  typeof(ContentItemVersionRecord), 
                                  typeof(ScheduledTaskRecord),
diff --git a/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs b/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
index 67e7fa800..54dfd37f3 100644
--- a/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
+++ b/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
@@ -6,6 +6,7 @@ using System.Web.Routing;
 using Autofac;
 using Moq;
 using NUnit.Framework;
+using Orchard.ContentManagement.MetaData.Records;
 using Orchard.Data;
 using Orchard.Environment;
 using Orchard.ContentManagement;
@@ -44,7 +45,13 @@ namespace Orchard.Tests.Modules.Users.Controllers {
 
         protected override IEnumerable<Type> DatabaseTypes {
             get {
-                return new[] { typeof(UserRecord), typeof(ContentItemRecord), typeof(ContentItemVersionRecord), typeof(ContentTypeRecord) };
+                return new[] { typeof(UserRecord), 
+                    typeof(ContentTypeRecord),
+                    typeof(ContentTypePartRecord), 
+                    typeof(ContentTypePartNameRecord),
+                    typeof(ContentItemRecord),
+                    typeof(ContentItemVersionRecord), 
+                };
             }
         }
 
diff --git a/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs b/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
index ea7ee2f3d..81551167c 100644
--- a/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
+++ b/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
@@ -3,6 +3,7 @@ using System.Web.Security;
 using Autofac;
 using NHibernate;
 using NUnit.Framework;
+using Orchard.ContentManagement.MetaData.Records;
 using Orchard.Data;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
@@ -41,7 +42,9 @@ namespace Orchard.Tests.Modules.Users.Services {
                 typeof(UserRecord),
                 typeof(ContentItemVersionRecord),
                 typeof(ContentItemRecord),
-                typeof(ContentTypeRecord));
+                typeof(ContentTypeRecord),
+                typeof(ContentTypePartRecord),
+                typeof(ContentTypePartNameRecord));
         }
 
         [TestFixtureTearDown]
diff --git a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
index 8b37ebe65..55d9960e5 100644
--- a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
+++ b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
@@ -2,6 +2,7 @@
 using Autofac;
 using NHibernate;
 using NUnit.Framework;
+using Orchard.ContentManagement.MetaData.Records;
 using Orchard.Data;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
@@ -27,7 +28,9 @@ namespace Orchard.Tests.ContentManagement {
                 typeof(EpsilonRecord),
                 typeof(ContentItemVersionRecord),
                 typeof(ContentItemRecord),
-                typeof(ContentTypeRecord));
+                typeof(ContentTypeRecord),
+                typeof(ContentTypePartRecord),
+                typeof(ContentTypePartNameRecord));
         }
 
         [TestFixtureTearDown]
diff --git a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs
index 36de12e5d..6341d4f4c 100644
--- a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs
+++ b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Autofac;
 using NHibernate;
 using NUnit.Framework;
+using Orchard.ContentManagement.MetaData.Records;
 using Orchard.Data;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
@@ -25,6 +26,8 @@ namespace Orchard.Tests.ContentManagement {
             _sessionFactory = DataUtility.CreateSessionFactory(
                 databaseFileName,
                 typeof(ContentTypeRecord),
+                typeof(ContentTypePartRecord),
+                typeof(ContentTypePartNameRecord),
                 typeof(ContentItemRecord),
                 typeof(ContentItemVersionRecord),
                 typeof(GammaRecord),