diff --git a/algorithm-exercises-java/src/test/java/ae/projecteuler/helper/NaturalNumberTest.java b/algorithm-exercises-java/src/test/java/ae/projecteuler/helper/NaturalNumberTest.java
index 3d201a03..82c8d20c 100644
--- a/algorithm-exercises-java/src/test/java/ae/projecteuler/helper/NaturalNumberTest.java
+++ b/algorithm-exercises-java/src/test/java/ae/projecteuler/helper/NaturalNumberTest.java
@@ -33,8 +33,6 @@ public class NextPrimeFactorOfNumberTestCase {
     }
   }
 
-  private List<NextPrimeFactorOfNumberTestCase> nextPrimeFactorTestCases;
-
   public class PrimeFactorsOfNumberTestCase {
     Integer input;
     Long[] factors;
@@ -47,8 +45,11 @@ public class PrimeFactorsOfNumberTestCase {
     }
   }
 
+  private List<NextPrimeFactorOfNumberTestCase> nextPrimeFactorTestCases;
+  private List<PrimeFactorsOfNumberTestCase> primeFactorsTestCases;
+
   @BeforeAll
-  void initNextPrimeFactorOfNumberTestCases() {
+  void initTestCases() {
     nextPrimeFactorTestCases =
         new ArrayList<NextPrimeFactorOfNumberTestCase>(
             Arrays.asList(
@@ -57,12 +58,7 @@ void initNextPrimeFactorOfNumberTestCases() {
                 new NextPrimeFactorOfNumberTestCase(4, 2, 2, false, 1),
                 new NextPrimeFactorOfNumberTestCase(9, 3, 3, false, 2),
                 new NextPrimeFactorOfNumberTestCase(7, 7, 1, true, 6)));
-  }
-
-  private List<PrimeFactorsOfNumberTestCase> primeFactorsTestCases;
 
-  @BeforeAll
-  void initPrimeFactorsOfNumberTestCases() {
     primeFactorsTestCases =
         new ArrayList<PrimeFactorsOfNumberTestCase>(
             Arrays.asList(