diff --git a/src/test/java/com/gmail/nossr50/util/random/ProbabilityFactoryTest.java b/src/test/java/com/gmail/nossr50/util/random/ProbabilityFactoryTest.java
deleted file mode 100644
index e83395516..000000000
--- a/src/test/java/com/gmail/nossr50/util/random/ProbabilityFactoryTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.gmail.nossr50.util.random;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.util.stream.Stream;
-
-import static com.gmail.nossr50.util.random.RandomChanceUtil.processProbability;
-import static org.junit.jupiter.api.Assertions.*;
-
-class ProbabilityFactoryTest {
-
-    private static Stream<Arguments> provideProbabilitiesForWithinExpectations() {
-        return Stream.of(
-                // static probability, % of time for success
-                Arguments.of(new ProbabilityImpl(5), 5),
-                Arguments.of(new ProbabilityImpl(10), 10),
-                Arguments.of(new ProbabilityImpl(15), 15),
-                Arguments.of(new ProbabilityImpl(20), 20),
-                Arguments.of(new ProbabilityImpl(25), 25),
-                Arguments.of(new ProbabilityImpl(50), 50),
-                Arguments.of(new ProbabilityImpl(75), 75),
-                Arguments.of(new ProbabilityImpl(90), 90),
-                Arguments.of(new ProbabilityImpl(99.9), 99.9),
-                Arguments.of(new ProbabilityImpl(0.05), 0.05),
-                Arguments.of(new ProbabilityImpl(0.1), 0.1),
-                Arguments.of(new ProbabilityImpl(500), 100),
-                Arguments.of(new ProbabilityImpl(1000), 100)
-        );
-    }
-    @Test
-    void testIsSuccessfulRollSucceeds() {
-        Probability probability = new ProbabilityImpl(100);
-
-        for (int i = 0; i < 100000; i++) {
-            assertTrue(processProbability(probability));
-        }
-    }
-
-    @Test
-    void testIsSuccessfulRollFails() {
-        Probability probability = new ProbabilityImpl(0);
-
-        for (int i = 0; i < 100000; i++) {
-            assertFalse(processProbability(probability));
-        }
-    }
-
-    @Test
-    void testIsSuccessfulRollFailsOfPercentage() {
-        Probability probability = Probability.ofPercentageValue(100);
-
-        for (int i = 0; i < 100000; i++) {
-            assertFalse(processProbability(probability));
-        }
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideProbabilitiesForWithinExpectations")
-    void testProcessProbabilityWithinExpectations(Probability probability, double expectedWinPercent) {
-        // Probabilities are tested 200,000,000 times with a margin of error of 0.01%
-        int iterations = 200000000;
-        double winCount = 0;
-
-        for (int i = 0; i < iterations; i++) {
-            if(processProbability(probability)) {
-                winCount++;
-            }
-        }
-
-        double successPercent = (winCount / iterations) * 100;
-        System.out.println(successPercent + ", " + expectedWinPercent);
-        assertEquals(expectedWinPercent, successPercent, 0.01D);
-    }
-
-    @Test
-    void ofPercentageValue() {
-    }
-
-    @Test
-    void ofSubSkill() {
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/com/gmail/nossr50/util/random/ProbabilityTest.java b/src/test/java/com/gmail/nossr50/util/random/ProbabilityTest.java
index da3b6ee56..41e883465 100644
--- a/src/test/java/com/gmail/nossr50/util/random/ProbabilityTest.java
+++ b/src/test/java/com/gmail/nossr50/util/random/ProbabilityTest.java
@@ -12,13 +12,74 @@ import static org.junit.jupiter.api.Assertions.*;
 
 class ProbabilityTest {
 
-
-
+    private static Stream<Arguments> provideProbabilitiesForWithinExpectations() {
+        return Stream.of(
+                // static probability, % of time for success
+                Arguments.of(new ProbabilityImpl(5), 5),
+                Arguments.of(new ProbabilityImpl(10), 10),
+                Arguments.of(new ProbabilityImpl(15), 15),
+                Arguments.of(new ProbabilityImpl(20), 20),
+                Arguments.of(new ProbabilityImpl(25), 25),
+                Arguments.of(new ProbabilityImpl(50), 50),
+                Arguments.of(new ProbabilityImpl(75), 75),
+                Arguments.of(new ProbabilityImpl(90), 90),
+                Arguments.of(new ProbabilityImpl(99.9), 99.9),
+                Arguments.of(new ProbabilityImpl(0.05), 0.05),
+                Arguments.of(new ProbabilityImpl(0.1), 0.1),
+                Arguments.of(new ProbabilityImpl(500), 100),
+                Arguments.of(new ProbabilityImpl(1000), 100)
+        );
+    }
     @Test
-    void chanceOfSuccessPercentage() {
+    void testIsSuccessfulRollSucceeds() {
+        Probability probability = new ProbabilityImpl(100);
+
+        for (int i = 0; i < 100000; i++) {
+            assertTrue(processProbability(probability));
+        }
     }
 
     @Test
-    void testChanceOfSuccessPercentage() {
+    void testIsSuccessfulRollFails() {
+        Probability probability = new ProbabilityImpl(0);
+
+        for (int i = 0; i < 100000; i++) {
+            assertFalse(processProbability(probability));
+        }
+    }
+
+    @Test
+    void testIsSuccessfulRollFailsOfPercentage() {
+        Probability probability = Probability.ofPercentageValue(100);
+
+        for (int i = 0; i < 100000; i++) {
+            assertFalse(processProbability(probability));
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideProbabilitiesForWithinExpectations")
+    void testProcessProbabilityWithinExpectations(Probability probability, double expectedWinPercent) {
+        // Probabilities are tested 200,000,000 times with a margin of error of 0.01%
+        int iterations = 200000000;
+        double winCount = 0;
+
+        for (int i = 0; i < iterations; i++) {
+            if(processProbability(probability)) {
+                winCount++;
+            }
+        }
+
+        double successPercent = (winCount / iterations) * 100;
+        System.out.println(successPercent + ", " + expectedWinPercent);
+        assertEquals(expectedWinPercent, successPercent, 0.01D);
+    }
+
+    @Test
+    void ofPercentageValue() {
+    }
+
+    @Test
+    void ofSubSkill() {
     }
 }
\ No newline at end of file