diff --git a/src/Orchard.Tests/ContentManagement/Handlers/AlphaPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/AlphaPartHandler.cs
index 3616a43e4..bea5ec8d2 100644
--- a/src/Orchard.Tests/ContentManagement/Handlers/AlphaPartHandler.cs
+++ b/src/Orchard.Tests/ContentManagement/Handlers/AlphaPartHandler.cs
@@ -4,13 +4,9 @@ using Orchard.Tests.ContentManagement.Models;
 namespace Orchard.Tests.ContentManagement.Handlers {
     public class AlphaPartHandler : ContentHandler {
         public AlphaPartHandler() {
+            Filters.Add(new ActivatingFilter<AlphaPart>("alpha"));
+
             OnGetDisplayShape<AlphaPart>((ctx, part) => ctx.Shape.Zones["Main"].Add(part, "3"));
         }
-        
-        protected override void Activating(ActivatingContentContext context) {
-            if (context.ContentType == "alpha") {
-                context.Builder.Weld<AlphaPart>();
-            }
-        }
     }
 }
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/BetaPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/BetaPartHandler.cs
index 44df432fe..133944795 100644
--- a/src/Orchard.Tests/ContentManagement/Handlers/BetaPartHandler.cs
+++ b/src/Orchard.Tests/ContentManagement/Handlers/BetaPartHandler.cs
@@ -3,10 +3,8 @@ using Orchard.Tests.ContentManagement.Models;
 
 namespace Orchard.Tests.ContentManagement.Handlers {
     public class BetaPartHandler : ContentHandler {
-        protected override void Activating(ActivatingContentContext context) {
-            if (context.ContentType == "beta") {
-                context.Builder.Weld<BetaPart>();
-            }
+        public BetaPartHandler() {
+            Filters.Add(new ActivatingFilter<BetaPart>("beta"));
         }
     }
 }
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/DeltaPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/DeltaPartHandler.cs
index afdf45f30..397e36012 100644
--- a/src/Orchard.Tests/ContentManagement/Handlers/DeltaPartHandler.cs
+++ b/src/Orchard.Tests/ContentManagement/Handlers/DeltaPartHandler.cs
@@ -6,7 +6,7 @@ using Orchard.Tests.ContentManagement.Records;
 namespace Orchard.Tests.ContentManagement.Handlers {
     public class DeltaPartHandler : ContentHandler {
         public DeltaPartHandler(IRepository<DeltaRecord> repository) {
-            Filters.Add(new ActivatingFilter<DeltaPart>(x => x == "delta"));
+            Filters.Add(new ActivatingFilter<DeltaPart>("delta"));
             Filters.Add(StorageFilter.For(repository));
         }
     }
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/EpsilonPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/EpsilonPartHandler.cs
index 0b0725113..914ce9ef3 100644
--- a/src/Orchard.Tests/ContentManagement/Handlers/EpsilonPartHandler.cs
+++ b/src/Orchard.Tests/ContentManagement/Handlers/EpsilonPartHandler.cs
@@ -5,7 +5,7 @@ using Orchard.Tests.ContentManagement.Models;
 namespace Orchard.Tests.ContentManagement.Handlers {
     public class EpsilonPartHandler : ContentHandler {
         public EpsilonPartHandler(IRepository<EpsilonRecord> repository) {
-            Filters.Add(new ActivatingFilter<EpsilonPart>(x => x == "gamma"));
+            Filters.Add(new ActivatingFilter<EpsilonPart>("gamma"));
             Filters.Add(StorageFilter.For(repository));
         }
     }
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/FlavoredPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/FlavoredPartHandler.cs
index a37041828..c26ab9bb1 100644
--- a/src/Orchard.Tests/ContentManagement/Handlers/FlavoredPartHandler.cs
+++ b/src/Orchard.Tests/ContentManagement/Handlers/FlavoredPartHandler.cs
@@ -4,12 +4,10 @@ using Orchard.Tests.ContentManagement.Models;
 namespace Orchard.Tests.ContentManagement.Handlers {
     public class FlavoredPartHandler : ContentHandler {
         public FlavoredPartHandler() {
+            Filters.Add(new ActivatingFilter<FlavoredPart>("alpha"));
+            Filters.Add(new ActivatingFilter<FlavoredPart>("beta"));
+
             OnGetDisplayShape<FlavoredPart>((ctx, part) => ctx.Shape.Zones["Main"].Add(part));
         }
-        protected override void Activating(ActivatingContentContext context) {
-            if (context.ContentType == "beta" || context.ContentType == "alpha") {
-                context.Builder.Weld<FlavoredPart>();
-            }
-        }
     }
 }
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/GammaPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/GammaPartHandler.cs
index cd2086713..3840a97fb 100644
--- a/src/Orchard.Tests/ContentManagement/Handlers/GammaPartHandler.cs
+++ b/src/Orchard.Tests/ContentManagement/Handlers/GammaPartHandler.cs
@@ -6,7 +6,7 @@ using Orchard.Tests.ContentManagement.Records;
 namespace Orchard.Tests.ContentManagement.Handlers {
     class GammaPartHandler : ContentHandler {
         public GammaPartHandler(IRepository<GammaRecord> repository) {
-            Filters.Add(new ActivatingFilter<GammaPart>(x => x == "gamma"));
+            Filters.Add(new ActivatingFilter<GammaPart>("gamma"));
             Filters.Add(StorageFilter.For(repository));
         }
     }