diff --git a/src/Umbraco.Tests/PropertyEditors/DropDownPropertyPreValueEditorTests.cs b/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs
similarity index 97%
rename from src/Umbraco.Tests/PropertyEditors/DropDownPropertyPreValueEditorTests.cs
rename to src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs
index ce9b7f70b5..42b9d174df 100644
--- a/src/Umbraco.Tests/PropertyEditors/DropDownPropertyPreValueEditorTests.cs
+++ b/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs
@@ -1,114 +1,114 @@
-using System;
-using System.Collections.Generic;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Web.PropertyEditors;
-
-namespace Umbraco.Tests.PropertyEditors
-{
-    /// <summary>
-    /// Tests for the base classes of ValueEditors and PreValueEditors that are used for Property Editors that edit
-    /// multiple values such as the drop down list, check box list, color picker, etc....
-    /// </summary>
-    [TestFixture]
-    public class MultiValuePropertyEditorTests
-    {
-        //TODO: Test the other formatting methods for the drop down classes
-
-        [Test]
-        public void DropDownMultipleValueEditor_With_Keys_Format_Data_For_Cache()
-        {
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            var dataTypeService = dataTypeServiceMock.Object;
-            var editor = new PublishValuesMultipleValueEditor(true, dataTypeService, new PropertyValueEditor());
-
-            var prop = new Property(1, Guid.NewGuid(),
-                                    new PropertyType(new DataTypeDefinition(1, "Test.TestEditor")),
-                                    "1234,4567,8910");
-
-            var result = editor.ConvertDbToString(prop, prop.PropertyType, new Mock<IDataTypeService>().Object);
-
-            Assert.AreEqual("1234,4567,8910", result);
-        }
-
-        [Test]
-        public void DropDownMultipleValueEditor_No_Keys_Format_Data_For_Cache()
-        {
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-
-            dataTypeServiceMock
-                .Setup(x => x.GetPreValuesCollectionByDataTypeId(It.IsAny<int>()))
-                           .Returns(new PreValueCollection(new Dictionary<string, PreValue>
-                               {
-                                   {"key0", new PreValue(4567, "Value 1")},
-                                   {"key1", new PreValue(1234, "Value 2")},
-                                   {"key2", new PreValue(8910, "Value 3")}
-                               }));
-
-            var dataTypeService = dataTypeServiceMock.Object;
-            var editor = new PublishValuesMultipleValueEditor(false, dataTypeService, new PropertyValueEditor());
-
-            var prop = new Property(1, Guid.NewGuid(),
-                                    new PropertyType(new DataTypeDefinition(1, "Test.TestEditor")),
-                                    "1234,4567,8910");
-
-            var result = editor.ConvertDbToString(prop, prop.PropertyType, new Mock<IDataTypeService>().Object);
-
-            Assert.AreEqual("Value 1,Value 2,Value 3", result);
-        }
-
-        [Test]
-        public void DropDownValueEditor_Format_Data_For_Cache()
-        {
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            dataTypeServiceMock
-                .Setup(x => x.GetPreValuesCollectionByDataTypeId(It.IsAny<int>()))
-                           .Returns(new PreValueCollection(new Dictionary<string, PreValue>
-                               {
-                                   {"key0", new PreValue(10, "Value 1")},
-                                   {"key1", new PreValue(1234, "Value 2")},
-                                   {"key2", new PreValue(11, "Value 3")}
-                               }));
-
-            var dataTypeService = dataTypeServiceMock.Object;
-            var editor = new PublishValueValueEditor(dataTypeService, new PropertyValueEditor());
-
-            var prop = new Property(1, Guid.NewGuid(),
-                                    new PropertyType(new DataTypeDefinition(1, "Test.TestEditor")),
-                                    "1234");
-
-            var result = editor.ConvertDbToString(prop, prop.PropertyType, new Mock<IDataTypeService>().Object);
-
-            Assert.AreEqual("Value 2", result);
-        }
-
-        [Test]
-        public void DropDownPreValueEditor_Format_Data_For_Editor()
-        {
-
-            var defaultVals = new Dictionary<string, object>();
-            var persisted = new PreValueCollection(new Dictionary<string, PreValue>
-                {
-                    {"item1", new PreValue(1, "Item 1")},
-                    {"item2", new PreValue(2, "Item 2")},
-                    {"item3", new PreValue(3, "Item 3")}
-                });
-
-            var editor = new ValueListPreValueEditor();
-
-            var result = editor.ConvertDbToEditor(defaultVals, persisted);
-
-            Assert.AreEqual(1, result.Count);
-            Assert.IsTrue(result.ContainsKey("items"));
-            var items = result["items"] as IDictionary<int, IDictionary<string, object>>;
-            Assert.IsNotNull(items);
-            Assert.AreEqual("Item 1", items[1]["value"]);
-            Assert.AreEqual("Item 2", items[2]["value"]);
-            Assert.AreEqual("Item 3", items[3]["value"]);
-        }
-
-    }
+using System;
+using System.Collections.Generic;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Web.PropertyEditors;
+
+namespace Umbraco.Tests.PropertyEditors
+{
+    /// <summary>
+    /// Tests for the base classes of ValueEditors and PreValueEditors that are used for Property Editors that edit
+    /// multiple values such as the drop down list, check box list, color picker, etc....
+    /// </summary>
+    [TestFixture]
+    public class MultiValuePropertyEditorTests
+    {
+        //TODO: Test the other formatting methods for the drop down classes
+
+        [Test]
+        public void DropDownMultipleValueEditor_With_Keys_Format_Data_For_Cache()
+        {
+            var dataTypeServiceMock = new Mock<IDataTypeService>();
+            var dataTypeService = dataTypeServiceMock.Object;
+            var editor = new PublishValuesMultipleValueEditor(true, dataTypeService, new PropertyValueEditor());
+
+            var prop = new Property(1, Guid.NewGuid(),
+                                    new PropertyType(new DataTypeDefinition(1, "Test.TestEditor")),
+                                    "1234,4567,8910");
+
+            var result = editor.ConvertDbToString(prop, prop.PropertyType, new Mock<IDataTypeService>().Object);
+
+            Assert.AreEqual("1234,4567,8910", result);
+        }
+
+        [Test]
+        public void DropDownMultipleValueEditor_No_Keys_Format_Data_For_Cache()
+        {
+            var dataTypeServiceMock = new Mock<IDataTypeService>();
+
+            dataTypeServiceMock
+                .Setup(x => x.GetPreValuesCollectionByDataTypeId(It.IsAny<int>()))
+                           .Returns(new PreValueCollection(new Dictionary<string, PreValue>
+                               {
+                                   {"key0", new PreValue(4567, "Value 1")},
+                                   {"key1", new PreValue(1234, "Value 2")},
+                                   {"key2", new PreValue(8910, "Value 3")}
+                               }));
+
+            var dataTypeService = dataTypeServiceMock.Object;
+            var editor = new PublishValuesMultipleValueEditor(false, dataTypeService, new PropertyValueEditor());
+
+            var prop = new Property(1, Guid.NewGuid(),
+                                    new PropertyType(new DataTypeDefinition(1, "Test.TestEditor")),
+                                    "1234,4567,8910");
+
+            var result = editor.ConvertDbToString(prop, prop.PropertyType, new Mock<IDataTypeService>().Object);
+
+            Assert.AreEqual("Value 1,Value 2,Value 3", result);
+        }
+
+        [Test]
+        public void DropDownValueEditor_Format_Data_For_Cache()
+        {
+            var dataTypeServiceMock = new Mock<IDataTypeService>();
+            dataTypeServiceMock
+                .Setup(x => x.GetPreValuesCollectionByDataTypeId(It.IsAny<int>()))
+                           .Returns(new PreValueCollection(new Dictionary<string, PreValue>
+                               {
+                                   {"key0", new PreValue(10, "Value 1")},
+                                   {"key1", new PreValue(1234, "Value 2")},
+                                   {"key2", new PreValue(11, "Value 3")}
+                               }));
+
+            var dataTypeService = dataTypeServiceMock.Object;
+            var editor = new PublishValueValueEditor(dataTypeService, new PropertyValueEditor());
+
+            var prop = new Property(1, Guid.NewGuid(),
+                                    new PropertyType(new DataTypeDefinition(1, "Test.TestEditor")),
+                                    "1234");
+
+            var result = editor.ConvertDbToString(prop, prop.PropertyType, new Mock<IDataTypeService>().Object);
+
+            Assert.AreEqual("Value 2", result);
+        }
+
+        [Test]
+        public void DropDownPreValueEditor_Format_Data_For_Editor()
+        {
+
+            var defaultVals = new Dictionary<string, object>();
+            var persisted = new PreValueCollection(new Dictionary<string, PreValue>
+                {
+                    {"item1", new PreValue(1, "Item 1")},
+                    {"item2", new PreValue(2, "Item 2")},
+                    {"item3", new PreValue(3, "Item 3")}
+                });
+
+            var editor = new ValueListPreValueEditor();
+
+            var result = editor.ConvertDbToEditor(defaultVals, persisted);
+
+            Assert.AreEqual(1, result.Count);
+            Assert.IsTrue(result.ContainsKey("items"));
+            var items = result["items"] as IDictionary<int, IDictionary<string, object>>;
+            Assert.IsNotNull(items);
+            Assert.AreEqual("Item 1", items[1]["value"]);
+            Assert.AreEqual("Item 2", items[2]["value"]);
+            Assert.AreEqual("Item 3", items[3]["value"]);
+        }
+
+    }
 }
\ No newline at end of file