diff --git a/src/WhiteMagic.Tests/ContentRepository/when_getting_children_by_page_type.cs b/src/WhiteMagic.Tests/ContentRepository/when_getting_children_by_page_type.cs
index eadc586..fd0bd5b 100644
--- a/src/WhiteMagic.Tests/ContentRepository/when_getting_children_by_page_type.cs
+++ b/src/WhiteMagic.Tests/ContentRepository/when_getting_children_by_page_type.cs
@@ -18,20 +18,11 @@ public override void Given()
         {
             base.Given();
 
-            _startPage = ContentRepository.GetDefaultPageData<StartPage>(ContentReference.RootPage);
-            ContentRepository.Save(_startPage, SaveAction.Publish, AccessLevel.NoAccess);
+            _startPage = ContentRepository.Publish<StartPage>(ContentReference.RootPage);
 
-            var childPage1 = ContentRepository.GetDefaultPageData<StartPage>(_startPage.PageLink);
-            childPage1.PageName = "ChildPage1";
-            ContentRepository.Save(childPage1, SaveAction.Publish, AccessLevel.NoAccess);
-
-            var childPage2 = ContentRepository.GetDefaultPageData<StartPage>(_startPage.PageLink);
-            childPage2.PageName = "ChildPage2";
-            ContentRepository.Save(childPage2, SaveAction.Publish, AccessLevel.NoAccess);
-
-            var childPage3 = ContentRepository.GetDefaultPageData<StandardPage>(_startPage.PageLink);
-            childPage3.PageName = "ChildPage3";
-            ContentRepository.Save(childPage3, SaveAction.Publish, AccessLevel.NoAccess);
+            ContentRepository.Publish<StartPage>(_startPage.PageLink, "ChildPage1");
+            ContentRepository.Publish<StartPage>(_startPage.PageLink, "ChildPage2");
+            ContentRepository.Publish<StandardPage>(_startPage.PageLink, "ChildPage3");
         }
 
         public override void When()
diff --git a/src/WhiteMagic.Tests/ContentRepository/when_moving_a_page.cs b/src/WhiteMagic.Tests/ContentRepository/when_moving_a_page.cs
index 7ea9b2c..56c98ba 100644
--- a/src/WhiteMagic.Tests/ContentRepository/when_moving_a_page.cs
+++ b/src/WhiteMagic.Tests/ContentRepository/when_moving_a_page.cs
@@ -20,8 +20,7 @@ public override void Given()
             base.Given();
 
             _startPage = ContentRepository
-                .GetDefault<StartPage>(ContentReference.RootPage)
-                .SaveAndPublish(ContentRepository);
+                .Publish<StartPage>(ContentReference.RootPage);
 
             _oldParent = ContentRepository
                 .GetDefault<StartPage>(_startPage.PageLink)
diff --git a/src/WhiteMagic.Tests/ContentRepository/when_saving_a_page.cs b/src/WhiteMagic.Tests/ContentRepository/when_saving_a_page.cs
index 8404b06..3e8eead 100644
--- a/src/WhiteMagic.Tests/ContentRepository/when_saving_a_page.cs
+++ b/src/WhiteMagic.Tests/ContentRepository/when_saving_a_page.cs
@@ -1,6 +1,4 @@
 using EPiServer.Core;
-using EPiServer.DataAccess;
-using EPiServer.Security;
 using NUnit.Framework;
 using Shouldly;
 using WhiteMagic.Tests.Pages;
@@ -9,16 +7,26 @@ namespace WhiteMagic.Tests.ContentRepository
 {
     public class when_saving_a_page : TestBase
     {
-        [Test]
-        public void it_should_be_returned_when_loaded()
+        private StartPage _startPage;
+        private StartPage _loadedPage;
+
+        public override void Given()
         {
-            var startPage = ContentRepository.GetDefaultPageData<StartPage>(ContentReference.RootPage);
-            startPage.MainBody = "Hejhej!";
+            base.Given();
+            _startPage = ContentRepository
+                .Publish<StartPage>(ContentReference.RootPage, p => p.MainBody = "Hejhej!");
+        }
 
-            ContentRepository.Save(startPage, SaveAction.Publish, AccessLevel.NoAccess);
+        public override void When()
+        {
+            base.When();
+            _loadedPage = ContentRepository.Get<StartPage>(_startPage.PageLink); 
+        }
 
-            var page2 = ContentRepository.Get<StartPage>(startPage.PageLink);
-            page2.MainBody.ShouldBe("Hejhej!");
+        [Test]
+        public void it_should_be_returned_when_loaded()
+        {
+            _loadedPage.MainBody.ShouldBe("Hejhej!");
         }
 
     }
diff --git a/src/WhiteMagic.Tests/ContentRepositoryExtensions.cs b/src/WhiteMagic.Tests/ContentRepositoryExtensions.cs
index 23de3ad..8fd0c44 100644
--- a/src/WhiteMagic.Tests/ContentRepositoryExtensions.cs
+++ b/src/WhiteMagic.Tests/ContentRepositoryExtensions.cs
@@ -11,6 +11,19 @@ public static class ContentRepositoryExtensions
         public static readonly Guid RootPageGuid = new Guid("945D02B0-B744-4349-A995-87CE3FCD51F4");
         public static readonly Guid WasteBasketGuid = new Guid("27D4C717-4ABC-4DC4-B3A1-5008F311E301");
 
+        public static T Publish<T>(this IContentRepository contentRepository, ContentReference parent, string pageName = "") where T : IContent
+        {
+            return contentRepository.Publish<T>(parent, p => p.Name = pageName);
+        }
+
+        public static T Publish<T>(this IContentRepository contentRepository, ContentReference parent, Action<T> setValues) where T : IContent
+        {
+            return contentRepository
+                .GetDefault<T>(parent)
+                .With(setValues)
+                .SaveAndPublish(contentRepository);
+        }
+
         public static void CreateSystemPages(this IContentRepository contentRepository)
         {
             var rootPage = new PageData();