diff --git a/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs b/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs
index 56a610eb04..a1b7e67a2a 100644
--- a/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs
+++ b/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs
@@ -76,7 +76,7 @@ namespace Umbraco.Tests.Membership
 
             var d = mpc.AsDynamic();
 
-            Assert.AreEqual("test comment", d.Comment);
+            Assert.AreEqual("test comment", d.Comments);
             Assert.AreEqual(date, d.CreationDate);
             Assert.AreEqual("test@email.com", d.Email);
             Assert.AreEqual(true, d.IsApproved);
@@ -117,7 +117,7 @@ namespace Umbraco.Tests.Membership
 
             var d = mpc.AsDynamic();
 
-            Assert.AreEqual("test comment", d.comment);
+            Assert.AreEqual("test comment", d.comments);
             Assert.AreEqual(date, d.creationDate);
             Assert.AreEqual("test@email.com", d.email);
             Assert.AreEqual(true, d.isApproved);
diff --git a/src/Umbraco.Tests/Models/MediaXmlTest.cs b/src/Umbraco.Tests/Models/MediaXmlTest.cs
index 5b24b8a8ae..ecfbc3ce61 100644
--- a/src/Umbraco.Tests/Models/MediaXmlTest.cs
+++ b/src/Umbraco.Tests/Models/MediaXmlTest.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Tests.Models
         public void Can_Generate_Xml_Representation_Of_Media()
         {
             // Arrange
-            var mediaType = MockedContentTypes.CreateImageMediaType();
+            var mediaType = MockedContentTypes.CreateImageMediaType("image2");
             ServiceContext.ContentTypeService.Save(mediaType);
 
             var media = MockedMedia.CreateMediaImage(mediaType, -1);
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
index c4b848bdaa..7aef4855ed 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             ContentTypeRepository contentTypeRepository;
             using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
             {
-                var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage");
+                var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
                 contentType.AllowedContentTypes = new List<ContentTypeSort>
                 {
                     new ContentTypeSort
@@ -106,7 +106,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             ContentTypeRepository contentTypeRepository;
             using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
             {
-                ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage");
+                ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage");
                 Content textpage = MockedContent.CreateSimpleContent(contentType);
 
                 // Act
@@ -130,7 +130,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             ContentTypeRepository contentTypeRepository;
             using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
             {
-                var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage");
+                var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
                 contentTypeRepository.AddOrUpdate(contentType);
                 unitOfWork.Commit();
 
@@ -164,7 +164,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             ContentTypeRepository contentTypeRepository;
             using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
             {
-                ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage");
+                ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
                 Content textpage = MockedContent.CreateSimpleContent(contentType);
 
                 // Act
@@ -194,7 +194,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             ContentTypeRepository contentTypeRepository;
             using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
             {
-                ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage");
+                ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
                 Content textpage = MockedContent.CreateSimpleContent(contentType);
 
                 // Act
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
index ee7ba32a6d..bf69dedb76 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
@@ -73,7 +73,7 @@ namespace Umbraco.Tests.PublishedContent
         [Test]
         public void Get_Property_Value_Uses_Converter()
         {            
-            var mType = MockedContentTypes.CreateImageMediaType();
+            var mType = MockedContentTypes.CreateImageMediaType("image2");
             //lets add an RTE to this
             mType.PropertyGroups.First().PropertyTypes.Add(
                 new PropertyType("test", DataTypeDatabaseType.Nvarchar)
diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
index 088c94b975..fc107fcdbc 100644
--- a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
+++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
@@ -252,11 +252,11 @@ namespace Umbraco.Tests.TestHelpers.Entities
             return mediaType;
         }
 
-        public static MediaType CreateImageMediaType()
+        public static MediaType CreateImageMediaType(string alias = Constants.Conventions.MediaTypes.Image)
         {
             var mediaType = new MediaType(-1)
             {
-                Alias = Constants.Conventions.MediaTypes.Image,
+                Alias = alias,
                 Name = "Image",
                 Description = "ContentType used for images",
                 Icon = ".sprTreeDoc3",