diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml b/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml
index 4713d6c..dbef365 100644
--- a/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml	
+++ b/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml	
@@ -165,7 +165,7 @@
         </member>
         <member name="T:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester">
             <summary>
-            This class tests <see cref="T:Advanced_Software_Engineering.SettingsAndHelperFunctions" /> methods and some <see cref="T:Advanced_Software_Engineering.Verbs.Value" /> methods. It uses a combination of manual and random tests.
+            This class tests <see cref="T:Advanced_Software_Engineering.SettingsAndHelperFunctions" /> methods. It uses a combination of manual and random tests.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.Strip_Random1">
@@ -183,26 +183,6 @@
             Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.Strip(System.String)" /> test
             </summary>
         </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.ConvertToInt_Random1">
-            <summary>
-            Random <see cref="M:Advanced_Software_Engineering.Verbs.Value.ConvertToInt(System.String)" /> test.
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.ConvertToDouble_Random1">
-            <summary>
-            Random <see cref="M:Advanced_Software_Engineering.Verbs.Value.ConvertToDouble(System.String)" /> test.
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.ConvertToDouble_Random2">
-            <summary>
-            Random <see cref="M:Advanced_Software_Engineering.Verbs.Value.ConvertToDouble(System.String)" /> test.
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.ConvertToDouble_Random3">
-            <summary>
-            Random <see cref="M:Advanced_Software_Engineering.Verbs.Value.ConvertToDouble(System.String)" /> test.
-            </summary>
-        </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.StripStringArray_Manual1">
             <summary>
             Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.StripStringArray(System.String[])" /> test.
@@ -238,5 +218,30 @@
             Random <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)" /> test.
             </summary>
         </member>
+        <member name="T:Advanced_Software_Engineering_Tests.ValueHelperTester">
+            <summary>
+            This class tests <see cref="T:Advanced_Software_Engineering.Verbs.ValueHelper" /> methods. It uses a combination of manual and random tests.
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.ValueHelperTester.ConvertToInt_Random1">
+            <summary>
+            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToInt(System.String)" /> test.
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.ValueHelperTester.ConvertToDouble_Random1">
+            <summary>
+            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToDouble(System.String)" /> test.
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.ValueHelperTester.ConvertToDouble_Random2">
+            <summary>
+            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToDouble(System.String)" /> test.
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.ValueHelperTester.ConvertToDouble_Random3">
+            <summary>
+            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToDouble(System.String)" /> test.
+            </summary>
+        </member>
     </members>
 </doc>
\ No newline at end of file
diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs b/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs
index d0abecb..a3b8f35 100644
--- a/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs	
@@ -1,5 +1,4 @@
 using Advanced_Software_Engineering;
-using Advanced_Software_Engineering.Verbs;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
@@ -8,7 +7,7 @@ using System.Linq;
 namespace Advanced_Software_Engineering_Tests {
 
     /// <summary>
-    /// This class tests <see cref="SettingsAndHelperFunctions"/> methods and some <see cref="ValueHelper"/> methods. It uses a combination of manual and random tests.
+    /// This class tests <see cref="SettingsAndHelperFunctions"/> methods. It uses a combination of manual and random tests.
     /// </summary>
     [TestClass]
     public class SettingsAndHelperFunctionsTester {
@@ -58,58 +57,6 @@ namespace Advanced_Software_Engineering_Tests {
             Assert.AreEqual(expected, SettingsAndHelperFunctions.Strip(input));
         }
 
-        /// <summary>
-        /// Random <see cref="ValueHelper.ConvertToInt(string)"/> test.
-        /// </summary>
-        [TestMethod]
-        public void ConvertToInt_Random1() {
-            for (int i = 0; i < 100000; i++) {
-                int expected = rand.Next(int.MinValue, int.MaxValue);
-                string input = expected.ToString();
-
-                Assert.AreEqual(expected, ValueHelper.ConvertToInt(input));
-            }
-        }
-
-        /// <summary>
-        /// Random <see cref="ValueHelper.ConvertToDouble(string)"/> test.
-        /// </summary>
-        [TestMethod]
-        public void ConvertToDouble_Random1() {
-            for (int i = 0; i < 100000; i++) {
-                double expected = rand.NextDouble();
-                string input = expected.ToString();
-
-                Assert.AreEqual(expected, ValueHelper.ConvertToDouble(input));
-            }
-        }
-
-        /// <summary>
-        /// Random <see cref="ValueHelper.ConvertToDouble(string)"/> test.
-        /// </summary>
-        [TestMethod]
-        public void ConvertToDouble_Random2() {
-            for (int i = 0; i < 100000; i++) {
-                double expected = rand.Next(100, 100) * rand.NextDouble();
-                string input = expected.ToString();
-
-                Assert.AreEqual(expected, ValueHelper.ConvertToDouble(input));
-            }
-        }
-
-        /// <summary>
-        /// Random <see cref="ValueHelper.ConvertToDouble(string)"/> test.
-        /// </summary>
-        [TestMethod]
-        public void ConvertToDouble_Random3() {
-            for (int i = 0; i < 100000; i++) {
-                int expected = rand.Next(100, 100);
-                string input = ((double)expected).ToString();
-
-                Assert.AreEqual((double)expected, ValueHelper.ConvertToDouble(input));
-            }
-        }
-
         /// <summary>
         /// Manual <see cref="SettingsAndHelperFunctions.StripStringArray(string[])"/> test.
         /// </summary>
diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/ValueHelperTester.cs b/Advanced Software Engineering/Advanced Software Engineering Tests/ValueHelperTester.cs
new file mode 100644
index 0000000..cee28e1
--- /dev/null
+++ b/Advanced Software Engineering/Advanced Software Engineering Tests/ValueHelperTester.cs	
@@ -0,0 +1,66 @@
+using Advanced_Software_Engineering.Verbs;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+
+namespace Advanced_Software_Engineering_Tests {
+
+    /// <summary>
+    /// This class tests <see cref="ValueHelper"/> methods. It uses a combination of manual and random tests.
+    /// </summary>
+    [TestClass]
+    internal class ValueHelperTester {
+        private Random rand = new Random();
+
+        /// <summary>
+        /// Random <see cref="ValueHelper.ConvertToInt(string)"/> test.
+        /// </summary>
+        [TestMethod]
+        public void ConvertToInt_Random1() {
+            for (int i = 0; i < 100000; i++) {
+                int expected = rand.Next(int.MinValue, int.MaxValue);
+                string input = expected.ToString();
+
+                Assert.AreEqual(expected, ValueHelper.ConvertToInt(input));
+            }
+        }
+
+        /// <summary>
+        /// Random <see cref="ValueHelper.ConvertToDouble(string)"/> test.
+        /// </summary>
+        [TestMethod]
+        public void ConvertToDouble_Random1() {
+            for (int i = 0; i < 100000; i++) {
+                double expected = rand.NextDouble();
+                string input = expected.ToString();
+
+                Assert.AreEqual(expected, ValueHelper.ConvertToDouble(input));
+            }
+        }
+
+        /// <summary>
+        /// Random <see cref="ValueHelper.ConvertToDouble(string)"/> test.
+        /// </summary>
+        [TestMethod]
+        public void ConvertToDouble_Random2() {
+            for (int i = 0; i < 100000; i++) {
+                double expected = rand.Next(100, 100) * rand.NextDouble();
+                string input = expected.ToString();
+
+                Assert.AreEqual(expected, ValueHelper.ConvertToDouble(input));
+            }
+        }
+
+        /// <summary>
+        /// Random <see cref="ValueHelper.ConvertToDouble(string)"/> test.
+        /// </summary>
+        [TestMethod]
+        public void ConvertToDouble_Random3() {
+            for (int i = 0; i < 100000; i++) {
+                int expected = rand.Next(100, 100);
+                string input = ((double)expected).ToString();
+
+                Assert.AreEqual((double)expected, ValueHelper.ConvertToDouble(input));
+            }
+        }
+    }
+}
\ No newline at end of file